Commits (4)
...@@ -102,72 +102,72 @@ public class Test_Cre_Apt_Epha extends UiccTestModel { ...@@ -102,72 +102,72 @@ public class Test_Cre_Apt_Epha extends UiccTestModel {
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE); test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
test.deleteApplet(APPLET_AID_1); test.deleteApplet(APPLET_AID_1);
test.deleteApplet(APPLET_AID_2); test.deleteApplet(APPLET_AID_2);
/*********************************************************************/
/** Testcase 3 */
/*********************************************************************/
// Install Applet1
response = test.installApplet(CAP_FILE_PATH, CLASS_AID_1, APPLET_AID_1,
"8008" + // TLV UICC Toolkit application specific parameters
"01" + // V Priority Level
"00" + // V Max. number of timers
"0A" + // V Maximum text length for a menu entry
"00" + // V Maximum number of menu entries
"00" + // V Maximum number of channels
"00" + // LV Minimum Security Level field
"00" + // LV TAR Value(s)
"00"); // V Maximum number of services
test.addResult(response.checkSw("9000"));
// Install Applet2
response = test.installApplet(CAP_FILE_PATH, CLASS_AID_2, APPLET_AID_2,
"8008" + // TLV UICC Toolkit application specific parameters
"01" + // V Priority Level
"00" + // V Max. number of timers
"0A" + // V Maximum text length for a menu entry
"00" + // V Maximum number of menu entries
"00" + // V Maximum number of channels
"00" + // LV Minimum Security Level field
"00" + // LV TAR Value(s)
"00"); // V Maximum number of services
addResult(response.checkSw("9000"));
// Card Initialisation
test.reset();
test.terminalProfileSession("09030020 21");
// Trigger the applets
response = test.envelopeEventProactiveHandlerAvailable();
addResult(response.checkSw("9000"));
/*********************************************************************/ // commented out Testcase 3, because envelopeEventProactiveHandlerAvailable() is currently FFS
/*********************************************************************/ // /*********************************************************************/
/** Check Applets */ // /** Testcase 3 */
/*********************************************************************/ // /*********************************************************************/
/*********************************************************************/ //
// // Install Applet1
// response = test.installApplet(CAP_FILE_PATH, CLASS_AID_1, APPLET_AID_1,
// "8008" + // TLV UICC Toolkit application specific parameters
// "01" + // V Priority Level
// "00" + // V Max. number of timers
// "0A" + // V Maximum text length for a menu entry
// "00" + // V Maximum number of menu entries
// "00" + // V Maximum number of channels
// "00" + // LV Minimum Security Level field
// "00" + // LV TAR Value(s)
// "00"); // V Maximum number of services
//
// test.addResult(response.checkSw("9000"));
//
// // Install Applet2
// response = test.installApplet(CAP_FILE_PATH, CLASS_AID_2, APPLET_AID_2,
// "8008" + // TLV UICC Toolkit application specific parameters
// "01" + // V Priority Level
// "00" + // V Max. number of timers
// "0A" + // V Maximum text length for a menu entry
// "00" + // V Maximum number of menu entries
// "00" + // V Maximum number of channels
// "00" + // LV Minimum Security Level field
// "00" + // LV TAR Value(s)
// "00"); // V Maximum number of services
//
// addResult(response.checkSw("9000"));
//
// // Card Initialisation
// test.reset();
// test.terminalProfileSession("09030020 21");
//
// // Trigger the applets
// response = test.envelopeEventProactiveHandlerAvailable();
// addResult(response.checkSw("9000"));
//
//
// /*********************************************************************/
// /*********************************************************************/
// /** Check Applets */
// /*********************************************************************/
// /*********************************************************************/
//
// response = test.selectApplication(APPLET_AID_1);
// addResult(response.checkData("10" + APPLET_AID_1 + "01" + "CC"));
//
//
// /*********************************************************************/
// /*********************************************************************/
// /** Restore card */
// /*********************************************************************/
// /*********************************************************************/
//
// test.reset();
// test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
// // delete applets and package
// test.deleteApplet(APPLET_AID_1);
// test.deleteApplet(APPLET_AID_2);
test.deletePackage(CAP_FILE_PATH);
response = test.selectApplication(APPLET_AID_1);
addResult(response.checkData("10" + APPLET_AID_1 + "01" + "CC"));
/*********************************************************************/
/*********************************************************************/
/** Restore card */
/*********************************************************************/
/*********************************************************************/
test.reset();
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
// delete applets and package
test.deleteApplet(APPLET_AID_1);
test.deleteApplet(APPLET_AID_2);
response = test.deletePackage(CAP_FILE_PATH);
addResult(response.checkSw("9000"));
return getOverallResult(); return getOverallResult();
} }
......
...@@ -32,14 +32,10 @@ public class Test_Cre_Mha_Enhd extends UiccTestModel { ...@@ -32,14 +32,10 @@ public class Test_Cre_Mha_Enhd extends UiccTestModel {
/** test applet 1 instance aid */ /** test applet 1 instance aid */
private static String APPLET_AID_3 = "A0000000 090005FF FFFFFF89 50030102"; private static String APPLET_AID_3 = "A0000000 090005FF FFFFFF89 50030102";
/** */ /** */
private UiccAPITestCardService test = null; private UiccAPITestCardService test = null;
/** contains the response from the executed command */ /** contains the response from the executed command */
private APDUResponse response = null; private APDUResponse response = null;
/** stores the test result */
private boolean testresult = false;
/** /**
...@@ -52,6 +48,8 @@ public class Test_Cre_Mha_Enhd extends UiccTestModel { ...@@ -52,6 +48,8 @@ public class Test_Cre_Mha_Enhd extends UiccTestModel {
* Installs the applet, runs the tests and checks the test result. * Installs the applet, runs the tests and checks the test result.
*/ */
public boolean run(){ public boolean run(){
initialiseResults();
// test script // test script
test.reset(); test.reset();
test.terminalProfileSession("0301"); test.terminalProfileSession("0301");
...@@ -94,90 +92,90 @@ public class Test_Cre_Mha_Enhd extends UiccTestModel { ...@@ -94,90 +92,90 @@ public class Test_Cre_Mha_Enhd extends UiccTestModel {
response = test.terminalProfileSession("FFFFFFF FFEFF1FFF FF0000FF FF9FFFEF" + response = test.terminalProfileSession("FFFFFFF FFEFF1FFF FF0000FF FF9FFFEF" +
"03FF000 0007FE300 01"); "03FF000 0007FE300 01");
response = test.envelopeMenuSelection("900102","9500"); response = test.envelopeMenuSelection("900102","9500");
testresult = response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 4 //TC 4
response = test.envelopeMenuSelection("900101",""); response = test.envelopeMenuSelection("900101","");
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 5 //TC 5
response = test.envelopeTimerExpiration("A40101"); response = test.envelopeTimerExpiration("A40101");
//TC 6 //TC 6
response = test.envelopeCallControlByNAA(); response = test.envelopeCallControlByNAA();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 7 //TC 7
response = test.envelopeEventDownloadMTCall(); response = test.envelopeEventDownloadMTCall();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 8 //TC 8
response = test.envelopeEventDownloadCallConnected(); response = test.envelopeEventDownloadCallConnected();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 9 //TC 9
response = test.envelopeEventDownloadCallDisconnected(); response = test.envelopeEventDownloadCallDisconnected();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 10 //TC 10
response = test.envelopeEventDownloadLocationStatus(); response = test.envelopeEventDownloadLocationStatus();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 11 //TC 11
response = test.envelopeEventDownloadUserActivity(); response = test.envelopeEventDownloadUserActivity();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 12 //TC 12
response = test.envelopeEventDownloadIdleScreenAvailable(); response = test.envelopeEventDownloadIdleScreenAvailable();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 13 //TC 13
response = test.envelopeEventDownloadCardReaderStatus(); response = test.envelopeEventDownloadCardReaderStatus();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 14 //TC 14
response = test.envelopeEventDownloadLanguageSelection(); response = test.envelopeEventDownloadLanguageSelection();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 15 //TC 15
response = test.envelopeEventDownloadBrowserTermination(); response = test.envelopeEventDownloadBrowserTermination();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 16 //TC 16
response = test.status("00","0C","00"); response = test.status("00","0C","00");
testresult &= response.checkSw("911A"); addResult(response.checkSw("911A"));
//TC 17 //TC 17
response = test.fetch("1A"); response = test.fetch("1A");
response = test.terminalResponse("81030140 01820282 8183010038 0281003502 " + response = test.terminalResponse("81030140 01820282 8183010038 0281003502 " +
"03003902 000A"); "03003902 000A");
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
response = test.envelopeEventDownloadDataAvailable("B8028100"); response = test.envelopeEventDownloadDataAvailable("B8028100");
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 18 //TC 18
response = test.envelopeEventDownloadChannelStatus("B8028100"); response = test.envelopeEventDownloadChannelStatus("B8028100");
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 19 //TC 19
response = test.unrecognizedEnvelope(); response = test.unrecognizedEnvelope();
response = test.fetch("10");//fetch declare service response = test.fetch("10");//fetch declare service
//get the service record tlv from declare service command //get the service record tlv from declare service command
String servrectlv = getServiceRecordTLV(response.getData()); String servrectlv = getServiceRecordTLV(response.getData());
response = test.terminalResponse("81030147 0082028281 830100"); response = test.terminalResponse("81030147 0082028281 830100");
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 20 //TC 20
response = test.envelopeEventDownloadLocalConnection("C1040000FFFF"); response = test.envelopeEventDownloadLocalConnection("C1040000FFFF");
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 21 //TC 21
response = test.envelopeEventDownloadAccessTechnologyChange(); response = test.envelopeEventDownloadAccessTechnologyChange();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 22 //TC 22
response = test.envelopeEventDownloadDisplayParametersChanged(); response = test.envelopeEventDownloadDisplayParametersChanged();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 23 //TC 23
//envelope handler availability with //envelope handler availability with
//event proactive handler available //event proactive handler available
//TC 24 APPLICATION DESELECT //TC 24 APPLICATION DESELECT
response = test.selectApplication ("A0000000 090005FF FFFFFF89 E0000002"); response = test.selectApplication ("A0000000 090005FF FFFFFF89 E0000002");
response = test.sendApdu ("00A4044C 10A00000 00090005 FFFFFFFF 89E00000 02"); response = test.sendApdu ("00A4044C 10A00000 00090005 FFFFFFFF 89E00000 02");
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 25 //TC 25
response = test.envelopeEventDownloadNetworkSearchModeChange(); response = test.envelopeEventDownloadNetworkSearchModeChange();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 26 //TC 26
response = test.envelopeEventDownloadBrowsingStatus(); response = test.envelopeEventDownloadBrowsingStatus();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 28 //TC 28
response = test.envelopeEventDownloadFramesInformationChanged(); response = test.envelopeEventDownloadFramesInformationChanged();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 29 //TC 29
response = test.envelopeEventDownloadHCIConnectivity(); response = test.envelopeEventDownloadHCIConnectivity();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 27 + 2 //TC 27 + 2
test.reset(); test.reset();
response = test.terminalProfileSession("FFFFFFF FFEFF1FFF FF0000FF FF9FFFEF" + response = test.terminalProfileSession("FFFFFFF FFEFF1FFF FF0000FF FF9FFFEF" +
...@@ -194,21 +192,21 @@ public class Test_Cre_Mha_Enhd extends UiccTestModel { ...@@ -194,21 +192,21 @@ public class Test_Cre_Mha_Enhd extends UiccTestModel {
"00" + // LV TAR Value(s) "00" + // LV TAR Value(s)
"00" ); // V Maximum number of services "00" ); // V Maximum number of services
response = test.selectApplication(APPLET_AID_3); response = test.selectApplication(APPLET_AID_3);
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//CHECK TEST RESULT //CHECK TEST RESULT
response = test.selectApplication(APPLET_AID_1); response = test.selectApplication(APPLET_AID_1);
testresult &= response.checkData("10" +APPLET_AID_1 + addResult(response.checkData("10" +APPLET_AID_1 +
"1CCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+ "1CCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
"CCCCCCCC CCCCCCCC CCCCCC CCCC"); "CCCCCCCC CCCCCCCC CCCCCC CCCC"));
response = test.selectApplication(APPLET_AID_2); response = test.selectApplication(APPLET_AID_2);
testresult &= response.checkData("10" +APPLET_AID_2 + addResult(response.checkData("10" +APPLET_AID_2 +
"13CCCC CCCCCCCC CCCCCCCC CCCCCCCC"+ "13CCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
"CCCCCC CCCC"); "CCCCCC CCCC"));
response = test.selectApplication(APPLET_AID_3); 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 // delete applet and package
test.reset(); test.reset();
...@@ -218,7 +216,7 @@ public class Test_Cre_Mha_Enhd extends UiccTestModel { ...@@ -218,7 +216,7 @@ public class Test_Cre_Mha_Enhd extends UiccTestModel {
test.deleteApplet(APPLET_AID_3); test.deleteApplet(APPLET_AID_3);
test.deletePackage(CAP_FILE_PATH); test.deletePackage(CAP_FILE_PATH);
return testresult; return getOverallResult();
} }
/** /**
......
...@@ -34,9 +34,6 @@ public class Test_Cre_Mha_Erhd extends UiccTestModel { ...@@ -34,9 +34,6 @@ public class Test_Cre_Mha_Erhd extends UiccTestModel {
private UiccAPITestCardService test = null; private UiccAPITestCardService test = null;
/** contains the response from the executed command */ /** contains the response from the executed command */
private APDUResponse response = null; private APDUResponse response = null;
/** stores the test result */
private boolean testresult = false;
/** /**
* *
*/ */
...@@ -47,7 +44,9 @@ public class Test_Cre_Mha_Erhd extends UiccTestModel { ...@@ -47,7 +44,9 @@ public class Test_Cre_Mha_Erhd extends UiccTestModel {
* Installs the applet, runs the tests and checks the test result. * Installs the applet, runs the tests and checks the test result.
*/ */
public boolean run(){ public boolean run(){
// test script initialiseResults();
// test script
test.reset(); test.reset();
test.terminalProfileSession("16FF"); test.terminalProfileSession("16FF");
// Install Applet // Install Applet
...@@ -90,114 +89,114 @@ public class Test_Cre_Mha_Erhd extends UiccTestModel { ...@@ -90,114 +89,114 @@ public class Test_Cre_Mha_Erhd extends UiccTestModel {
"FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF " + "FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF " +
"FFFF"); "FFFF");
response = test.envelopeMenuSelection("900102","9500"); response = test.envelopeMenuSelection("900102","9500");
testresult = response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 4 //TC 4
response = test.envelopeMenuSelection("900101",""); response = test.envelopeMenuSelection("900101","");
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 5 //TC 5
response = test.envelopeTimerExpiration("A40101"); response = test.envelopeTimerExpiration("A40101");
//TC 6 //TC 6
response = test.envelopeEventDownloadMTCall(); response = test.envelopeEventDownloadMTCall();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 7 //TC 7
response = test.envelopeEventDownloadCallConnected(); response = test.envelopeEventDownloadCallConnected();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 8 //TC 8
response = test.envelopeEventDownloadCallDisconnected(); response = test.envelopeEventDownloadCallDisconnected();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 9 //TC 9
response = test.envelopeEventDownloadLocationStatus(); response = test.envelopeEventDownloadLocationStatus();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 10 //TC 10
response = test.envelopeEventDownloadUserActivity(); response = test.envelopeEventDownloadUserActivity();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 11 //TC 11
response = test.envelopeEventDownloadIdleScreenAvailable(); response = test.envelopeEventDownloadIdleScreenAvailable();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 12 //TC 12
response = test.envelopeEventDownloadCardReaderStatus(); response = test.envelopeEventDownloadCardReaderStatus();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 13 //TC 13
response = test.envelopeEventDownloadLanguageSelection(); response = test.envelopeEventDownloadLanguageSelection();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 14 //TC 14
response = test.envelopeEventDownloadBrowserTermination(); response = test.envelopeEventDownloadBrowserTermination();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 15 //TC 15
response = test.status("00","0C","00"); response = test.status("00","0C","00");
testresult &= response.checkSw("911A"); addResult(response.checkSw("911A"));
//TC 16 //TC 16
response = test.fetch("1A"); response = test.fetch("1A");
response = test.terminalResponse("81030140 01820282 8183010038 0281003502 " + response = test.terminalResponse("81030140 01820282 8183010038 0281003502 " +
"03003902 000A"); "03003902 000A");
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
response = test.envelopeEventDownloadDataAvailable("B8028100");//channel id 1 response = test.envelopeEventDownloadDataAvailable("B8028100");//channel id 1
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 17 //TC 17
response = test.envelopeEventDownloadChannelStatus("B8028100"); response = test.envelopeEventDownloadChannelStatus("B8028100");
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 18 //TC 18
response = test.envelopeCallControlByNAA(); response = test.envelopeCallControlByNAA();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
response = test.envelopeCallControlByNAA(); response = test.envelopeCallControlByNAA();
testresult &= response.checkSw("9110"); addResult(response.checkSw("9110"));
response = test.fetch("10"); response = test.fetch("10");
testresult &= response.checkData("D00E8103 01218082 0281028D 03040000"); addResult(response.checkData("D00E8103 01218082 0281028D 03040000"));
response = test.terminalResponse("81030121 80820282 81830100"); response = test.terminalResponse("81030121 80820282 81830100");
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 19 //TC 19
response = test.unrecognizedEnvelope(); response = test.unrecognizedEnvelope();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
response = test.unrecognizedEnvelope(); response = test.unrecognizedEnvelope();
testresult &= response.checkSw("9111"); addResult(response.checkSw("9111"));
response = test.fetch("11"); response = test.fetch("11");
testresult &= response.checkData("D00F8103 01218082 0281028D 0404010203"); addResult(response.checkData("D00F8103 01218082 0281028D 0404010203"));
response = test.terminalResponse("81030121 80820282 81830100"); response = test.terminalResponse("81030121 80820282 81830100");
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 20 //TC 20
response = test.unrecognizedEnvelope(); response = test.unrecognizedEnvelope();
testresult &= response.checkSw("9114"); addResult(response.checkSw("9114"));
response = test.envelopeCallControlByNAA(); response = test.envelopeCallControlByNAA();
testresult &= response.checkSw("9114"); addResult(response.checkSw("9114"));
response = test.fetch("14"); 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"); response = test.terminalResponse("81030121 80820282 81030100");
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 21 //TC 21
response = test.unrecognizedEnvelope(); response = test.unrecognizedEnvelope();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 22 //TC 22
response = test.envelopeEventDownloadAccessTechnologyChange(); response = test.envelopeEventDownloadAccessTechnologyChange();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 23 //TC 23
response = test.envelopeEventDownloadDisplayParametersChanged(); response = test.envelopeEventDownloadDisplayParametersChanged();
testresult &= response.checkSw("9110"); addResult(response.checkSw("9110"));
//TC 24 //TC 24
//fetch declare service //fetch declare service
response = test.fetch("10");//fetch declare service response = test.fetch("10");//fetch declare service
//get the service record tlv from declare service command //get the service record tlv from declare service command
String servrectlv = getServiceRecordTLV(response.getData()); String servrectlv = getServiceRecordTLV(response.getData());
response = test.terminalResponse("81030147 0082028281 830100"); response = test.terminalResponse("81030147 0082028281 830100");
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 25 //TC 25
response = test.envelopeEventDownloadLocalConnection("C1040000FFFF"); response = test.envelopeEventDownloadLocalConnection("C1040000FFFF");
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 26 //TC 26
response = test.selectApplication ("A0000000 090005FF FFFFFF89 E0000002"); response = test.selectApplication ("A0000000 090005FF FFFFFF89 E0000002");
response = test.sendApdu ("00A4044C 10A00000 00090005 FFFFFFFF 89E00000 02"); response = test.sendApdu ("00A4044C 10A00000 00090005 FFFFFFFF 89E00000 02");
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 27 //TC 27
response = test.envelopeEventDownloadNetworkSearchModeChange(); response = test.envelopeEventDownloadNetworkSearchModeChange();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 28 //TC 28
response = test.envelopeEventDownloadBrowsingStatus(); response = test.envelopeEventDownloadBrowsingStatus();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 28 //TC 28
response = test.envelopeEventDownloadFramesInformationChanged(); response = test.envelopeEventDownloadFramesInformationChanged();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 29 //TC 29
response = test.envelopeEventDownloadHCIConnectivity(); response = test.envelopeEventDownloadHCIConnectivity();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 27 + 2 //TC 27 + 2
test.reset(); test.reset();
response = test.terminalProfileSession("13"); response = test.terminalProfileSession("13");
...@@ -222,16 +221,16 @@ public class Test_Cre_Mha_Erhd extends UiccTestModel { ...@@ -222,16 +221,16 @@ public class Test_Cre_Mha_Erhd extends UiccTestModel {
//check results of the tests //check results of the tests
//test.reset(); //test.reset();
response = test.selectApplication(APPLET_AID_1); response = test.selectApplication(APPLET_AID_1);
testresult &= response.checkData("10" +APPLET_AID_1 + addResult(response.checkData("10" +APPLET_AID_1 +
"1ECCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+ "1ECCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCC"); "CCCCCCCC CCCCCCCC CCCCCCCC CCCCCC"));
response = test.selectApplication(APPLET_AID_2); response = test.selectApplication(APPLET_AID_2);
testresult &= response.checkData("10" +APPLET_AID_2 + addResult(response.checkData("10" +APPLET_AID_2 +
"02CCCC"); "02CCCC"));
response = test.selectApplication(APPLET_AID_3); 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 // delete applet and package
test.reset(); test.reset();
...@@ -241,7 +240,7 @@ public class Test_Cre_Mha_Erhd extends UiccTestModel { ...@@ -241,7 +240,7 @@ public class Test_Cre_Mha_Erhd extends UiccTestModel {
test.deleteApplet(APPLET_AID_3); test.deleteApplet(APPLET_AID_3);
test.deletePackage(CAP_FILE_PATH); test.deletePackage(CAP_FILE_PATH);
return testresult; return getOverallResult();
} }
......
...@@ -39,8 +39,6 @@ public class Test_Cre_Mha_Pahd extends UiccTestModel { ...@@ -39,8 +39,6 @@ public class Test_Cre_Mha_Pahd extends UiccTestModel {
private UiccAPITestCardService test = null; private UiccAPITestCardService test = null;
/** contains the response from the executed command */ /** contains the response from the executed command */
private APDUResponse response = null; 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, public final byte[] AID_ADF1 = {(byte)0xA0, (byte)0x00, (byte)0x00, (byte)0x00,
(byte)0x09, (byte)0x00, (byte)0x05, (byte)0xFF, (byte)0x09, (byte)0x00, (byte)0x05, (byte)0xFF,
...@@ -59,7 +57,9 @@ public class Test_Cre_Mha_Pahd extends UiccTestModel { ...@@ -59,7 +57,9 @@ public class Test_Cre_Mha_Pahd extends UiccTestModel {
* Installs the applet, runs the tests and checks the test result. * Installs the applet, runs the tests and checks the test result.
*/ */
public boolean run(){ public boolean run(){
// test script initialiseResults();
// test script
test.reset(); test.reset();
test.terminalProfileSession("0301"); test.terminalProfileSession("0301");
...@@ -101,61 +101,61 @@ public class Test_Cre_Mha_Pahd extends UiccTestModel { ...@@ -101,61 +101,61 @@ public class Test_Cre_Mha_Pahd extends UiccTestModel {
"FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF " + "FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF " +
"FFFF"); "FFFF");
response = test.envelopeMenuSelection("900102","9500"); response = test.envelopeMenuSelection("900102","9500");
testresult = response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 4 //TC 4
response = test.envelopeMenuSelection("900101",""); response = test.envelopeMenuSelection("900101","");
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 5 //TC 5
response = test.envelopeTimerExpiration("A40101"); response = test.envelopeTimerExpiration("A40101");
//TC 6 //TC 6
response = test.envelopeCallControlByNAA(); response = test.envelopeCallControlByNAA();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 7 //TC 7
response = test.envelopeEventDownloadMTCall(); response = test.envelopeEventDownloadMTCall();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 8 //TC 8
response = test.envelopeEventDownloadCallConnected(); response = test.envelopeEventDownloadCallConnected();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 9 //TC 9
response = test.envelopeEventDownloadCallDisconnected(); response = test.envelopeEventDownloadCallDisconnected();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 10 //TC 10
response = test.envelopeEventDownloadLocationStatus(); response = test.envelopeEventDownloadLocationStatus();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 11 //TC 11
response = test.envelopeEventDownloadUserActivity(); response = test.envelopeEventDownloadUserActivity();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 12 //TC 12
response = test.envelopeEventDownloadIdleScreenAvailable(); response = test.envelopeEventDownloadIdleScreenAvailable();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 13 //TC 13
response = test.envelopeEventDownloadCardReaderStatus(); response = test.envelopeEventDownloadCardReaderStatus();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 14 //TC 14
response = test.envelopeEventDownloadLanguageSelection(); response = test.envelopeEventDownloadLanguageSelection();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 15 //TC 15
response = test.envelopeEventDownloadBrowserTermination(); response = test.envelopeEventDownloadBrowserTermination();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 16 //TC 16
response = test.status("00","0C","00"); response = test.status("00","0C","00");
testresult &= response.checkSw("911A"); addResult(response.checkSw("911A"));
//TC 17 //TC 17
response = test.fetch("1A"); response = test.fetch("1A");
response = test.terminalResponse("81030140 01820282 8183010038 0281003502 " + response = test.terminalResponse("81030140 01820282 8183010038 0281003502 " +
"03003902 000A"); "03003902 000A");
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
response = test.envelopeEventDownloadDataAvailable("B8028100"); response = test.envelopeEventDownloadDataAvailable("B8028100");
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 18 //TC 18
response = test.envelopeEventDownloadChannelStatus("B8028100"); response = test.envelopeEventDownloadChannelStatus("B8028100");
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 19 //TC 19
response = test.unrecognizedEnvelope(); response = test.unrecognizedEnvelope();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 20 //TC 20
response = test.envelopeEventDownloadAccessTechnologyChange(); response = test.envelopeEventDownloadAccessTechnologyChange();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 21 //TC 21
response = test.envelopeEventDownloadDisplayParametersChanged(); response = test.envelopeEventDownloadDisplayParametersChanged();
//fetch declare service //fetch declare service
...@@ -163,22 +163,22 @@ public class Test_Cre_Mha_Pahd extends UiccTestModel { ...@@ -163,22 +163,22 @@ public class Test_Cre_Mha_Pahd extends UiccTestModel {
//get the service record tlv from declare service command //get the service record tlv from declare service command
String servrectlv = getServiceRecordTLV(response.getData()); String servrectlv = getServiceRecordTLV(response.getData());
response = test.terminalResponse("81030147 0082028281 830100"); response = test.terminalResponse("81030147 0082028281 830100");
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 22 //TC 22
response = test.envelopeEventDownloadLocalConnection(servrectlv); response = test.envelopeEventDownloadLocalConnection(servrectlv);
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 23 //TC 23
response = test.envelopeEventDownloadCallConnected(); response = test.envelopeEventDownloadCallConnected();
//fetch display text //fetch display text
response = test.fetch("14"); response = test.fetch("14");
response = test.terminalResponse("81030121 80820282 81030100"); response = test.terminalResponse("81030121 80820282 81030100");
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 24 //TC 24
//- Select for activation ADF1 //- Select for activation ADF1
response = test.selectApplication (byteArrayToHexString(AID_ADF1)); response = test.selectApplication (byteArrayToHexString(AID_ADF1));
//- Select for termination ADF1 //- Select for termination ADF1
response = test.sendApdu ("00A4044C 10"+byteArrayToHexString(AID_ADF1) ); response = test.sendApdu ("00A4044C 10"+byteArrayToHexString(AID_ADF1) );
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 25 //TC 25
test.reset(); test.reset();
//no terminal profile is sent and proactive handler shall not be available. //no terminal profile is sent and proactive handler shall not be available.
...@@ -233,10 +233,10 @@ public class Test_Cre_Mha_Pahd extends UiccTestModel { ...@@ -233,10 +233,10 @@ public class Test_Cre_Mha_Pahd extends UiccTestModel {
"FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF " + "FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF " +
"FFFF"); "FFFF");
response = test.envelopeEventDownloadNetworkSearchModeChange(); response = test.envelopeEventDownloadNetworkSearchModeChange();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 46 //TC 46
response = test.envelopeEventDownloadBrowsingStatus(); response = test.envelopeEventDownloadBrowsingStatus();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 47 //TC 47
test.reset(); test.reset();
// Install Applet // Install Applet
...@@ -263,7 +263,7 @@ public class Test_Cre_Mha_Pahd extends UiccTestModel { ...@@ -263,7 +263,7 @@ public class Test_Cre_Mha_Pahd extends UiccTestModel {
// case that a CAT facility is not supported by the terminal profile, // case that a CAT facility is not supported by the terminal profile,
// the applet will not be triggered on an unsupported event. // the applet will not be triggered on an unsupported event.
response = test.selectApplication(APPLET_AID_1); response = test.selectApplication(APPLET_AID_1);
testresult &= (response.checkData("10" +APPLET_AID_1 + addResult(response.checkData("10" +APPLET_AID_1 +
"30CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+ "30CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+ "CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC CC") || "CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC CC") ||
...@@ -272,7 +272,7 @@ public class Test_Cre_Mha_Pahd extends UiccTestModel { ...@@ -272,7 +272,7 @@ public class Test_Cre_Mha_Pahd extends UiccTestModel {
"CCCCCCCC CCCCCCCC CC") ); "CCCCCCCC CCCCCCCC CC") );
response = test.selectApplication(APPLET_AID_2); response = test.selectApplication(APPLET_AID_2);
testresult &= (response.checkData("10" +APPLET_AID_2 + addResult(response.checkData("10" +APPLET_AID_2 +
"25CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+ "25CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+ "CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
"CCCCCCCC CCCC") || "CCCCCCCC CCCC") ||
...@@ -281,7 +281,7 @@ public class Test_Cre_Mha_Pahd extends UiccTestModel { ...@@ -281,7 +281,7 @@ public class Test_Cre_Mha_Pahd extends UiccTestModel {
"CCCC") ); "CCCC") );
response = test.selectApplication(APPLET_AID_3); 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 // delete applet and package
test.reset(); test.reset();
...@@ -291,7 +291,7 @@ public class Test_Cre_Mha_Pahd extends UiccTestModel { ...@@ -291,7 +291,7 @@ public class Test_Cre_Mha_Pahd extends UiccTestModel {
test.deleteApplet(APPLET_AID_3); test.deleteApplet(APPLET_AID_3);
test.deletePackage(CAP_FILE_PATH); test.deletePackage(CAP_FILE_PATH);
return testresult; return getOverallResult();
} }
/** /**
......
...@@ -38,8 +38,6 @@ public class Test_Cre_Mha_Prhd extends UiccTestModel { ...@@ -38,8 +38,6 @@ public class Test_Cre_Mha_Prhd extends UiccTestModel {
private UiccAPITestCardService test = null; private UiccAPITestCardService test = null;
/** contains the response from the executed command */ /** contains the response from the executed command */
private APDUResponse response = null; private APDUResponse response = null;
/** stores the test result */
private boolean testresult = false;
/** /**
* *
...@@ -51,6 +49,7 @@ public class Test_Cre_Mha_Prhd extends UiccTestModel { ...@@ -51,6 +49,7 @@ public class Test_Cre_Mha_Prhd extends UiccTestModel {
* Installs the applet, runs the tests and checks the test result. * Installs the applet, runs the tests and checks the test result.
*/ */
public boolean run(){ public boolean run(){
initialiseResults();
// test script // test script
test.reset(); test.reset();
...@@ -94,61 +93,61 @@ public class Test_Cre_Mha_Prhd extends UiccTestModel { ...@@ -94,61 +93,61 @@ public class Test_Cre_Mha_Prhd extends UiccTestModel {
"FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF " + "FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF " +
"FFFF"); "FFFF");
response = test.envelopeMenuSelection("900102","9500"); response = test.envelopeMenuSelection("900102","9500");
testresult = response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 4 //TC 4
response = test.envelopeMenuSelection("900101",""); response = test.envelopeMenuSelection("900101","");
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 5 //TC 5
response = test.envelopeTimerExpiration("A40101"); response = test.envelopeTimerExpiration("A40101");
//TC 6 //TC 6
response = test.envelopeCallControlByNAA(); response = test.envelopeCallControlByNAA();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 7 //TC 7
response = test.envelopeEventDownloadMTCall(); response = test.envelopeEventDownloadMTCall();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 8 //TC 8
response = test.envelopeEventDownloadCallConnected(); response = test.envelopeEventDownloadCallConnected();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 9 //TC 9
response = test.envelopeEventDownloadCallDisconnected(); response = test.envelopeEventDownloadCallDisconnected();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 10 //TC 10
response = test.envelopeEventDownloadLocationStatus(); response = test.envelopeEventDownloadLocationStatus();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 11 //TC 11
response = test.envelopeEventDownloadUserActivity(); response = test.envelopeEventDownloadUserActivity();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 12 //TC 12
response = test.envelopeEventDownloadIdleScreenAvailable(); response = test.envelopeEventDownloadIdleScreenAvailable();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 13 //TC 13
response = test.envelopeEventDownloadCardReaderStatus(); response = test.envelopeEventDownloadCardReaderStatus();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 14 //TC 14
response = test.envelopeEventDownloadLanguageSelection(); response = test.envelopeEventDownloadLanguageSelection();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 15 //TC 15
response = test.envelopeEventDownloadBrowserTermination(); response = test.envelopeEventDownloadBrowserTermination();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 16 //TC 16
response = test.status("00","0C","00"); response = test.status("00","0C","00");
testresult &= response.checkSw("911A"); addResult(response.checkSw("911A"));
//TC 17 //TC 17
response = test.fetch("1A"); response = test.fetch("1A");
response = test.terminalResponse("81030140 01820282 8183010038 0281003502 " + response = test.terminalResponse("81030140 01820282 8183010038 0281003502 " +
"03003902 000A"); "03003902 000A");
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
response = test.envelopeEventDownloadDataAvailable("B8028100"); response = test.envelopeEventDownloadDataAvailable("B8028100");
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 18 //TC 18
response = test.envelopeEventDownloadChannelStatus("B8028100"); response = test.envelopeEventDownloadChannelStatus("B8028100");
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 19 //TC 19
response = test.unrecognizedEnvelope(); response = test.unrecognizedEnvelope();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 20 //TC 20
response = test.envelopeEventDownloadAccessTechnologyChange(); response = test.envelopeEventDownloadAccessTechnologyChange();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 21 //TC 21
response = test.envelopeEventDownloadDisplayParametersChanged(); response = test.envelopeEventDownloadDisplayParametersChanged();
//fetch declare service //fetch declare service
...@@ -156,22 +155,22 @@ public class Test_Cre_Mha_Prhd extends UiccTestModel { ...@@ -156,22 +155,22 @@ public class Test_Cre_Mha_Prhd extends UiccTestModel {
//get the service record tlv from declare service command //get the service record tlv from declare service command
String servrectlv = getServiceRecordTLV(response.getData()); String servrectlv = getServiceRecordTLV(response.getData());
response = test.terminalResponse("81030147 0082028281 830100"); response = test.terminalResponse("81030147 0082028281 830100");
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 22 //TC 22
response = test.envelopeEventDownloadLocalConnection(servrectlv); response = test.envelopeEventDownloadLocalConnection(servrectlv);
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 23 //TC 23
response = test.envelopeEventDownloadCallConnected(); response = test.envelopeEventDownloadCallConnected();
//fetch display text //fetch display text
response = test.fetch("14"); response = test.fetch("14");
response = test.terminalResponse("81030121 80820282 81030100"); response = test.terminalResponse("81030121 80820282 81030100");
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 24 //TC 24
//- Select for activation ADF1 //- Select for activation ADF1
response = test.selectApplication (AID_ADF1); response = test.selectApplication (AID_ADF1);
//- Select for termination ADF1 //- Select for termination ADF1
response = test.sendApdu ("00A4044C 10"+AID_ADF1 ); response = test.sendApdu ("00A4044C 10"+AID_ADF1 );
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 25 //TC 25
test.reset(); test.reset();
//no terminal profile is sent and proactive handler shall not be available. //no terminal profile is sent and proactive handler shall not be available.
...@@ -226,10 +225,10 @@ public class Test_Cre_Mha_Prhd extends UiccTestModel { ...@@ -226,10 +225,10 @@ public class Test_Cre_Mha_Prhd extends UiccTestModel {
"FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF " + "FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF " +
"FFFF"); "FFFF");
response = test.envelopeEventDownloadNetworkSearchModeChange(); response = test.envelopeEventDownloadNetworkSearchModeChange();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 46 //TC 46
response = test.envelopeEventDownloadBrowsingStatus(); response = test.envelopeEventDownloadBrowsingStatus();
testresult &= response.checkSw("9000"); addResult(response.checkSw("9000"));
//TC 47 //TC 47
test.reset(); test.reset();
// Install Applet // Install Applet
...@@ -257,7 +256,7 @@ public class Test_Cre_Mha_Prhd extends UiccTestModel { ...@@ -257,7 +256,7 @@ public class Test_Cre_Mha_Prhd extends UiccTestModel {
// case that a CAT facility is not supported by the terminal profile, // case that a CAT facility is not supported by the terminal profile,
// the applet will not be triggered on an unsupported event. // the applet will not be triggered on an unsupported event.
response = test.selectApplication(APPLET_AID_1); response = test.selectApplication(APPLET_AID_1);
testresult &= (response.checkData("10" +APPLET_AID_1 + addResult(response.checkData("10" +APPLET_AID_1 +
"30CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+ "30CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+ "CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC CC" "CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC CC"
...@@ -269,18 +268,18 @@ public class Test_Cre_Mha_Prhd extends UiccTestModel { ...@@ -269,18 +268,18 @@ public class Test_Cre_Mha_Prhd extends UiccTestModel {
response = test.selectApplication(APPLET_AID_2); response = test.selectApplication(APPLET_AID_2);
testresult &= response.checkData("10" +APPLET_AID_2 + addResult(response.checkData("10" +APPLET_AID_2 +
"25CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+ "25CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+ "CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
"CCCCCCCC CCCC") || "CCCCCCCC CCCC") ||
response.checkData("10" +APPLET_AID_2 + response.checkData("10" +APPLET_AID_2 +
"15CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+ "15CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
"CCCCCCCC CCCC" "CCCCCCCC CCCC"
); ));
response = test.selectApplication(APPLET_AID_3); 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 // delete applet and package
test.reset(); test.reset();
...@@ -290,7 +289,7 @@ public class Test_Cre_Mha_Prhd extends UiccTestModel { ...@@ -290,7 +289,7 @@ public class Test_Cre_Mha_Prhd extends UiccTestModel {
test.deleteApplet(APPLET_AID_3); test.deleteApplet(APPLET_AID_3);
test.deletePackage(CAP_FILE_PATH); test.deletePackage(CAP_FILE_PATH);
return testresult; return getOverallResult();
} }
......
...@@ -82,11 +82,13 @@ public class Test_Cre_Tin_Chal extends UiccTestModel { ...@@ -82,11 +82,13 @@ public class Test_Cre_Tin_Chal extends UiccTestModel {
"04" + // V Maximum number of channels "04" + // V Maximum number of channels
"00" + // LV Minimum Security Level field "00" + // LV Minimum Security Level field
"00" + // LV TAR Value(s) "00" + // LV TAR Value(s)
"00"); // V Maximum number of services "00", // V Maximum number of services
true);
addResult(response.checkSw("9000"));
// Send a status command to be sure to retrieve the correct status word in the RAPDU
test.status("00","0C","00");
addResult(response.checkSw("9000"));
// Fetch SetUpMenu // Fetch SetUpMenu
test.fetch("20"); test.fetch("20");
test.terminalResponse("81030125 00820282 81830100"); test.terminalResponse("81030125 00820282 81830100");
...@@ -132,6 +134,8 @@ public class Test_Cre_Tin_Chal extends UiccTestModel { ...@@ -132,6 +134,8 @@ public class Test_Cre_Tin_Chal extends UiccTestModel {
addResult(response.checkSw("9000")); addResult(response.checkSw("9000"));
// Send a status command to be sure to retrieve the correct status word in the RAPDU
test.status("00","0C","00");
// Fetch SetUpMenu // Fetch SetUpMenu
test.fetch("2A"); test.fetch("2A");
......
...@@ -12,11 +12,10 @@ import org.etsi.scp.wg3.uicc.jcapi.userclass.*; ...@@ -12,11 +12,10 @@ import org.etsi.scp.wg3.uicc.jcapi.userclass.*;
public class Test_Api_2_Trs_IsPrAv extends UiccTestModel { public class Test_Api_2_Trs_IsPrAv extends UiccTestModel {
static final String CAP_FILE_PATH = "uicc/test/toolkit/api_2_trs_isprav"; static final String CAP_FILE_PATH = "uicc/test/toolkit/api_2_trs_isprav";
static final String CLASS_AID_1 = "A0000000 090005FF FFFFFF89 50010001"; static final String CLASS_AID_1 = "A0000000 090005FF FFFFFF89 20010001";
static final String APPLET_AID_1 = "A0000000 090005FF FFFFFF89 50010102"; static final String CLASS_AID_2 = "A0000000 090005FF FFFFFF89 20020001";
static final String APPLET_AID_2 = "A0000000 090005FF FFFFFF89 50010202"; static final String APPLET_AID_1 = "A0000000 090005FF FFFFFF89 20010102";
static final String APPLET_AID_3 = "A0000000 090005FF FFFFFF89 50010302"; static final String APPLET_AID_2 = "A0000000 090005FF FFFFFF89 20010202";
static final String APPLET_AID_4 = "A0000000 090005FF FFFFFF89 50010402";
private UiccAPITestCardService test; private UiccAPITestCardService test;
APDUResponse response; APDUResponse response;
...@@ -56,7 +55,7 @@ public class Test_Api_2_Trs_IsPrAv extends UiccTestModel { ...@@ -56,7 +55,7 @@ public class Test_Api_2_Trs_IsPrAv extends UiccTestModel {
addResult(response.checkSw("9000")); addResult(response.checkSw("9000"));
// Install Applet2 // Install Applet2
response = test.installApplet(CAP_FILE_PATH, CLASS_AID_1, APPLET_AID_2, response = test.installApplet(CAP_FILE_PATH, CLASS_AID_2, APPLET_AID_2,
"8008" + // TLV UICC Toolkit application specific parameters "8008" + // TLV UICC Toolkit application specific parameters
"02" + // V Priority Level "02" + // V Priority Level
"00" + // V Max. number of timers "00" + // V Max. number of timers
...@@ -101,7 +100,6 @@ public class Test_Api_2_Trs_IsPrAv extends UiccTestModel { ...@@ -101,7 +100,6 @@ public class Test_Api_2_Trs_IsPrAv extends UiccTestModel {
// delete applets and package // delete applets and package
test.deleteApplet(APPLET_AID_1); test.deleteApplet(APPLET_AID_1);
test.deleteApplet(APPLET_AID_2); test.deleteApplet(APPLET_AID_2);
test.deletePackage(CAP_FILE_PATH);
addResult(response.checkSw("9000")); addResult(response.checkSw("9000"));
/*********************************************************************/ /*********************************************************************/
...@@ -109,7 +107,7 @@ public class Test_Api_2_Trs_IsPrAv extends UiccTestModel { ...@@ -109,7 +107,7 @@ public class Test_Api_2_Trs_IsPrAv extends UiccTestModel {
/*********************************************************************/ /*********************************************************************/
// Install Applet1 // Install Applet1
response = test.installApplet(CAP_FILE_PATH, CLASS_AID_1, APPLET_AID_3, response = test.installApplet(CAP_FILE_PATH, CLASS_AID_1, APPLET_AID_1,
"8008" + // TLV UICC Toolkit application specific parameters "8008" + // TLV UICC Toolkit application specific parameters
"01" + // V Priority Level "01" + // V Priority Level
"00" + // V Max. number of timers "00" + // V Max. number of timers
...@@ -123,7 +121,7 @@ public class Test_Api_2_Trs_IsPrAv extends UiccTestModel { ...@@ -123,7 +121,7 @@ public class Test_Api_2_Trs_IsPrAv extends UiccTestModel {
addResult(response.checkSw("9000")); addResult(response.checkSw("9000"));
// Install Applet2 // Install Applet2
response = test.installApplet(CAP_FILE_PATH, CLASS_AID_1, APPLET_AID_4, response = test.installApplet(CAP_FILE_PATH, CLASS_AID_2, APPLET_AID_2,
"8008" + // TLV UICC Toolkit application specific parameters "8008" + // TLV UICC Toolkit application specific parameters
"01" + // V Priority Level "01" + // V Priority Level
"00" + // V Max. number of timers "00" + // V Max. number of timers
...@@ -151,9 +149,9 @@ public class Test_Api_2_Trs_IsPrAv extends UiccTestModel { ...@@ -151,9 +149,9 @@ public class Test_Api_2_Trs_IsPrAv extends UiccTestModel {
/*********************************************************************/ /*********************************************************************/
/*********************************************************************/ /*********************************************************************/
response = test.selectApplication(APPLET_AID_3); response = test.selectApplication(APPLET_AID_1);
addResult(response.checkData("10" + APPLET_AID_1 + "01" + "CC")); addResult(response.checkData("10" + APPLET_AID_1 + "01" + "CC"));
response = test.selectApplication(APPLET_AID_4); response = test.selectApplication(APPLET_AID_2);
addResult(response.checkData("10" + APPLET_AID_2 + "01" + "CC")); addResult(response.checkData("10" + APPLET_AID_2 + "01" + "CC"));
...@@ -166,8 +164,8 @@ public class Test_Api_2_Trs_IsPrAv extends UiccTestModel { ...@@ -166,8 +164,8 @@ public class Test_Api_2_Trs_IsPrAv extends UiccTestModel {
test.reset(); test.reset();
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE); test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
// delete applets and package // delete applets and package
test.deleteApplet(APPLET_AID_3); test.deleteApplet(APPLET_AID_1);
test.deleteApplet(APPLET_AID_4); test.deleteApplet(APPLET_AID_2);
test.deletePackage(CAP_FILE_PATH); test.deletePackage(CAP_FILE_PATH);
addResult(response.checkSw("9000")); addResult(response.checkSw("9000"));
......