Commit 434b4370 authored by Sebastian Hans's avatar Sebastian Hans
Browse files

CR 59 SET(22)000166 Ensure UiccResultsService is used

parent 5ae440c1

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

+34 −36
Original line number Diff line number Diff line
@@ -32,14 +32,10 @@ public class Test_Cre_Mha_Enhd extends UiccTestModel { 
    /** test applet 1 instance aid */

    private static String            APPLET_AID_3        = "A0000000 090005FF FFFFFF89 50030102";







    /**  */

    private UiccAPITestCardService    test               = null;

    /** contains the response from the executed command */

    private APDUResponse            response             = null;

    /** stores the test result */

    private boolean                    testresult        = false;





    /**
@@ -52,6 +48,8 @@ public class Test_Cre_Mha_Enhd extends UiccTestModel { 
     * Installs the applet, runs the tests and checks the test result.

     */

    public boolean run(){

        initialiseResults();



        // test script

        test.reset();

        test.terminalProfileSession("0301");
@@ -94,90 +92,90 @@ public class Test_Cre_Mha_Enhd extends UiccTestModel { 
        response = test.terminalProfileSession("FFFFFFF FFEFF1FFF FF0000FF FF9FFFEF" +

                                               "03FF000 0007FE300 01");

        response = test.envelopeMenuSelection("900102","9500");

        testresult = response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 4

        response = test.envelopeMenuSelection("900101","");

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 5

        response = test.envelopeTimerExpiration("A40101");

        //TC 6

        response = test.envelopeCallControlByNAA();

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 7

        response = test.envelopeEventDownloadMTCall();

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 8

        response = test.envelopeEventDownloadCallConnected();

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 9

        response = test.envelopeEventDownloadCallDisconnected();

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 10

        response = test.envelopeEventDownloadLocationStatus();

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 11

        response = test.envelopeEventDownloadUserActivity();

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 12

        response = test.envelopeEventDownloadIdleScreenAvailable();

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 13

        response = test.envelopeEventDownloadCardReaderStatus();

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 14

        response = test.envelopeEventDownloadLanguageSelection();

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 15

        response = test.envelopeEventDownloadBrowserTermination();

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 16

        response = test.status("00","0C","00");

        testresult &= response.checkSw("911A");

        addResult(response.checkSw("911A"));

        //TC 17

        response = test.fetch("1A");

        response = test.terminalResponse("81030140 01820282 8183010038 0281003502 " +

                                         "03003902 000A");

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        response = test.envelopeEventDownloadDataAvailable("B8028100");

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 18

        response = test.envelopeEventDownloadChannelStatus("B8028100");

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 19

        response = test.unrecognizedEnvelope();

        response = test.fetch("10");//fetch declare service

        //get the service record tlv from declare service command

        String servrectlv = getServiceRecordTLV(response.getData());

        response = test.terminalResponse("81030147 0082028281 830100");

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 20

        response = test.envelopeEventDownloadLocalConnection("C1040000FFFF");

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 21

        response = test.envelopeEventDownloadAccessTechnologyChange();

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 22

        response = test.envelopeEventDownloadDisplayParametersChanged();

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 23

        //envelope handler availability with

        //event proactive handler available

        //TC 24 APPLICATION DESELECT

        response = test.selectApplication ("A0000000 090005FF FFFFFF89 E0000002");

        response = test.sendApdu ("00A4044C 10A00000 00090005 FFFFFFFF 89E00000 02");

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 25

        response = test.envelopeEventDownloadNetworkSearchModeChange();

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 26

        response = test.envelopeEventDownloadBrowsingStatus();

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 28

        response = test.envelopeEventDownloadFramesInformationChanged();

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 29

        response = test.envelopeEventDownloadHCIConnectivity();

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 27 + 2

        test.reset();

        response = test.terminalProfileSession("FFFFFFF FFEFF1FFF FF0000FF FF9FFFEF" +
@@ -194,21 +192,21 @@ public class Test_Cre_Mha_Enhd extends UiccTestModel { 
                            "00" +   // LV TAR Value(s)

                            "00" );  // V Maximum number of services

        response = test.selectApplication(APPLET_AID_3);

       testresult &= response.checkSw("9000");

       addResult(response.checkSw("9000"));



        //CHECK TEST RESULT

        response = test.selectApplication(APPLET_AID_1);

        testresult &=  response.checkData("10" +APPLET_AID_1 +

        addResult(response.checkData("10" +APPLET_AID_1 +

                                        "1CCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+

                                        "CCCCCCCC CCCCCCCC CCCCCC CCCC");

                                        "CCCCCCCC CCCCCCCC CCCCCC CCCC"));



        response = test.selectApplication(APPLET_AID_2);

        testresult &=  response.checkData("10" +APPLET_AID_2 +

        addResult(response.checkData("10" +APPLET_AID_2 +

                                        "13CCCC CCCCCCCC CCCCCCCC CCCCCCCC"+

                                        "CCCCCC CCCC");

                                        "CCCCCC CCCC"));



        response = test.selectApplication(APPLET_AID_3);

        testresult &=  response.checkData("10" +APPLET_AID_3 + "01CC");

        addResult(response.checkData("10" +APPLET_AID_3 + "01CC"));



        //  delete applet and package

        test.reset();
@@ -218,7 +216,7 @@ public class Test_Cre_Mha_Enhd extends UiccTestModel { 
        test.deleteApplet(APPLET_AID_3);

        test.deletePackage(CAP_FILE_PATH);



        return testresult;

        return getOverallResult();

    }



    /**

source/Annex_E_SourceCode/uicc/test/catre/cre_mha_erhd/Test_Cre_Mha_Erhd.java

+46 −47
Original line number Diff line number Diff line
@@ -34,9 +34,6 @@ public class Test_Cre_Mha_Erhd extends UiccTestModel { 
	private UiccAPITestCardService	test				= null;

	/** contains the response from the executed command */

	private APDUResponse			response			= null;

	/** stores the test result */

	private boolean					testresult			= false;



	/**

	 *

	 */
@@ -47,6 +44,8 @@ public class Test_Cre_Mha_Erhd extends UiccTestModel { 
	 * Installs the applet, runs the tests and checks the test result.

	 */

	public boolean run(){

        initialiseResults();



        // test script

        test.reset();

        test.terminalProfileSession("16FF");
@@ -90,114 +89,114 @@ public class Test_Cre_Mha_Erhd extends UiccTestModel { 
        		                               "FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF " +

        		                               "FFFF");

        response = test.envelopeMenuSelection("900102","9500");

        testresult = response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 4

        response = test.envelopeMenuSelection("900101","");

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 5

        response = test.envelopeTimerExpiration("A40101");

        //TC 6

        response = test.envelopeEventDownloadMTCall();

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 7

        response = test.envelopeEventDownloadCallConnected();

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 8

        response = test.envelopeEventDownloadCallDisconnected();

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 9

        response = test.envelopeEventDownloadLocationStatus();

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 10

        response = test.envelopeEventDownloadUserActivity();

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 11

        response = test.envelopeEventDownloadIdleScreenAvailable();

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 12

        response = test.envelopeEventDownloadCardReaderStatus();

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 13

        response = test.envelopeEventDownloadLanguageSelection();

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 14

        response = test.envelopeEventDownloadBrowserTermination();

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 15

        response = test.status("00","0C","00");

        testresult &= response.checkSw("911A");

        addResult(response.checkSw("911A"));

        //TC 16

        response = test.fetch("1A");

        response = test.terminalResponse("81030140 01820282 8183010038 0281003502 " +

        		                         "03003902 000A");

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        response = test.envelopeEventDownloadDataAvailable("B8028100");//channel id 1

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 17

        response = test.envelopeEventDownloadChannelStatus("B8028100");

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 18

        response = test.envelopeCallControlByNAA();

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        response = test.envelopeCallControlByNAA();

        testresult &= response.checkSw("9110");

        addResult(response.checkSw("9110"));

        response = test.fetch("10");

        testresult &= response.checkData("D00E8103 01218082 0281028D 03040000");

        addResult(response.checkData("D00E8103 01218082 0281028D 03040000"));

        response   = test.terminalResponse("81030121 80820282 81830100");

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 19

        response = test.unrecognizedEnvelope();

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        response = test.unrecognizedEnvelope();

        testresult &= response.checkSw("9111");

        addResult(response.checkSw("9111"));

        response = test.fetch("11");

        testresult &= response.checkData("D00F8103 01218082 0281028D 0404010203");

        addResult(response.checkData("D00F8103 01218082 0281028D 0404010203"));

        response   = test.terminalResponse("81030121 80820282 81830100");

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 20

        response = test.unrecognizedEnvelope();

        testresult &= response.checkSw("9114");

        addResult(response.checkSw("9114"));

        response = test.envelopeCallControlByNAA();

        testresult &= response.checkSw("9114");

        addResult(response.checkSw("9114"));

        response = test.fetch("14");

        testresult &= response.checkData("D0128103 01218082 0281028D 07045445 58542031");

        addResult(response.checkData("D0128103 01218082 0281028D 07045445 58542031"));

        response = test.terminalResponse("81030121 80820282 81030100");

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 21

        response = test.unrecognizedEnvelope();

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 22

        response = test.envelopeEventDownloadAccessTechnologyChange();

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 23

        response = test.envelopeEventDownloadDisplayParametersChanged();

        testresult &= response.checkSw("9110");

        addResult(response.checkSw("9110"));

        //TC 24

        //fetch declare service

        response = test.fetch("10");//fetch declare service

        //get the service record tlv from declare service command

        String servrectlv = getServiceRecordTLV(response.getData());

        response = test.terminalResponse("81030147 0082028281 830100");

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 25

        response = test.envelopeEventDownloadLocalConnection("C1040000FFFF");

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 26

        response = test.selectApplication ("A0000000 090005FF FFFFFF89 E0000002");

        response = test.sendApdu ("00A4044C 10A00000 00090005 FFFFFFFF 89E00000 02");

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

   	    //TC 27

   	 	response = test.envelopeEventDownloadNetworkSearchModeChange();

	    testresult &= response.checkSw("9000");

	    addResult(response.checkSw("9000"));

   	 	//TC 28

   	 	response = test.envelopeEventDownloadBrowsingStatus();

   	    testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 28

        response = test.envelopeEventDownloadFramesInformationChanged();

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 29

        response = test.envelopeEventDownloadHCIConnectivity();

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 27 + 2

        test.reset();

        response = test.terminalProfileSession("13");
@@ -222,16 +221,16 @@ public class Test_Cre_Mha_Erhd extends UiccTestModel { 
   	    //check results of the tests

        //test.reset();

   		response = test.selectApplication(APPLET_AID_1);

   		testresult &=  response.checkData("10" +APPLET_AID_1 +

        addResult(response.checkData("10" +APPLET_AID_1 +

      									  "1ECCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+

      									  "CCCCCCCC CCCCCCCC CCCCCCCC CCCCCC");

      									  "CCCCCCCC CCCCCCCC CCCCCCCC CCCCCC"));



   		response = test.selectApplication(APPLET_AID_2);

   		testresult &=  response.checkData("10" +APPLET_AID_2 +

   										  "02CCCC");

        addResult(response.checkData("10" +APPLET_AID_2 +

   										  "02CCCC"));



   		response = test.selectApplication(APPLET_AID_3);

   		testresult &=  response.checkData("10" +APPLET_AID_3 + "01CC");

        addResult(response.checkData("10" +APPLET_AID_3 + "01CC"));



   		//  delete applet and package

		test.reset();
@@ -241,7 +240,7 @@ public class Test_Cre_Mha_Erhd extends UiccTestModel { 
		test.deleteApplet(APPLET_AID_3);

		test.deletePackage(CAP_FILE_PATH);



    	return testresult;

    	return getOverallResult();

	}

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

+31 −31
Original line number Diff line number Diff line
@@ -39,8 +39,6 @@ public class Test_Cre_Mha_Pahd extends UiccTestModel { 
	private UiccAPITestCardService	test				= null;

	/** contains the response from the executed command */

	private APDUResponse			response			= null;

	/** stores the test result */

	private boolean					testresult			= false;



    public final byte[] AID_ADF1 = {(byte)0xA0, (byte)0x00, (byte)0x00, (byte)0x00,

    (byte)0x09, (byte)0x00, (byte)0x05, (byte)0xFF,
@@ -59,6 +57,8 @@ public class Test_Cre_Mha_Pahd extends UiccTestModel { 
	 * Installs the applet, runs the tests and checks the test result.

	 */

	public boolean run(){

        initialiseResults();



        // test script

        test.reset();

        test.terminalProfileSession("0301");
@@ -101,61 +101,61 @@ public class Test_Cre_Mha_Pahd extends UiccTestModel { 
        		                       "FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF " +

        		                       "FFFF");

        response = test.envelopeMenuSelection("900102","9500");

        testresult = response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 4

        response = test.envelopeMenuSelection("900101","");

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 5

        response = test.envelopeTimerExpiration("A40101");

        //TC 6

        response = test.envelopeCallControlByNAA();

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 7

        response = test.envelopeEventDownloadMTCall();

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 8

        response = test.envelopeEventDownloadCallConnected();

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 9

        response = test.envelopeEventDownloadCallDisconnected();

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 10

        response = test.envelopeEventDownloadLocationStatus();

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 11

        response = test.envelopeEventDownloadUserActivity();

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 12

        response = test.envelopeEventDownloadIdleScreenAvailable();

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 13

        response = test.envelopeEventDownloadCardReaderStatus();

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 14

        response = test.envelopeEventDownloadLanguageSelection();

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 15

        response = test.envelopeEventDownloadBrowserTermination();

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 16

        response = test.status("00","0C","00");

        testresult &= response.checkSw("911A");

        addResult(response.checkSw("911A"));

        //TC 17

        response = test.fetch("1A");

        response = test.terminalResponse("81030140 01820282 8183010038 0281003502 " +

        		                         "03003902 000A");

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        response = test.envelopeEventDownloadDataAvailable("B8028100");

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 18

        response = test.envelopeEventDownloadChannelStatus("B8028100");

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 19

        response = test.unrecognizedEnvelope();

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 20

        response = test.envelopeEventDownloadAccessTechnologyChange();

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 21

        response = test.envelopeEventDownloadDisplayParametersChanged();

        //fetch declare service
@@ -163,22 +163,22 @@ public class Test_Cre_Mha_Pahd extends UiccTestModel { 
        //get the service record tlv from declare service command

        String servrectlv = getServiceRecordTLV(response.getData());

        response = test.terminalResponse("81030147 0082028281 830100");

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 22

        response = test.envelopeEventDownloadLocalConnection(servrectlv);

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 23

        response = test.envelopeEventDownloadCallConnected();

        //fetch display text

        response = test.fetch("14");

        response = test.terminalResponse("81030121 80820282 81030100");

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 24

        //- Select for activation ADF1

        response = test.selectApplication (byteArrayToHexString(AID_ADF1));

        //- Select for termination ADF1

        response = test.sendApdu ("00A4044C 10"+byteArrayToHexString(AID_ADF1) );

        testresult &= response.checkSw("9000");

        addResult(response.checkSw("9000"));

        //TC 25

        test.reset();

        //no terminal profile is sent and proactive handler shall not be available.
@@ -233,10 +233,10 @@ public class Test_Cre_Mha_Pahd extends UiccTestModel { 
                                               "FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF " +

                                               "FFFF");

   	 	response = test.envelopeEventDownloadNetworkSearchModeChange();

	        testresult &= response.checkSw("9000");

	    addResult(response.checkSw("9000"));

   	 	//TC 46

   	 	response = test.envelopeEventDownloadBrowsingStatus();

   	        testresult &= response.checkSw("9000");

   	    addResult(response.checkSw("9000"));

        //TC 47

        test.reset();

        // Install Applet
@@ -263,7 +263,7 @@ public class Test_Cre_Mha_Pahd extends UiccTestModel { 
        // case that a CAT facility is not supported by the terminal profile,

        // the applet will not be triggered on an unsupported event.

   		response = test.selectApplication(APPLET_AID_1);

   		testresult &=  (response.checkData("10" +APPLET_AID_1 +

        addResult(response.checkData("10" +APPLET_AID_1 +

                                        "30CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+

                                        "CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+

                                        "CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC CC") ||
@@ -272,7 +272,7 @@ public class Test_Cre_Mha_Pahd extends UiccTestModel { 
                                        "CCCCCCCC CCCCCCCC CC") );



   		response = test.selectApplication(APPLET_AID_2);

   		testresult &=  (response.checkData("10" +APPLET_AID_2 +

        addResult(response.checkData("10" +APPLET_AID_2 +

										"25CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+

										"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+

										"CCCCCCCC CCCC") ||
@@ -281,7 +281,7 @@ public class Test_Cre_Mha_Pahd extends UiccTestModel { 
                                        "CCCC") );



   		response = test.selectApplication(APPLET_AID_3);

   		testresult &=  response.checkData("10" +APPLET_AID_3 + "01CC");

        addResult(response.checkData("10" +APPLET_AID_3 + "01CC"));



   		//  delete applet and package

		test.reset();
@@ -291,7 +291,7 @@ public class Test_Cre_Mha_Pahd extends UiccTestModel { 
		test.deleteApplet(APPLET_AID_3);

		test.deletePackage(CAP_FILE_PATH);



    	return testresult;

    	return getOverallResult();

	}



	/**

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

+30 −31

File changed.

Preview size limit exceeded, changes collapsed.