Commit 7db068cf authored by Sebastian Hans's avatar Sebastian Hans
Browse files

review corrections

parent 4ac038fb
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ public class Cre_Mha_Prhd_1 extends TestToolkitApplet {
            testCaseNb==(byte)0x18) {handler_available=false;}

        else if (testCaseNb==(byte)0x02 ||
                 testCaseNb==(byte)0x2E ){handler_available=true;}
                 testCaseNb==(byte)0x2C ){handler_available=true;}

        switch(event){
            //--TC 1
+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ public class Cre_Mha_Prhd_2 extends TestToolkitApplet {
            testCaseNb==(byte)0x11 ){handler_available=false;}

       else if (testCaseNb==(byte)0x02 ||
                testCaseNb==(byte)0x23){handler_available=true;}
                testCaseNb==(byte)0x21){handler_available=true;}


        switch (event) {
+14 −8
Original line number Diff line number Diff line
@@ -210,10 +210,6 @@ public class Test_Cre_Mha_Prhd extends UiccTestModel {
        response = test.envelopeEventDownloadAccessTechnologyChange();
        //TC 41
        response = test.envelopeEventDownloadDisplayParametersChanged();
         //TC 48
        response = test.envelopeEventDownloadFramesInformationChanged();
        //TC 49
        response = test.envelopeEventDownloadHCIConnectivity();
        //TC 42
        //The Proactive Handler is not available before the
        //Terminal Profile
@@ -250,6 +246,16 @@ public class Test_Cre_Mha_Prhd extends UiccTestModel {
                            "00" +   // LV TAR Value(s)
                            "00" );  // V Maximum number of services
        response = test.selectApplication(APPLET_AID_3);
        //TC 48
        // reset, because Applet3 is now selected on channel 0, which we need to use for toolkit activity
        test.reset();
        //initialization with all the facilities supported (without SETUP_EVENT_LIST)
        response = test.terminalProfileSession("FFFFFFFF FEFFFFFF FFFFFFFF FFFFFFFF " +
            "FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF " +
            "FFFF");
        response = test.envelopeEventDownloadFramesInformationChanged();
        //TC 49
        response = test.envelopeEventDownloadHCIConnectivity();


        // get result from applets
@@ -260,9 +266,9 @@ public class Test_Cre_Mha_Prhd extends UiccTestModel {
        // the applet will not be triggered on an unsupported event.
        response = test.selectApplication(APPLET_AID_1);
        addResult(response.checkData("10" +APPLET_AID_1 +
                                        "30CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
                                        "2FCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
                                        "CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
                                        "CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC CC"
                                        "CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"
                                        ) ||
                        response.checkData("10" +APPLET_AID_1 +
                                        "1CCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
@@ -272,9 +278,9 @@ public class Test_Cre_Mha_Prhd extends UiccTestModel {

        response = test.selectApplication(APPLET_AID_2);
        addResult(response.checkData("10" +APPLET_AID_2 +
                                        "25CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
                                        "24CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
                                        "CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
                                        "CCCCCCCC CCCC") ||
                                        "CCCCCCCC CC") ||
                      response.checkData("10" +APPLET_AID_2 +
                                       "15CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
                                       "CCCCCCCC CCCC"
+4 −4
Original line number Diff line number Diff line
@@ -397,7 +397,7 @@ public class Test_Cre_Pcs_Spco extends UiccTestModel {
                           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");
        test.sendApdu("00 A4 00 0C 02 3F 00");
        // Fetch SetUpEventList command
        response = test.fetch("0F");
        addResult(response.checkData("D00D8103 01050082 02818219 020003") ||
@@ -432,7 +432,7 @@ public class Test_Cre_Pcs_Spco extends UiccTestModel {
        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");
        test.sendApdu("00 A4 00 0C 02 3F 00");
        // Fetch Polling Off command
        response = test.fetch("0B");
        addResult(response.checkData("D0098103 01040082 028182"));
@@ -448,7 +448,7 @@ public class Test_Cre_Pcs_Spco extends UiccTestModel {
        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");
        test.sendApdu("00 A4 00 0C 02 3F 00");
        // Fetch Poll Interval command
        response = test.fetch("0F");
        addResult(response.checkData(pollInterCmd));
@@ -502,7 +502,7 @@ public class Test_Cre_Pcs_Spco extends UiccTestModel {
                           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");
        test.sendApdu("00 A4 00 0C 02 3F 00");
        // Fetch Poll Interval command
        response = test.fetch("0F");
        addResult(response.checkData(pollInterCmd));