source/Annex_E_SourceCode/uicc/test/access/api_1_cont/Test_Api_1_Cont.java

@@ -464,7 +464,8 @@ public class Test_Api_1_Cont extends UiccTestModel {
         addResult(test.selectFile(EF_NOSH).checkSw("6985"));
  
         //5
-        test.fetch("13");
+        response = test.fetch("13");
+        addResult(response.checkSw("9000"));
         response = test.terminalResponse("81030121 80820282 81830100");
  
         /** test case 14
@@ -479,7 +480,8 @@ public class Test_Api_1_Cont extends UiccTestModel {
         addResult(test.selectFile(EF_NOSH).checkSw("6985"));
  
         //5
-        test.fetch("13");
+        response = test.fetch("13");
+        addResult(response.checkSw("9000"));
         response = test.terminalResponse("81030121 80820282 81830100");
  
         /** test case 15

source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edat/Test_Cre_Apt_Edat.java

@@ -55,13 +55,15 @@ public class Test_Cre_Apt_Edat extends UiccTestModel {
         //***TEST CASE 1: 1-APPLET 1 IS REGISTERED TO EVENT_EVENT_DOWNLOAD_ACCESS_TECHNOLOGY_CHANGE***
         //***TEST CASE 1: 2-APPLET 1 IS TRIGGERED***
         test.envelopeEventDownloadAccessTechnologyChange();
-        test.fetch("0D");
+        response = test.fetch("0D");
+        addResult(response.checkSw("9000"));
         test.terminalResponse("81030105 00820282 81830100");
         //***TEST CASE 2: 1-APPLET 1 IS NOT TRIGGERED***
         test.envelopeEventDownloadAccessTechnologyChange();
         //***TEST CASE 2: 1 IS REGISTERED TO EVENT_EVENT_DOWNLOAD_ACCESS_TECHNOLOGY_CHANGE***
         test.envelopeMenuSelection("100101", "");//Help Request not available
-        test.fetch("0E");
+        response = test.fetch("0E");
+        addResult(response.checkSw("9000"));
         test.terminalResponse("81030105 00820282 81830100");
         //***TEST CASE 2: 2-APPLET 1 IS TRIGGERED***
         test.envelopeEventDownloadAccessTechnologyChange();

source/Annex_E_SourceCode/uicc/test/catre/cre_mha_enhd/Test_Cre_Mha_Enhd.java

@@ -144,6 +144,7 @@ public class Test_Cre_Mha_Enhd extends UiccTestModel {
         //TC 19
         response = test.unrecognizedEnvelope();
         response = test.fetch("10");//fetch declare service
+        addResult(response.checkSw("9000"));
         //get the service record tlv from declare service command
         String servrectlv = getServiceRecordTLV(response.getData());
         response = test.terminalResponse("81030147 0082028281 830100");

source/Annex_E_SourceCode/uicc/test/catre/cre_mha_pahd/Test_Cre_Mha_Pahd.java

@@ -142,6 +142,7 @@ public class Test_Cre_Mha_Pahd extends UiccTestModel {
         addResult(response.checkSw("911A"));
         //TC 17
         response = test.fetch("1A");
+        addResult(response.checkSw("9000"));
         response = test.terminalResponse("81030140 01820282 8183010038 0281003502 " +
         		                         "03003902 000A");
         addResult(response.checkSw("9000"));
@@ -160,6 +161,7 @@ public class Test_Cre_Mha_Pahd extends UiccTestModel {
         response = test.envelopeEventDownloadDisplayParametersChanged();
         //fetch declare service
         response = test.fetch("10");
+        addResult(response.checkSw("9000"));
         //get the service record tlv from declare service command
         String servrectlv = getServiceRecordTLV(response.getData());
         response = test.terminalResponse("81030147 0082028281 830100");
@@ -169,6 +171,7 @@ public class Test_Cre_Mha_Pahd extends UiccTestModel {
         addResult(response.checkSw("9000"));
         //TC 23
         response = test.envelopeEventDownloadCallConnected();
+        addResult(response.checkSw("9000"));
         //fetch display text
         response = test.fetch("14");
         response = test.terminalResponse("81030121 80820282 81030100");

source/Annex_E_SourceCode/uicc/test/catre/cre_mha_prhd/Test_Cre_Mha_Prhd.java

@@ -134,6 +134,7 @@ public class Test_Cre_Mha_Prhd extends UiccTestModel {
         addResult(response.checkSw("911A"));
         //TC 17
         response = test.fetch("1A");
+        addResult(response.checkSw("9000"));
         response = test.terminalResponse("81030140 01820282 8183010038 0281003502 " +
                                          "03003902 000A");
         addResult(response.checkSw("9000"));
@@ -152,6 +153,7 @@ public class Test_Cre_Mha_Prhd extends UiccTestModel {
         response = test.envelopeEventDownloadDisplayParametersChanged();
         //fetch declare service
         response = test.fetch("10");
+        addResult(response.checkSw("9000"));
         //get the service record tlv from declare service command
         String servrectlv = getServiceRecordTLV(response.getData());
         response = test.terminalResponse("81030147 0082028281 830100");
@@ -163,6 +165,7 @@ public class Test_Cre_Mha_Prhd extends UiccTestModel {
         response = test.envelopeEventDownloadCallConnected();
         //fetch display text
         response = test.fetch("14");
+        addResult(response.checkSw("9000"));
         response = test.terminalResponse("81030121 80820282 81030100");
         addResult(response.checkSw("9000"));
         //TC 24

source/Annex_E_SourceCode/uicc/test/catre/cre_pcs_spco/Test_Cre_Pcs_Spco.java

@@ -241,9 +241,9 @@ public class Test_Cre_Pcs_Spco extends UiccTestModel {
         /** Testcase 3                                                       */
         /*********************************************************************/
 
-        // Lock Applet1
-        test.lockApplication(APPLET_AID_1);
-        // Send a status command to be sure to retrieve the correct status word in the RAPDU
+        // Lock Applet1; note that we don't want this method to consume any unnecessary 91XX -> true
+        test.lockApplication(APPLET_AID_1, true);
+		// Send a status command to be sure to retrieve the correct status word in the RAPDU
         test.status("00","0C","00");
         // Fetch the SetUpMenu with the menus
         menuList[0] = "Menu2";
@@ -257,6 +257,8 @@ public class Test_Cre_Pcs_Spco extends UiccTestModel {
 
         // Make selectable Applet1; note that we don't want this method to consume any unnecessary 91XX -> true
         test.unlockApplication(APPLET_AID_1, true);
+		// Send a status command to be sure to retrieve the correct status word in the RAPDU
+        test.status("00","0C","00");
         // Fetch the SetUpMenu with the menus
         menuList[0] = "Menu1";
         menuIdList[0] = "01";
@@ -300,9 +302,9 @@ public class Test_Cre_Pcs_Spco extends UiccTestModel {
         /** Testcase 6                                                       */
         /*********************************************************************/
         
-        // Lock Applet1
-        test.lockApplication(APPLET_AID_1);
-        // Send a status command to be sure to retrieve the correct status word in the RAPDU
+        // Lock Applet1; note that we don't want this method to consume any unnecessary 91XX -> true
+        test.lockApplication(APPLET_AID_1, true);
+		// Send a status command to be sure to retrieve the correct status word in the RAPDU
         test.status("00","0C","00");
         // Fetch SetUpEventList command
         response = test.fetch("0D");
@@ -318,6 +320,8 @@ public class Test_Cre_Pcs_Spco extends UiccTestModel {
         
         // Make selectable Applet1; note that we don't want this method to consume any unnecessary 91XX -> true
         test.unlockApplication(APPLET_AID_1, true);
+		// Send a status command to be sure to retrieve the correct status word in the RAPDU
+        test.status("00","0C","00");
         // Fetch SetUpEventList command
         response = test.fetch("0F");
         addResult(response.checkData("D00D8103 01050082 02818219 020003") ||
@@ -366,9 +370,9 @@ public class Test_Cre_Pcs_Spco extends UiccTestModel {
         response = test.terminalResponse("81030105 00820282 81830100");                                    
         addResult(response.checkSw("9000"));
 
-        // Delete Applet1
-        test.deleteApplet(APPLET_AID_1);
-        // Send a status command to be sure to retrieve the correct status word in the RAPDU
+        // Delete Applet1; note that we don't want this method to consume any unnecessary 91XX -> true
+        test.deleteApplet(APPLET_AID_1, true);
+		// Send a status command to be sure to retrieve the correct status word in the RAPDU
         test.status("00","0C","00");
         // Fetch SetUpEventList command
         response = test.fetch("0D");
@@ -391,9 +395,9 @@ public class Test_Cre_Pcs_Spco extends UiccTestModel {
                                "00" +   // LV TAR Value(s) 
                                "00",    // V Maximum number of services
                            true);
-        // Send a Select command to be sure to retrieve the correct status word in the RAPDU
-        // Do not send Status, because this would turn off polling (which is coded for the start of Testcase 12)
-        test.sendApdu("00 A4 00 0C 02 3F 00");
+	    // Send a status command to be sure to retrieve the correct status word in the RAPDU
+		// Do not send Status, because this would turn off polling (which is coded for the start of Testcase12)
+        test.sendpdu("00 A4 00 0C 02 3F 00");
         // Fetch SetUpEventList command
         response = test.fetch("0F");
         addResult(response.checkData("D00D8103 01050082 02818219 020003") ||
@@ -424,11 +428,11 @@ public class Test_Cre_Pcs_Spco extends UiccTestModel {
         /** Testcase 10                                                      */
         /*********************************************************************/
         
-        // Lock Applet1
-        test.lockApplication(APPLET_AID_1);
-        // Send a Select command to be sure to retrieve the correct status word in the RAPDU
-        // Do not send Status, because this would turn off polling (which is coded for the start of Testcase 12)
-        test.sendApdu("00 A4 00 0C 02 3F 00");
+        // Lock Applet1; note that we don't want this method to consume any unnecessary 91XX -> true
+        test.lockApplication(APPLET_AID_1, true);
+		// Send a status command to be sure to retrieve the correct status word in the RAPDU
+		// Do not send Status, because this would turn off polling (which is coded for the start of Testcase12)
+        test.sendpdu("00 A4 00 0C 02 3F 00");
         // Fetch Polling Off command
         response = test.fetch("0B");
         addResult(response.checkData("D0098103 01040082 028182"));
@@ -440,11 +444,11 @@ public class Test_Cre_Pcs_Spco extends UiccTestModel {
         /** Testcase 11                                                      */
         /*********************************************************************/
         
-        // Make selectable Applet1
-        test.unlockApplication(APPLET_AID_1);
-        // Send a Select command to be sure to retrieve the correct status word in the RAPDU
-        // Do not send Status, because this would turn off polling (which is coded for the start of Testcase 12)
-        test.sendApdu("00 A4 00 0C 02 3F 00");
+        // Make selectable Applet1; note that we don't want this method to consume any unnecessary 91XX -> true
+        test.unlockApplication(APPLET_AID_1, true);
+		// Send a status command to be sure to retrieve the correct status word in the RAPDU
+		// Do not send Status, because this would turn off polling (which is coded for the start of Testcase12)
+        test.sendpdu("00 A4 00 0C 02 3F 00");
         // Fetch Poll Interval command
         response = test.fetch("0F");
         addResult(response.checkData(pollInterCmd));
@@ -472,9 +476,9 @@ public class Test_Cre_Pcs_Spco extends UiccTestModel {
         response = test.terminalResponse("81030103 00820282 81830100 84020010");                                    
         addResult(response.checkSw("9000"));
 
-        // Delete Applet1
-        test.deleteApplet(APPLET_AID_1);
-        // Send a status command to be sure to retrieve the correct status word in the RAPDU
+        // Delete Applet1; note that we don't want this method to consume any unnecessary 91XX -> true
+        test.deleteApplet(APPLET_AID_1, true);
+		// Send a status command to be sure to retrieve the correct status word in the RAPDU
         test.status("00","0C","00");
         // Fetch Polling Off command
         response = test.fetch("0B");
@@ -496,9 +500,9 @@ public class Test_Cre_Pcs_Spco extends UiccTestModel {
                                "00" +   // LV TAR Value(s) 
                                "00",    // V Maximum number of services
                            true);
-        // Send a Select command to be sure to retrieve the correct status word in the RAPDU
-        // Do not send Status, because this would turn off polling (which is coded for the start of Testcase 12)
-        test.sendApdu("00 A4 00 0C 02 3F 00");
+		// Send a status command to be sure to retrieve the correct status word in the RAPDU
+		// Do not send Status, because this would turn off polling (which is coded for the start of Testcase12)
+        test.sendpdu("00 A4 00 0C 02 3F 00");
         // Fetch Poll Interval command
         response = test.fetch("0F");
         addResult(response.checkData(pollInterCmd));
@@ -712,9 +716,9 @@ public class Test_Cre_Pcs_Spco extends UiccTestModel {
         addResult(response.checkSw("9000"));
         
         //Lock Applet3 (testcase 14-14); note that we don't want this method to consume any unnecessary 91XX -> true
-        response = test.lockApplication(APPLET_AID_3, true);
+        test.lockApplication(APPLET_AID_3, true);
         // Send a status command to be sure to retrieve the correct status word in the RAPDU
-        response = test.status("00","0C","00");
+        test.status("00","0C","00");
         // Fetch the SetUpMenu
         response = test.fetch(response.getStatusWord().substring(2));
         addResult(response.checkData("D01C8103 01250082 02818285 09554943" +
@@ -728,9 +732,9 @@ public class Test_Cre_Pcs_Spco extends UiccTestModel {
         response = test.terminalResponse("81030125 00820282 81830100");                                    
         addResult(response.checkSw("9000"));
         
-        //Make selectable Applet3 (testcase 14-15)
-        test.unlockApplication(APPLET_AID_3);
-        // Send a status command to be sure to retrieve the correct status word in the RAPDU
+        //Make selectable Applet3 (testcase 14-15); note that we don't want this method to consume any unnecessary 91XX -> true
+        test.unlockApplication(APPLET_AID_3, true);
+		// Send a status command to be sure to retrieve the correct status word in the RAPDU
         test.status("00","0C","00");
         // Fetch the SetUpMenu
         response = test.fetch("30");

source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_gpol/Test_Api_2_Tkr_Gpol.java

@@ -60,11 +60,13 @@ public class Test_Api_2_Tkr_Gpol extends UiccTestModel {
         response = test.unrecognizedEnvelope();
         addResult(response.checkSw("910F"));
         response = test.fetch("0F");
+        addResult(response.checkSw("9000"));
         test.terminalResponse("81030103 00820282 81830100 840200FF");
         test.reset();
         response = test.terminalProfile("09017020");
         addResult(response.checkSw("910F"));
         response = test.fetch("0F");
+        addResult(response.checkSw("9000"));
         test.terminalResponse("81030103 00820282 81830100 840200FF");
         test.unrecognizedEnvelope();
 
@@ -74,11 +76,13 @@ public class Test_Api_2_Tkr_Gpol extends UiccTestModel {
         response = test.unrecognizedEnvelope();
         addResult(response.checkSw("910F"));
         response = test.fetch("0F");
+        addResult(response.checkSw("9000"));
         test.terminalResponse("81030103 00820282 81830100 8402011E");
         test.reset();
         response = test.terminalProfile("09017020");
         addResult(response.checkSw("910F"));
         response = test.fetch("0F");
+        addResult(response.checkSw("9000"));
         test.terminalResponse("81030103 00820282 81830100 84020175");
         test.unrecognizedEnvelope();
 
@@ -88,6 +92,7 @@ public class Test_Api_2_Tkr_Gpol extends UiccTestModel {
         response = test.unrecognizedEnvelope();
         addResult(response.checkSw("910B"));
         response = test.fetch("0B");
+        addResult(response.checkSw("9000"));
         test.terminalResponse("81030104 00820282 81830100");
         test.reset();
         response = test.terminalProfile("09017020");

source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rsid/Test_Api_2_Tkr_Rsid.java

@@ -76,6 +76,7 @@ public class Test_Api_2_Tkr_Rsid extends UiccTestModel {
         response = test.envelopeMenuSelection("900102","");
         addResult(response.checkSw("9110"));
         response = test.fetch("10");
+        addResult(response.checkSw("9000"));
         response = test.terminalResponse("81030147 00820282 81830100");
         
 

source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_sevl/Test_Api_2_Tkr_Sevl.java

@@ -82,6 +82,7 @@ public class Test_Api_2_Tkr_Sevl extends UiccTestModel {
         response = test.envelopeMenuSelection("900102", "");
         addResult(response.checkSw("910E"));
         response = test.fetch("0E");
+        addResult(response.checkSw("9000"));
 
         // check results
         response = test.selectApplication(APPLET_AID_1);

source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_smta/Test_Api_2_Tkr_Smta.java

@@ -59,6 +59,7 @@ public class Test_Api_2_Tkr_Smta extends UiccTestModel {
         
         addResult(response.checkSw("913E"));
         response = test.fetch("3E");
+        addResult(response.checkSw("9000"));
         test.terminalResponse("81030125 00820282 81830100");
 
         // testcase 1

source/Annex_E_SourceCode/uicc/test/toolkit/api_2_trs_isprav/Test_Api_2_Trs_IsPrAv.java

@@ -97,7 +97,7 @@ public class Test_Api_2_Trs_IsPrAv extends UiccTestModel {
 
         test.reset();
         test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
-        // delete applets and package
+        // delete applets 
         test.deleteApplet(APPLET_AID_1);
         test.deleteApplet(APPLET_AID_2);
 	    addResult(response.checkSw("9000"));