Commit 4ac038fb authored by Sebastian Hans's avatar Sebastian Hans
Browse files

correct incomplete implementation of CR 55 and 56

parent f08bb831

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

+37 −33
Original line number Diff line number Diff line
@@ -241,8 +241,8 @@ public class Test_Cre_Pcs_Spco extends UiccTestModel { 
        /** Testcase 3                                                       */

        /*********************************************************************/



        // Lock Applet1

        test.lockApplication(APPLET_AID_1);

        // 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
@@ -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,8 +302,8 @@ public class Test_Cre_Pcs_Spco extends UiccTestModel { 
        /** Testcase 6                                                       */

        /*********************************************************************/

        

        // Lock Applet1

        test.lockApplication(APPLET_AID_1);

        // 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
@@ -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,8 +370,8 @@ 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);

        // 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
@@ -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

	    // 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.sendApdu("00 A4 00 0C 02 3F 00");

        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

        // 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.sendApdu("00 A4 00 0C 02 3F 00");

        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

        // 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.sendApdu("00 A4 00 0C 02 3F 00");

        test.sendpdu("00 A4 00 0C 02 3F 00");

        // Fetch Poll Interval command

        response = test.fetch("0F");

        addResult(response.checkData(pollInterCmd));
@@ -472,8 +476,8 @@ 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);

        // 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
@@ -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

		// 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.sendApdu("00 A4 00 0C 02 3F 00");

        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,8 +732,8 @@ 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);

        //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