diff --git a/source/Annex_D_UiccInterfaces/org/etsi/scp/wg3/uicc/jcapi/userclass/UiccTestModel.java b/source/Annex_D_UiccInterfaces/org/etsi/scp/wg3/uicc/jcapi/userclass/UiccTestModel.java
index 4c3b89054e53c4d57ab9540e76e211025ad8b85d..6c72e75f0d31faf4d00d9e257ce606c66241414f 100644
--- a/source/Annex_D_UiccInterfaces/org/etsi/scp/wg3/uicc/jcapi/userclass/UiccTestModel.java
+++ b/source/Annex_D_UiccInterfaces/org/etsi/scp/wg3/uicc/jcapi/userclass/UiccTestModel.java
@@ -9,4 +9,36 @@ package org.etsi.scp.wg3.uicc.jcapi.userclass;
public abstract class UiccTestModel {
public abstract boolean run();
+
+ /**
+ * Initialises the results, removing all previous results.
+ */
+ protected final void initialiseResults()
+ {
+ UiccAPITestCardService.getTheUiccTestCardService().initialiseResults();
+ }
+
+ /**
+ * Adds a new result.
+ */
+ protected final void addResult(boolean result)
+ {
+ UiccAPITestCardService.getTheUiccTestCardService().addResult(result);
+ }
+
+ /**
+ * Returns the overall result, based on all results submitted via {@link #addResult(boolean)}
+ * since the last call to {@link #initialiseResults()}.
+ *
+ * The following logic is used:
+ *
+ * - if no results have been submitted,
false will be returned;
+ * - if any
false results have been submitted, false will be returned;
+ * - otherwise,
true will be returned.
+ *
+ */
+ protected final boolean getOverallResult()
+ {
+ return UiccAPITestCardService.getTheUiccTestCardService().getOverallResult();
+ }
}
diff --git a/source/Annex_D_UiccInterfaces/org/etsi/scp/wg3/uicc/jcapi/userinterface/UiccResultsService.java b/source/Annex_D_UiccInterfaces/org/etsi/scp/wg3/uicc/jcapi/userinterface/UiccResultsService.java
new file mode 100644
index 0000000000000000000000000000000000000000..fba9634ecaf18845fe3ee122bb3418a437c53fdf
--- /dev/null
+++ b/source/Annex_D_UiccInterfaces/org/etsi/scp/wg3/uicc/jcapi/userinterface/UiccResultsService.java
@@ -0,0 +1,30 @@
+package org.etsi.scp.wg3.uicc.jcapi.userinterface;
+
+/**
+ * A service to allow results to be reported.
+ */
+public interface UiccResultsService
+{
+ /**
+ * Initialises the results, removing all previous results.
+ */
+ public void initialiseResults();
+
+ /**
+ * Adds a new result.
+ */
+ public void addResult(boolean result);
+
+ /**
+ * Returns the overall result, based on all results submitted via {@link #addResult(boolean)}
+ * since the last call to {@link #initialiseResults()}.
+ *
+ * The following logic is used:
+ *
+ * - if no results have been submitted,
false will be returned;
+ * - if any
false results have been submitted, false will be returned;
+ * - otherwise,
true will be returned.
+ *
+ */
+ public boolean getOverallResult();
+}
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_cont/Test_Api_1_Cont.java b/source/Annex_E_SourceCode/uicc/test/access/api_1_cont/Test_Api_1_Cont.java
index 46afa88e91349ea3c99c803057d0532fb283784e..d24ab7528f07b4692a64fa79e631ed681bab4898 100644
--- a/source/Annex_E_SourceCode/uicc/test/access/api_1_cont/Test_Api_1_Cont.java
+++ b/source/Annex_E_SourceCode/uicc/test/access/api_1_cont/Test_Api_1_Cont.java
@@ -49,7 +49,7 @@ public class Test_Api_1_Cont extends UiccTestModel {
}
public boolean run() {
- boolean result = true;
+ initialiseResults();
// start test
test.reset();
@@ -112,7 +112,7 @@ public class Test_Api_1_Cont extends UiccTestModel {
//10
response = test.activate(EF_TNR);
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
//11
test.selectFile(MF);
@@ -121,7 +121,7 @@ public class Test_Api_1_Cont extends UiccTestModel {
//12
response = test.readBinary("0000", "02");
- result &= response.checkData("0101");
+ addResult(response.checkData("0101"));
//13
test.updateBinary("0000", "FFFFFF");
@@ -133,14 +133,14 @@ public class Test_Api_1_Cont extends UiccTestModel {
//15
response = test.activate(EF_CNR);
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
//16
test.selectFile(EF_TARU);
//17
response = test.readBinary("0000", "02");
- result &= response.checkData("0202");
+ addResult(response.checkData("0202"));
//18
test.updateBinary("0000", "FFFFFF");
@@ -160,7 +160,7 @@ public class Test_Api_1_Cont extends UiccTestModel {
test.selectFile(DF_TEST);
test.selectFile(EF_TARU);
response = test.readBinary("0000", "04");
- result &= response.checkData("01010202");
+ addResult(response.checkData("01010202"));
//12
test.updateBinary("0000", "FFFFFFFF");
@@ -170,7 +170,7 @@ public class Test_Api_1_Cont extends UiccTestModel {
test.selectFile(DF_TEST);
test.selectFile(EF_TARU);
response = test.readBinary("0000", "04");
- result &= response.checkData("03030404");
+ addResult(response.checkData("03030404"));
//14
test.updateBinary("0000", "FFFFFFFF");
@@ -195,11 +195,11 @@ public class Test_Api_1_Cont extends UiccTestModel {
test.selectFile(DF_TEST);
test.selectFile(EF_LUPC);
response = test.readRecord("01", "04", "0A");
- result &= response.checkData("11111111 11111111 1111");
+ addResult(response.checkData("11111111 11111111 1111"));
//14
response = test.readRecord("02", "04", "0A");
- result &= response.checkData("33333333 33333333 3333");
+ addResult(response.checkData("33333333 33333333 3333"));
//15
test.updateRecord("01", "04", "11111111 11111111 1111");
@@ -212,11 +212,11 @@ public class Test_Api_1_Cont extends UiccTestModel {
test.selectFile(DF_TEST);
test.selectFile(EF_LUPC);
response = test.readRecord("01", "04", "0A");
- result &= response.checkData("11111111 11111111 1111");
+ addResult(response.checkData("11111111 11111111 1111"));
//18
response = test.readRecord("02", "04", "0A");
- result &= response.checkData("11111111 11111111 1111");
+ addResult(response.checkData("11111111 11111111 1111"));
//19
test.updateRecord("01", "04", "11111111 11111111 1111");
@@ -239,11 +239,11 @@ public class Test_Api_1_Cont extends UiccTestModel {
test.selectFile(DF_TEST);
test.selectFile(EF_LARU);
response = test.readRecord("00", "02", "04");
- result &= response.checkData("66666666");
+ addResult(response.checkData("66666666"));
//18
response = test.readRecord("00", "02", "04");
- result &= response.checkData("BBBBBBBB");
+ addResult(response.checkData("BBBBBBBB"));
//19
test.updateRecord("01", "04", "55555555");
@@ -256,11 +256,11 @@ public class Test_Api_1_Cont extends UiccTestModel {
test.selectFile(DF_TEST);
test.selectFile(EF_LARU);
response = test.readRecord("00", "02", "04");
- result &= response.checkData("44444444");
+ addResult(response.checkData("44444444"));
//22
response = test.readRecord("00", "02", "04");
- result &= response.checkData("99999999");
+ addResult(response.checkData("99999999"));
//23
test.updateRecord("01", "04", "55555555");
@@ -281,17 +281,17 @@ public class Test_Api_1_Cont extends UiccTestModel {
//11
test.selectFile(DF_TEST);
response = test.selectFile(EF_TNU);
- result &= response.checkSw("6283");
+ addResult(response.checkSw("6283"));
//12
response = test.activate(EF_TNU);
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
//13
test.selectApplication(AID_ADF_1);
test.selectFile(DF_TEST);
response = test.selectFile(EF_TNU);
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** test case 7
* Increase
@@ -307,46 +307,46 @@ public class Test_Api_1_Cont extends UiccTestModel {
test.selectFile(DF_TEST);
test.selectFile(EF_CARU);
response = test.readRecord("00", "04", "03");
- result &= response.checkSw("6A83");
+ addResult(response.checkSw("6A83"));
//21
response = test.readRecord("00", "03", "03");
- result &= response.checkData("000001");
+ addResult(response.checkData("000001"));
//22
response = test.readRecord("00", "03", "03");
- result &= response.checkData("000002");
+ addResult(response.checkData("000002"));
//23
response = test.updateRecord("00", "03", "AAAAAA");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
//24
response = test.updateRecord("00", "03", "555555");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
//25
test.selectApplication(AID_ADF_1);
test.selectFile(DF_TEST);
test.selectFile(EF_CARU);
response = test.readRecord("00", "04", "03");
- result &= response.checkSw("6A83");
+ addResult(response.checkSw("6A83"));
//26
response = test.readRecord("00", "03", "03");
- result &= response.checkData("000002");
+ addResult(response.checkData("000002"));
//27
response = test.readRecord("00", "03", "03");
- result &= response.checkData("000004");
+ addResult(response.checkData("000004"));
//28
response = test.updateRecord("00", "03", "AAAAAA");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
//29
response = test.updateRecord("00", "03", "555555");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
@@ -362,18 +362,18 @@ public class Test_Api_1_Cont extends UiccTestModel {
//21
test.selectFile(DF_TEST);
- result &= test.selectFile(EF_RFU0).checkSw("9000");
+ addResult(test.selectFile(EF_RFU0).checkSw("9000"));
//22
- result &= test.selectFile(EF_RFU1).checkSw("9000");
+ addResult(test.selectFile(EF_RFU1).checkSw("9000"));
//23
test.selectApplication(AID_ADF_1);
test.selectFile(DF_TEST);
- result &= test.selectFile(EF_RFU0).checkSw("9000");
+ addResult(test.selectFile(EF_RFU0).checkSw("9000"));
//24
- result &= test.selectFile(EF_RFU1).checkSw("9000");
+ addResult(test.selectFile(EF_RFU1).checkSw("9000"));
/** test case 9
* CreateFile DF
@@ -387,17 +387,17 @@ public class Test_Api_1_Cont extends UiccTestModel {
//21
test.selectFile(DF_TEST);
- result &= test.selectFile(DF_RFU1).checkSw("9000");
+ addResult(test.selectFile(DF_RFU1).checkSw("9000"));
//22
- result &= test.selectFile(DF_RFU2).checkSw("9000");
+ addResult(test.selectFile(DF_RFU2).checkSw("9000"));
//23
test.selectApplication(AID_ADF_1);
- result &= test.selectFile(DF_RFU1).checkSw("9000");
+ addResult(test.selectFile(DF_RFU1).checkSw("9000"));
//24
- result &= test.selectFile(DF_RFU2).checkSw("9000");
+ addResult(test.selectFile(DF_RFU2).checkSw("9000"));
/** test case 10
@@ -414,31 +414,31 @@ public class Test_Api_1_Cont extends UiccTestModel {
test.selectFile(DF_TEST);
test.selectFile(EF_TDAC);
response = test.readBinary("0000", "06");
- result &=(response.checkSw("9000")||response.checkSw("6282")||response.checkSw("6700"));
+ addResult(response.checkSw("9000")||response.checkSw("6282")||response.checkSw("6700"));
if (response.checkSw("9000"))
{
- result &= response.checkData("000000FF");
+ addResult(response.checkData("000000FF"));
}
//12
- result &= test.readBinary("0000", "04").checkData("000000FF");
+ addResult(test.readBinary("0000", "04").checkData("000000FF"));
//13
- result &= test.resizeFile(EF_TDAC, "03").checkSw("9000");
+ addResult(test.resizeFile(EF_TDAC, "03").checkSw("9000"));
//14
test.selectApplication(AID_ADF_1);
test.selectFile(DF_TEST);
test.selectFile(EF_LNU);
response = test.readRecord("00", "04", "04");
- result &= response.checkSw("6A83");
+ addResult(response.checkSw("6A83"));
//15
response = test.readRecord("00", "03", "04");
- result &= response.checkData("FFFFFFFF");
+ addResult(response.checkData("FFFFFFFF"));
//16
- result &= test.resizeFile(EF_LNU, "08").checkSw("9000");
+ addResult(test.resizeFile(EF_LNU, "08").checkSw("9000"));
@@ -461,7 +461,7 @@ public class Test_Api_1_Cont extends UiccTestModel {
//4
test.selectFile(DF_TEST);
- result &= test.selectFile(EF_NOSH).checkSw("6985");
+ addResult(test.selectFile(EF_NOSH).checkSw("6985"));
//5
test.fetch("13");
@@ -476,7 +476,7 @@ public class Test_Api_1_Cont extends UiccTestModel {
//4
test.selectApplication(AID_ADF_1);
test.selectFile(DF_TEST);
- result &= test.selectFile(EF_NOSH).checkSw("6985");
+ addResult(test.selectFile(EF_NOSH).checkSw("6985"));
//5
test.fetch("13");
@@ -491,7 +491,7 @@ public class Test_Api_1_Cont extends UiccTestModel {
//2
test.selectFile(DF_TEST);
- result &= test.selectFile(EF_NOSH).checkSw("9000");
+ addResult(test.selectFile(EF_NOSH).checkSw("9000"));
//3
test.unrecognizedEnvelope();
@@ -506,7 +506,7 @@ public class Test_Api_1_Cont extends UiccTestModel {
//2
test.selectApplication(AID_ADF_1);
test.selectFile(DF_TEST);
- result &= test.selectFile(EF_NOSH).checkSw("9000");
+ addResult(test.selectFile(EF_NOSH).checkSw("9000"));
//3
test.unrecognizedEnvelope();
@@ -545,8 +545,8 @@ public class Test_Api_1_Cont extends UiccTestModel {
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "11CCCCCC CCCCCCCC CCCCCCCC" +
- "CCCCCCCC CCCC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "11CCCCCC CCCCCCCC CCCCCCCC" +
+ "CCCCCCCC CCCC"));
// delete applet and package
@@ -555,6 +555,6 @@ public class Test_Api_1_Cont extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_actf/Test_Api_1_Fvw_Actf.java b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_actf/Test_Api_1_Fvw_Actf.java
index 00c6eba92061487cc48bff2e7ffc4b0109972bd1..c483940d55c274a3b3b08bd552d6b6ddaf8c7f33 100644
--- a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_actf/Test_Api_1_Fvw_Actf.java
+++ b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_actf/Test_Api_1_Fvw_Actf.java
@@ -25,7 +25,7 @@ public class Test_Api_1_Fvw_Actf extends UiccTestModel {
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -64,7 +64,7 @@ public class Test_Api_1_Fvw_Actf extends UiccTestModel {
// Trigger Applet
response = test.envelopeMenuSelection("100101", "");
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -74,7 +74,7 @@ public class Test_Api_1_Fvw_Actf extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "04" + "CCCCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "04" + "CCCCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -88,6 +88,6 @@ public class Test_Api_1_Fvw_Actf extends UiccTestModel {
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_dacf/Test_Api_1_Fvw_Dacf.java b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_dacf/Test_Api_1_Fvw_Dacf.java
index f0c9e0e8a9b8390c139954937ad072aa99884e38..cd3e317bd9f8fcb3e6dcadf9749545ad9882c985 100644
--- a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_dacf/Test_Api_1_Fvw_Dacf.java
+++ b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_dacf/Test_Api_1_Fvw_Dacf.java
@@ -25,7 +25,7 @@ public class Test_Api_1_Fvw_Dacf extends UiccTestModel {
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -64,7 +64,7 @@ public class Test_Api_1_Fvw_Dacf extends UiccTestModel {
// Trigger Applet
response = test.envelopeMenuSelection("100101", "");
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -74,7 +74,7 @@ public class Test_Api_1_Fvw_Dacf extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "04" + "CCCCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "04" + "CCCCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -88,6 +88,6 @@ public class Test_Api_1_Fvw_Dacf extends UiccTestModel {
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_incr/Api_1_Fvw_Incr_1.java b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_incr/Api_1_Fvw_Incr_1.java
index 6bd00d91583ce0d4da9c2d0fb306a310642602a5..7e6d175868ae4b986be732ab42e14a10d7736f16 100644
--- a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_incr/Api_1_Fvw_Incr_1.java
+++ b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_incr/Api_1_Fvw_Incr_1.java
@@ -22,15 +22,25 @@ public class Api_1_Fvw_Incr_1 extends TestToolkitApplet implements UICCConstants
private ViewHandler createEFCmd = null;
private static byte[] MenuInit = {(byte)'M',(byte)'e',(byte)'n',(byte)'u',(byte)'1'};
- private byte [] abCreateEF = {
+ private byte [] abCreateEF_2C00 = {
(byte)0x82,(byte)0x04, // Tag, Length - File descriptor
- (byte)0x46,(byte)0x21,(byte)0x00,(byte)0x7F, // Value - File descriptor (Cyclic) and record length (0x7F)
+ (byte)0x46,(byte)0x21,(byte)0x00,(byte)0x00, // Value - File descriptor (Cyclic) and record length (0x00)
(byte)0x83,(byte)0x02, // Tag, Length - File Id
- (byte)0x2C,(byte)0x7F, // Value - File Id
+ (byte)0x2C,(byte)0x00, // Value - File Id
(byte)0x8A,(byte)0x01,(byte)0x05, // Tag, Length, Value - LCSI (Activated)
(byte)0x8B,(byte)0x03, // Tag, Length - Security attribute
(byte)0x2F,(byte)0x06,(byte)0x01, // Value - Security attribute (EF Arr, record nb)
- (byte)0x80,(byte)0x02,(byte)0x00,(byte)0x7F, // Tag, Length, value - File size (0 bytes => no record)
+ (byte)0x80,(byte)0x02,(byte)0x00,(byte)0x00, // Tag, Length, value - File size (0 bytes => no record)
+ (byte)0x88,(byte)0x00}; // Tag, Length - SFI (no SFI)
+ private byte [] abCreateEF_2CFD = {
+ (byte)0x82,(byte)0x04, // Tag, Length - File descriptor
+ (byte)0x46,(byte)0x21,(byte)0x00,(byte)0xFD, // Value - File descriptor (Cyclic) and record length (0xFD)
+ (byte)0x83,(byte)0x02, // Tag, Length - File Id
+ (byte)0x2C,(byte)0xFD, // Value - File Id
+ (byte)0x8A,(byte)0x01,(byte)0x05, // Tag, Length, Value - LCSI (Activated)
+ (byte)0x8B,(byte)0x03, // Tag, Length - Security attribute
+ (byte)0x2F,(byte)0x06,(byte)0x01, // Value - Security attribute (EF Arr, record nb)
+ (byte)0x80,(byte)0x02,(byte)0x00,(byte)0xFD, // Tag, Length, value - File size (0 bytes => no record)
(byte)0x88,(byte)0x00}; // Tag, Length - SFI (no SFI)
byte testCaseNb = (byte) 0x00;
byte incr[] = null;
@@ -502,13 +512,14 @@ public class Api_1_Fvw_Incr_1 extends TestToolkitApplet implements UICCConstants
// activate
UiccFileView.activateFile();
// Restore Ef content
- // Set records to 55 55 55
- Util.arrayFillNonAtomic(data, (short)0, (short)data.length, (byte)0x55);
- UiccFileView.updateRecord((short)0, REC_ACC_MODE_PREVIOUS, (short)0, data, (short)0, (short)data.length);
// Set records to AA AA AA
Util.arrayFillNonAtomic(data, (short)0, (short)data.length, (byte)0xAA);
UiccFileView.updateRecord((short)0, REC_ACC_MODE_PREVIOUS, (short)0, data, (short)0, (short)data.length);
- bRes &= true;
+ // Set records to 55 55 55
+ Util.arrayFillNonAtomic(data, (short)0, (short)data.length, (byte)0x55);
+ UiccFileView.updateRecord((short)0, REC_ACC_MODE_PREVIOUS, (short)0, data, (short)0, (short)data.length);
+
+ bRes &= true;
}
catch (Exception e)
{
@@ -517,34 +528,68 @@ public class Api_1_Fvw_Incr_1 extends TestToolkitApplet implements UICCConstants
reportTestOutcome(testCaseNb, bRes);
// -----------------------------------------------------------------
- // Test Case 15 : incrLength out of range
- // -----------------------------------------------------------------
+ // Test Case 15 : Record not found
+ //
testCaseNb = 15;
+ try
+ {
+ incr = new byte[3];
+ resp = new byte[3];
+ createEFCmd = HandlerBuilder.buildTLVHandler(HandlerBuilder.EDIT_HANDLER, (short)abCreateEF_2C00.length, abCreateEF_2C00, (short)0x00, (short)abCreateEF_2C00.length);
+ UiccAdminFileView.createFile(createEFCmd);
+ UiccAdminFileView.select((short)0x2C00);
+
+ incrOffset = 0;
+ incrLength = 3;
+ respOffset = 0;
+
+ respLength = UiccFileView.increase(incr, incrOffset, incrLength, resp, respOffset);
+ bRes = false;
+ }
+ catch (UICCException e)
+ {
+ if (e.getReason() == UICCException.RECORD_NOT_FOUND)
+ bRes = true;
+ else
+ bRes = false;
+ }
+ catch(Exception e)
+ {
+ bRes = false;
+ }
+
+ UiccAdminFileView.deleteFile((short)0x2C00);
+ reportTestOutcome(testCaseNb, bRes);
+
+ // -----------------------------------------------------------------
+ // Test Case 16 : incrLength out of range
+ // -----------------------------------------------------------------
+ testCaseNb = 16;
try
{
// Create EF 0x2CFD
incr = new byte[128];
resp = new byte[0xFF];
comp = new byte[0xFF];
- createEFCmd = HandlerBuilder.buildTLVHandler(HandlerBuilder.EDIT_HANDLER, (short)abCreateEF.length, abCreateEF, (short)0x00, (short)abCreateEF.length);
+ createEFCmd = HandlerBuilder.buildTLVHandler(HandlerBuilder.EDIT_HANDLER, (short)abCreateEF_2CFD.length, abCreateEF_2CFD, (short)0x00, (short)abCreateEF_2CFD.length);
UiccAdminFileView.createFile(createEFCmd);
- UiccAdminFileView.select((short)0x2C7F);
+ UiccAdminFileView.select((short)0x2CFD);
- Util.arrayFillNonAtomic(comp, (short)0, (short)127, (byte)0xFF);
- comp[0] = (byte)0x00;
- UiccAdminFileView.updateRecord((short)0, REC_ACC_MODE_PREVIOUS, (short)0, comp, (short)0, (short)127);
+ Util.arrayFillNonAtomic(comp, (short)0, (short)126, (byte)0x00);
+ Util.arrayFillNonAtomic(comp, (short)126, (short)(0xFD-126), (byte)0xFF);
+ UiccAdminFileView.updateRecord((short)0, REC_ACC_MODE_PREVIOUS, (short)0, comp, (short)0, (short)0xFD);
// increase
Util.arrayFillNonAtomic(incr, (short)0, (short)incr.length, (byte)0);
Util.arrayFillNonAtomic(resp, (short)0, (short)resp.length, (byte)0);
Util.arrayFillNonAtomic(comp, (short)0, (short)resp.length, (byte)0);
incr[127] = (byte)0x01;
- comp[0] = (byte)0x01;
+ comp[125] = (byte)0x01;
incrOffset = 1;
incrLength = 127;
respOffset = 0;
respLength = UiccAdminFileView.increase(incr, incrOffset, incrLength, resp, respOffset);
// Check result
- if ((respLength == (short)0x7F) &&
+ if ((respLength == (short)0xFD) &&
(Util.arrayCompare(resp, (short)0, comp, (short)0, respLength) == 0))
bRes = true;
else
@@ -568,7 +613,59 @@ public class Api_1_Fvw_Incr_1 extends TestToolkitApplet implements UICCConstants
bRes &= true;
}
reportTestOutcome(testCaseNb, bRes);
- UiccAdminFileView.deleteFile((short)0x2C7F);
-
+ UiccAdminFileView.deleteFile((short)0x2CFD);
}
}
+
+/*
+testCaseNb = 16;
+try
+{
+ // Create EF 0x2CFD
+ incr = new byte[128];
+ resp = new byte[0xFF];
+ comp = new byte[0xFF];
+ createEFCmd = HandlerBuilder.buildTLVHandler(HandlerBuilder.EDIT_HANDLER, (short)abCreateEF.length, abCreateEF, (short)0x00, (short)abCreateEF.length);
+ UiccAdminFileView.createFile(createEFCmd);
+ UiccAdminFileView.select((short)0x2C7F);
+
+ Util.arrayFillNonAtomic(comp, (short)0, (short)127, (byte)0xFF);
+ comp[0] = (byte)0x00;
+ UiccAdminFileView.updateRecord((short)0, REC_ACC_MODE_PREVIOUS, (short)0, comp, (short)0, (short)127);
+ // increase
+ Util.arrayFillNonAtomic(incr, (short)0, (short)incr.length, (byte)0);
+ Util.arrayFillNonAtomic(resp, (short)0, (short)resp.length, (byte)0);
+ Util.arrayFillNonAtomic(comp, (short)0, (short)resp.length, (byte)0);
+ incr[127] = (byte)0x01;
+ comp[0] = (byte)0x01;
+ incrOffset = 1;
+ incrLength = 127;
+ respOffset = 0;
+ respLength = UiccAdminFileView.increase(incr, incrOffset, incrLength, resp, respOffset);
+ // Check result
+ if ((respLength == (short)0x7F) &&
+ (Util.arrayCompare(resp, (short)0, comp, (short)0, respLength) == 0))
+ bRes = true;
+ else
+ bRes = false;
+}
+catch (Exception e)
+{
+ bRes = false;
+}
+try
+{
+ // increase
+ incrOffset = 0;
+ incrLength = 128;
+ respOffset = 0;
+ respLength = UiccAdminFileView.increase(incr, incrOffset, incrLength, resp, respOffset);
+ bRes = false;
+}
+catch (Exception e)
+{
+ bRes &= true;
+}
+reportTestOutcome(testCaseNb, bRes);
+UiccAdminFileView.deleteFile((short)0x2C7F);
+*/
\ No newline at end of file
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_incr/Test_Api_1_Fvw_Incr.java b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_incr/Test_Api_1_Fvw_Incr.java
index 9290f49fa3f704b11f01f72063602a7eaa5f4655..9e4f687cc3782e4d683d90cd4ed7a403857ba68a 100644
--- a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_incr/Test_Api_1_Fvw_Incr.java
+++ b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_incr/Test_Api_1_Fvw_Incr.java
@@ -81,8 +81,8 @@ public class Test_Api_1_Fvw_Incr extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "0F" +
- "CCCCCCCC CCCCCCCC CCCCCCCC CCCCCC");
+ result &= response.checkData("10" + APPLET_AID_1 + "10" +
+ "CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC");
/*********************************************************************/
/*********************************************************************/
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_redb/Test_Api_1_Fvw_Redb.java b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_redb/Test_Api_1_Fvw_Redb.java
index 3d627a4fe1916e44730f868db9c59badbca2f6f1..4c3a0f4f1f44cc70a3a91ff22891e111b475aa78 100644
--- a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_redb/Test_Api_1_Fvw_Redb.java
+++ b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_redb/Test_Api_1_Fvw_Redb.java
@@ -17,7 +17,7 @@ import org.etsi.scp.wg3.uicc.jcapi.userinterface.*;
/**
* Test Area : uicc.test.access.api_1_fvw_redb
*
- * @version 0.0.1 - 6 déc. 2005
+ * @version 0.0.1 - 6 d�c. 2005
* @author 3GPP T3 SWG API
*/
public class Test_Api_1_Fvw_Redb extends UiccTestModel {
@@ -35,7 +35,7 @@ public class Test_Api_1_Fvw_Redb extends UiccTestModel {
}
public boolean run() {
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -75,8 +75,8 @@ public class Test_Api_1_Fvw_Redb extends UiccTestModel {
test.unrecognizedEnvelope();
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1 +
- "0CCCCCCC CCCCCCCC CCCCCCCC CC");
+ addResult(response.checkData("10" + APPLET_AID_1 +
+ "0CCCCCCC CCCCCCCC CCCCCCCC CC"));
test.reset();
test.terminalProfileSession("0101");
@@ -89,6 +89,6 @@ public class Test_Api_1_Fvw_Redb extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
\ No newline at end of file
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_redr/Test_Api_1_Fvw_Redr.java b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_redr/Test_Api_1_Fvw_Redr.java
index 97768fcf03363e57bdee493c4ba58aceb00cc720..b0cdabb6faa632088c74a0daf6ebf058bef84379 100644
--- a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_redr/Test_Api_1_Fvw_Redr.java
+++ b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_redr/Test_Api_1_Fvw_Redr.java
@@ -17,7 +17,7 @@ import org.etsi.scp.wg3.uicc.jcapi.userinterface.*;
/**
* Test Area : uicc.test.access.api_1_fvw_redr
*
- * @version 0.0.1 - 6 déc. 2005
+ * @version 0.0.1 - 6 d�c. 2005
* @author 3GPP T3 SWG API
*/
public class Test_Api_1_Fvw_Redr extends UiccTestModel {
@@ -35,7 +35,7 @@ public class Test_Api_1_Fvw_Redr extends UiccTestModel {
}
public boolean run() {
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -75,9 +75,9 @@ public class Test_Api_1_Fvw_Redr extends UiccTestModel {
test.unrecognizedEnvelope();
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1 +
+ addResult(response.checkData("10" + APPLET_AID_1 +
"19CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
- "CCCCCCCC CCCCCCCC CCCC");
+ "CCCCCCCC CCCCCCCC CCCC"));
test.reset();
test.terminalProfileSession("0101");
@@ -90,6 +90,6 @@ public class Test_Api_1_Fvw_Redr extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
\ No newline at end of file
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_sear/Test_Api_1_Fvw_Sear.java b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_sear/Test_Api_1_Fvw_Sear.java
index 03241f59f6ab33087205a2c62efcf3a9fe372fab..933f13bd77ffc74274e34c41c7dd7dc483033d1e 100644
--- a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_sear/Test_Api_1_Fvw_Sear.java
+++ b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_sear/Test_Api_1_Fvw_Sear.java
@@ -25,7 +25,7 @@ public class Test_Api_1_Fvw_Sear extends UiccTestModel {
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -65,7 +65,7 @@ public class Test_Api_1_Fvw_Sear extends UiccTestModel {
// Trigger Applet
response = test.envelopeMenuSelection("100101", "");
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -75,10 +75,10 @@ public class Test_Api_1_Fvw_Sear extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "25" +
+ addResult(response.checkData("10" + APPLET_AID_1 + "25" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
- "CCCCCCCC CC");
+ "CCCCCCCC CC"));
/*********************************************************************/
/*********************************************************************/
@@ -92,6 +92,6 @@ public class Test_Api_1_Fvw_Sear extends UiccTestModel {
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_slctb/Test_Api_1_Fvw_Slctb.java b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_slctb/Test_Api_1_Fvw_Slctb.java
index 7022d66086f87f47ba0562c661a8a6d04a227b42..2a6b762d5944c5ec31aede442f68f62c09fdd8d0 100644
--- a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_slctb/Test_Api_1_Fvw_Slctb.java
+++ b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_slctb/Test_Api_1_Fvw_Slctb.java
@@ -24,7 +24,7 @@ public class Test_Api_1_Fvw_Slctb extends UiccTestModel {
}
public boolean run() {
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -67,8 +67,8 @@ public class Test_Api_1_Fvw_Slctb extends UiccTestModel {
test.unrecognizedEnvelope();
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1 +
- "06CCCCCC CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1 +
+ "06CCCCCC CCCCCC"));
test.reset();
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
@@ -82,6 +82,6 @@ public class Test_Api_1_Fvw_Slctb extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
\ No newline at end of file
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_slctb_bss/Test_Api_1_Fvw_Slctb_Bss.java b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_slctb_bss/Test_Api_1_Fvw_Slctb_Bss.java
index 13c1af6b28ba854879c21537501144f37f1afc2b..c2f3ad0a802bcad3e9263ffddbd1f8a600dad21d 100644
--- a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_slctb_bss/Test_Api_1_Fvw_Slctb_Bss.java
+++ b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_slctb_bss/Test_Api_1_Fvw_Slctb_Bss.java
@@ -27,7 +27,7 @@ public class Test_Api_1_Fvw_Slctb_Bss extends UiccTestModel {
}
public boolean run() {
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -86,9 +86,9 @@ public class Test_Api_1_Fvw_Slctb_Bss extends UiccTestModel {
test.unrecognizedEnvelope();
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1 +
+ addResult(response.checkData("10" + APPLET_AID_1 +
"16CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
- "CCCCCCCC CCCCCC");
+ "CCCCCCCC CCCCCC"));
test.reset();
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
@@ -110,6 +110,6 @@ public class Test_Api_1_Fvw_Slctb_Bss extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_slcts/Test_Api_1_Fvw_Slcts.java b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_slcts/Test_Api_1_Fvw_Slcts.java
index a1dcc7264455b34401552f598158a0b2d79a0cfb..39c8b3fc30726ee28a35e5a09833abc1d8e239a0 100644
--- a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_slcts/Test_Api_1_Fvw_Slcts.java
+++ b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_slcts/Test_Api_1_Fvw_Slcts.java
@@ -27,7 +27,7 @@ public class Test_Api_1_Fvw_Slcts extends UiccTestModel {
}
public boolean run() {
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -72,9 +72,9 @@ public class Test_Api_1_Fvw_Slcts extends UiccTestModel {
test.unrecognizedEnvelope();
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1 +
+ addResult(response.checkData("10" + APPLET_AID_1 +
"10CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
- "CC");
+ "CC"));
test.reset();
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
@@ -96,6 +96,6 @@ public class Test_Api_1_Fvw_Slcts extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_stat/Test_Api_1_Fvw_Stat.java b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_stat/Test_Api_1_Fvw_Stat.java
index 64ec5117aa7357029da0b99acf5b1314c6014e18..1434295607e2d93945c18f3706d4ec45701854af 100644
--- a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_stat/Test_Api_1_Fvw_Stat.java
+++ b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_stat/Test_Api_1_Fvw_Stat.java
@@ -24,7 +24,7 @@ public class Test_Api_1_Fvw_Stat extends UiccTestModel {
}
public boolean run() {
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -73,8 +73,8 @@ public class Test_Api_1_Fvw_Stat extends UiccTestModel {
test.unrecognizedEnvelope();
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1 +
- "0CCCCCCC CCCCCCCC CCCCCCCC CC");
+ addResult(response.checkData("10" + APPLET_AID_1 +
+ "0CCCCCCC CCCCCCCC CCCCCCCC CC"));
test.reset();
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
@@ -89,6 +89,6 @@ public class Test_Api_1_Fvw_Stat extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_updb/Test_Api_1_Fvw_Updb.java b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_updb/Test_Api_1_Fvw_Updb.java
index 85f040f513bf2b0d616294ecd90700d7359cc40b..afa374200e5610b077600c4b8db68eda6a4361cc 100644
--- a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_updb/Test_Api_1_Fvw_Updb.java
+++ b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_updb/Test_Api_1_Fvw_Updb.java
@@ -17,7 +17,7 @@ import org.etsi.scp.wg3.uicc.jcapi.userinterface.*;
/**
* Test Area : uicc.test.access.api_1_fvw_updb
*
- * @version 0.0.1 - 8 déc. 2005
+ * @version 0.0.1 - 8 d�c. 2005
* @author 3GPP T3 SWG API
*/
public class Test_Api_1_Fvw_Updb extends UiccTestModel {
@@ -35,7 +35,7 @@ public class Test_Api_1_Fvw_Updb extends UiccTestModel {
}
public boolean run() {
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -74,8 +74,8 @@ public class Test_Api_1_Fvw_Updb extends UiccTestModel {
test.unrecognizedEnvelope();
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1 +
- "0CCCCCCC CCCCCCCC CCCCCCCC CC");
+ addResult(response.checkData("10" + APPLET_AID_1 +
+ "0CCCCCCC CCCCCCCC CCCCCCCC CC"));
test.reset();
test.terminalProfileSession("0101");
@@ -88,6 +88,6 @@ public class Test_Api_1_Fvw_Updb extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
\ No newline at end of file
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_updr/Test_Api_1_Fvw_Updr.java b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_updr/Test_Api_1_Fvw_Updr.java
index 5180ffe0f06764d2ccb82c4021fb464aac0b6c2f..c82c1a6f3ff404b4b53300645bfc364349ed1490 100644
--- a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_updr/Test_Api_1_Fvw_Updr.java
+++ b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_updr/Test_Api_1_Fvw_Updr.java
@@ -17,7 +17,7 @@ import org.etsi.scp.wg3.uicc.jcapi.userinterface.*;
/**
* Test Area : uicc.test.access.api_1_fvw_updr
*
- * @version 0.0.1 - 8 déc. 2005
+ * @version 0.0.1 - 8 d�c. 2005
* @author 3GPP T3 SWG API
*/
public class Test_Api_1_Fvw_Updr extends UiccTestModel {
@@ -35,7 +35,7 @@ public class Test_Api_1_Fvw_Updr extends UiccTestModel {
}
public boolean run() {
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -75,9 +75,9 @@ public class Test_Api_1_Fvw_Updr extends UiccTestModel {
test.unrecognizedEnvelope();
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1 +
+ addResult(response.checkData("10" + APPLET_AID_1 +
"17CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
- "CCCCCCCC CCCCCCCC");
+ "CCCCCCCC CCCCCCCC"));
test.reset();
test.terminalProfileSession("0101");
@@ -91,6 +91,6 @@ public class Test_Api_1_Fvw_Updr extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
\ No newline at end of file
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_uex_coor/Test_Api_1_Uex_Coor.java b/source/Annex_E_SourceCode/uicc/test/access/api_1_uex_coor/Test_Api_1_Uex_Coor.java
index 1931d080656ef37dbf2acdd35083938534368a67..fbe57aafc19e976b2ad62c800ec58841a79815fa 100644
--- a/source/Annex_E_SourceCode/uicc/test/access/api_1_uex_coor/Test_Api_1_Uex_Coor.java
+++ b/source/Annex_E_SourceCode/uicc/test/access/api_1_uex_coor/Test_Api_1_Uex_Coor.java
@@ -25,7 +25,7 @@ public class Test_Api_1_Uex_Coor extends UiccTestModel {
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -57,7 +57,7 @@ public class Test_Api_1_Uex_Coor extends UiccTestModel {
// Trigger Applet
response = test.envelopeMenuSelection("100101", "");
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -67,7 +67,7 @@ public class Test_Api_1_Uex_Coor extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "01" + "CC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "01" + "CC"));
/*********************************************************************/
/*********************************************************************/
@@ -81,6 +81,6 @@ public class Test_Api_1_Uex_Coor extends UiccTestModel {
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_uex_thit/Test_Api_1_Uex_Thit.java b/source/Annex_E_SourceCode/uicc/test/access/api_1_uex_thit/Test_Api_1_Uex_Thit.java
index 07ccc6b79674a8f07fc0ad240c59f8e7195b9492..499cfc0ea5ca3960ae3ce2e566d055b37f7060f0 100644
--- a/source/Annex_E_SourceCode/uicc/test/access/api_1_uex_thit/Test_Api_1_Uex_Thit.java
+++ b/source/Annex_E_SourceCode/uicc/test/access/api_1_uex_thit/Test_Api_1_Uex_Thit.java
@@ -25,7 +25,7 @@ public class Test_Api_1_Uex_Thit extends UiccTestModel {
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -57,7 +57,7 @@ public class Test_Api_1_Uex_Thit extends UiccTestModel {
// Trigger Applet
response = test.envelopeMenuSelection("100101", "");
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -67,7 +67,7 @@ public class Test_Api_1_Uex_Thit extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "06" + "CCCCCCCC CCCC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "06" + "CCCCCCCC CCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -81,6 +81,6 @@ public class Test_Api_1_Uex_Thit extends UiccTestModel {
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_usy_getf_bsbb/Test_Api_1_Usy_Getf_Bsbb.java b/source/Annex_E_SourceCode/uicc/test/access/api_1_usy_getf_bsbb/Test_Api_1_Usy_Getf_Bsbb.java
index 0a3cbb38d6a4e502db07d1186d82012967d57711..bca043cee5c0050e93435b2e890f32ce8401dc70 100644
--- a/source/Annex_E_SourceCode/uicc/test/access/api_1_usy_getf_bsbb/Test_Api_1_Usy_Getf_Bsbb.java
+++ b/source/Annex_E_SourceCode/uicc/test/access/api_1_usy_getf_bsbb/Test_Api_1_Usy_Getf_Bsbb.java
@@ -31,7 +31,7 @@ public class Test_Api_1_Usy_Getf_Bsbb extends UiccTestModel {
}
public boolean run() {
- boolean result = true;
+ initialiseResults();
// start test
test.reset();
@@ -80,26 +80,26 @@ public class Test_Api_1_Usy_Getf_Bsbb extends UiccTestModel {
*/
response = test.envelopeMenuSelection("100101", "");
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Test case 2
* Normal execution
*/
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
test.reset();
test.terminalProfileSession("0101");
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
test.reset();
test.terminalProfileSession("0101");
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
response = test.selectApplication(APPLET_AID_1);
response = test.selectApplication(AID_ADF_2);
@@ -110,7 +110,7 @@ public class Test_Api_1_Usy_Getf_Bsbb extends UiccTestModel {
test.terminalProfileSession("0101");
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Test case 3
@@ -118,7 +118,7 @@ public class Test_Api_1_Usy_Getf_Bsbb extends UiccTestModel {
*/
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Test case 4
@@ -126,7 +126,7 @@ public class Test_Api_1_Usy_Getf_Bsbb extends UiccTestModel {
*/
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Test case 5
@@ -134,7 +134,7 @@ public class Test_Api_1_Usy_Getf_Bsbb extends UiccTestModel {
*/
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
test.reset();
test.terminalProfileSession("0101");
@@ -153,14 +153,14 @@ public class Test_Api_1_Usy_Getf_Bsbb extends UiccTestModel {
*/
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Test case 8
* NullPointerException
*/
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Testcase 9
@@ -168,7 +168,7 @@ public class Test_Api_1_Usy_Getf_Bsbb extends UiccTestModel {
*/
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Testcase 10
@@ -176,7 +176,7 @@ public class Test_Api_1_Usy_Getf_Bsbb extends UiccTestModel {
*/
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/**
@@ -188,7 +188,7 @@ public class Test_Api_1_Usy_Getf_Bsbb extends UiccTestModel {
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "0ACCCCCC CCCCCCCC CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "0ACCCCCC CCCCCCCC CCCCCC"));
// delete applet and package
test.reset();
@@ -196,6 +196,6 @@ public class Test_Api_1_Usy_Getf_Bsbb extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_usy_getfb/Test_Api_1_Usy_Getfb.java b/source/Annex_E_SourceCode/uicc/test/access/api_1_usy_getfb/Test_Api_1_Usy_Getfb.java
index 2145af48ef1829ea924c09b3b2502d9881172f56..d25713ef8e6d68ca9f1fa627a97a07cd46e07bee 100644
--- a/source/Annex_E_SourceCode/uicc/test/access/api_1_usy_getfb/Test_Api_1_Usy_Getfb.java
+++ b/source/Annex_E_SourceCode/uicc/test/access/api_1_usy_getfb/Test_Api_1_Usy_Getfb.java
@@ -31,7 +31,7 @@ public class Test_Api_1_Usy_Getfb extends UiccTestModel {
}
public boolean run() {
- boolean result = true;
+ initialiseResults();
// start test
test.reset();
@@ -79,26 +79,26 @@ public class Test_Api_1_Usy_Getfb extends UiccTestModel {
*/
response = test.envelopeMenuSelection("100101", "");
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Test case 2
* Normal execution
*/
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
test.reset();
test.terminalProfileSession("0101");
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
test.reset();
test.terminalProfileSession("0101");
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
response = test.selectApplication(APPLET_AID_1);
response = test.selectApplication(AID_ADF_2);
@@ -109,7 +109,7 @@ public class Test_Api_1_Usy_Getfb extends UiccTestModel {
test.terminalProfileSession("0101");
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Test case 3
@@ -117,7 +117,7 @@ public class Test_Api_1_Usy_Getfb extends UiccTestModel {
*/
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Test case 4
@@ -125,7 +125,7 @@ public class Test_Api_1_Usy_Getfb extends UiccTestModel {
*/
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Test case 5
@@ -133,7 +133,7 @@ public class Test_Api_1_Usy_Getfb extends UiccTestModel {
*/
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
test.reset();
test.terminalProfileSession("0101");
@@ -152,7 +152,7 @@ public class Test_Api_1_Usy_Getfb extends UiccTestModel {
*/
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/**
@@ -164,7 +164,7 @@ public class Test_Api_1_Usy_Getfb extends UiccTestModel {
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "07CCCCCC CCCCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "07CCCCCC CCCCCCCC"));
// delete applet and package
test.reset();
@@ -172,6 +172,6 @@ public class Test_Api_1_Usy_Getfb extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_usy_getfob/Test_Api_1_Usy_Getfob.java b/source/Annex_E_SourceCode/uicc/test/access/api_1_usy_getfob/Test_Api_1_Usy_Getfob.java
index 4952d4e4583ec4e5c3a8faa06c0c86b82990def3..6201205b90108dbd314092664b6a06cc468a1ed0 100644
--- a/source/Annex_E_SourceCode/uicc/test/access/api_1_usy_getfob/Test_Api_1_Usy_Getfob.java
+++ b/source/Annex_E_SourceCode/uicc/test/access/api_1_usy_getfob/Test_Api_1_Usy_Getfob.java
@@ -31,7 +31,7 @@ public class Test_Api_1_Usy_Getfob extends UiccTestModel {
}
public boolean run() {
- boolean result = true;
+ initialiseResults();
// start test
test.reset();
@@ -80,26 +80,26 @@ public class Test_Api_1_Usy_Getfob extends UiccTestModel {
*/
response = test.envelopeMenuSelection("100101", "");
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Test case 2
* Normal execution
*/
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
test.reset();
test.terminalProfileSession("0101");
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
test.reset();
test.terminalProfileSession("0101");
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
response = test.selectApplication(APPLET_AID_1);
response = test.selectApplication(AID_ADF_2);
@@ -110,7 +110,7 @@ public class Test_Api_1_Usy_Getfob extends UiccTestModel {
test.terminalProfileSession("0101");
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Test case 3
@@ -118,7 +118,7 @@ public class Test_Api_1_Usy_Getfob extends UiccTestModel {
*/
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Test case 4
@@ -126,7 +126,7 @@ public class Test_Api_1_Usy_Getfob extends UiccTestModel {
*/
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Test case 5
@@ -134,7 +134,7 @@ public class Test_Api_1_Usy_Getfob extends UiccTestModel {
*/
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
test.reset();
test.terminalProfileSession("0101");
@@ -153,14 +153,14 @@ public class Test_Api_1_Usy_Getfob extends UiccTestModel {
*/
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Test case 8
* NullPointerException
*/
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/**
@@ -172,7 +172,7 @@ public class Test_Api_1_Usy_Getfob extends UiccTestModel {
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "08CCCCCC CCCCCCCC CC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "08CCCCCC CCCCCCCC CC"));
// delete applet and package
test.reset();
@@ -180,6 +180,6 @@ public class Test_Api_1_Usy_Getfob extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_aex_coor/Test_Api_4_Aex_Coor.java b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_aex_coor/Test_Api_4_Aex_Coor.java
index 02db496f22b3d989f19d94684e8385727a89bc71..23556e605670ecbb48539508468c9a4c164ebc76 100644
--- a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_aex_coor/Test_Api_4_Aex_Coor.java
+++ b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_aex_coor/Test_Api_4_Aex_Coor.java
@@ -25,7 +25,7 @@ public class Test_Api_4_Aex_Coor extends UiccTestModel {
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -57,7 +57,7 @@ public class Test_Api_4_Aex_Coor extends UiccTestModel {
// Trigger Applet
response = test.envelopeMenuSelection("100101", "");
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -67,7 +67,7 @@ public class Test_Api_4_Aex_Coor extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "01" + "CC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "01" + "CC"));
/*********************************************************************/
/*********************************************************************/
@@ -81,6 +81,6 @@ public class Test_Api_4_Aex_Coor extends UiccTestModel {
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_aex_thit/Test_Api_4_Aex_Thit.java b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_aex_thit/Test_Api_4_Aex_Thit.java
index d371e82f0a82f8bcbd5e3d192fbb0ebdb47475a6..85b2637d66e7ac67a50f809072705f52506d3b48 100644
--- a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_aex_thit/Test_Api_4_Aex_Thit.java
+++ b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_aex_thit/Test_Api_4_Aex_Thit.java
@@ -25,7 +25,7 @@ public class Test_Api_4_Aex_Thit extends UiccTestModel {
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -57,7 +57,7 @@ public class Test_Api_4_Aex_Thit extends UiccTestModel {
// Trigger Applet
response = test.envelopeMenuSelection("100101", "");
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -67,7 +67,7 @@ public class Test_Api_4_Aex_Thit extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "06" + "CCCCCCCC CCCC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "06" + "CCCCCCCC CCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -81,6 +81,6 @@ public class Test_Api_4_Aex_Thit extends UiccTestModel {
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afb_gtaf_bsbb/Test_Api_4_Afb_Gtaf_Bsbb.java b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afb_gtaf_bsbb/Test_Api_4_Afb_Gtaf_Bsbb.java
index 54cb4a95df55a14d8a133d3e24fa5e777c57023c..997c8cf7c7e803818df8d6851bd6c47726f1a6ff 100644
--- a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afb_gtaf_bsbb/Test_Api_4_Afb_Gtaf_Bsbb.java
+++ b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afb_gtaf_bsbb/Test_Api_4_Afb_Gtaf_Bsbb.java
@@ -31,7 +31,7 @@ public class Test_Api_4_Afb_Gtaf_Bsbb extends UiccTestModel {
}
public boolean run() {
- boolean result = true;
+ initialiseResults();
// start test
test.reset();
@@ -80,26 +80,26 @@ public class Test_Api_4_Afb_Gtaf_Bsbb extends UiccTestModel {
*/
response = test.envelopeMenuSelection("100101", "");
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Test case 2
* Normal execution
*/
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
test.reset();
test.terminalProfileSession("0101");
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
test.reset();
test.terminalProfileSession("0101");
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
response = test.selectApplication(APPLET_AID_1);
response = test.selectApplication(AID_ADF_2);
@@ -110,7 +110,7 @@ public class Test_Api_4_Afb_Gtaf_Bsbb extends UiccTestModel {
test.terminalProfileSession("0101");
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Test case 3
@@ -118,7 +118,7 @@ public class Test_Api_4_Afb_Gtaf_Bsbb extends UiccTestModel {
*/
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Test case 4
@@ -126,7 +126,7 @@ public class Test_Api_4_Afb_Gtaf_Bsbb extends UiccTestModel {
*/
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Test case 5
@@ -134,7 +134,7 @@ public class Test_Api_4_Afb_Gtaf_Bsbb extends UiccTestModel {
*/
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Test case 6
@@ -153,14 +153,14 @@ public class Test_Api_4_Afb_Gtaf_Bsbb extends UiccTestModel {
*/
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Test case 8
* NullPointerException
*/
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Testcase 9
@@ -168,7 +168,7 @@ public class Test_Api_4_Afb_Gtaf_Bsbb extends UiccTestModel {
*/
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Testcase 10
@@ -176,7 +176,7 @@ public class Test_Api_4_Afb_Gtaf_Bsbb extends UiccTestModel {
*/
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/**
@@ -188,7 +188,7 @@ public class Test_Api_4_Afb_Gtaf_Bsbb extends UiccTestModel {
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "0ACCCCCC CCCCCCCC CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "0ACCCCCC CCCCCCCC CCCCCC"));
// delete applet and package
test.reset();
@@ -196,6 +196,6 @@ public class Test_Api_4_Afb_Gtaf_Bsbb extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afb_gtafb/Test_Api_4_Afb_Gtafb.java b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afb_gtafb/Test_Api_4_Afb_Gtafb.java
index 2a986ffd36489012521290b0e769efdfa62e7b56..79965e64828dd97e9ceed241c22e6562b9b74727 100644
--- a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afb_gtafb/Test_Api_4_Afb_Gtafb.java
+++ b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afb_gtafb/Test_Api_4_Afb_Gtafb.java
@@ -31,7 +31,7 @@ public class Test_Api_4_Afb_Gtafb extends UiccTestModel {
}
public boolean run() {
- boolean result = true;
+ initialiseResults();
// start test
test.reset();
@@ -79,26 +79,26 @@ public class Test_Api_4_Afb_Gtafb extends UiccTestModel {
*/
response = test.envelopeMenuSelection("100101", "");
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Test case 2
* Normal execution
*/
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
test.reset();
test.terminalProfileSession("0101");
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
test.reset();
test.terminalProfileSession("0101");
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
response = test.selectApplication(APPLET_AID_1);
response = test.selectApplication(AID_ADF_2);
@@ -109,7 +109,7 @@ public class Test_Api_4_Afb_Gtafb extends UiccTestModel {
test.terminalProfileSession("0101");
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Test case 3
@@ -117,14 +117,14 @@ public class Test_Api_4_Afb_Gtafb extends UiccTestModel {
*/
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Test case 4
* ILLEGAL_TRANSIENT SystemException
*/
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Test case 5
@@ -132,7 +132,7 @@ public class Test_Api_4_Afb_Gtafb extends UiccTestModel {
*/
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Test case 6
@@ -151,7 +151,7 @@ public class Test_Api_4_Afb_Gtafb extends UiccTestModel {
*/
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/**
@@ -163,7 +163,7 @@ public class Test_Api_4_Afb_Gtafb extends UiccTestModel {
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "07CCCCCC CCCCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "07CCCCCC CCCCCCCC"));
// delete applet and package
test.reset();
@@ -171,6 +171,6 @@ public class Test_Api_4_Afb_Gtafb extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afb_gtafob/Test_Api_4_Afb_Gtafob.java b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afb_gtafob/Test_Api_4_Afb_Gtafob.java
index 7ebc038f48bd9f6428cdb72e3b4bf685448caf30..0d09e38e5c383a62997dc6b510e83f3785b4f182 100644
--- a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afb_gtafob/Test_Api_4_Afb_Gtafob.java
+++ b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afb_gtafob/Test_Api_4_Afb_Gtafob.java
@@ -31,7 +31,7 @@ public class Test_Api_4_Afb_Gtafob extends UiccTestModel {
}
public boolean run() {
- boolean result = true;
+ initialiseResults();
// start test
test.reset();
@@ -80,26 +80,26 @@ public class Test_Api_4_Afb_Gtafob extends UiccTestModel {
*/
response = test.envelopeMenuSelection("100101", "");
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Test case 2
* Normal execution
*/
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
test.reset();
test.terminalProfileSession("0101");
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
test.reset();
test.terminalProfileSession("0101");
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
response = test.selectApplication(APPLET_AID_1);
response = test.selectApplication(AID_ADF_2);
@@ -110,7 +110,7 @@ public class Test_Api_4_Afb_Gtafob extends UiccTestModel {
test.terminalProfileSession("0101");
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Test case 3
@@ -118,7 +118,7 @@ public class Test_Api_4_Afb_Gtafob extends UiccTestModel {
*/
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Test case 4
@@ -126,7 +126,7 @@ public class Test_Api_4_Afb_Gtafob extends UiccTestModel {
*/
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Test case 5
@@ -134,7 +134,7 @@ public class Test_Api_4_Afb_Gtafob extends UiccTestModel {
*/
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Test case 6
@@ -153,14 +153,14 @@ public class Test_Api_4_Afb_Gtafob extends UiccTestModel {
*/
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Test case 8
* NullPointerException
*/
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/**
@@ -172,7 +172,7 @@ public class Test_Api_4_Afb_Gtafob extends UiccTestModel {
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "08CCCCCC CCCCCCCC CC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "08CCCCCC CCCCCCCC CC"));
// delete applet and package
test.reset();
@@ -180,6 +180,6 @@ public class Test_Api_4_Afb_Gtafob extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_actf/Test_Api_4_Afv_Actf.java b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_actf/Test_Api_4_Afv_Actf.java
index 3ecf95e5e94893558d44d6e7783f7563c1839713..d80b45a4956bd71fd35a6b3a8cb44b729a69fbc0 100644
--- a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_actf/Test_Api_4_Afv_Actf.java
+++ b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_actf/Test_Api_4_Afv_Actf.java
@@ -25,7 +25,7 @@ public class Test_Api_4_Afv_Actf extends UiccTestModel {
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -62,7 +62,7 @@ public class Test_Api_4_Afv_Actf extends UiccTestModel {
// Trigger Applet
response = test.envelopeMenuSelection("100101", "");
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -72,7 +72,7 @@ public class Test_Api_4_Afv_Actf extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "04" + "CCCCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "04" + "CCCCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -86,6 +86,6 @@ public class Test_Api_4_Afv_Actf extends UiccTestModel {
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_crtf/Test_Api_4_Afv_Crtf.java b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_crtf/Test_Api_4_Afv_Crtf.java
index 0f283f060273a6224d8d9b3033f05e98b6b57ff7..467bf11cf661b431819904e488a7baa156c7e7ef 100644
--- a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_crtf/Test_Api_4_Afv_Crtf.java
+++ b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_crtf/Test_Api_4_Afv_Crtf.java
@@ -51,7 +51,7 @@ public class Test_Api_4_Afv_Crtf extends UiccTestModel {
}
public boolean run() {
- boolean result = true;
+ initialiseResults();
// start test
test.reset();
@@ -98,15 +98,15 @@ public class Test_Api_4_Afv_Crtf extends UiccTestModel {
test.selectFile(DF_TEST);
test.selectFile(EF_RFU0);
response = test.readBinary("0000", "03");
- result &= response.checkData("123456");
+ addResult(response.checkData("123456"));
test.selectFile(EF_RFU1);
response = test.readRecord("01", "04", "01");
- result &= response.checkData("02");
+ addResult(response.checkData("02"));
test.selectFile(EF_RFU2);
response = test.readRecord("01", "04", "03");
- result &= response.checkData("123456");
+ addResult(response.checkData("123456"));
/** test case 2
@@ -120,7 +120,7 @@ public class Test_Api_4_Afv_Crtf extends UiccTestModel {
test.selectFile(DF_RFU1);
test.selectFile(EF_RFU0);
response = test.readBinary("0000", "03");
- result &= response.checkData("123456");
+ addResult(response.checkData("123456"));
/** test cases 3, 4, 5, 6, 7
@@ -166,7 +166,7 @@ public class Test_Api_4_Afv_Crtf extends UiccTestModel {
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "07CCCCCC CCCCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "07CCCCCC CCCCCCCC"));
// delete applet and package
test.reset();
@@ -174,6 +174,6 @@ public class Test_Api_4_Afv_Crtf extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_dacf/Test_Api_4_Afv_Dacf.java b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_dacf/Test_Api_4_Afv_Dacf.java
index 4c8d3f36d79c778f86e4c86c4e44b8f7c02f38f3..4ee83c93a6434e38a8f208fe86d52b7c82c45c91 100644
--- a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_dacf/Test_Api_4_Afv_Dacf.java
+++ b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_dacf/Test_Api_4_Afv_Dacf.java
@@ -25,7 +25,7 @@ public class Test_Api_4_Afv_Dacf extends UiccTestModel {
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -63,7 +63,7 @@ public class Test_Api_4_Afv_Dacf extends UiccTestModel {
// Trigger Applet
response = test.envelopeMenuSelection("100101", "");
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -73,7 +73,7 @@ public class Test_Api_4_Afv_Dacf extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "04" + "CCCCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "04" + "CCCCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -87,6 +87,6 @@ public class Test_Api_4_Afv_Dacf extends UiccTestModel {
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_dltf/Test_Api_4_Afv_Dltf.java b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_dltf/Test_Api_4_Afv_Dltf.java
index 111b34d7aaa9cb923c1683052fb50dd8ca5fd886..420d63ae08ab6395ee213efa3f5f3e106ac9b083 100644
--- a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_dltf/Test_Api_4_Afv_Dltf.java
+++ b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_dltf/Test_Api_4_Afv_Dltf.java
@@ -30,7 +30,7 @@ public class Test_Api_4_Afv_Dltf extends UiccTestModel {
}
public boolean run() {
- boolean result = true;
+ initialiseResults();
// start test
test.reset();
@@ -92,7 +92,7 @@ public class Test_Api_4_Afv_Dltf extends UiccTestModel {
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "06CCCCCC CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "06CCCCCC CCCCCC"));
// delete applet and package
test.reset();
@@ -100,6 +100,6 @@ public class Test_Api_4_Afv_Dltf extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_incr/Api_4_Afv_Incr_1.java b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_incr/Api_4_Afv_Incr_1.java
index 4229c61767d0d64c8aebcb649dd8ddf2d7ee2a39..0ee6f5b6ac1e88ce36d075431d38af643f859c28 100644
--- a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_incr/Api_4_Afv_Incr_1.java
+++ b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_incr/Api_4_Afv_Incr_1.java
@@ -502,13 +502,13 @@ public class Api_4_Afv_Incr_1 extends TestToolkitApplet implements UICCConstants
// activate
UiccFileView.activateFile();
// Restore Ef content
- // Set records to 55 55 55
- Util.arrayFillNonAtomic(data, (short)0, (short)data.length, (byte)0x55);
- UiccFileView.updateRecord((short)0, REC_ACC_MODE_PREVIOUS, (short)0, data, (short)0, (short)data.length);
// Set records to AA AA AA
Util.arrayFillNonAtomic(data, (short)0, (short)data.length, (byte)0xAA);
UiccFileView.updateRecord((short)0, REC_ACC_MODE_PREVIOUS, (short)0, data, (short)0, (short)data.length);
- bRes &= true;
+ // Set records to 55 55 55
+ Util.arrayFillNonAtomic(data, (short)0, (short)data.length, (byte)0x55);
+ UiccFileView.updateRecord((short)0, REC_ACC_MODE_PREVIOUS, (short)0, data, (short)0, (short)data.length);
+ bRes &= true;
}
catch (Exception e)
{
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_incr/Test_Api_4_Afv_Incr.java b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_incr/Test_Api_4_Afv_Incr.java
index 08bfeef0e42478193c021b7ef6c37931917784f6..0dac60d099730cc8d8ec451c742c6c22bdeb1f3f 100644
--- a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_incr/Test_Api_4_Afv_Incr.java
+++ b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_incr/Test_Api_4_Afv_Incr.java
@@ -25,7 +25,7 @@ public class Test_Api_4_Afv_Incr extends UiccTestModel {
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -63,7 +63,7 @@ public class Test_Api_4_Afv_Incr extends UiccTestModel {
// Trigger Applet
response = test.envelopeMenuSelection("100101", "");
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -73,8 +73,8 @@ public class Test_Api_4_Afv_Incr extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "0F" +
- "CCCCCCCC CCCCCCCC CCCCCCCC CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "0F" +
+ "CCCCCCCC CCCCCCCC CCCCCCCC CCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -88,6 +88,6 @@ public class Test_Api_4_Afv_Incr extends UiccTestModel {
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_redb/Test_Api_4_Afv_Redb.java b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_redb/Test_Api_4_Afv_Redb.java
index b9ef8241b2eef81c5ecff33b7c4d95aef765f43a..6a1723e57c9d9d084419c54a36877fd17e2c62eb 100644
--- a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_redb/Test_Api_4_Afv_Redb.java
+++ b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_redb/Test_Api_4_Afv_Redb.java
@@ -17,7 +17,7 @@ import org.etsi.scp.wg3.uicc.jcapi.userinterface.*;
/**
* Test Area : uicc.test.access.fileadministration.api_4_afv_redb
*
- * @version 0.0.1 - 6 déc. 2005
+ * @version 0.0.1 - 6 d�c. 2005
* @author 3GPP T3 SWG API
*/
public class Test_Api_4_Afv_Redb extends UiccTestModel {
@@ -35,7 +35,7 @@ public class Test_Api_4_Afv_Redb extends UiccTestModel {
}
public boolean run() {
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -74,8 +74,8 @@ public class Test_Api_4_Afv_Redb extends UiccTestModel {
test.unrecognizedEnvelope();
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1 +
- "0CCCCCCC CCCCCCCC CCCCCCCC CC");
+ addResult(response.checkData("10" + APPLET_AID_1 +
+ "0CCCCCCC CCCCCCCC CCCCCCCC CC"));
test.reset();
test.terminalProfileSession("0101");
@@ -88,6 +88,6 @@ public class Test_Api_4_Afv_Redb extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
\ No newline at end of file
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_redr/Test_Api_4_Afv_Redr.java b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_redr/Test_Api_4_Afv_Redr.java
index fe741603cb7f262c48f152772c105b55e83ade78..1b83d6d6c664b9fcf785510432677c2fade59104 100644
--- a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_redr/Test_Api_4_Afv_Redr.java
+++ b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_redr/Test_Api_4_Afv_Redr.java
@@ -17,7 +17,7 @@ import org.etsi.scp.wg3.uicc.jcapi.userinterface.*;
/**
* Test Area : uicc.test.access.fileadministration.api_4_afv_redr
*
- * @version 0.0.1 - 6 déc. 2005
+ * @version 0.0.1 - 6 d�c. 2005
* @author 3GPP T3 SWG API
*/
public class Test_Api_4_Afv_Redr extends UiccTestModel {
@@ -35,7 +35,7 @@ public class Test_Api_4_Afv_Redr extends UiccTestModel {
}
public boolean run() {
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -74,9 +74,9 @@ public class Test_Api_4_Afv_Redr extends UiccTestModel {
test.unrecognizedEnvelope();
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1 +
+ addResult(response.checkData("10" + APPLET_AID_1 +
"19CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
- "CCCCCCCC CCCCCCCC CCCC");
+ "CCCCCCCC CCCCCCCC CCCC"));
test.reset();
test.terminalProfileSession("0101");
@@ -89,6 +89,6 @@ public class Test_Api_4_Afv_Redr extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
\ No newline at end of file
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_rszf/Test_Api_4_Afv_Rszf.java b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_rszf/Test_Api_4_Afv_Rszf.java
index 4dffe70176ba5a4795df31554deb8fe1093d2263..4f04085e057e93149c46f8d315b0d727f2c2bee1 100644
--- a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_rszf/Test_Api_4_Afv_Rszf.java
+++ b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_rszf/Test_Api_4_Afv_Rszf.java
@@ -51,7 +51,7 @@ public class Test_Api_4_Afv_Rszf extends UiccTestModel {
}
public boolean run() {
- boolean result = true;
+ initialiseResults();
// start test
test.reset();
@@ -98,7 +98,7 @@ public class Test_Api_4_Afv_Rszf extends UiccTestModel {
test.selectFile(DF_TEST);
response = test.selectFile(EF_TARU);
- result &= (response.getData().indexOf("8002000A") != -1);
+ addResult(response.getData().indexOf("8002000A") != -1);
test.resizeFile(EF_TARU, "0104");
@@ -113,7 +113,7 @@ public class Test_Api_4_Afv_Rszf extends UiccTestModel {
test.selectFile(DF_TEST);
response = test.selectFile(EF_LARU);
- result &= (response.getData().indexOf("80020010") != -1);
+ addResult(response.getData().indexOf("80020010") != -1);
test.resizeFile(EF_LARU, "08");
@@ -141,7 +141,7 @@ public class Test_Api_4_Afv_Rszf extends UiccTestModel {
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "08CCCCCC CCCCCCCC CC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "08CCCCCC CCCCCCCC CC"));
// delete applet and package
test.reset();
@@ -149,6 +149,6 @@ public class Test_Api_4_Afv_Rszf extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_sear/Test_Api_4_Afv_Sear.java b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_sear/Test_Api_4_Afv_Sear.java
index 2658011ad4bf941ace8f5006ccd136f229e7f16c..3f37dfffcb86a466b6a8b7fc353e07bc4c9a4f58 100644
--- a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_sear/Test_Api_4_Afv_Sear.java
+++ b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_sear/Test_Api_4_Afv_Sear.java
@@ -25,7 +25,7 @@ public class Test_Api_4_Afv_Sear extends UiccTestModel {
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -63,7 +63,7 @@ public class Test_Api_4_Afv_Sear extends UiccTestModel {
// Trigger Applet
response = test.envelopeMenuSelection("100101", "");
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -73,10 +73,10 @@ public class Test_Api_4_Afv_Sear extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "25" +
+ addResult(response.checkData("10" + APPLET_AID_1 + "25" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
- "CCCCCCCC CC");
+ "CCCCCCCC CC"));
/*********************************************************************/
/*********************************************************************/
@@ -90,6 +90,6 @@ public class Test_Api_4_Afv_Sear extends UiccTestModel {
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_slctb/Test_Api_4_Afv_Slctb.java b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_slctb/Test_Api_4_Afv_Slctb.java
index 7ca1f3d14c5321f65393ffb9072e8841ee1f6d51..94ff008d2f02fd05529edca70b9a3e4d59af645b 100644
--- a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_slctb/Test_Api_4_Afv_Slctb.java
+++ b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_slctb/Test_Api_4_Afv_Slctb.java
@@ -24,7 +24,7 @@ public class Test_Api_4_Afv_Slctb extends UiccTestModel {
}
public boolean run() {
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -67,8 +67,8 @@ public class Test_Api_4_Afv_Slctb extends UiccTestModel {
test.unrecognizedEnvelope();
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1 +
- "06CCCCCC CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1 +
+ "06CCCCCC CCCCCC"));
test.reset();
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
@@ -83,6 +83,6 @@ public class Test_Api_4_Afv_Slctb extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
\ No newline at end of file
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_slctb_bss/Test_Api_4_Afv_Slctb_Bss.java b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_slctb_bss/Test_Api_4_Afv_Slctb_Bss.java
index 0cb0d21c05f3d029a34fe1d60d9aa3e2ee59b8bc..3fe89c8aa91bc047d7b5ac3ecba72f2580c669b4 100644
--- a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_slctb_bss/Test_Api_4_Afv_Slctb_Bss.java
+++ b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_slctb_bss/Test_Api_4_Afv_Slctb_Bss.java
@@ -24,7 +24,7 @@ public class Test_Api_4_Afv_Slctb_Bss extends UiccTestModel {
}
public boolean run() {
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -83,9 +83,9 @@ public class Test_Api_4_Afv_Slctb_Bss extends UiccTestModel {
test.unrecognizedEnvelope();
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1 +
+ addResult(response.checkData("10" + APPLET_AID_1 +
"16CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
- "CCCCCCCC CCCCCC");
+ "CCCCCCCC CCCCCC"));
test.reset();
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
@@ -107,6 +107,6 @@ public class Test_Api_4_Afv_Slctb_Bss extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_slcts/Test_Api_4_Afv_Slcts.java b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_slcts/Test_Api_4_Afv_Slcts.java
index 79a24cb46aa1114e9fd36d379633b5a876c9c535..bdef4659b6b42f53eae14488681f46b87e890797 100644
--- a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_slcts/Test_Api_4_Afv_Slcts.java
+++ b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_slcts/Test_Api_4_Afv_Slcts.java
@@ -24,7 +24,7 @@ public class Test_Api_4_Afv_Slcts extends UiccTestModel {
}
public boolean run() {
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -69,9 +69,9 @@ public class Test_Api_4_Afv_Slcts extends UiccTestModel {
test.unrecognizedEnvelope();
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1 +
+ addResult(response.checkData("10" + APPLET_AID_1 +
"10CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
- "CC");
+ "CC"));
test.reset();
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
@@ -93,6 +93,6 @@ public class Test_Api_4_Afv_Slcts extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_stat/Test_Api_4_Afv_Stat.java b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_stat/Test_Api_4_Afv_Stat.java
index 9d3e05d3b8fd925881d3dfe076bd2e77fb207e3f..36c2aa0beed2c962cc69ebcf1bdfdf3efd1d9a79 100644
--- a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_stat/Test_Api_4_Afv_Stat.java
+++ b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_stat/Test_Api_4_Afv_Stat.java
@@ -24,7 +24,7 @@ public class Test_Api_4_Afv_Stat extends UiccTestModel {
}
public boolean run() {
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -73,8 +73,8 @@ public class Test_Api_4_Afv_Stat extends UiccTestModel {
test.unrecognizedEnvelope();
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1 +
- "0CCCCCCC CCCCCCCC CCCCCCCC CC");
+ addResult(response.checkData("10" + APPLET_AID_1 +
+ "0CCCCCCC CCCCCCCC CCCCCCCC CC"));
test.reset();
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
@@ -90,6 +90,6 @@ public class Test_Api_4_Afv_Stat extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_updb/Test_Api_4_Afv_Updb.java b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_updb/Test_Api_4_Afv_Updb.java
index 8be56ad383915e3ac66d6ef5b7988ed4ccc2486a..d4f062f0f9ba64ac205ecd067777b87c34574000 100644
--- a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_updb/Test_Api_4_Afv_Updb.java
+++ b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_updb/Test_Api_4_Afv_Updb.java
@@ -17,7 +17,7 @@ import org.etsi.scp.wg3.uicc.jcapi.userinterface.*;
/**
* Test Area : uicc.test.access.fileadministration.api_4_afv_updb
*
- * @version 0.0.1 - 8 déc. 2005
+ * @version 0.0.1 - 8 d�c. 2005
* @author 3GPP T3 SWG API
*/
public class Test_Api_4_Afv_Updb extends UiccTestModel {
@@ -35,7 +35,7 @@ public class Test_Api_4_Afv_Updb extends UiccTestModel {
}
public boolean run() {
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -74,8 +74,8 @@ public class Test_Api_4_Afv_Updb extends UiccTestModel {
test.unrecognizedEnvelope();
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1 +
- "0CCCCCCC CCCCCCCC CCCCCCCC CC");
+ addResult(response.checkData("10" + APPLET_AID_1 +
+ "0CCCCCCC CCCCCCCC CCCCCCCC CC"));
test.reset();
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
@@ -89,6 +89,6 @@ public class Test_Api_4_Afv_Updb extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
\ No newline at end of file
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_updr/Test_Api_4_Afv_Updr.java b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_updr/Test_Api_4_Afv_Updr.java
index af1589a4b712c9ff2f3433f6ab55c8cc648f244a..881a3a405758a3ab90817c135ccdf139477d5920 100644
--- a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_updr/Test_Api_4_Afv_Updr.java
+++ b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_updr/Test_Api_4_Afv_Updr.java
@@ -17,7 +17,7 @@ import org.etsi.scp.wg3.uicc.jcapi.userinterface.*;
/**
* Test Area : uicc.test.access.fileadministration.api_4_afv_updr
*
- * @version 0.0.1 - 8 déc. 2005
+ * @version 0.0.1 - 8 d�c. 2005
* @author 3GPP T3 SWG API
*/
public class Test_Api_4_Afv_Updr extends UiccTestModel {
@@ -35,7 +35,7 @@ public class Test_Api_4_Afv_Updr extends UiccTestModel {
}
public boolean run() {
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -74,9 +74,9 @@ public class Test_Api_4_Afv_Updr extends UiccTestModel {
test.unrecognizedEnvelope();
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1 +
+ addResult(response.checkData("10" + APPLET_AID_1 +
"17CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
- "CCCCCCCC CCCCCCCC");
+ "CCCCCCCC CCCCCCCC"));
test.reset();
test.terminalProfileSession("0101");
@@ -90,6 +90,6 @@ public class Test_Api_4_Afv_Updr extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
\ No newline at end of file
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_api_hepo/Test_Cre_Api_Hepo.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_api_hepo/Test_Cre_Api_Hepo.java
index 80cfadaceb0c0be8187b82287058b17a0cae84bc..8fa0bd3d63aa5855085cbca22f054863a29e98af 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_api_hepo/Test_Cre_Api_Hepo.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_api_hepo/Test_Cre_Api_Hepo.java
@@ -30,7 +30,7 @@ public class Test_Cre_Api_Hepo extends UiccTestModel {
public boolean run() {
- boolean result = false;
+ initialiseResults();
// start test
test.reset();
@@ -55,18 +55,18 @@ public class Test_Cre_Api_Hepo extends UiccTestModel {
// test case 1 to 8: trigger applet1
response = test.unrecognizedEnvelope();
- result = response.checkSw("9113");
+ addResult(response.checkSw("9113"));
// fetch display text proactive command
response = test.fetch("13");
- result = result & response.checkData("D0118103 01218082 0281028D 06044845" +
- "4C4C4F");
+ addResult(response.checkData("D0118103 01218082 0281028D 06044845" +
+ "4C4C4F"));
response = test.terminalResponse("81030121 80020282 81030100");
- result = result & response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// check results
response = test.selectApplication(APPLET_AID_1);
- result = result & response.checkData("10" + APPLET_AID_1 + "08CCCCCC CCCCCCCC CC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "08CCCCCC CCCCCCCC CC"));
// delete applet and package
test.reset();
@@ -74,7 +74,7 @@ public class Test_Cre_Api_Hepo extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_api_tmid/Test_Cre_Api_Tmid.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_api_tmid/Test_Cre_Api_Tmid.java
index 63b4ee1da859f243548bed0d846dd14ff6c30fdf..77e6a8dbaa75d0d4945aa9c799d831019396448e 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_api_tmid/Test_Cre_Api_Tmid.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_api_tmid/Test_Cre_Api_Tmid.java
@@ -31,7 +31,7 @@ public class Test_Cre_Api_Tmid extends UiccTestModel {
public boolean run() {
- boolean result = false;
+ initialiseResults();
// start test
test.reset();
@@ -72,11 +72,11 @@ public class Test_Cre_Api_Tmid extends UiccTestModel {
// test case 1: trigger second instance
response = test.envelopeMenuSelection("900102", "");
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// check results
response = test.selectApplication(APPLET_AID_2);
- result = result & response.checkData("10" + APPLET_AID_2 + "01CC");
+ addResult(response.checkData("10" + APPLET_AID_2 + "01CC"));
// delete applets and package
test.reset();
@@ -85,6 +85,6 @@ public class Test_Cre_Api_Tmid extends UiccTestModel {
test.deleteApplet(APPLET_AID_2);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_api_tran/Test_Cre_Api_Tran.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_api_tran/Test_Cre_Api_Tran.java
index fb90144903ae2b0631d8080cdc8e69e62dc99f98..b6e96a2e382770c1bc5d6c73b8f3e357bce880d0 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_api_tran/Test_Cre_Api_Tran.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_api_tran/Test_Cre_Api_Tran.java
@@ -32,7 +32,7 @@ public class Test_Cre_Api_Tran extends UiccTestModel {
public boolean run() {
- boolean result = true;
+ initialiseResults();
// start test
test.reset();
@@ -55,12 +55,12 @@ public class Test_Cre_Api_Tran extends UiccTestModel {
// test case 1: trigger applet1
response = test.unrecognizedEnvelope();
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07044845" +
- "4C4C4F31");
+ addResult(response.checkData("D0128103 01218082 0281028D 07044845" +
+ "4C4C4F31"));
response = test.terminalResponse("81030121 80020282 81030100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// install applet2
test.installApplet(CAP_FILE_PATH, CLASS_AID_2, APPLET_AID_2,
@@ -80,24 +80,24 @@ public class Test_Cre_Api_Tran extends UiccTestModel {
// test case 2: trigger applet2
response = test.envelopeMenuSelection("900101", "");
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
// trigger applet1
response = test.unrecognizedEnvelope();
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
// resume applet2
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07044845" +
- "4C4C4F32");
+ addResult(response.checkData("D0128103 01218082 0281028D 07044845" +
+ "4C4C4F32"));
response = test.terminalResponse("81030121 80020282 81030100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "02CCCC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "02CCCC"));
response = test.selectApplication(APPLET_AID_2);
- result &= response.checkData("10" + APPLET_AID_2 + "01CC");
+ addResult(response.checkData("10" + APPLET_AID_2 + "01CC"));
// delete applets and package
test.reset();
@@ -106,6 +106,6 @@ public class Test_Cre_Api_Tran extends UiccTestModel {
test.deleteApplet(APPLET_AID_2);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_eade/Test_Cre_Apt_Eade.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_eade/Test_Cre_Apt_Eade.java
index 3ab8d0ac37211d0cba2c5b9bbe3ed30d7b38fab5..0ea6548a81088217e680d515e58785bb9d8ca11a 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_eade/Test_Cre_Apt_Eade.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_eade/Test_Cre_Apt_Eade.java
@@ -28,7 +28,7 @@ public class Test_Cre_Apt_Eade extends UiccTestModel {
public boolean run() {
- boolean result;
+ initialiseResults();
// start test
test.reset();
@@ -76,7 +76,7 @@ public class Test_Cre_Apt_Eade extends UiccTestModel {
// check results
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10"+APPLET_AID_1+"0ACCCCCC CCCCCCCC CCCCCC");
+ addResult(response.checkData("10"+APPLET_AID_1+"0ACCCCCC CCCCCCCC CCCCCC"));
// delete applet and package
test.reset();
@@ -84,6 +84,6 @@ public class Test_Cre_Apt_Eade extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_eccn/Test_Cre_Apt_Eccn.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_eccn/Test_Cre_Apt_Eccn.java
index 62a3d38cf83fb2e647af267f1b31ab49ae77ce58..91a2b666d397fd68a14a131f4aa7888540893d6b 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_eccn/Test_Cre_Apt_Eccn.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_eccn/Test_Cre_Apt_Eccn.java
@@ -29,7 +29,7 @@ public class Test_Cre_Apt_Eccn extends UiccTestModel {
public boolean run() {
- boolean result;
+ initialiseResults();
// start test
test.reset();
@@ -68,22 +68,22 @@ public class Test_Cre_Apt_Eccn extends UiccTestModel {
test.envelopeCallControlByNAA();
//***TEST CASE 2: 1-APPLET 2 IS TRIGGERED***
response = test.envelopeMenuSelection("100101", "");//Help Request not available
- result = response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045465" +
- "78742031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045465" +
+ "78742031"));
//***TEST CASE 2: 3-APPLET 1 IS TRIGGERED***
test.envelopeCallControlByNAA();
//***TERMINAL RESPONSE TO THE DISPLAY TEXT***
response = test.terminalResponse("81030121 80820282 81030100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
//***TEST CASE 3: APPLET 2 IS TRIGGERED, APPLET1 IS NOT TRIGGERED***
test.envelopeCallControlByNAA();
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10"+APPLET_AID_1+"03CCCCCC");
+ addResult(response.checkData("10"+APPLET_AID_1+"03CCCCCC"));
response = test.selectApplication(APPLET_AID_2);
- result &= response.checkData("10"+APPLET_AID_2+"03CCCCCC");
+ addResult(response.checkData("10"+APPLET_AID_2+"03CCCCCC"));
// delete applet and package
@@ -93,6 +93,6 @@ public class Test_Cre_Apt_Eccn extends UiccTestModel {
test.deleteApplet(APPLET_AID_2);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edat/Test_Cre_Apt_Edat.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edat/Test_Cre_Apt_Edat.java
index 4019a7f85ec8391cdc44abb245ff6dc23cde2b68..7e0b4e8eb6ed29db5f9f7ab0113fc0d3042c96d0 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edat/Test_Cre_Apt_Edat.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edat/Test_Cre_Apt_Edat.java
@@ -26,7 +26,7 @@ public class Test_Cre_Apt_Edat extends UiccTestModel {
public boolean run() {
- boolean result;
+ initialiseResults();
@@ -69,7 +69,7 @@ public class Test_Cre_Apt_Edat extends UiccTestModel {
// check results
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10"+APPLET_AID_1+"05CCCCCC CCCC");
+ addResult(response.checkData("10"+APPLET_AID_1+"05CCCCCC CCCC"));
@@ -79,6 +79,6 @@ public class Test_Cre_Apt_Edat extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edbs/Test_Cre_Apt_Edbs.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edbs/Test_Cre_Apt_Edbs.java
index cf803e8f64936e8187d5d3b4964fa6bb7346c92c..2d404f06e070c1d851e18c816b118ddc0de893d6 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edbs/Test_Cre_Apt_Edbs.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edbs/Test_Cre_Apt_Edbs.java
@@ -27,7 +27,7 @@ public class Test_Cre_Apt_Edbs extends UiccTestModel {
public boolean run() {
- boolean result;
+ initialiseResults();
// start test
test.reset();
@@ -62,7 +62,7 @@ public class Test_Cre_Apt_Edbs extends UiccTestModel {
// check results
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10"+APPLET_AID_1+"07CCCCCC CCCCCCCC");
+ addResult(response.checkData("10"+APPLET_AID_1+"07CCCCCC CCCCCCCC"));
// delete applet and package
test.reset();
@@ -70,6 +70,6 @@ public class Test_Cre_Apt_Edbs extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edbt/Test_Cre_Apt_Edbt.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edbt/Test_Cre_Apt_Edbt.java
index ad9bde177b38786d284481d6facdd86a1c6e9e30..8d1b60b24530d9f38a129a3cd90a8e073fb61810 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edbt/Test_Cre_Apt_Edbt.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edbt/Test_Cre_Apt_Edbt.java
@@ -26,7 +26,7 @@ public class Test_Cre_Apt_Edbt extends UiccTestModel {
public boolean run() {
- boolean result;
+ initialiseResults();
// start test
test.reset();
@@ -65,7 +65,7 @@ public class Test_Cre_Apt_Edbt extends UiccTestModel {
// check results
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10"+APPLET_AID_1+"05CCCCCC CCCC");
+ addResult(response.checkData("10"+APPLET_AID_1+"05CCCCCC CCCC"));
// delete applet and package
test.reset();
@@ -73,6 +73,6 @@ public class Test_Cre_Apt_Edbt extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edcc/Test_Cre_Apt_Edcc.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edcc/Test_Cre_Apt_Edcc.java
index 846a3a4453d21df0cd3dc358cb788d491a7a3aa2..0cc342d3db9cff24121ef480270f95cb173acf6d 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edcc/Test_Cre_Apt_Edcc.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edcc/Test_Cre_Apt_Edcc.java
@@ -26,7 +26,7 @@ public class Test_Cre_Apt_Edcc extends UiccTestModel {
public boolean run() {
- boolean result;
+ initialiseResults();
// start test
test.reset();
@@ -63,7 +63,7 @@ public class Test_Cre_Apt_Edcc extends UiccTestModel {
// check results
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10"+APPLET_AID_1+"05CCCCCC CCCC");
+ addResult(response.checkData("10"+APPLET_AID_1+"05CCCCCC CCCC"));
@@ -73,6 +73,6 @@ public class Test_Cre_Apt_Edcc extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edcd/Test_Cre_Apt_Edcd.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edcd/Test_Cre_Apt_Edcd.java
index f3511cb95e02c4fb813f0dca832f7326019767d7..d410305261f663d1fbf06fe06d826b28e72f5a1d 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edcd/Test_Cre_Apt_Edcd.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edcd/Test_Cre_Apt_Edcd.java
@@ -26,7 +26,7 @@ public class Test_Cre_Apt_Edcd extends UiccTestModel {
public boolean run() {
- boolean result;
+ initialiseResults();
// start test
test.reset();
@@ -63,7 +63,7 @@ public class Test_Cre_Apt_Edcd extends UiccTestModel {
// check results
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10"+APPLET_AID_1+"05CCCCCC CCCC");
+ addResult(response.checkData("10"+APPLET_AID_1+"05CCCCCC CCCC"));
// delete applet and package
test.reset();
@@ -71,6 +71,6 @@ public class Test_Cre_Apt_Edcd extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edcr/Test_Cre_Apt_Edcr.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edcr/Test_Cre_Apt_Edcr.java
index 91303e2c60a19cfabd8b5435e3db447f0bee3965..853d4b3fde49f7d2d35fc34d151a76ef0e3d1968 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edcr/Test_Cre_Apt_Edcr.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edcr/Test_Cre_Apt_Edcr.java
@@ -26,7 +26,7 @@ public class Test_Cre_Apt_Edcr extends UiccTestModel {
public boolean run() {
- boolean result;
+ initialiseResults();
// start test
test.reset();
@@ -62,7 +62,7 @@ public class Test_Cre_Apt_Edcr extends UiccTestModel {
// check results
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10"+APPLET_AID_1+"05CCCCCC CCCC");
+ addResult(response.checkData("10"+APPLET_AID_1+"05CCCCCC CCCC"));
// delete applet and package
test.reset();
@@ -70,6 +70,6 @@ public class Test_Cre_Apt_Edcr extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edcs/Test_Cre_Apt_Edcs.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edcs/Test_Cre_Apt_Edcs.java
index 16642749998c5e536abc11cad3b62dc223e5049a..97ab10953b6dae1a0ca3efe56d6247275aa53455 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edcs/Test_Cre_Apt_Edcs.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edcs/Test_Cre_Apt_Edcs.java
@@ -26,7 +26,7 @@ public class Test_Cre_Apt_Edcs extends UiccTestModel {
public boolean run() {
- boolean result;
+ initialiseResults();
// start test
test.reset();
@@ -55,92 +55,92 @@ public class Test_Cre_Apt_Edcs extends UiccTestModel {
test.terminalProfileSession("09010020 000C0000 00000003 40");
//***TEST CASE 1: 1-APPLET 1 IS TRIGGERED BY EVENT MENU SELECTION
response = test.envelopeMenuSelection("100101", "");//Help Request not available
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
//***TEST CASE 1: 3-APPLET 1 IS NOT TRIGGERED BY EVENT_EVENT_DOWNLOAD_CHANNEL_STATUS
response = test.envelopeEventDownloadChannelStatus("38028100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
//***TEST CASE 1: 4-APPLET 1 IS TRIGGERED BY EVENT MENU SELECTION
response = test.envelopeMenuSelection("100101", "");//Help Request not available
- result &= response.checkSw("911A");
+ addResult(response.checkSw("911A"));
response = test.fetch("1A");
- result &= response.checkData("D0188103 01400182 02818206 05815566" +
- "77883502 03003902 000A");
+ addResult(response.checkData("D0188103 01400182 02818206 05815566" +
+ "77883502 03003902 000A"));
//TERMINAL RESPONSE WITH PROACTIVE UICC SESSION TERMINATED BY USER
test.terminalResponse("81030140 01820282 81830110");
//***TEST CASE 1: 8-APPLET 1 IS NOT TRIGGERED BY EVENT_EVENT_DOWNLOAD_CHANNEL_STATUS
response = test.envelopeEventDownloadChannelStatus("38020100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
//***TEST CASE 1: 9-APPLET 1 IS TRIGGERED BY EVENT MENU SELECTION
response = test.envelopeMenuSelection("100101", "");//Help Request not available
- result &= response.checkSw("911A");
+ addResult(response.checkSw("911A"));
//APPLET 1 BUILD A PROACTIVE COMMAND OPEN CHANNEL
response = test.fetch("1A");
- result &= response.checkData("D0188103 01400182 02818206 05815566" +
- "77883502 03003902 000A");
+ addResult(response.checkData("D0188103 01400182 02818206 05815566" +
+ "77883502 03003902 000A"));
//SUCCESSFUL TERMINAL RESPONSE
response = test.terminalResponse("81030140 01820282 81830100 38028100" +
"35020300 3902000A");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
//***TEST CASE 2: 1-APPLET 1 IS TRIGGERED BY EVENT_EVENT_DOWNLOAD_CHANNEL_STATUS
response = test.envelopeEventDownloadChannelStatus("38028100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
//***TEST CASE 3: 1-APPLET 1 IS TRIGGERED BY EVENT MENU SELECTION
response = test.envelopeMenuSelection("100101", "");//Help Request not available
- result &= response.checkSw("911A");
+ addResult(response.checkSw("911A"));
//APPLET 1 BUILD A PROACTIVE COMMAND OPEN CHANNEL
response = test.fetch("1A");
- result &= response.checkData("D0188103 01400282 02818206 05815566" +
- "77883502 03003902 000A");
+ addResult(response.checkData("D0188103 01400282 02818206 05815566" +
+ "77883502 03003902 000A"));
//TERMINAL RESPONSE WITH PARTIAL COMPREHENSION
response = test.terminalResponse("81030140 02820282 81830101 38028200" +
"35020300 3902000A");
- result &= response.checkSw("910B");
+ addResult(response.checkSw("910B"));
//APPLET 1 BUILD A PROACTIVE COMMAND CLOSE CHANNEL
response = test.fetch("0B");
- result &= response.checkData("D0098103 01410082 028122");
+ addResult(response.checkData("D0098103 01410082 028122"));
//UNSUCCESSFUL TERMINAL RESPONSE: TERMINAL CURRENTLY UNABLE TO PERFORM THE COMMAND
response = test.terminalResponse("81030141 00820282 81830120");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
//***TEST CASE 3: 4-APPLET 1 IS TRIGGERED BY EVENT_EVENT_DOWNLOAD_CHANNEL_STATUS
response = test.envelopeEventDownloadChannelStatus("38028200");
- result &= response.checkSw("910B");
+ addResult(response.checkSw("910B"));
//APPLET 1 BUILD A PROACTIVE COMMAND CLOSE CHANNEL
response = test.fetch("0B");
- result &= response.checkData("D0098103 01410082 028122");
+ addResult(response.checkData("D0098103 01410082 028122"));
//TERMINAL RESPONSE WITH MISSING INFORMATION
response = test.terminalResponse("81030141 00820282 81830102");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
//***TEST CASE 4: 4-APPLET 1 IS NOT TRIGGERED BY EVENT_EVENT_DOWNLOAD_CHANNEL_STATUS
response = test.envelopeEventDownloadChannelStatus("38028200");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
//***TEST CASE 5: 1-APPLET 1 IS TRIGGERED BY EVENT MENU SELECTION
response = test.envelopeMenuSelection("100101", "");//Help Request not available
- result &= response.checkSw("911A");
+ addResult(response.checkSw("911A"));
//APPLET 1 BUILD A PROACTIVE COMMAND OPEN CHANNEL
response = test.fetch("1A");
- result &= response.checkData("D0188103 01400182 02818206 05815566" +
- "77883502 03003902 000A");
+ addResult(response.checkData("D0188103 01400182 02818206 05815566" +
+ "77883502 03003902 000A"));
//SUCCESSFUL TERMINAL RESPONSE
test.terminalResponse("81030140 01820282 81830100 38028200" +
"35020300 3902000A");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
test.reset();
test.terminalProfileSession("09010020 000C0000 00000003 40");
response = test.envelopeEventDownloadChannelStatus("38028200");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10"+APPLET_AID_1+"0DCCCCCC CCCCCCCC CCCCCCCC CCCC");
+ addResult(response.checkData("10"+APPLET_AID_1+"0DCCCCCC CCCCCCCC CCCCCCCC CCCC"));
// delete applet and package
test.reset();
@@ -148,7 +148,7 @@ public class Test_Cre_Apt_Edcs extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
\ No newline at end of file
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edda/Test_Cre_Apt_Edda.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edda/Test_Cre_Apt_Edda.java
index f8aa56e1b83e57095c62d3a698e889c78b35781d..f44e7680903d1d4122566cf9c31dd8a6de91d339 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edda/Test_Cre_Apt_Edda.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edda/Test_Cre_Apt_Edda.java
@@ -26,7 +26,7 @@ public class Test_Cre_Apt_Edda extends UiccTestModel {
public boolean run() {
- boolean result;
+ initialiseResults();
// start test
test.reset();
@@ -55,92 +55,92 @@ public class Test_Cre_Apt_Edda extends UiccTestModel {
test.terminalProfileSession("09010020 000C0000 00000003 40");
//***TEST CASE 1: 1-APPLET 1 IS TRIGGERED BY EVENT MENU SELECTION
response = test.envelopeMenuSelection("100101", "");//Help Request not available
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
//***TEST CASE 1: 3-APPLET 1 IS NOT TRIGGERED BY EVENT_EVENT_DATA_DOWNLOAD_AVAILABLE
response = test.envelopeEventDownloadDataAvailable("38028100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
//***TEST CASE 1: 4-APPLET 1 IS TRIGGERED BY EVENT MENU SELECTION
response = test.envelopeMenuSelection("100101", "");//Help Request not available
- result &= response.checkSw("911A");
+ addResult(response.checkSw("911A"));
response = test.fetch("1A");
- result &= response.checkData("D0188103 01400182 02818206 05815566" +
- "77883502 03003902 000A");
+ addResult(response.checkData("D0188103 01400182 02818206 05815566" +
+ "77883502 03003902 000A"));
//TERMINAL RESPONSE WITH PROACTIVE UICC SESSION TERMINATED BY USER
test.terminalResponse("81030140 01820282 81830110");
//***TEST CASE 1: 8-APPLET 1 IS NOT TRIGGERED BY EVENT_EVENT_DATA_DOWNLOAD_AVAILABLE
response = test.envelopeEventDownloadDataAvailable("38020100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
//***TEST CASE 1: 9-APPLET 1 IS TRIGGERED BY EVENT MENU SELECTION
response = test.envelopeMenuSelection("100101", "");//Help Request not available
- result &= response.checkSw("911A");
+ addResult(response.checkSw("911A"));
//APPLET 1 BUILD A PROACTIVE COMMAND OPEN CHANNEL
response = test.fetch("1A");
- result &= response.checkData("D0188103 01400182 02818206 05815566" +
- "77883502 03003902 000A");
+ addResult(response.checkData("D0188103 01400182 02818206 05815566" +
+ "77883502 03003902 000A"));
//SUCCESSFUL TERMINAL RESPONSE
response = test.terminalResponse("81030140 01820282 81830100 38028100" +
"35020300 3902000A");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
//***TEST CASE 2: 1-APPLET 1 IS TRIGGERED BY EVENT_EVENT_DATA_DOWNLOAD_AVAILABLE
response = test.envelopeEventDownloadDataAvailable("38028100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
//***TEST CASE 3: 1-APPLET 1 IS TRIGGERED BY EVENT MENU SELECTION
response = test.envelopeMenuSelection("100101", "");//Help Request not available
- result &= response.checkSw("911A");
+ addResult(response.checkSw("911A"));
//APPLET 1 BUILD A PROACTIVE COMMAND OPEN CHANNEL
response = test.fetch("1A");
- result &= response.checkData("D0188103 01400282 02818206 05815566" +
- "77883502 03003902 000A");
+ addResult(response.checkData("D0188103 01400282 02818206 05815566" +
+ "77883502 03003902 000A"));
//TERMINAL RESPONSE WITH PARTIAL COMPREHENSION
response = test.terminalResponse("81030140 02820282 81830101 38028200" +
"35020300 3902000A");
- result &= response.checkSw("910B");
+ addResult(response.checkSw("910B"));
//APPLET 1 BUILD A PROACTIVE COMMAND CLOSE CHANNEL
response = test.fetch("0B");
- result &= response.checkData("D0098103 01410082 028122");
+ addResult(response.checkData("D0098103 01410082 028122"));
//UNSUCCESSFUL TERMINAL RESPONSE: TERMINAL CURRENTLY UNABLE TO PERFORM THE COMMAND
response = test.terminalResponse("81030141 00820282 81830120");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
//***TEST CASE 3: 4-APPLET 1 IS TRIGGERED BY EVENT_EVENT_DATA_DOWNLOAD_AVAILABLE
response = test.envelopeEventDownloadDataAvailable("38028200");
- result &= response.checkSw("910B");
+ addResult(response.checkSw("910B"));
//APPLET 1 BUILD A PROACTIVE COMMAND CLOSE CHANNEL
response = test.fetch("0B");
- result &= response.checkData("D0098103 01410082 028122");
+ addResult(response.checkData("D0098103 01410082 028122"));
//TERMINAL RESPONSE WITH MISSING INFORMATION
response = test.terminalResponse("81030141 00820282 81830102");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
//***TEST CASE 4: 4-APPLET 1 IS NOT TRIGGERED BY EVENT_EVENT_DATA_DOWNLOAD_AVAILABLE
response = test.envelopeEventDownloadDataAvailable("38028200");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
//***TEST CASE 5: 1-APPLET 1 IS TRIGGERED BY EVENT MENU SELECTION
response = test.envelopeMenuSelection("100101", "");//Help Request not available
- result &= response.checkSw("911A");
+ addResult(response.checkSw("911A"));
//APPLET 1 BUILD A PROACTIVE COMMAND OPEN CHANNEL
response = test.fetch("1A");
- result &= response.checkData("D0188103 01400182 02818206 05815566" +
- "77883502 03003902 000A");
+ addResult(response.checkData("D0188103 01400182 02818206 05815566" +
+ "77883502 03003902 000A"));
//SUCCESSFUL TERMINAL RESPONSE
response = test.terminalResponse("81030140 01820282 81830100 38028200" +
"35020300 3902000A");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
test.reset();
test.terminalProfileSession("09010020 000C0000 00000003 40");
response = test.envelopeEventDownloadDataAvailable("38028200");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10"+APPLET_AID_1+"0DCCCCCC CCCCCCCC CCCCCCCC CCCC");
+ addResult(response.checkData("10"+APPLET_AID_1+"0DCCCCCC CCCCCCCC CCCCCCCC CCCC"));
// delete applet and package
test.reset();
@@ -148,7 +148,7 @@ public class Test_Cre_Apt_Edda extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
\ No newline at end of file
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_eddp/Test_Cre_Apt_Eddp.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_eddp/Test_Cre_Apt_Eddp.java
index e3404bdeaebcb60918e2960dc25144d7634aafba..9ffa0bc429e1d29c61021222bf44df1414384ab1 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_eddp/Test_Cre_Apt_Eddp.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_eddp/Test_Cre_Apt_Eddp.java
@@ -27,7 +27,7 @@ public class Test_Cre_Apt_Eddp extends UiccTestModel {
public boolean run() {
- boolean result;
+ initialiseResults();
// start test
test.reset();
@@ -63,7 +63,7 @@ public class Test_Cre_Apt_Eddp extends UiccTestModel {
// check results
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10"+APPLET_AID_1+"05CCCCCC CCCC");
+ addResult(response.checkData("10"+APPLET_AID_1+"05CCCCCC CCCC"));
@@ -73,6 +73,6 @@ public class Test_Cre_Apt_Eddp extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edis/Test_Cre_Apt_Edis.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edis/Test_Cre_Apt_Edis.java
index a6b159e88bd4d0f48850df8aa3d5417974e83286..7ac9c405d9556725b57b737b31be51e64cf291ee 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edis/Test_Cre_Apt_Edis.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edis/Test_Cre_Apt_Edis.java
@@ -27,7 +27,7 @@ public class Test_Cre_Apt_Edis extends UiccTestModel {
public boolean run() {
- boolean result;
+ initialiseResults();
// start test
test.reset();
@@ -64,7 +64,7 @@ public class Test_Cre_Apt_Edis extends UiccTestModel {
// check results
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10"+APPLET_AID_1+"05CCCCCC CCCC");
+ addResult(response.checkData("10"+APPLET_AID_1+"05CCCCCC CCCC"));
@@ -74,6 +74,6 @@ public class Test_Cre_Apt_Edis extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edlc/Test_Cre_Apt_Edlc.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edlc/Test_Cre_Apt_Edlc.java
index fc05399a15d0c8f1d2a8c8fd2537c12e71c3764f..496b861ecc3c58e1ae847f76e34d1d92cd40ff79 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edlc/Test_Cre_Apt_Edlc.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edlc/Test_Cre_Apt_Edlc.java
@@ -28,7 +28,7 @@ public class Test_Cre_Apt_Edlc extends UiccTestModel {
public boolean run() {
- boolean result;
+ initialiseResults();
// start test
test.reset();
@@ -60,9 +60,9 @@ public class Test_Cre_Apt_Edlc extends UiccTestModel {
//***TEST CASE 1: 4-APPLET IS TRIGGERED
response = test.envelopeMenuSelection("100101", "");//Help Request not available
//***TEST CASE 1: 5-DECLARE SERVICE ADD COMMAND IS FETCHED
- result = response.checkSw("9110");
+ addResult(response.checkSw("9110"));
response = test.fetch("10");
- result &= response.checkData("D00E8103 01470082 028182" + ServiceRecordTLV);
+ addResult(response.checkData("D00E8103 01470082 028182" + ServiceRecordTLV));
//UNSUCCESFULL TERMINAL RESPONSE with General Result = 0x20
test.terminalResponse("81030147 00820282 81830120");
//***TEST CASE 1: 6-APPLET IS NOT TRIGGERED
@@ -70,9 +70,9 @@ public class Test_Cre_Apt_Edlc extends UiccTestModel {
//***TEST CASE 1: 7-APPLET IS TRIGGERED
response = test.envelopeMenuSelection("100101", "");//Help Request not available
//***TEST CASE1: 8-DECLARE SERVICE ADD COMMAND IS FETCHED
- result &= response.checkSw("9110");
+ addResult(response.checkSw("9110"));
response = test.fetch("10");
- result &= response.checkData("D00E8103 01470082 028182" + ServiceRecordTLV);
+ addResult(response.checkData("D00E8103 01470082 028182" + ServiceRecordTLV));
//SUCCESFULL TERMINAL RESPONSE with General Result = 0x00
test.terminalResponse("81030147 00820282 81830100");
//***TEST CASE 2: 1-APPLET IS TRIGGERED
@@ -80,17 +80,17 @@ public class Test_Cre_Apt_Edlc extends UiccTestModel {
//***TEST CASE 3: 1-APPLET IS TRIGGERED
response = test.envelopeMenuSelection("100101", "");//Help Request not available
//***TEST CASE 3: 2-DECLARE SERVICE DELETE COMMAND IS FETCHED
- result &= response.checkSw("9110");
+ addResult(response.checkSw("9110"));
response = test.fetch("10");
- result &= response.checkData("D00E8103 01470182 028182" + ServiceRecordTLV);
+ addResult(response.checkData("D00E8103 01470182 028182" + ServiceRecordTLV));
//UNSUCCESFULL TERMINAL RESPONSE with General Result = 0x20
test.terminalResponse("81030147 01820282 81830120");
//***TEST CASE 3: 3-APPLET IS TRIGGERED
response = test.envelopeEventDownloadLocalConnection(ServiceRecordTLV);
//***TEST CASE 3: 2-DECLARE SERVICE DELETE COMMAND IS FETCHED
- result &= response.checkSw("9110");
+ addResult(response.checkSw("9110"));
response = test.fetch("10");
- result &= response.checkData("D00E8103 01470182 028182" + ServiceRecordTLV);
+ addResult(response.checkData("D00E8103 01470182 028182" + ServiceRecordTLV));
//SUCCESFULL TERMINAL RESPONSE with General Result = 0x00
test.terminalResponse("81030147 01820282 81830100");
//***TEST CASE 4: 1-APPLET IS NOT TRIGGERED
@@ -98,9 +98,9 @@ public class Test_Cre_Apt_Edlc extends UiccTestModel {
//***TEST CASE 5: 1-APPLET IS TRIGGERED
response = test.envelopeMenuSelection("100101", "");//Help Request not available
//***TEST CASE 5: 2-DECLARE SERVICE ADD COMMAND IS FETCHED
- result &= response.checkSw("9110");
+ addResult(response.checkSw("9110"));
response = test.fetch("10");
- result &= response.checkData("D00E8103 01470082 028182" + ServiceRecordTLV);
+ addResult(response.checkData("D00E8103 01470082 028182" + ServiceRecordTLV));
//SUCCESFULL TERMINAL RESPONSE with General Result = 0x00
test.terminalResponse("81030147 00820282 81830100");
//***TEST CASE 5: 3-APPLET IS TRIGGERED
@@ -112,8 +112,8 @@ public class Test_Cre_Apt_Edlc extends UiccTestModel {
// check results
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10"+APPLET_AID_1+"12CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
- "CCCCCC");
+ addResult(response.checkData("10"+APPLET_AID_1+"12CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
+ "CCCCCC"));
// delete applet and package
test.reset();
@@ -121,6 +121,6 @@ public class Test_Cre_Apt_Edlc extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edlg/Test_Cre_Apt_Edlg.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edlg/Test_Cre_Apt_Edlg.java
index 371e940cfbea53e8dba5d536b868490932e05467..e9d12a0b904d53970a43931e9d202400d1bd6b26 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edlg/Test_Cre_Apt_Edlg.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edlg/Test_Cre_Apt_Edlg.java
@@ -27,7 +27,7 @@ public class Test_Cre_Apt_Edlg extends UiccTestModel {
public boolean run() {
- boolean result;
+ initialiseResults();
// start test
test.reset();
@@ -66,7 +66,7 @@ public class Test_Cre_Apt_Edlg extends UiccTestModel {
// check results
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10"+APPLET_AID_1+"05CCCCCC CCCC");
+ addResult(response.checkData("10"+APPLET_AID_1+"05CCCCCC CCCC"));
@@ -76,6 +76,6 @@ public class Test_Cre_Apt_Edlg extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edls/Test_Cre_Apt_Edls.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edls/Test_Cre_Apt_Edls.java
index 4c63b39a4ada6d3f31c1b44e066ad05ffef3ab0f..e1b5602d988fea163213decafe93974f5b3cde1c 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edls/Test_Cre_Apt_Edls.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edls/Test_Cre_Apt_Edls.java
@@ -26,7 +26,7 @@ public class Test_Cre_Apt_Edls extends UiccTestModel {
public boolean run() {
- boolean result;
+ initialiseResults();
// start test
test.reset();
@@ -63,7 +63,7 @@ public class Test_Cre_Apt_Edls extends UiccTestModel {
// check results
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10"+APPLET_AID_1+"05CCCCCC CCCC");
+ addResult(response.checkData("10"+APPLET_AID_1+"05CCCCCC CCCC"));
@@ -73,6 +73,6 @@ public class Test_Cre_Apt_Edls extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edmc/Test_Cre_Apt_Edmc.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edmc/Test_Cre_Apt_Edmc.java
index d7c0b92ef78cd448de786184bf34f4df2109483b..adda46c39f669877bd9284036fcb1f062132d845 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edmc/Test_Cre_Apt_Edmc.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edmc/Test_Cre_Apt_Edmc.java
@@ -26,7 +26,7 @@ public class Test_Cre_Apt_Edmc extends UiccTestModel {
public boolean run() {
- boolean result;
+ initialiseResults();
// start test
test.reset();
@@ -63,7 +63,7 @@ public class Test_Cre_Apt_Edmc extends UiccTestModel {
// check results
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10"+APPLET_AID_1+"05CCCCCC CCCC");
+ addResult(response.checkData("10"+APPLET_AID_1+"05CCCCCC CCCC"));
@@ -73,6 +73,6 @@ public class Test_Cre_Apt_Edmc extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edns/Test_Cre_Apt_Edns.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edns/Test_Cre_Apt_Edns.java
index fdbc2c4b3cbdf493437561f139e323ffd661bb96..cc199312747023ebb4b43e4c77dbd1ff979f4f91 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edns/Test_Cre_Apt_Edns.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edns/Test_Cre_Apt_Edns.java
@@ -28,7 +28,7 @@ public class Test_Cre_Apt_Edns extends UiccTestModel {
public boolean run() {
- boolean result;
+ initialiseResults();
// start test
test.reset();
@@ -63,7 +63,7 @@ public class Test_Cre_Apt_Edns extends UiccTestModel {
// check results
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10"+APPLET_AID_1+"07CCCCCC CCCCCCCC");
+ addResult(response.checkData("10"+APPLET_AID_1+"07CCCCCC CCCCCCCC"));
// delete applet and package
test.reset();
@@ -71,6 +71,6 @@ public class Test_Cre_Apt_Edns extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edua/Test_Cre_Apt_Edua.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edua/Test_Cre_Apt_Edua.java
index a9cc989697129d4ae8fd697b67a72163facd1a1d..71b1e139530a6964073773b5fa2e5f639b23c44e 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edua/Test_Cre_Apt_Edua.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edua/Test_Cre_Apt_Edua.java
@@ -27,7 +27,7 @@ public class Test_Cre_Apt_Edua extends UiccTestModel {
public boolean run() {
- boolean result;
+ initialiseResults();
// start test
test.reset();
@@ -63,7 +63,7 @@ public class Test_Cre_Apt_Edua extends UiccTestModel {
// check results
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10"+APPLET_AID_1+"05CCCCCC CCCC");
+ addResult(response.checkData("10"+APPLET_AID_1+"05CCCCCC CCCC"));
// delete applet and package
test.reset();
@@ -71,6 +71,6 @@ public class Test_Cre_Apt_Edua extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_eefu/Test_Cre_Apt_Eefu.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_eefu/Test_Cre_Apt_Eefu.java
index c104ca189c448735bfec09c55f06bce0624d42a5..7d4d908f0d00e51c44e71695c061ff13119decca 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_eefu/Test_Cre_Apt_Eefu.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_eefu/Test_Cre_Apt_Eefu.java
@@ -47,7 +47,7 @@ public class Test_Cre_Apt_Eefu extends UiccTestModel {
public boolean run() {
- boolean result;
+ initialiseResults();
// start test
test.reset();
@@ -182,9 +182,9 @@ public class Test_Cre_Apt_Eefu extends UiccTestModel {
// check results
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10"+APPLET_AID_1+"1FCCCCCC CCCCCCCC"+
+ addResult(response.checkData("10"+APPLET_AID_1+"1FCCCCCC CCCCCCCC"+
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
- "CCCCCCCC CCCCCCCC");
+ "CCCCCCCC CCCCCCCC"));
// delete applet and package
test.reset();
@@ -192,7 +192,7 @@ public class Test_Cre_Apt_Eefu extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_efca/Test_Cre_Apt_Efca.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_efca/Test_Cre_Apt_Efca.java
index e1f3f5c70c07cbb520d591d0ec9b7055f9344c80..705bca8997b369c36b107ef6d5b554d5dc977228 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_efca/Test_Cre_Apt_Efca.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_efca/Test_Cre_Apt_Efca.java
@@ -35,7 +35,7 @@ public class Test_Cre_Apt_Efca extends UiccTestModel {
public boolean run() {
- boolean result;
+ initialiseResults();
// start test
test.reset();
@@ -85,7 +85,7 @@ public class Test_Cre_Apt_Efca extends UiccTestModel {
//***TEST CASE 1: 4-APPLET 3 IS TRIGGERED
response = test.envelopeMenuSelection("100101", "");//Help Request not available
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
test.reset();
//***TEST CASE 2: 1-APPLET 3 IS TRIGGERED, APPLET 1, APPLET 2 ARE NOT TRIGGERED
@@ -109,13 +109,13 @@ public class Test_Cre_Apt_Efca extends UiccTestModel {
test.terminalProfileSession("09010020 01");
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10"+APPLET_AID_1+"03CCCCCC");
+ addResult(response.checkData("10"+APPLET_AID_1+"03CCCCCC"));
response = test.selectApplication(APPLET_AID_2);
- result &= response.checkData("10"+APPLET_AID_2+"03CCCCCC");
+ addResult(response.checkData("10"+APPLET_AID_2+"03CCCCCC"));
response = test.selectApplication(APPLET_AID_3);
- result &= response.checkData("10"+APPLET_AID_3+"05CCCCCC CCCC");
+ addResult(response.checkData("10"+APPLET_AID_3+"05CCCCCC CCCC"));
response = test.selectApplication(APPLET_AID_4);
- result &= response.checkData("10"+APPLET_AID_4+"02CCCC");
+ addResult(response.checkData("10"+APPLET_AID_4+"02CCCC"));
// delete applet and package
test.reset();
@@ -147,15 +147,15 @@ public class Test_Cre_Apt_Efca extends UiccTestModel {
test.reset();
//***TEST CASE 4: 1-APPLET 5 IS TRIGGERED BY THE EVENT_FIRST_COMMAND_AFTER_ATR
response = test.terminalProfile("09010020 01");
- result &= response.checkSw("911E");
+ addResult(response.checkSw("911E"));
//***TEST CASE 4: 1-APPLET 5 DISABLES A MENU ENTRY, THE FETCH OF SET UP MENU CONTAIN ONLY ONE ITEM
response = test.fetch("1E");
- result &= response.checkData("D01C8103 01250082 02818285 09554943" +
- "43205445 53548F06 014D656E 7531");
+ addResult(response.checkData("D01C8103 01250082 02818285 09554943" +
+ "43205445 53548F06 014D656E 7531"));
// check results
response = test.selectApplication(APPLET_AID_5);
- result &= response.checkData("10"+APPLET_AID_5+"01CC");
+ addResult(response.checkData("10"+APPLET_AID_5+"01CC"));
// delete applet and package
test.reset();
@@ -163,7 +163,7 @@ public class Test_Cre_Apt_Efca extends UiccTestModel {
test.deleteApplet(APPLET_AID_5);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
\ No newline at end of file
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_emse/Test_Cre_Apt_Emse.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_emse/Test_Cre_Apt_Emse.java
index bf1cb9908ae303cc6a42c363c9cfa544c0281b89..4972832ab6fcb22ebc4fafbc12546ee949016798 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_emse/Test_Cre_Apt_Emse.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_emse/Test_Cre_Apt_Emse.java
@@ -29,7 +29,7 @@ public class Test_Cre_Apt_Emse extends UiccTestModel {
public boolean run() {
- boolean result;
+ initialiseResults();
// start test
@@ -77,9 +77,9 @@ public class Test_Cre_Apt_Emse extends UiccTestModel {
// check results
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10"+APPLET_AID_1+"03CCCCCC");
+ addResult(response.checkData("10"+APPLET_AID_1+"03CCCCCC"));
response = test.selectApplication(APPLET_AID_2);
- result &= response.checkData("10"+APPLET_AID_2+"03CCCCCC");
+ addResult(response.checkData("10"+APPLET_AID_2+"03CCCCCC"));
// delete applet and package
@@ -89,6 +89,6 @@ public class Test_Cre_Apt_Emse extends UiccTestModel {
test.deleteApplet(APPLET_AID_2);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_emsh/Test_Cre_Apt_Emsh.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_emsh/Test_Cre_Apt_Emsh.java
index 44c123633ac3c2d2a5b6e8f18de0ab6024011fb0..85b367469bd22de03ec5c3e8df0821cdf5c26443 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_emsh/Test_Cre_Apt_Emsh.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_emsh/Test_Cre_Apt_Emsh.java
@@ -31,7 +31,7 @@ public class Test_Cre_Apt_Emsh extends UiccTestModel {
public boolean run() {
- boolean result;
+ initialiseResults();
// start test
@@ -84,9 +84,9 @@ public class Test_Cre_Apt_Emsh extends UiccTestModel {
test.envelopeMenuSelection("100104", "1500");//Help Request
// check results of Applet 1 and Applet2.
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10"+APPLET_AID_1+"03CCCCCC");
+ addResult(response.checkData("10"+APPLET_AID_1+"03CCCCCC"));
response = test.selectApplication(APPLET_AID_2);
- result &= response.checkData("10"+APPLET_AID_2+"03CCCCCC");
+ addResult(response.checkData("10"+APPLET_AID_2+"03CCCCCC"));
//Delete Applet 1 and Applet2.
test.reset();
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
@@ -113,31 +113,31 @@ public class Test_Cre_Apt_Emsh extends UiccTestModel {
test.terminalProfile("09010020 01");
//UICC proactive command SET UP MENU, Menu Entry ID 05, 06, 07, Help Request supported
response = test.fetch("37");
- result &= response.checkData("D0358103 01258082 02818285 09554943" +
+ addResult(response.checkData("D0358103 01258082 02818285 09554943" +
"43205445 53548F09 05417070 6C657433" +
"418F0906 4170706C 65743342 8F090741" +
- "70706C65 743343");
+ "70706C65 743343"));
test.terminalResponse("81030125 80820282 81830100");
//*** Test Case 2: 2-Applet3 is triggered ****
test.envelopeMenuSelection("100105", "1500");//Help Request
response = test.fetch("2C");
- result &= response.checkData("D02A8103 01258082 02818285 09554943" +
+ addResult(response.checkData("D02A8103 01258082 02818285 09554943" +
"43205445 53548F09 06417070 6C657433" +
- "428F0907 4170706C 65743343");
+ "428F0907 4170706C 65743343"));
test.terminalResponse("81030125 80820282 81830100");
//*** Test Case 2: 4-Applet3 is triggered ****
test.envelopeMenuSelection("100106", "1500");//Help Request
response = test.fetch("21");
- result &= response.checkData("D01F8103 01250082 02818285 09554943" +
+ addResult(response.checkData("D01F8103 01250082 02818285 09554943" +
"43205445 53548F09 07417070 6C657433" +
- "43");
+ "43"));
response = test.terminalResponse("81030125 00820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// check results
response = test.selectApplication(APPLET_AID_3);
- result &= response.checkData("10"+APPLET_AID_3+"04CCCCCC CC");
+ addResult(response.checkData("10"+APPLET_AID_3+"04CCCCCC CC"));
// delete applet and package
test.reset();
@@ -146,6 +146,6 @@ public class Test_Cre_Apt_Emsh extends UiccTestModel {
test.deleteApplet(APPLET_AID_3);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_epdw/Test_Cre_Apt_Epdw.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_epdw/Test_Cre_Apt_Epdw.java
index e1a5e4b2151670e3543a24c2816b1b27e1d940a1..af0d1c22ef72edd57bbf96f51c32a8d95f820983 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_epdw/Test_Cre_Apt_Epdw.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_epdw/Test_Cre_Apt_Epdw.java
@@ -30,7 +30,7 @@ public class Test_Cre_Apt_Epdw extends UiccTestModel {
public boolean run() {
- boolean result;
+ initialiseResults();
// start test
@@ -79,9 +79,9 @@ public class Test_Cre_Apt_Epdw extends UiccTestModel {
test.terminalProfileSession("09018000 01");
//***TEST CASE 1 OF THE APPLET 3 ***
response = test.envelopeMenuSelection("100101", "");//Help Request not available
- result = response.checkSw("910B");
+ addResult(response.checkSw("910B"));
response = test.fetch("0B");
- result &= response.checkData("D0098103 01010382 028182");
+ addResult(response.checkData("D0098103 01010382 028182"));
//***TEST CASE 2 OF THE APPLETS 1 AND 2 ***
test.terminalProfileSession("03010000 01");
@@ -92,11 +92,11 @@ public class Test_Cre_Apt_Epdw extends UiccTestModel {
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10"+APPLET_AID_1+"03CCCCCC");
+ addResult(response.checkData("10"+APPLET_AID_1+"03CCCCCC"));
response = test.selectApplication(APPLET_AID_2);
- result &= response.checkData("10"+APPLET_AID_2+"03CCCCCC");
+ addResult(response.checkData("10"+APPLET_AID_2+"03CCCCCC"));
response = test.selectApplication(APPLET_AID_3);
- result &= response.checkData("10"+APPLET_AID_3+"03CCCCCC");
+ addResult(response.checkData("10"+APPLET_AID_3+"03CCCCCC"));
// delete applet and package
test.reset();
@@ -106,6 +106,6 @@ public class Test_Cre_Apt_Epdw extends UiccTestModel {
test.deleteApplet(APPLET_AID_3);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_epha/Test_Cre_Apt_Epha.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_epha/Test_Cre_Apt_Epha.java
index c97fdd00ee6907115f7f737a10a3db5ea66ce8ad..b280bf46fe7f06d296500cf402cd1eadf22e729a 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_epha/Test_Cre_Apt_Epha.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_epha/Test_Cre_Apt_Epha.java
@@ -30,7 +30,7 @@ public class Test_Cre_Apt_Epha extends UiccTestModel {
public boolean run() {
- boolean result;
+ initialiseResults();
// start test
test.reset();
@@ -69,14 +69,14 @@ public class Test_Cre_Apt_Epha extends UiccTestModel {
test.terminalProfileSession("09030100");
//***TEST CASE 1: 1-APPLET 1 IS TRIGGERED***
response = test.envelopeMenuSelection("100101", "");//Help Request not available
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
//***TEST CASE 1: 4-APPLET 1 IS TRIGGERED***
test.envelopeEventDownloadUserActivity();
//***TEST CASE 2: 1-APPLET 1 IS TRIGGERED***
response = test.envelopeMenuSelection("100101", "");//Help Request not available
- result &= response.checkSw("9113");
+ addResult(response.checkSw("9113"));
response = test.fetch("13");
- result &= response.checkData("D0118103 01218082 0281028D 0604"+Text1);
+ addResult(response.checkData("D0118103 01218082 0281028D 0604"+Text1));
//***TEST CASE 2: 3-APPLET 2 IS TRIGGERED***
test.envelopeMenuSelection("100102", "");//Help Request not available
test.reset();
@@ -87,9 +87,9 @@ public class Test_Cre_Apt_Epha extends UiccTestModel {
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10"+APPLET_AID_1+"0CCCCCCC CCCCCCCC CCCCCCCC CC");
+ addResult(response.checkData("10"+APPLET_AID_1+"0CCCCCCC CCCCCCCC CCCCCCCC CC"));
response = test.selectApplication(APPLET_AID_2);
- result &= response.checkData("10"+APPLET_AID_2+"07CCCCCC CCCCCCCC");
+ addResult(response.checkData("10"+APPLET_AID_2+"07CCCCCC CCCCCCCC"));
// delete applet and package
@@ -99,6 +99,6 @@ public class Test_Cre_Apt_Epha extends UiccTestModel {
test.deleteApplet(APPLET_AID_2);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_estc/Test_Cre_Apt_Estc.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_estc/Test_Cre_Apt_Estc.java
index 13c3c8c45bcaea315cfcf56e686e1dddf02e74ec..7717ae6cb8200b0caba3d337c351e461d560f19e 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_estc/Test_Cre_Apt_Estc.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_estc/Test_Cre_Apt_Estc.java
@@ -30,7 +30,7 @@ public class Test_Cre_Apt_Estc extends UiccTestModel {
public boolean run() {
- boolean result;
+ initialiseResults();
// start test
test.reset();
@@ -80,10 +80,10 @@ public class Test_Cre_Apt_Estc extends UiccTestModel {
//***TEST CASE 2: 1-APPLET3 IS TRIGGERED***
response = test.envelopeMenuSelection("100101", "");//Help Request not available
//DISPLAY TEXT BY APPLET3
- result = response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045465" +
- "78742031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045465" +
+ "78742031"));
//***TEST CASE 2: 3-APPLET1,APPLET2 ARE TRIGGERED***
test.status("00", "0C", "00"); //No data requested
//TERMINAL RESPONSE TO THE DISPLAY TEXT OF THE APPLET3
@@ -95,11 +95,11 @@ public class Test_Cre_Apt_Estc extends UiccTestModel {
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10"+APPLET_AID_1+"03CCCCCC");
+ addResult(response.checkData("10"+APPLET_AID_1+"03CCCCCC"));
response = test.selectApplication(APPLET_AID_2);
- result &= response.checkData("10"+APPLET_AID_2+"03CCCCCC");
+ addResult(response.checkData("10"+APPLET_AID_2+"03CCCCCC"));
response = test.selectApplication(APPLET_AID_3);
- result &= response.checkData("10"+APPLET_AID_3+"03CCCCCC");
+ addResult(response.checkData("10"+APPLET_AID_3+"03CCCCCC"));
// delete applet and package
test.reset();
@@ -109,6 +109,6 @@ public class Test_Cre_Apt_Estc extends UiccTestModel {
test.deleteApplet(APPLET_AID_3);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_etex/Test_Cre_Apt_Etex.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_etex/Test_Cre_Apt_Etex.java
index 496182cd68d5bd7bc996f8e52e54a8c4c3fecc86..a1885a50ec9e7815bcc3b0abdffd83ba4de894d3 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_etex/Test_Cre_Apt_Etex.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_etex/Test_Cre_Apt_Etex.java
@@ -29,7 +29,7 @@ public class Test_Cre_Apt_Etex extends UiccTestModel {
public boolean run() {
- boolean result;
+ initialiseResults();
// start test
test.reset();
@@ -66,7 +66,7 @@ public class Test_Cre_Apt_Etex extends UiccTestModel {
// check results
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10"+APPLET_AID_1+"05CCCCCC CCCC");
+ addResult(response.checkData("10"+APPLET_AID_1+"05CCCCCC CCCC"));
@@ -76,6 +76,6 @@ public class Test_Cre_Apt_Etex extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_euev/Test_Cre_Apt_Euev.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_euev/Test_Cre_Apt_Euev.java
index c767791799fe8fa2e160626d76b74a25add2a6dd..c452323f9c6ac97dadd9490a7bb742e25ee52c8c 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_euev/Test_Cre_Apt_Euev.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_euev/Test_Cre_Apt_Euev.java
@@ -27,7 +27,7 @@ public class Test_Cre_Apt_Euev extends UiccTestModel {
public boolean run() {
- boolean result;
+ initialiseResults();
// start test
test.reset();
@@ -64,7 +64,7 @@ public class Test_Cre_Apt_Euev extends UiccTestModel {
// check results
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10"+APPLET_AID_1+"05CCCCCC CCCC");
+ addResult(response.checkData("10"+APPLET_AID_1+"05CCCCCC CCCC"));
@@ -74,6 +74,6 @@ public class Test_Cre_Apt_Euev extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_genb/Test_Cre_Apt_Genb.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_genb/Test_Cre_Apt_Genb.java
index 54074130bbeab8b9a679d733476f4686541a9350..8c2303685ec807a51d1f7929c53cefa80b284756 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_genb/Test_Cre_Apt_Genb.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_genb/Test_Cre_Apt_Genb.java
@@ -27,7 +27,7 @@ public class Test_Cre_Apt_Genb extends UiccTestModel {
public boolean run() {
- boolean result;
+ initialiseResults();
// start test
test.reset();
@@ -49,14 +49,14 @@ public class Test_Cre_Apt_Genb extends UiccTestModel {
"00" + // LV Minimum Security Level field
"00" + // LV TAR Value(s)
"00"); // V Maximum number of services
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test script
test.reset();
test.terminalProfileSession("01010000 20");
response = test.selectApplication(APPLET_AID_1);
- result &= !response.checkSw("9000");
+ addResult(!response.checkSw("9000"));
test.reset();
test.terminalProfileSession("01010000 20");
@@ -68,9 +68,9 @@ public class Test_Cre_Apt_Genb extends UiccTestModel {
//***
//**** INSTALL THE APPLET IN SELECTABLE STATE
response = test.makeSelectableApplet(APPLET_AID_1);
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test script
test.reset();
@@ -80,10 +80,10 @@ public class Test_Cre_Apt_Genb extends UiccTestModel {
//***TEST CASE 3: 2-THE APPLET IS IN LOCK STATE: APPLET ISN'T TRIGGERED ***
response = test.lockApplication(APPLET_AID_1);
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
response = test.selectApplication(APPLET_AID_1);
- result &= !response.checkSw("9000");
+ addResult(!response.checkSw("9000"));
test.reset();
test.terminalProfileSession("01010000 20");
@@ -94,9 +94,9 @@ public class Test_Cre_Apt_Genb extends UiccTestModel {
//***APPLET IS IN UNLOCK STATE:APPLET IS TRIGGERED
response = test.unlockApplication(APPLET_AID_1);
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test script
test.reset();
@@ -106,7 +106,7 @@ public class Test_Cre_Apt_Genb extends UiccTestModel {
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10"+APPLET_AID_1+"04CCCCCC CC");
+ addResult(response.checkData("10"+APPLET_AID_1+"04CCCCCC CC"));
// delete applet and package
test.reset();
@@ -114,6 +114,6 @@ public class Test_Cre_Apt_Genb extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_erp_eccn/Test_Cre_Erp_Eccn.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_erp_eccn/Test_Cre_Erp_Eccn.java
index 84f6ca43392a969e27685707e64db10fd79be59c..12b1f7e155a372529b5fcefd43a987ee8216e418 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_erp_eccn/Test_Cre_Erp_Eccn.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_erp_eccn/Test_Cre_Erp_Eccn.java
@@ -29,7 +29,7 @@ public class Test_Cre_Erp_Eccn extends UiccTestModel {
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -73,19 +73,19 @@ public class Test_Cre_Erp_Eccn extends UiccTestModel {
// Trigger Applet2
response = test.envelopeMenuSelection("100101", "");
- result = response.checkSw("9114");
+ addResult(response.checkSw("9114"));
// Trigger Applet1
response = test.envelopeCallControlByNAA();
- result &= response.checkData("02078605 91112233 44");
- result &= response.checkSw("9114");
+ addResult(response.checkData("02078605 91112233 44"));
+ addResult(response.checkSw("9114"));
// Fetch Display Text and Terminal Response
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07044150" +
- "504C4554");
+ addResult(response.checkData("D0128103 01218082 0281028D 07044150" +
+ "504C4554"));
response = test.terminalResponse("81030121 80820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -95,9 +95,9 @@ public class Test_Cre_Erp_Eccn extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "01" + "CC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "01" + "CC"));
response = test.selectApplication(APPLET_AID_2);
- result &= response.checkData("10" + APPLET_AID_2 + "01" + "CC");
+ addResult(response.checkData("10" + APPLET_AID_2 + "01" + "CC"));
/*********************************************************************/
/*********************************************************************/
@@ -138,19 +138,19 @@ public class Test_Cre_Erp_Eccn extends UiccTestModel {
// Trigger Applet3
response = test.envelopeMenuSelection("100101", "");
- result = response.checkSw("9114");
+ addResult(response.checkSw("9114"));
// Trigger Applet3
response = test.envelopeCallControlByNAA();
- result &= response.checkData("02078605 91112233 44");
- result &= response.checkSw("9114");
+ addResult(response.checkData("02078605 91112233 44"));
+ addResult(response.checkSw("9114"));
// Fetch Display Text and Terminal Response
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07044150" +
- "504C4554");
+ addResult(response.checkData("D0128103 01218082 0281028D 07044150" +
+ "504C4554"));
response = test.terminalResponse("81030121 80820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -160,7 +160,7 @@ public class Test_Cre_Erp_Eccn extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_3);
- result &= response.checkData("10" + APPLET_AID_3 + "01" + "CC");
+ addResult(response.checkData("10" + APPLET_AID_3 + "01" + "CC"));
/*********************************************************************/
@@ -176,6 +176,6 @@ public class Test_Cre_Erp_Eccn extends UiccTestModel {
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_erp_euen/Test_Cre_Erp_Euen.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_erp_euen/Test_Cre_Erp_Euen.java
index 54554549a69141290b138d20665beeecc6504f28..883ca2f3d3cf14fe1bbfb77c97cd27e5685fd907 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_erp_euen/Test_Cre_Erp_Euen.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_erp_euen/Test_Cre_Erp_Euen.java
@@ -25,7 +25,7 @@ public class Test_Cre_Erp_Euen extends UiccTestModel {
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -60,13 +60,13 @@ public class Test_Cre_Erp_Euen extends UiccTestModel {
// Trigger Applet1
response = test.unrecognizedEnvelope();
- result = response.checkData("0CAB");
- result &= response.checkSw("9000");
+ addResult(response.checkData("0CAB"));
+ addResult(response.checkSw("9000"));
// Trigger Applet1
response = test.unrecognizedEnvelope();
- result &= response.checkData("0CAB");
- result &= response.checkSw("9000");
+ addResult(response.checkData("0CAB"));
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -76,7 +76,7 @@ public class Test_Cre_Erp_Euen extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "02" + "CCCC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "02" + "CCCC"));
/*********************************************************************/
@@ -92,6 +92,6 @@ public class Test_Cre_Erp_Euen extends UiccTestModel {
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_exh_genb/Test_Cre_Exh_Genb.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_exh_genb/Test_Cre_Exh_Genb.java
index e7c961d473e0673396eb7deb2dfd00412112b667..049fd74f6645fcf7ba5913b2b08b2b0f34ad2412 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_exh_genb/Test_Cre_Exh_Genb.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_exh_genb/Test_Cre_Exh_Genb.java
@@ -27,7 +27,7 @@ public class Test_Cre_Exh_Genb extends UiccTestModel {
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -76,11 +76,11 @@ public class Test_Cre_Exh_Genb extends UiccTestModel {
// Trigger applets
response = test.envelopeEventDownloadMTCall();
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// Trigger applets
response = test.envelopeEventDownloadMTCall();
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
/** Testcase 2 */
@@ -88,11 +88,11 @@ public class Test_Cre_Exh_Genb extends UiccTestModel {
// Trigger Applet1
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9300");
+ addResult(response.checkSw("9300"));
// Trigger Applet2
response = test.envelopeEventDownloadUserActivity();
- result &= response.checkSw("9300");
+ addResult(response.checkSw("9300"));
/*********************************************************************/
/** Testcase 3 */
@@ -100,11 +100,11 @@ public class Test_Cre_Exh_Genb extends UiccTestModel {
// Trigger Applet1
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// Trigger Applet1
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -114,9 +114,9 @@ public class Test_Cre_Exh_Genb extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "05" + "CCCCCCCC CC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "05" + "CCCCCCCC CC"));
response = test.selectApplication(APPLET_AID_2);
- result &= response.checkData("10" + APPLET_AID_2 + "03" + "CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_2 + "03" + "CCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -132,6 +132,6 @@ public class Test_Cre_Exh_Genb extends UiccTestModel {
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_exh_imtg/Test_Cre_Exh_Imtg.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_exh_imtg/Test_Cre_Exh_Imtg.java
index 501323d7dbba74dfd43dc329631681ba088952d3..9389a7f6eb2eb2108f12a034ad8c5c297d95a688 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_exh_imtg/Test_Cre_Exh_Imtg.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_exh_imtg/Test_Cre_Exh_Imtg.java
@@ -27,7 +27,7 @@ public class Test_Cre_Exh_Imtg extends UiccTestModel {
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -79,7 +79,7 @@ public class Test_Cre_Exh_Imtg extends UiccTestModel {
// Trigger applets with Status command
response = test.status("00","00","16");
- result = response.getData().regionMatches(16, "3F00", 0, 4);
+ addResult(response.getData().regionMatches(16, "3F00", 0, 4));
/*********************************************************************/
@@ -88,7 +88,7 @@ public class Test_Cre_Exh_Imtg extends UiccTestModel {
// Trigger applets with unrecognized envelope
response = test.unrecognizedEnvelope();
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -97,7 +97,7 @@ public class Test_Cre_Exh_Imtg extends UiccTestModel {
// Trigger applets with unrecognized envelope
response = test.envelopeEventDownloadMTCall();
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
@@ -108,9 +108,9 @@ public class Test_Cre_Exh_Imtg extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "04" + "CCCCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "04" + "CCCCCCCC"));
response = test.selectApplication(APPLET_AID_2);
- result &= response.checkData("10" + APPLET_AID_2 + "04" + "CCCCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_2 + "04" + "CCCCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -126,6 +126,6 @@ public class Test_Cre_Exh_Imtg extends UiccTestModel {
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_hin_enhd/Test_Cre_Hin_Enhd.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_hin_enhd/Test_Cre_Hin_Enhd.java
index d1a138e58a354bfa8b8f46d158663b28c824ba23..5218edf4d97b33461b62ba427e874cf10ba38b6d 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_hin_enhd/Test_Cre_Hin_Enhd.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_hin_enhd/Test_Cre_Hin_Enhd.java
@@ -33,7 +33,7 @@ public class Test_Cre_Hin_Enhd extends UiccTestModel {
}
public boolean run() {
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -73,26 +73,26 @@ public class Test_Cre_Hin_Enhd extends UiccTestModel {
response = test.envelopeMenuSelection("100102", "1500");
//Open Channel
- result = response.checkSw("911A");
+ addResult(response.checkSw("911A"));
response = test.fetch("1A");
- result &= response.checkData("D0188103 01400182 02818206 05815566" +
- "77883502 03003902 000A");
+ addResult(response.checkData("D0188103 01400182 02818206 05815566" +
+ "77883502 03003902 000A"));
response = test.terminalResponse("81030140 01820282 81830100 38028100" +
"35020300 3902000A");
//Declare Service
- result &= response.checkSw("9110");
+ addResult(response.checkSw("9110"));
response = test.fetch("10");
declareService = response.getData();
serviceRecordTLV = declareService.substring(22,32); //to get ServiceId
- result &= response.checkData("D00E8103 01470082 028182" + serviceRecordTLV);
+ addResult(response.checkData("D00E8103 01470082 028182" + serviceRecordTLV));
response = test.terminalResponse("81030147 00820282 81830100");
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.envelopeCallControlByNAA();
test.terminalResponse("81030121 80820282 81030100");
@@ -100,10 +100,10 @@ public class Test_Cre_Hin_Enhd extends UiccTestModel {
response = test.envelopeMenuSelection("100101", "");
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.envelopeCallControlByNAA();
response = test.terminalResponse("81030121 80820282 81030100");
@@ -111,10 +111,10 @@ public class Test_Cre_Hin_Enhd extends UiccTestModel {
response = test.envelopeTimerExpiration("240101");
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.envelopeCallControlByNAA();
response = test.terminalResponse("81030121 80820282 81030100");
@@ -122,10 +122,10 @@ public class Test_Cre_Hin_Enhd extends UiccTestModel {
response = test.envelopeCallControlByNAA();
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.envelopeCallControlByNAA();
response = test.terminalResponse("81030121 80820282 81030100");
@@ -133,10 +133,10 @@ public class Test_Cre_Hin_Enhd extends UiccTestModel {
response = test.envelopeEventDownloadMTCall();
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.envelopeCallControlByNAA();
response = test.terminalResponse("81030121 80820282 81030100");
@@ -144,10 +144,10 @@ public class Test_Cre_Hin_Enhd extends UiccTestModel {
response = test.envelopeEventDownloadCallConnected();
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.envelopeCallControlByNAA();
response = test.terminalResponse("81030121 80820282 81030100");
@@ -155,10 +155,10 @@ public class Test_Cre_Hin_Enhd extends UiccTestModel {
response = test.envelopeEventDownloadCallDisconnected();
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.envelopeCallControlByNAA();
response = test.terminalResponse("81030121 80820282 81030100");
@@ -166,10 +166,10 @@ public class Test_Cre_Hin_Enhd extends UiccTestModel {
response = test.envelopeEventDownloadLocationStatus();
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.envelopeCallControlByNAA();
response = test.terminalResponse("81030121 80820282 81030100");
@@ -177,10 +177,10 @@ public class Test_Cre_Hin_Enhd extends UiccTestModel {
response = test.envelopeEventDownloadUserActivity();
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.envelopeCallControlByNAA();
response = test.terminalResponse("81030121 80820282 81030100");
@@ -188,10 +188,10 @@ public class Test_Cre_Hin_Enhd extends UiccTestModel {
response = test.envelopeEventDownloadIdleScreenAvailable();
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.envelopeCallControlByNAA();
response = test.terminalResponse("81030121 80820282 81030100");
@@ -199,10 +199,10 @@ public class Test_Cre_Hin_Enhd extends UiccTestModel {
response = test.envelopeEventDownloadCardReaderStatus();
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.envelopeCallControlByNAA();
response = test.terminalResponse("81030121 80820282 81030100");
@@ -210,10 +210,10 @@ public class Test_Cre_Hin_Enhd extends UiccTestModel {
response = test.unrecognizedEnvelope();
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.envelopeCallControlByNAA();
response = test.terminalResponse("81030121 80820282 81030100");
@@ -221,10 +221,10 @@ public class Test_Cre_Hin_Enhd extends UiccTestModel {
response = test.envelopeEventDownloadLanguageSelection();
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.envelopeCallControlByNAA();
response = test.terminalResponse("81030121 80820282 81030100");
@@ -232,10 +232,10 @@ public class Test_Cre_Hin_Enhd extends UiccTestModel {
response = test.envelopeEventDownloadBrowserTermination();
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.envelopeCallControlByNAA();
response = test.terminalResponse("81030121 80820282 81030100");
@@ -243,10 +243,10 @@ public class Test_Cre_Hin_Enhd extends UiccTestModel {
response = test.envelopeEventDownloadDataAvailable("38028100");
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.envelopeCallControlByNAA();
response = test.terminalResponse("81030121 80820282 81030100");
@@ -254,10 +254,10 @@ public class Test_Cre_Hin_Enhd extends UiccTestModel {
response = test.envelopeEventDownloadChannelStatus("38028100");
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.envelopeCallControlByNAA();
response = test.terminalResponse("81030121 80820282 81030100");
@@ -265,10 +265,10 @@ public class Test_Cre_Hin_Enhd extends UiccTestModel {
response = test.envelopeEventDownloadAccessTechnologyChange();
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.envelopeCallControlByNAA();
response = test.terminalResponse("81030121 80820282 81030100");
@@ -276,10 +276,10 @@ public class Test_Cre_Hin_Enhd extends UiccTestModel {
response = test.envelopeEventDownloadDisplayParametersChanged();
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.envelopeCallControlByNAA();
response = test.terminalResponse("81030121 80820282 81030100");
@@ -287,10 +287,10 @@ public class Test_Cre_Hin_Enhd extends UiccTestModel {
response = test.envelopeEventDownloadLocalConnection(serviceRecordTLV);
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.envelopeCallControlByNAA();
response = test.terminalResponse("81030121 80820282 81030100");
@@ -298,10 +298,10 @@ public class Test_Cre_Hin_Enhd extends UiccTestModel {
response = test.envelopeEventDownloadNetworkSearchModeChange();
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.envelopeCallControlByNAA();
response = test.terminalResponse("81030121 80820282 81030100");
@@ -309,10 +309,10 @@ public class Test_Cre_Hin_Enhd extends UiccTestModel {
response = test.envelopeEventDownloadBrowsingStatus();
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.envelopeCallControlByNAA();
response = test.terminalResponse("81030121 80820282 81030100");
@@ -324,10 +324,10 @@ public class Test_Cre_Hin_Enhd extends UiccTestModel {
response = test.updateBinary("0000", "FFFFFF");
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.envelopeCallControlByNAA();
response = test.terminalResponse("81030121 80820282 81030100");
@@ -339,19 +339,19 @@ public class Test_Cre_Hin_Enhd extends UiccTestModel {
response = test.updateRecord("01", "04", "55555555");
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.envelopeCallControlByNAA();
response = test.terminalResponse("81030121 80820282 81030100");
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 +
+ addResult(response.checkData("10" + APPLET_AID_1 +
"17CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
- "CCCCCCCC CCCCCCCC");
+ "CCCCCCCC CCCCCCCC"));
test.reset();
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
@@ -366,6 +366,6 @@ public class Test_Cre_Hin_Enhd extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_hin_erhd/Test_Cre_Hin_Erhd.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_hin_erhd/Test_Cre_Hin_Erhd.java
index d700aa76d7932468e414943790910bb038251934..c7f534ccede21c75ac33d9c91f19b3452106ce44 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_hin_erhd/Test_Cre_Hin_Erhd.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_hin_erhd/Test_Cre_Hin_Erhd.java
@@ -24,7 +24,7 @@ public class Test_Cre_Hin_Erhd extends UiccTestModel {
}
public boolean run() {
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -62,8 +62,8 @@ public class Test_Cre_Hin_Erhd extends UiccTestModel {
test.unrecognizedEnvelope();
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1 +
- "01CC");
+ addResult(response.checkData("10" + APPLET_AID_1 +
+ "01CC"));
test.reset();
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
@@ -78,6 +78,6 @@ public class Test_Cre_Hin_Erhd extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_hin_pahd/Test_Cre_Hin_Pahd.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_hin_pahd/Test_Cre_Hin_Pahd.java
index 17836c47699f4aeec349316ad239939ccb1c5911..5018b42e0d70b6a9198594ebc50dfa9459cc6933 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_hin_pahd/Test_Cre_Hin_Pahd.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_hin_pahd/Test_Cre_Hin_Pahd.java
@@ -28,7 +28,7 @@ public class Test_Cre_Hin_Pahd extends UiccTestModel {
}
public boolean run() {
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -84,16 +84,16 @@ public class Test_Cre_Hin_Pahd extends UiccTestModel {
// 1- Trigger AppletA1
test.envelopeEventDownloadUserActivity();
response = test.fetch("0B");
- result = response.checkData("D0098103 01218082 028102");
+ addResult(response.checkData("D0098103 01218082 028102"));
test.terminalResponse("81030121 80820282 81830100");
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 +
- "03CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1 +
+ "03CCCCCC"));
response = test.selectApplication(APPLET_AID_2);
- result &= response.checkData("10" + APPLET_AID_2 +
- "08CCCCCC CCCCCCCC CC");
+ addResult(response.checkData("10" + APPLET_AID_2 +
+ "08CCCCCC CCCCCCCC CC"));
test.reset();
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
@@ -110,6 +110,6 @@ public class Test_Cre_Hin_Pahd extends UiccTestModel {
test.deleteApplet(APPLET_AID_2);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_hin_prhd/Test_Cre_Hin_Prhd.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_hin_prhd/Test_Cre_Hin_Prhd.java
index e3a8ffb3abc9da204c245d69d14b682cbf1e26f6..f6da04201fb60f8c34ba0736f917d87d9b64ff21 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_hin_prhd/Test_Cre_Hin_Prhd.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_hin_prhd/Test_Cre_Hin_Prhd.java
@@ -31,7 +31,7 @@ public class Test_Cre_Hin_Prhd extends UiccTestModel {
}
public boolean run() {
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -74,63 +74,63 @@ public class Test_Cre_Hin_Prhd extends UiccTestModel {
response = test.terminalProfile("A8970101 FEEF0081 010000FF FF");
//Open Channel
- result = response.checkSw("911A");
+ addResult(response.checkSw("911A"));
response = test.fetch("1A");
- result &= response.checkData("D0188103 01400182 02818206 05815566" +
- "77883502 03003902 000A");
+ addResult(response.checkData("D0188103 01400182 02818206 05815566" +
+ "77883502 03003902 000A"));
response = test.terminalResponse("81030140 01820282 81830100 38028100" +
"35020300 3902000A");
//Declare Service
- result &= response.checkSw("9110");
+ addResult(response.checkSw("9110"));
response = test.fetch("10");
declareService = response.getData();
serviceRecordTLV = declareService.substring(22,32); //to get ServiceId
- result &= response.checkData("D00E8103 01470082 028182" + serviceRecordTLV);
+ addResult(response.checkData("D00E8103 01470082 028182" + serviceRecordTLV));
response = test.terminalResponse("81030147 00820282 81830100");
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.terminalResponse("81030121 80820282 81030100");
//Select Item
- result &= response.checkSw("910E");
+ addResult(response.checkSw("910E"));
response = test.fetch("0E");
- result &= response.checkData("D00C8103 01240082 02818290 0101");
+ addResult(response.checkData("D00C8103 01240082 02818290 0101"));
response = test.terminalResponse("81030124 00820282 81030100 900101");
//event EVENT_PROACTIVE_HANDLER_AVAILABLE
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.terminalResponse("81030121 80820282 81030100");
//Select Item
- result &= response.checkSw("910E");
+ addResult(response.checkSw("910E"));
response = test.fetch("0E");
- result &= response.checkData("D00C8103 01240082 02818290 0101");
+ addResult(response.checkData("D00C8103 01240082 02818290 0101"));
response = test.terminalResponse("81030124 00820282 81030100 900101");
//event EVENT_MENU_SELECTION
response = test.envelopeMenuSelection("100101", "");
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.terminalResponse("81030121 80820282 81030100");
//Select Item
- result &= response.checkSw("910E");
+ addResult(response.checkSw("910E"));
response = test.fetch("0E");
- result &= response.checkData("D00C8103 01240082 02818290 0101");
+ addResult(response.checkData("D00C8103 01240082 02818290 0101"));
test.terminalResponse("81030124 00820282 81030100 900101");
@@ -138,16 +138,16 @@ public class Test_Cre_Hin_Prhd extends UiccTestModel {
response = test.envelopeMenuSelection("100102", "1500");
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.terminalResponse("81030121 80820282 81030100");
//Select Item
- result &= response.checkSw("910E");
+ addResult(response.checkSw("910E"));
response = test.fetch("0E");
- result &= response.checkData("D00C8103 01240082 02818290 0101");
+ addResult(response.checkData("D00C8103 01240082 02818290 0101"));
test.terminalResponse("81030124 00820282 81030100 900101");
@@ -155,16 +155,16 @@ public class Test_Cre_Hin_Prhd extends UiccTestModel {
response = test.envelopeCallControlByNAA();
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.terminalResponse("81030121 80820282 81030100");
//Select Item
- result &= response.checkSw("910E");
+ addResult(response.checkSw("910E"));
response = test.fetch("0E");
- result &= response.checkData("D00C8103 01240082 02818290 0101");
+ addResult(response.checkData("D00C8103 01240082 02818290 0101"));
test.terminalResponse("81030124 00820282 81030100 900101");
@@ -172,16 +172,16 @@ public class Test_Cre_Hin_Prhd extends UiccTestModel {
response = test.envelopeTimerExpiration("240101");
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.terminalResponse("81030121 80820282 81030100");
//Select Item
- result &= response.checkSw("910E");
+ addResult(response.checkSw("910E"));
response = test.fetch("0E");
- result &= response.checkData("D00C8103 01240082 02818290 0101");
+ addResult(response.checkData("D00C8103 01240082 02818290 0101"));
test.terminalResponse("81030124 00820282 81030100 900101");
@@ -189,16 +189,16 @@ public class Test_Cre_Hin_Prhd extends UiccTestModel {
response = test.envelopeEventDownloadMTCall();
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.terminalResponse("81030121 80820282 81030100");
//Select Item
- result &= response.checkSw("910E");
+ addResult(response.checkSw("910E"));
response = test.fetch("0E");
- result &= response.checkData("D00C8103 01240082 02818290 0101");
+ addResult(response.checkData("D00C8103 01240082 02818290 0101"));
test.terminalResponse("81030124 00820282 81030100 900101");
@@ -206,16 +206,16 @@ public class Test_Cre_Hin_Prhd extends UiccTestModel {
response = test.envelopeEventDownloadCallConnected();
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.terminalResponse("81030121 80820282 81030100");
//Select Item
- result &= response.checkSw("910E");
+ addResult(response.checkSw("910E"));
response = test.fetch("0E");
- result &= response.checkData("D00C8103 01240082 02818290 0101");
+ addResult(response.checkData("D00C8103 01240082 02818290 0101"));
test.terminalResponse("81030124 00820282 81030100 900101");
@@ -223,16 +223,16 @@ public class Test_Cre_Hin_Prhd extends UiccTestModel {
response = test.envelopeEventDownloadCallDisconnected();
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.terminalResponse("81030121 80820282 81030100");
//Select Item
- result &= response.checkSw("910E");
+ addResult(response.checkSw("910E"));
response = test.fetch("0E");
- result &= response.checkData("D00C8103 01240082 02818290 0101");
+ addResult(response.checkData("D00C8103 01240082 02818290 0101"));
test.terminalResponse("81030124 00820282 81030100 900101");
@@ -240,16 +240,16 @@ public class Test_Cre_Hin_Prhd extends UiccTestModel {
response = test.envelopeEventDownloadLocationStatus();
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.terminalResponse("81030121 80820282 81030100");
//Select Item
- result &= response.checkSw("910E");
+ addResult(response.checkSw("910E"));
response = test.fetch("0E");
- result &= response.checkData("D00C8103 01240082 02818290 0101");
+ addResult(response.checkData("D00C8103 01240082 02818290 0101"));
test.terminalResponse("81030124 00820282 81030100 900101");
@@ -257,16 +257,16 @@ public class Test_Cre_Hin_Prhd extends UiccTestModel {
response = test.envelopeEventDownloadUserActivity();
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.terminalResponse("81030121 80820282 81030100");
//Select Item
- result &= response.checkSw("910E");
+ addResult(response.checkSw("910E"));
response = test.fetch("0E");
- result &= response.checkData("D00C8103 01240082 02818290 0101");
+ addResult(response.checkData("D00C8103 01240082 02818290 0101"));
test.terminalResponse("81030124 00820282 81030100 900101");
@@ -274,16 +274,16 @@ public class Test_Cre_Hin_Prhd extends UiccTestModel {
response = test.envelopeEventDownloadIdleScreenAvailable();
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.terminalResponse("81030121 80820282 81030100");
//Select Item
- result &= response.checkSw("910E");
+ addResult(response.checkSw("910E"));
response = test.fetch("0E");
- result &= response.checkData("D00C8103 01240082 02818290 0101");
+ addResult(response.checkData("D00C8103 01240082 02818290 0101"));
test.terminalResponse("81030124 00820282 81030100 900101");
@@ -291,16 +291,16 @@ public class Test_Cre_Hin_Prhd extends UiccTestModel {
response = test.envelopeEventDownloadCardReaderStatus();
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.terminalResponse("81030121 80820282 81030100");
//Select Item
- result &= response.checkSw("910E");
+ addResult(response.checkSw("910E"));
response = test.fetch("0E");
- result &= response.checkData("D00C8103 01240082 02818290 0101");
+ addResult(response.checkData("D00C8103 01240082 02818290 0101"));
test.terminalResponse("81030124 00820282 81030100 900101");
@@ -308,16 +308,16 @@ public class Test_Cre_Hin_Prhd extends UiccTestModel {
response = test.status("00", "0C", "00");
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.terminalResponse("81030121 80820282 81030100");
//Select Item
- result &= response.checkSw("910E");
+ addResult(response.checkSw("910E"));
response = test.fetch("0E");
- result &= response.checkData("D00C8103 01240082 02818290 0101");
+ addResult(response.checkData("D00C8103 01240082 02818290 0101"));
test.terminalResponse("81030124 00820282 81030100 900101");
@@ -325,16 +325,16 @@ public class Test_Cre_Hin_Prhd extends UiccTestModel {
response = test.envelopeEventDownloadLanguageSelection();
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.terminalResponse("81030121 80820282 81030100");
//Select Item
- result &= response.checkSw("910E");
+ addResult(response.checkSw("910E"));
response = test.fetch("0E");
- result &= response.checkData("D00C8103 01240082 02818290 0101");
+ addResult(response.checkData("D00C8103 01240082 02818290 0101"));
test.terminalResponse("81030124 00820282 81030100 900101");
@@ -342,16 +342,16 @@ public class Test_Cre_Hin_Prhd extends UiccTestModel {
response = test.envelopeEventDownloadBrowserTermination();
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.terminalResponse("81030121 80820282 81030100");
//Select Item
- result &= response.checkSw("910E");
+ addResult(response.checkSw("910E"));
response = test.fetch("0E");
- result &= response.checkData("D00C8103 01240082 02818290 0101");
+ addResult(response.checkData("D00C8103 01240082 02818290 0101"));
test.terminalResponse("81030124 00820282 81030100 900101");
@@ -359,16 +359,16 @@ public class Test_Cre_Hin_Prhd extends UiccTestModel {
response = test.envelopeEventDownloadDataAvailable("38028100");
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.terminalResponse("81030121 80820282 81030100");
//Select Item
- result &= response.checkSw("910E");
+ addResult(response.checkSw("910E"));
response = test.fetch("0E");
- result &= response.checkData("D00C8103 01240082 02818290 0101");
+ addResult(response.checkData("D00C8103 01240082 02818290 0101"));
test.terminalResponse("81030124 00820282 81030100 900101");
@@ -376,16 +376,16 @@ public class Test_Cre_Hin_Prhd extends UiccTestModel {
response = test.envelopeEventDownloadChannelStatus("38028100");
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.terminalResponse("81030121 80820282 81030100");
//Select Item
- result &= response.checkSw("910E");
+ addResult(response.checkSw("910E"));
response = test.fetch("0E");
- result &= response.checkData("D00C8103 01240082 02818290 0101");
+ addResult(response.checkData("D00C8103 01240082 02818290 0101"));
test.terminalResponse("81030124 00820282 81030100 900101");
@@ -393,32 +393,32 @@ public class Test_Cre_Hin_Prhd extends UiccTestModel {
response = test.envelopeEventDownloadAccessTechnologyChange();
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.terminalResponse("81030121 80820282 81030100");
//Select Item
- result &= response.checkSw("910E");
+ addResult(response.checkSw("910E"));
response = test.fetch("0E");
- result &= response.checkData("D00C8103 01240082 02818290 0101");
+ addResult(response.checkData("D00C8103 01240082 02818290 0101"));
test.terminalResponse("81030124 00820282 81030100 900101");
//event EVENT_EVENT_DOWNLOAD_DISPLAY_PARAMETER_CHANGED
response = test.envelopeEventDownloadDisplayParametersChanged();
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.terminalResponse("81030121 80820282 81030100");
//Select Item
- result &= response.checkSw("910E");
+ addResult(response.checkSw("910E"));
response = test.fetch("0E");
- result &= response.checkData("D00C8103 01240082 02818290 0101");
+ addResult(response.checkData("D00C8103 01240082 02818290 0101"));
test.terminalResponse("81030124 00820282 81030100 900101");
@@ -426,16 +426,16 @@ public class Test_Cre_Hin_Prhd extends UiccTestModel {
response = test.envelopeEventDownloadLocalConnection(serviceRecordTLV);
//response = test.envelopeEventDownloadLocalConnection("41 03000000");
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.terminalResponse("81030121 80820282 81030100");
//Select Item
- result &= response.checkSw("910E");
+ addResult(response.checkSw("910E"));
response = test.fetch("0E");
- result &= response.checkData("D00C8103 01240082 02818290 0101");
+ addResult(response.checkData("D00C8103 01240082 02818290 0101"));
test.terminalResponse("81030124 00820282 81030100 900101");
@@ -443,16 +443,16 @@ public class Test_Cre_Hin_Prhd extends UiccTestModel {
response = test.envelopeEventDownloadNetworkSearchModeChange();
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.terminalResponse("81030121 80820282 81030100");
//Select Item
- result &= response.checkSw("910E");
+ addResult(response.checkSw("910E"));
response = test.fetch("0E");
- result &= response.checkData("D00C8103 01240082 02818290 0101");
+ addResult(response.checkData("D00C8103 01240082 02818290 0101"));
test.terminalResponse("81030124 00820282 81030100 900101");
@@ -460,16 +460,16 @@ public class Test_Cre_Hin_Prhd extends UiccTestModel {
response = test.envelopeEventDownloadBrowsingStatus();
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.terminalResponse("81030121 80820282 81030100");
//Select Item
- result &= response.checkSw("910E");
+ addResult(response.checkSw("910E"));
response = test.fetch("0E");
- result &= response.checkData("D00C8103 01240082 02818290 0101");
+ addResult(response.checkData("D00C8103 01240082 02818290 0101"));
test.terminalResponse("81030124 00820282 81030100 900101");
@@ -480,16 +480,16 @@ public class Test_Cre_Hin_Prhd extends UiccTestModel {
response = test.updateBinary("0000", "FFFFFF");
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.terminalResponse("81030121 80820282 81030100");
//Select Item
- result &= response.checkSw("910E");
+ addResult(response.checkSw("910E"));
response = test.fetch("0E");
- result &= response.checkData("D00C8103 01240082 02818290 0101");
+ addResult(response.checkData("D00C8103 01240082 02818290 0101"));
test.terminalResponse("81030124 00820282 81030100 900101");
@@ -497,24 +497,24 @@ public class Test_Cre_Hin_Prhd extends UiccTestModel {
response = test.unrecognizedEnvelope();
//Display Text
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
response = test.fetch("14");
- result &= response.checkData("D0128103 01218082 0281028D 07045445" +
- "58542031");
+ addResult(response.checkData("D0128103 01218082 0281028D 07045445" +
+ "58542031"));
response = test.terminalResponse("81030121 80820282 81030100");
//Select Item
- result &= response.checkSw("910E");
+ addResult(response.checkSw("910E"));
response = test.fetch("0E");
- result &= response.checkData("D00C8103 01240082 02818290 0101");
+ addResult(response.checkData("D00C8103 01240082 02818290 0101"));
test.terminalResponse("81030124 00820282 81030100 900101");
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 +
+ addResult(response.checkData("10" + APPLET_AID_1 +
"19CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
- "CCCCCCCC CCCCCCCC CCCC");
+ "CCCCCCCC CCCCCCCC CCCC"));
test.reset();
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
@@ -529,6 +529,6 @@ public class Test_Cre_Hin_Prhd extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_enhd/Test_Cre_Mha_Enhd.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_enhd/Test_Cre_Mha_Enhd.java
index a584da8aa28d375f2e4043830a7376b29b2787ec..887972c388191dd39367a9687d35f92aa4a94192 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_enhd/Test_Cre_Mha_Enhd.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_enhd/Test_Cre_Mha_Enhd.java
@@ -38,9 +38,7 @@ public class Test_Cre_Mha_Enhd 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;
-
+
/**
*
@@ -52,6 +50,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("03010000 0102");
@@ -94,84 +94,84 @@ 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 27
test.reset();
response = test.terminalProfileSession("FFFFFFF FFEFF1FFF FF0000FF FF9FFFEF" +
@@ -188,21 +188,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 +
"1ACCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
- "CCCCCCCC CCCCCCCC CCCCCC");
+ "CCCCCCCC CCCCCCCC CCCCCC"));
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();
@@ -212,7 +212,7 @@ public class Test_Cre_Mha_Enhd extends UiccTestModel {
test.deleteApplet(APPLET_AID_3);
test.deletePackage(CAP_FILE_PATH);
- return testresult;
+ return getOverallResult();
}
/**
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_erhd/Test_Cre_Mha_Erhd.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_erhd/Test_Cre_Mha_Erhd.java
index 760b4a41ec0d9fe7c5217f73ee360101a98d1ff4..8bb0ae92909d032c584450308228856bdaeede1a 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_erhd/Test_Cre_Mha_Erhd.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_erhd/Test_Cre_Mha_Erhd.java
@@ -35,8 +35,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;
/**
*
@@ -48,7 +46,9 @@ public class Test_Cre_Mha_Erhd extends UiccTestModel {
* Installs the applet, runs the tests and checks the test result.
*/
public boolean run(){
- // test script
+ initialiseResults();
+
+ // test script
test.reset();
test.terminalProfileSession("16FF");
// Install Applet
@@ -91,108 +91,108 @@ 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("81030110 00820282 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("81030110 00820282 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 27
test.reset();
response = test.terminalProfileSession("13");
@@ -217,16 +217,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 +
"1CCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
- "CCCCCCCC CCCCCCCC CCCCCCCC CC");
+ "CCCCCCCC CCCCCCCC CCCCCCCC CC"));
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();
@@ -236,7 +236,7 @@ public class Test_Cre_Mha_Erhd extends UiccTestModel {
test.deleteApplet(APPLET_AID_3);
test.deletePackage(CAP_FILE_PATH);
- return testresult;
+ return getOverallResult();
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_pahd/Test_Cre_Mha_Pahd.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_pahd/Test_Cre_Mha_Pahd.java
index 98e5bfc0b5a174adb29ed0dcf1dc92301963ad02..b0cefaa76aa78708d95af060716fd1d1c3433f45 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_pahd/Test_Cre_Mha_Pahd.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_pahd/Test_Cre_Mha_Pahd.java
@@ -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,7 +57,9 @@ public class Test_Cre_Mha_Pahd extends UiccTestModel {
* Installs the applet, runs the tests and checks the test result.
*/
public boolean run(){
- // test script
+ initialiseResults();
+
+ // test script
test.reset();
test.terminalProfileSession("03010000 0102");
@@ -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.
@@ -229,10 +229,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
@@ -259,7 +259,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 +
"2DCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
"CCCCCCCC CCCCCCCC CCCCCCCC CCCC") ||
@@ -268,7 +268,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 +
"22CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
"CCCCCC") ||
@@ -277,7 +277,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();
@@ -287,7 +287,7 @@ public class Test_Cre_Mha_Pahd extends UiccTestModel {
test.deleteApplet(APPLET_AID_3);
test.deletePackage(CAP_FILE_PATH);
- return testresult;
+ return getOverallResult();
}
/**
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_prhd/Test_Cre_Mha_Prhd.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_prhd/Test_Cre_Mha_Prhd.java
index 29ae33a6585560771da02927a5a3f071ce5a7a73..4e68e0f7c5974ae4c06f2b84c22edbb2e9c44cd4 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_prhd/Test_Cre_Mha_Prhd.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_prhd/Test_Cre_Mha_Prhd.java
@@ -38,8 +38,6 @@ public class Test_Cre_Mha_Prhd 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;
/**
*
@@ -51,6 +49,7 @@ public class Test_Cre_Mha_Prhd extends UiccTestModel {
* Installs the applet, runs the tests and checks the test result.
*/
public boolean run(){
+ initialiseResults();
// test script
test.reset();
@@ -94,61 +93,61 @@ public class Test_Cre_Mha_Prhd 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
@@ -156,22 +155,22 @@ public class Test_Cre_Mha_Prhd 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 (AID_ADF1);
//- Select for termination ADF1
response = test.sendApdu ("00A4044C 10"+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.
@@ -222,10 +221,10 @@ public class Test_Cre_Mha_Prhd 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
@@ -253,7 +252,7 @@ public class Test_Cre_Mha_Prhd 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 +
"2DCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
"CCCCCCCC CCCCCCCC CCCCCCCC CCCC"
@@ -265,7 +264,7 @@ public class Test_Cre_Mha_Prhd extends UiccTestModel {
response = test.selectApplication(APPLET_AID_2);
- testresult &= response.checkData("10" +APPLET_AID_2 +
+ addResult(response.checkData("10" +APPLET_AID_2 +
"22CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
"CCCCCC"
@@ -274,11 +273,11 @@ public class Test_Cre_Mha_Prhd extends UiccTestModel {
response.checkData("10" +APPLET_AID_2 +
"15CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
"CCCCCCCC 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();
@@ -288,7 +287,7 @@ public class Test_Cre_Mha_Prhd extends UiccTestModel {
test.deleteApplet(APPLET_AID_3);
test.deletePackage(CAP_FILE_PATH);
- return testresult;
+ return getOverallResult();
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_pcs_igco/Test_Cre_Pcs_Igco.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_pcs_igco/Test_Cre_Pcs_Igco.java
index 924867f4e766d2308e7ea009855e31db1e7c4db8..86a36e1d00d245a43b0b8c5b1004dffb5575fad4 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_pcs_igco/Test_Cre_Pcs_Igco.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_pcs_igco/Test_Cre_Pcs_Igco.java
@@ -25,7 +25,7 @@ public class Test_Cre_Pcs_Igco extends UiccTestModel {
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -58,32 +58,32 @@ public class Test_Cre_Pcs_Igco extends UiccTestModel {
// Terminal Profile with Set Up Menu
response = test.terminalProfile("09010020");
// SW1 shall be 91
- result = response.checkSw("9126");
+ addResult(response.checkSw("9126"));
// select MF
response = test.selectFile("3F00");
- result &= response.getData().regionMatches(16, "3F00", 0, 4);
- result &= response.checkSw("9126");
+ addResult(response.getData().regionMatches(16, "3F00", 0, 4));
+ addResult(response.checkSw("9126"));
// select failed
response = test.selectFile("03FF");
// SW = 6A82
- result &= response.checkSw("6A82");
+ addResult(response.checkSw("6A82"));
// Fetch the Set Up Menu
response = test.fetch("26");
- result &= response.checkData("D0248103 01250082 02818285 09554943" +
+ addResult(response.checkData("D0248103 01250082 02818285 09554943" +
"43205445 53548F06 014D656E 75318F06" +
- "024D656E 7532");
+ "024D656E 7532"));
// select MF
response = test.selectFile("3F00");
- result &= response.getData().regionMatches(16, "3F00", 0, 4);
- result &= response.checkSw("9000");
+ addResult(response.getData().regionMatches(16, "3F00", 0, 4));
+ addResult(response.checkSw("9000"));
// Terminal Response
response = test.terminalResponse("81030125 00820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -93,31 +93,31 @@ public class Test_Cre_Pcs_Igco extends UiccTestModel {
// Trigger Applet1
response = test.envelopeMenuSelection("100101","");
// SW1 shall be 91
- result = response.checkSw("9114");
+ addResult(response.checkSw("9114"));
// select MF
response = test.selectFile("3F00");
- result &= response.getData().regionMatches(16, "3F00", 0, 4);
- result &= response.checkSw("9114");
+ addResult(response.getData().regionMatches(16, "3F00", 0, 4));
+ addResult(response.checkSw("9114"));
// select failed
response = test.selectFile("03FF");
// SW = 6A82
- result &= response.checkSw("6A82");
+ addResult(response.checkSw("6A82"));
// Fetch display Text
response = test.fetch("14");
- result &= response.checkData("D0128103 01210082 0281028D 07045465" +
- "73742041");
+ addResult(response.checkData("D0128103 01210082 0281028D 07045465" +
+ "73742041"));
// select MF
response = test.selectFile("3F00");
- result &= response.getData().regionMatches(16, "3F00", 0, 4);
- result &= response.checkSw("9000");
+ addResult(response.getData().regionMatches(16, "3F00", 0, 4));
+ addResult(response.checkSw("9000"));
// Terminal Response
response = test.terminalResponse("81030121 00820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -129,45 +129,45 @@ public class Test_Cre_Pcs_Igco extends UiccTestModel {
// select MF (Testcase 3-1)
response = test.selectFile("3F00");
- result &= response.getData().regionMatches(16, "3F00", 0, 4);
- result &= response.checkSw("9114");
+ addResult(response.getData().regionMatches(16, "3F00", 0, 4));
+ addResult(response.checkSw("9114"));
// Fetch display Text
response = test.fetch("14");
- result &= response.checkData("D0128103 01210082 0281028D 07045465" +
- "73742042");
+ addResult(response.checkData("D0128103 01210082 0281028D 07045465" +
+ "73742042"));
// select MF (Testcase 3-4)
response = test.selectFile("3F00");
- result &= response.getData().regionMatches(16, "3F00", 0, 4);
- result &= response.checkSw("9000");
+ addResult(response.getData().regionMatches(16, "3F00", 0, 4));
+ addResult(response.checkSw("9000"));
// select failed
response = test.selectFile("03FF");
// SW = 6A82
- result &= response.checkSw("6A82");
+ addResult(response.checkSw("6A82"));
// Terminal Response
response = test.terminalResponse("81030121 00820282 81830100");
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
// select MF (Testcase 3-8)
response = test.selectFile("3F00");
- result &= response.getData().regionMatches(16, "3F00", 0, 4);
- result &= response.checkSw("9114");
+ addResult(response.getData().regionMatches(16, "3F00", 0, 4));
+ addResult(response.checkSw("9114"));
// select failed
response = test.selectFile("03FF");
// SW = 6A82
- result &= response.checkSw("6A82");
+ addResult(response.checkSw("6A82"));
// Fetch display Text
response = test.fetch("14");
- result &= response.checkData("D0128103 01210082 0281028D 07045465" +
- "73742043");
+ addResult(response.checkData("D0128103 01210082 0281028D 07045465" +
+ "73742043"));
// select MF (Testcase 3-12)
response = test.selectFile("3F00");
- result &= response.getData().regionMatches(16, "3F00", 0, 4);
- result &= response.checkSw("9000");
+ addResult(response.getData().regionMatches(16, "3F00", 0, 4));
+ addResult(response.checkSw("9000"));
// Terminal Response
response = test.terminalResponse("81030121 00820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -177,7 +177,7 @@ public class Test_Cre_Pcs_Igco extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "02" + "CCCC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "02" + "CCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -192,6 +192,6 @@ public class Test_Cre_Pcs_Igco extends UiccTestModel {
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_pcs_pcco/Test_Cre_Pcs_Pcco.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_pcs_pcco/Test_Cre_Pcs_Pcco.java
index 535f7c42081a91841dbc4a8d274c5c800154a946..2a182d48c7b0450fec09e7f09554d2974b79d146 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_pcs_pcco/Test_Cre_Pcs_Pcco.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_pcs_pcco/Test_Cre_Pcs_Pcco.java
@@ -29,7 +29,7 @@ public class Test_Cre_Pcs_Pcco extends UiccTestModel {
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -95,7 +95,7 @@ public class Test_Cre_Pcs_Pcco extends UiccTestModel {
// Trigger Applet1
response = test.envelopeMenuSelection("100101","");
// SW = 9000
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -105,42 +105,42 @@ public class Test_Cre_Pcs_Pcco extends UiccTestModel {
// Trigger Applet2
response = test.envelopeMenuSelection("100102","");
// SW = 9000
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// Trigger Applet1
response = test.envelopeMenuSelection("100101","");
// SW = 9000
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// Trigger Applet2
response = test.envelopeMenuSelection("100102","");
// SW = 9000
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// Trigger Applet1
response = test.envelopeMenuSelection("100101","");
// SW = 9000
- result &= response.checkSw("9113");
+ addResult(response.checkSw("9113"));
// Fecth 3 Timer Management proactive commands
response = test.fetch("13");
- result &= response.checkData("D0118103 01270082 02818224 01012503" +
- "000100");
+ addResult(response.checkData("D0118103 01270082 02818224 01012503" +
+ "000100"));
response = test.terminalResponse("81030127 00820282 81030100 24010125" +
"03000100");
- result &= response.checkSw("9113");
+ addResult(response.checkSw("9113"));
response = test.fetch("13");
- result &= response.checkData("D0118103 01270082 02818224 01022503" +
- "000100");
+ addResult(response.checkData("D0118103 01270082 02818224 01022503" +
+ "000100"));
response = test.terminalResponse("81030127 00820282 81030100 24010125" +
"03000100");
- result &= response.checkSw("9113");
+ addResult(response.checkSw("9113"));
response = test.fetch("13");
- result &= response.checkData("D0118103 01270082 02818224 01032503" +
- "000100");
+ addResult(response.checkData("D0118103 01270082 02818224 01032503" +
+ "000100"));
response = test.terminalResponse("81030127 00820282 81030100 24010125" +
"03000100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -150,7 +150,7 @@ public class Test_Cre_Pcs_Pcco extends UiccTestModel {
// Trigger Applet1
response = test.envelopeMenuSelection("100101","");
// SW = 9000
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -160,44 +160,44 @@ public class Test_Cre_Pcs_Pcco extends UiccTestModel {
// Trigger Applet3
response = test.envelopeMenuSelection("100103","");
// SW = 911C
- result &= response.checkSw("911C");
+ addResult(response.checkSw("911C"));
// Fetch the Open Channel
response = test.fetch("1C");
- result &= response.checkData("D01A8103 01400182 02818206 05911122" +
- "33443504 01000000 39020080");
+ addResult(response.checkData("D01A8103 01400182 02818206 05911122" +
+ "33443504 01000000 39020080"));
// Terminal Response OK on channel 7
response = test.terminalResponse("81030140 01820282 81030100 38028700" +
"35040100 00003902 0080");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// Trigger Applet2
response = test.envelopeMenuSelection("100102","");
// SW = 911C
- result &= response.checkSw("911C");
+ addResult(response.checkSw("911C"));
// Fetch the Open Channel CSD
response = test.fetch("1C");
- result &= response.checkData("D01A8103 01400182 02818206 05911122" +
- "33443504 01000000 39020080");
+ addResult(response.checkData("D01A8103 01400182 02818206 05911122" +
+ "33443504 01000000 39020080"));
// Terminal Response OK on channel 1
response = test.terminalResponse("81030140 01820282 81030100 38028100" +
"35040100 00003902 0080");
- result &= response.checkSw("9117");
+ addResult(response.checkSw("9117"));
// Fetch the Open Channel GPRS
response = test.fetch("17");
- result &= response.checkData("D0158103 01400182 02818235 06020101" +
- "02013139 020080");
+ addResult(response.checkData("D0158103 01400182 02818235 06020101" +
+ "02013139 020080"));
// Terminal Response OK on channel 2
response = test.terminalResponse("81030140 01820282 81030100 38028200" +
"35060201 01020131 39020080");
- result &= response.checkSw("911C");
+ addResult(response.checkSw("911C"));
// Fetch the Open Channel CSD
response = test.fetch("1C");
- result &= response.checkData("D01A8103 01400182 02818206 05911122" +
- "33443504 01000000 39020080");
+ addResult(response.checkData("D01A8103 01400182 02818206 05911122" +
+ "33443504 01000000 39020080"));
// Terminal Response OK on channel 3
response = test.terminalResponse("81030140 01820282 81030100 38028300" +
"35040100 00003902 0080");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -209,43 +209,43 @@ public class Test_Cre_Pcs_Pcco extends UiccTestModel {
// Trigger Applet1
response = test.envelopeMenuSelection("100101","");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// Trigger Applet2
response = test.envelopeMenuSelection("100102","");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// Trigger Applet1
response = test.envelopeMenuSelection("100101","");
- result &= response.checkSw("9110");
+ addResult(response.checkSw("9110"));
// Fecth 3 Declare Service "Add" proactive commands
response = test.fetch("10");
- result &= response.checkData("D00E8103 01470082 02818241 03000000");
+ addResult(response.checkData("D00E8103 01470082 02818241 03000000"));
response = test.terminalResponse("81030147 00820282 81030100");
- result &= response.checkSw("9110");
+ addResult(response.checkSw("9110"));
response = test.fetch("10");
- result &= response.checkData("D00E8103 01470082 02818241 03000100");
+ addResult(response.checkData("D00E8103 01470082 02818241 03000100"));
response = test.terminalResponse("81030147 00820282 81030100");
- result &= response.checkSw("9110");
+ addResult(response.checkSw("9110"));
response = test.fetch("10");
- result &= response.checkData("D00E8103 01470082 02818241 03000200");
+ addResult(response.checkData("D00E8103 01470082 02818241 03000200"));
response = test.terminalResponse("81030147 00820282 81030100");
- result &= response.checkSw("9110");
+ addResult(response.checkSw("9110"));
// Fecth 3 Declare Service "Delete" proactive commands
response = test.fetch("10");
- result &= response.checkData("D00E8103 01470182 02818241 03000000");
+ addResult(response.checkData("D00E8103 01470182 02818241 03000000"));
response = test.terminalResponse("81030147 01820282 81030100");
- result &= response.checkSw("9110");
+ addResult(response.checkSw("9110"));
response = test.fetch("10");
- result &= response.checkData("D00E8103 01470182 02818241 03000100");
+ addResult(response.checkData("D00E8103 01470182 02818241 03000100"));
response = test.terminalResponse("81030147 01820282 81030100");
- result &= response.checkSw("9110");
+ addResult(response.checkSw("9110"));
response = test.fetch("10");
- result &= response.checkData("D00E8103 01470182 02818241 03000200");
+ addResult(response.checkData("D00E8103 01470182 02818241 03000200"));
response = test.terminalResponse("81030147 01820282 81030100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
@@ -255,13 +255,13 @@ public class Test_Cre_Pcs_Pcco extends UiccTestModel {
// Trigger Applet1
response = test.envelopeMenuSelection("100101","");
- result &= response.checkSw("910F");
+ addResult(response.checkSw("910F"));
// Fecth 3 unknown proactive commande
response = test.fetch("0F");
- result &= response.checkData("D00D8103 01000082 02810000 020000");
+ addResult(response.checkData("D00D8103 01000082 02810000 020000"));
response = test.terminalResponse("81030100 00820282 81030100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
@@ -272,14 +272,14 @@ public class Test_Cre_Pcs_Pcco extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "12" +
+ addResult(response.checkData("10" + APPLET_AID_1 + "12" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
- "CCCC");
+ "CCCC"));
response = test.selectApplication(APPLET_AID_2);
- result &= response.checkData("10" + APPLET_AID_2 + "0B" +
- "CCCCCCCC CCCCCCCC CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_2 + "0B" +
+ "CCCCCCCC CCCCCCCC CCCCCC"));
response = test.selectApplication(APPLET_AID_3);
- result &= response.checkData("10" + APPLET_AID_3 + "01" + "CC");
+ addResult(response.checkData("10" + APPLET_AID_3 + "01" + "CC"));
/*********************************************************************/
/*********************************************************************/
@@ -296,6 +296,6 @@ public class Test_Cre_Pcs_Pcco extends UiccTestModel {
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_pcs_spco/Test_Cre_Pcs_Spco.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_pcs_spco/Test_Cre_Pcs_Spco.java
index 7f8b395e4b7b86643cf311079034b282adc0c1af..9786d073c803d14a24eeff6aba8ae1a4bdcaad74 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_pcs_spco/Test_Cre_Pcs_Spco.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_pcs_spco/Test_Cre_Pcs_Spco.java
@@ -28,9 +28,9 @@ public class Test_Cre_Pcs_Spco extends UiccTestModel {
// Fetch a sepUpMenu command, check it according to the parameters
// and send the Terminal Response.
- // Return true if the received command corresponds to the one rebuilt using
+ // Logs test result indicating whether the received command corresponds to the one rebuilt using
// the parameters
- private boolean fetchSetUpMenu(
+ private void fetchSetUpMenu(
String alphaId, // AlphaId TLV Value
String alphaIdTextAtt, // AlphaId Text Attribute TLV Value
byte nbMenu, // Number of menus
@@ -39,7 +39,6 @@ public class Test_Cre_Pcs_Spco extends UiccTestModel {
String nextActionTLV, // Next Action List TLV
String itemTextAttListTLV) // Item Text Attribute List TLV
{
- boolean result;
String setUpMenuCmd = "";
String endOfCmd = "";
String Cmd = "";
@@ -77,11 +76,9 @@ public class Test_Cre_Pcs_Spco extends UiccTestModel {
setUpMenuCmd = "D0" + ToString((byte)(Cmd.length()/2)) + Cmd;
response = test.fetch(ToString((byte)(setUpMenuCmd.length()/2)));
- result = response.checkData(setUpMenuCmd);
+ addResult(response.checkData(setUpMenuCmd));
test.terminalResponse("81030125 00820282 81830100");
-
- return result;
}
private String ByteToString( byte tab[] )
@@ -125,7 +122,7 @@ public class Test_Cre_Pcs_Spco extends UiccTestModel {
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -168,45 +165,45 @@ public class Test_Cre_Pcs_Spco extends UiccTestModel {
String DefaultAttr = "00000390";
String BoldAttr = "00001390";
String ItalicAttr = "00002390";
- result = fetchSetUpMenu("UICC TEST", null, (byte)1, menuIdList, menuList, null, null);
+ fetchSetUpMenu("UICC TEST", null, (byte)1, menuIdList, menuList, null, null);
// Update EFsume with the new menu title "TEST MENU" in bold
test.selectFile(DF_TELECOM);
response = test.selectFile(EF_SUME);
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
test.sendApdu("00D60000 11850954 45535420 4D454E55" +
"50040000 1390");
// Fetch The SetUpMenu with main menu "TEST MENU" and text attribute "00001390" (bold)
menuList[0] = "Menu2";
menuIdList[0] = "02";
- result &= fetchSetUpMenu("TEST MENU", BoldAttr, (byte)1, menuIdList, menuList, null, null);
+ fetchSetUpMenu("TEST MENU", BoldAttr, (byte)1, menuIdList, menuList, null, null);
// Send an unrecognized envelope
test.unrecognizedEnvelope();
// Fetch the SetUpMenu with main menu "TEST UICC" and no text attribute
menuList[0] = "Menu2";
menuIdList[0] = "02";
- result &= fetchSetUpMenu("TEST UICC", null, (byte)1, menuIdList, menuList, null, null);
+ fetchSetUpMenu("TEST UICC", null, (byte)1, menuIdList, menuList, null, null);
// Send an unrecognized envelope
test.unrecognizedEnvelope();
menuList[0] = "Menu2";
menuIdList[0] = "02";
- result &= fetchSetUpMenu("TEST UICC", BoldAttr, (byte)1, menuIdList, menuList, null, null);
+ fetchSetUpMenu("TEST UICC", BoldAttr, (byte)1, menuIdList, menuList, null, null);
// restaure EFsume with the menu title "UICC TEST" and no attribute
test.selectFile(DF_TELECOM);
response = test.selectFile(EF_SUME);
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
test.sendApdu("00D60000 11850955 49434320 54455354" +
"FFFFFFFF FFFF");
// Fetch the SetUpMenu with main menu "UICC TEST" and no text attribute
menuList[0] = "Menu2";
menuIdList[0] = "02";
- result &= fetchSetUpMenu("UICC TEST", null, (byte)1, menuIdList, menuList, null, null);
+ fetchSetUpMenu("UICC TEST", null, (byte)1, menuIdList, menuList, null, null);
/*********************************************************************/
@@ -235,7 +232,7 @@ public class Test_Cre_Pcs_Spco extends UiccTestModel {
menuIdList[0] = "01";
menuList[1] = "Menu2";
menuIdList[1] = "02";
- result &= fetchSetUpMenu("UICC TEST", null, (byte)2, menuIdList, menuList, null, null);
+ fetchSetUpMenu("UICC TEST", null, (byte)2, menuIdList, menuList, null, null);
/*********************************************************************/
/** Testcase 3 */
@@ -246,7 +243,7 @@ public class Test_Cre_Pcs_Spco extends UiccTestModel {
// Fetch the SetUpMenu with the menus
menuList[0] = "Menu2";
menuIdList[0] = "02";
- result &= fetchSetUpMenu("UICC TEST", null, (byte)1, menuIdList, menuList, null, null);
+ fetchSetUpMenu("UICC TEST", null, (byte)1, menuIdList, menuList, null, null);
/*********************************************************************/
@@ -260,14 +257,14 @@ public class Test_Cre_Pcs_Spco extends UiccTestModel {
menuIdList[0] = "01";
menuList[1] = "Menu2";
menuIdList[1] = "02";
- result &= fetchSetUpMenu("UICC TEST", null, (byte)2, menuIdList, menuList, null, null);
+ fetchSetUpMenu("UICC TEST", null, (byte)2, menuIdList, menuList, null, null);
// Send an envelope menu selection - Applet1 disables its menu
test.envelopeMenuSelection("100101", "");
// Fetch the SetUpMenu with the menus
menuList[0] = "Menu2";
menuIdList[0] = "02";
- result &= fetchSetUpMenu("UICC TEST", null, (byte)1, menuIdList, menuList, null, null);
+ fetchSetUpMenu("UICC TEST", null, (byte)1, menuIdList, menuList, null, null);
// Send an envelope event download MT Call - Applet1 enables its menu
test.envelopeEventDownloadMTCall();
@@ -276,7 +273,7 @@ public class Test_Cre_Pcs_Spco extends UiccTestModel {
menuIdList[0] = "01";
menuList[1] = "Menu2";
menuIdList[1] = "02";
- result &= fetchSetUpMenu("UICC TEST", null, (byte)2, menuIdList, menuList, null, null);
+ fetchSetUpMenu("UICC TEST", null, (byte)2, menuIdList, menuList, null, null);
/*********************************************************************/
/** Testcase 5 */
@@ -288,10 +285,10 @@ public class Test_Cre_Pcs_Spco extends UiccTestModel {
// Fetch SetUpEventList command
response = test.fetch("0F");
- result &= response.checkData("D00D8103 01050082 02818219 020003") ||
- response.checkData("D00D8103 01050082 02818299 020003");
+ addResult(response.checkData("D00D8103 01050082 02818219 020003") ||
+ response.checkData("D00D8103 01050082 02818299 020003"));
response = test.terminalResponse("81030105 00820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -302,10 +299,10 @@ public class Test_Cre_Pcs_Spco extends UiccTestModel {
test.lockApplication(APPLET_AID_1);
// Fetch SetUpEventList command
response = test.fetch("0D");
- result &= response.checkData("D00B8103 01050082 02818219 00") ||
- response.checkData("D00B8103 01050082 02818299 00");
+ addResult(response.checkData("D00B8103 01050082 02818219 00") ||
+ response.checkData("D00B8103 01050082 02818299 00"));
response = test.terminalResponse("81030105 00820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -316,10 +313,10 @@ public class Test_Cre_Pcs_Spco extends UiccTestModel {
test.unlockApplication(APPLET_AID_1);
// Fetch SetUpEventList command
response = test.fetch("0F");
- result &= response.checkData("D00D8103 01050082 02818219 020003") ||
- response.checkData("D00D8103 01050082 02818299 020003");
+ addResult(response.checkData("D00D8103 01050082 02818219 020003") ||
+ response.checkData("D00D8103 01050082 02818299 020003"));
response = test.terminalResponse("81030105 00820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -330,46 +327,46 @@ public class Test_Cre_Pcs_Spco extends UiccTestModel {
test.envelopeMenuSelection("100101", "");
// Fetch SetUpEventList command
response = test.fetch("0E");
- result &= response.checkData("D00C8103 01050082 02818219 0103") ||
- response.checkData("D00C8103 01050082 02818299 0103");
+ addResult(response.checkData("D00C8103 01050082 02818219 0103") ||
+ response.checkData("D00C8103 01050082 02818299 0103"));
response = test.terminalResponse("81030105 00820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// Trigger Applet2
test.unrecognizedEnvelope();
// Fetch SetUpEventList command
response = test.fetch("0F");
- result &= response.checkData("D00D8103 01050082 02818219 020307") ||
- response.checkData("D00D8103 01050082 02818299 020307");
+ addResult(response.checkData("D00D8103 01050082 02818219 020307") ||
+ response.checkData("D00D8103 01050082 02818299 020307"));
response = test.terminalResponse("81030105 00820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// Trigger Applets
test.envelopeEventDownloadLocationStatus();
// Fetch SetUpEventList command
response = test.fetch("0D");
- result &= response.checkData("D00B8103 01050082 02818219 00") ||
- response.checkData("D00B8103 01050082 02818299 00");
+ addResult(response.checkData("D00B8103 01050082 02818219 00") ||
+ response.checkData("D00B8103 01050082 02818299 00"));
response = test.terminalResponse("81030105 00820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// Trigger Applet1
test.envelopeMenuSelection("100101", "");
// Fetch SetUpEventList command
response = test.fetch("0E");
- result &= response.checkData("D00C8103 01050082 02818219 0100") ||
- response.checkData("D00C8103 01050082 02818299 0100");
+ addResult(response.checkData("D00C8103 01050082 02818219 0100") ||
+ response.checkData("D00C8103 01050082 02818299 0100"));
response = test.terminalResponse("81030105 00820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// Delete Applet1
test.deleteApplet(APPLET_AID_1);
// Fetch SetUpEventList command
response = test.fetch("0D");
- result &= response.checkData("D00B8103 01050082 02818219 00") ||
- response.checkData("D00B8103 01050082 02818299 00");
+ addResult(response.checkData("D00B8103 01050082 02818219 00") ||
+ response.checkData("D00B8103 01050082 02818299 00"));
response = test.terminalResponse("81030105 00820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// Install Applet1
test.installApplet(CAP_FILE_PATH, CLASS_AID_1, APPLET_AID_1,
@@ -386,10 +383,10 @@ public class Test_Cre_Pcs_Spco extends UiccTestModel {
"00" ); // V Maximum number of services
// Fetch SetUpEventList command
response = test.fetch("0F");
- result &= response.checkData("D00D8103 01050082 02818219 020003") ||
- response.checkData("D00D8103 01050082 02818299 020003");
+ addResult(response.checkData("D00D8103 01050082 02818219 020003") ||
+ response.checkData("D00D8103 01050082 02818299 020003"));
response = test.terminalResponse("81030105 00820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -402,12 +399,12 @@ public class Test_Cre_Pcs_Spco extends UiccTestModel {
// Fetch Poll Interval command
response = test.fetch("0F");
String pollInterCmd = response.getData();
- result &= pollInterCmd.regionMatches(0, "D00D8103010300820281820402",
+ addResult(pollInterCmd.regionMatches(0, "D00D8103010300820281820402",
0, "D00D8103010300820281820402".length()) ||
- pollInterCmd.regionMatches(0, "D00D8103010300820281828402",
- 0, "D00D8103010300820281828402".length());
+ pollInterCmd.regionMatches(0, "D00D8103010300820281828402",
+ 0, "D00D8103010300820281828402".length()));
response = test.terminalResponse("81030103 00820282 81830100 84020010");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -418,9 +415,9 @@ public class Test_Cre_Pcs_Spco extends UiccTestModel {
test.lockApplication(APPLET_AID_1);
// Fetch Polling Off command
response = test.fetch("0B");
- result &= response.checkData("D0098103 01040082 028182");
+ addResult(response.checkData("D0098103 01040082 028182"));
response = test.terminalResponse("81030104 00820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -431,9 +428,9 @@ public class Test_Cre_Pcs_Spco extends UiccTestModel {
test.unlockApplication(APPLET_AID_1);
// Fetch Poll Interval command
response = test.fetch("0F");
- result &= response.checkData(pollInterCmd);
+ addResult(response.checkData(pollInterCmd));
response = test.terminalResponse("81030103 00820282 81830100 84020010");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -444,25 +441,25 @@ public class Test_Cre_Pcs_Spco extends UiccTestModel {
test.status("00", "00", "16");
// Fetch Polling Off command
response = test.fetch("0B");
- result &= response.checkData("D0098103 01040082 028182");
+ addResult(response.checkData("D0098103 01040082 028182"));
response = test.terminalResponse("81030104 00820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// Trigger Applet1
test.unrecognizedEnvelope();
// Fetch Poll Interval command
response = test.fetch("0F");
- result &= response.checkData(pollInterCmd);
+ addResult(response.checkData(pollInterCmd));
response = test.terminalResponse("81030103 00820282 81830100 84020010");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// Delete Applet1
test.deleteApplet(APPLET_AID_1);
// Fetch Polling Off command
response = test.fetch("0B");
- result &= response.checkData("D0098103 01040082 028182");
+ addResult(response.checkData("D0098103 01040082 028182"));
response = test.terminalResponse("81030104 00820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// Install Applet1
test.installApplet(CAP_FILE_PATH, CLASS_AID_1, APPLET_AID_1,
@@ -479,9 +476,9 @@ public class Test_Cre_Pcs_Spco extends UiccTestModel {
"00" ); // V Maximum number of services
// Fetch Poll Interval command
response = test.fetch("0F");
- result &= response.checkData(pollInterCmd);
+ addResult(response.checkData(pollInterCmd));
response = test.terminalResponse("81030103 00820282 81830100 84020010");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -495,22 +492,22 @@ public class Test_Cre_Pcs_Spco extends UiccTestModel {
test.unrecognizedEnvelope();
// Fetch Diplay text
response = test.fetch("13");
- result &= response.checkData("D0118103 01210082 0281028D 06045465" +
- "787431");
+ addResult(response.checkData("D0118103 01210082 0281028D 06045465" +
+ "787431"));
response = test.terminalResponse("81030121 00820282 81830100");
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
// Fetch Diplay text
response = test.fetch("14");
- result &= response.checkData("D0128103 01210082 0281028D 07045465" +
- "78743231");
+ addResult(response.checkData("D0128103 01210082 0281028D 07045465" +
+ "78743231"));
response = test.terminalResponse("81030121 00820282 81830100");
- result &= response.checkSw("9114");
+ addResult(response.checkSw("9114"));
// Fetch Diplay text
response = test.fetch("14");
- result &= response.checkData("D0128103 01210082 0281028D 07045465" +
- "78743232");
+ addResult(response.checkData("D0128103 01210082 0281028D 07045465" +
+ "78743232"));
response = test.terminalResponse("81030121 00820282 81830100");
for (byte i = 0; i < 3; i++)
@@ -520,24 +517,24 @@ public class Test_Cre_Pcs_Spco extends UiccTestModel {
case 0x9118:
// Fetch an empty SetUpMenu
response = test.fetch("18");
- result &= response.checkData("D0168103 01250082 02818285 09554943" +
- "43205445 53548F00");
+ addResult(response.checkData("D0168103 01250082 02818285 09554943" +
+ "43205445 53548F00"));
response = test.terminalResponse("81030125 00820282 81830100");
break;
case 0x910E:
response = test.fetch("0E");
- result &= response.checkData("D00C8103 01050082 02818219 0103") ||
- response.checkData("D00C8103 01050082 02818299 0103");
+ addResult(response.checkData("D00C8103 01050082 02818219 0103") ||
+ response.checkData("D00C8103 01050082 02818299 0103"));
response = test.terminalResponse("81030105 00820282 81830100");
break;
case 0x910B:
// Fetch Polling Off command
response = test.fetch("0B");
- result &= response.checkData("D0098103 01040082 028182");
+ addResult(response.checkData("D0098103 01040082 028182"));
response = test.terminalResponse("81030104 00820282 81830100");
break;
default:
- result = false;
+ addResult(false);
break;
}
}
@@ -566,22 +563,22 @@ public class Test_Cre_Pcs_Spco extends UiccTestModel {
"00000000 00000000 0000003F 7F");
// Fetch the SetUpMenu
response = test.fetch(response.getStatusWord().substring(2));
- result &= response.checkData("D01C8103 01250082 02818285 09554943" +
+ addResult(response.checkData("D01C8103 01250082 02818285 09554943" +
"43205445 53548F06 034D656E 7533") ||
response.checkData("D0228103 01250082 02818285 09554943" +
"43205445 53548F06 034D656E 75335104" +
"00000390") ||
response.checkData("D0228103 01250082 02818285 09554943" +
"43205445 53548F06 034D656E 7533D104" +
- "00000390");
+ "00000390"));
response = test.terminalResponse("81030125 00820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
//Trigger Applet2 (testcase 14-2)
response = test.unrecognizedEnvelope();
// Fetch the SetUpMenu
response = test.fetch(response.getStatusWord().substring(2));
- result &= response.checkData("D0248103 01250082 02818285 09554943" +
+ addResult(response.checkData("D0248103 01250082 02818285 09554943" +
"43205445 53548F06 024D656E 75328F06" +
"034D656E 7533") ||
response.checkData("D02E8103 01250082 02818285 09554943" +
@@ -589,110 +586,110 @@ public class Test_Cre_Pcs_Spco extends UiccTestModel {
"034D656E 75335108 00000390 00000390") ||
response.checkData("D02E8103 01250082 02818285 09554943" +
"43205445 53548F06 024D656E 75328F06" +
- "024D656E 7533D108 00000390 00000390");
+ "024D656E 7533D108 00000390 00000390"));
response = test.terminalResponse("81030125 00820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
//Trigger Applet2 (testcase 14-4)
test.envelopeMenuSelection("100102", "");
// Fetch the SetUpMenu
response = test.fetch("30");
- result &= response.checkData("D02E8103 01250082 02818285 09554943" +
+ addResult(response.checkData("D02E8103 01250082 02818285 09554943" +
"43205445 53548F06 024D656E 75328F06" +
"034D656E 75335108 00001390 00000390") ||
response.checkData("D02E8103 01250082 02818285 09554943" +
"43205445 53548F06 024D656E 75328F06" +
- "034D656E 7533D108 00001390 00000390");
+ "034D656E 7533D108 00001390 00000390"));
response = test.terminalResponse("81030125 00820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
//Trigger Applet2 (testcase 14-6)
response = test.envelopeMenuSelection("100102", "");
// Fetch the SetUpMenu
response = test.fetch(response.getStatusWord().substring(2));
- result &= response.checkData("D01C8103 01250082 02818285 09554943" +
+ addResult(response.checkData("D01C8103 01250082 02818285 09554943" +
"43205445 53548F06 034D656E 7533") ||
response.checkData("D0228103 01250082 02818285 09554943" +
"43205445 53548F06 034D656E 75335104" +
"00000390") ||
response.checkData("D0228103 01250082 02818285 09554943" +
"43205445 53548F06 034D656E 7533D104" +
- "00000390");
+ "00000390"));
response = test.terminalResponse("81030125 00820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
//Trigger Applet3 (testcase 14-8)
test.envelopeMenuSelection("100103", "");
// Fetch the SetUpMenu
response = test.fetch("24");
- result &= response.checkData("D0228103 01250082 02818285 09554943" +
+ addResult(response.checkData("D0228103 01250082 02818285 09554943" +
"43205445 53548F06 034D656E 75335104" +
"00002390") ||
response.checkData("D0228103 01250082 02818285 09554943" +
"43205445 53548F06 034D656E 7533D104" +
- "00002390");
+ "00002390"));
response = test.terminalResponse("81030125 00820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
//Trigger Applet2 (testcase 14-10)
test.unrecognizedEnvelope();
// Fetch the SetUpMenu
response = test.fetch("30");
- result &= response.checkData("D02E8103 01250082 02818285 09554943" +
+ addResult(response.checkData("D02E8103 01250082 02818285 09554943" +
"43205445 53548F06 024D656E 75328F06" +
"034D656E 75335108 00001390 00002390") ||
response.checkData("D02E8103 01250082 02818285 09554943" +
"43205445 53548F06 024D656E 75328F06" +
- "034D656E 7533D108 00001390 00002390");
+ "034D656E 7533D108 00001390 00002390"));
response = test.terminalResponse("81030125 00820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
//Trigger Applet2 (testcase 14-12)
test.envelopeMenuSelection("100102", "");
// Fetch the SetUpMenu
response = test.fetch("30");
- result &= response.checkData("D02E8103 01250082 02818285 09554943" +
+ addResult(response.checkData("D02E8103 01250082 02818285 09554943" +
"43205445 53548F06 024D656E 75328F06" +
"034D656E 75335108 00000390 00002390") ||
response.checkData("D02E8103 01250082 02818285 09554943" +
"43205445 53548F06 024D656E 75328F06" +
- "034D656E 7533D108 00000390 00002390");
+ "034D656E 7533D108 00000390 00002390"));
response = test.terminalResponse("81030125 00820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
//Lock Applet3 (testcase 14-14)
response = test.lockApplication(APPLET_AID_3);
// Fetch the SetUpMenu
response = test.fetch(response.getStatusWord().substring(2));
- result &= response.checkData("D01C8103 01250082 02818285 09554943" +
+ addResult(response.checkData("D01C8103 01250082 02818285 09554943" +
"43205445 53548F06 024D656E 7532") ||
response.checkData("D0228103 01250082 02818285 09554943" +
"43205445 53548F06 024D656E 75325104" +
"00000390") ||
response.checkData("D0228103 01250082 02818285 09554943" +
"43205445 53548F06 024D656E 7532D104" +
- "00000390");
+ "00000390"));
response = test.terminalResponse("81030125 00820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
//Make selectable Applet3 (testcase 14-15)
test.unlockApplication(APPLET_AID_3);
// Fetch the SetUpMenu
response = test.fetch("30");
- result &= response.checkData("D02E8103 01250082 02818285 09554943" +
+ addResult(response.checkData("D02E8103 01250082 02818285 09554943" +
"43205445 53548F06 024D656E 75328F06" +
"034D656E 75335108 00000390 00002390") ||
response.checkData("D02E8103 01250082 02818285 09554943" +
"43205445 53548F06 024D656E 75328F06" +
- "034D656E 7533D108 00000390 00002390");
+ "034D656E 7533D108 00000390 00002390"));
response = test.terminalResponse("81030125 00820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
//Trigger Applet3 (testcase 14-16)
response = test.envelopeMenuSelection("100103", "");
// Fetch the SetUpMenu
response = test.fetch(response.getStatusWord().substring(2));
- result &= response.checkData("D0248103 01250082 02818285 09554943" +
+ addResult(response.checkData("D0248103 01250082 02818285 09554943" +
"43205445 53548F06 024D656E 75328F06" +
"034D656E 7533") ||
response.checkData("D02E8103 01250082 02818285 09554943" +
@@ -700,9 +697,9 @@ public class Test_Cre_Pcs_Spco extends UiccTestModel {
"034D656E 75335108 00000390 00000390") ||
response.checkData("D02E8103 01250082 02818285 09554943" +
"43205445 53548F06 024D656E 75328F06" +
- "024D656E 7533D108 00000390 00000390");
+ "024D656E 7533D108 00000390 00000390"));
response = test.terminalResponse("81030125 00820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
/*********************************************************************/
@@ -711,14 +708,14 @@ public class Test_Cre_Pcs_Spco extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "09" +
- "CCCCCCCC CCCCCCCC CC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "09" +
+ "CCCCCCCC CCCCCCCC CC"));
response = test.selectApplication(APPLET_AID_2);
- result &= response.checkData("10" + APPLET_AID_2 + "0C" +
- "CCCCCCCC CCCCCCCC CCCCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_2 + "0C" +
+ "CCCCCCCC CCCCCCCC CCCCCCCC"));
response = test.selectApplication(APPLET_AID_3);
- result &= response.checkData("10" + APPLET_AID_3 + "02" +
- "CCCC");
+ addResult(response.checkData("10" + APPLET_AID_3 + "02" +
+ "CCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -734,6 +731,6 @@ public class Test_Cre_Pcs_Spco extends UiccTestModel {
test.deleteApplet(APPLET_AID_3);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
\ No newline at end of file
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_reg_evtr/Cre_Reg_Evtr_2.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_reg_evtr/Cre_Reg_Evtr_2.java
index 6f17e52460d82ae665c67a0876cc3365abe5ae79..97e1c53237896f213fd2c5c07410128d4974bc31 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_reg_evtr/Cre_Reg_Evtr_2.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_reg_evtr/Cre_Reg_Evtr_2.java
@@ -47,10 +47,10 @@ public class Cre_Reg_Evtr_2 extends TestToolkitApplet {
}
public Shareable getShareableInterfaceObject(AID clientAID, byte parameter) {
- testCounter++;
// According to CAT Runtime Environment behaviour for ToolkitInterface object retrieval
if ((clientAID == null) && (parameter == (byte)0x01)) {
- return((Shareable) this);
+ testCounter++;
+ return((Shareable) this);
} else {
return(null);
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_reg_evtr/Test_Cre_Reg_Evtr.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_reg_evtr/Test_Cre_Reg_Evtr.java
index 817d0453f80abd36c7fc7c909306c35faad2149f..8cd1ef11dbf364458e9b103a812908f7bd09d5ab 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_reg_evtr/Test_Cre_Reg_Evtr.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_reg_evtr/Test_Cre_Reg_Evtr.java
@@ -29,7 +29,7 @@ public class Test_Cre_Reg_Evtr extends UiccTestModel {
public boolean run() {
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -58,17 +58,18 @@ public class Test_Cre_Reg_Evtr extends UiccTestModel {
// test script
response = test.makeSelectableApplet(APPLET_AID_1);
- result = response.checkSw("910F");
+ addResult(response.checkSw("910F"));
response = test.fetch("0F");
- result &= (response.checkData("D00D8103 01050082 02818299 020004") ||
+ addResult(response.checkData("D00D8103 01050082 02818299 020004") ||
response.checkData("D00D8103 01050082 02818219 020004"));
test.terminalResponse("81030105 00820282 81830100");
// test case 1: trigger applet1
response = test.envelopeEventDownloadUserActivity();
- result &= response.checkSw("910F");
+ addResult(response.checkSw("910F"));
response = test.fetch("0F");
- result &= response.checkData("D00D8103 01050082 02818299 020003");
+ addResult(response.checkData("D00D8103 01050082 02818299 020003")) ||
+ response.checkData("D00D8103 01050082 02818219 020003"));
test.terminalResponse("81030105 00820282 81830100");
// Install Applet2
@@ -89,14 +90,14 @@ public class Test_Cre_Reg_Evtr extends UiccTestModel {
// test case 2: trigger applet2
response = test.unrecognizedEnvelope();
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "01CC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "01CC"));
response = test.selectApplication(APPLET_AID_2);
- result &= response.checkData("10" + APPLET_AID_2 + "01CC");
+ addResult(response.checkData("10" + APPLET_AID_2 + "01CC"));
// delete applet and package
@@ -106,6 +107,6 @@ public class Test_Cre_Reg_Evtr extends UiccTestModel {
test.deleteApplet(APPLET_AID_2);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_acdo/Test_Cre_Tin_Acdo.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_acdo/Test_Cre_Tin_Acdo.java
index f4bb13407a4f096029349fc98c955affd269017e..96a8d33f2ec7225c315a1b8676aea3ca8a29ae66 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_acdo/Test_Cre_Tin_Acdo.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_acdo/Test_Cre_Tin_Acdo.java
@@ -36,7 +36,7 @@ public class Test_Cre_Tin_Acdo extends UiccTestModel {
}
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -86,41 +86,41 @@ public class Test_Cre_Tin_Acdo extends UiccTestModel {
// Trigger Applet1 on its menu 1 to launch fileview access tests
response = test.envelopeMenuSelection("100101", "");
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Check Applet first results */
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "4B" +
+ addResult(response.checkData("10" + APPLET_AID_1 + "4B" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
- "CCCCCCCC CCCCCCCC CCCCCC");
+ "CCCCCCCC CCCCCCCC CCCCCC"));
test.reset();
test.terminalProfileSession("09010020");
// Trigger Applet1 on its menu 2 to launch admin fileview access tests
response = test.envelopeMenuSelection("100102", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Check Applet second results then delete it */
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "5A" +
+ addResult(response.checkData("10" + APPLET_AID_1 + "5A" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
- "CCCCCCCC CCCCCCCC CCCC");
+ "CCCCCCCC CCCCCCCC CCCC"));
test.reset();
// Terminal Profile with Set Up Menu
- test.terminalProfileSession("09010020");
+ test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
// delete applet
test.deleteApplet(APPLET_AID_1);
@@ -165,18 +165,18 @@ public class Test_Cre_Tin_Acdo extends UiccTestModel {
// Trigger Applet2 on its menu 1 to launch fileview access tests
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Check Applet first results */
/*********************************************************************/
response = test.selectApplication(APPLET_AID_2);
- result &= response.checkData("10" + APPLET_AID_2 + "4B" +
+ addResult(response.checkData("10" + APPLET_AID_2 + "4B" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
- "CCCCCCCC CCCCCCCC CCCCCC");
+ "CCCCCCCC CCCCCCCC CCCCCC"));
test.reset();
// Terminal Profile with Set Up Menu
@@ -184,23 +184,23 @@ public class Test_Cre_Tin_Acdo extends UiccTestModel {
// Trigger Applet2 on its menu 2 to launch admin fileview access tests
response = test.envelopeMenuSelection("100102", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Check Applet second results then delete it */
/*********************************************************************/
response = test.selectApplication(APPLET_AID_2);
- result &= response.checkData("10" + APPLET_AID_2 + "5A" +
+ addResult(response.checkData("10" + APPLET_AID_2 + "5A" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
- "CCCCCCCC CCCCCCCC CCCC");
+ "CCCCCCCC CCCCCCCC CCCC"));
test.reset();
// Terminal Profile with Set Up Menu
- test.terminalProfileSession("09010020");
+ test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
// delete applet
test.deleteApplet(APPLET_AID_2);
@@ -246,18 +246,18 @@ public class Test_Cre_Tin_Acdo extends UiccTestModel {
// Trigger Applet3 on its menu 1 to launch fileview access tests
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Check Applet first results */
/*********************************************************************/
response = test.selectApplication(APPLET_AID_3);
- result &= response.checkData("10" + APPLET_AID_3 + "4B" +
+ addResult(response.checkData("10" + APPLET_AID_3 + "4B" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
- "CCCCCCCC CCCCCCCC CCCCCC");
+ "CCCCCCCC CCCCCCCC CCCCCC"));
test.reset();
// Terminal Profile with Set Up Menu
@@ -265,19 +265,19 @@ public class Test_Cre_Tin_Acdo extends UiccTestModel {
// Trigger Applet3 on its menu 2 to launch admin fileview access tests
response = test.envelopeMenuSelection("100102", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Check Applet second results then delete it */
/*********************************************************************/
response = test.selectApplication(APPLET_AID_3);
- result &= response.checkData("10" + APPLET_AID_3 + "5A" +
+ addResult(response.checkData("10" + APPLET_AID_3 + "5A" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
- "CCCCCCCC CCCCCCCC CCCC");
+ "CCCCCCCC CCCCCCCC CCCC"));
test.reset();
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
@@ -325,18 +325,18 @@ public class Test_Cre_Tin_Acdo extends UiccTestModel {
// Trigger Applet4 on its menu 1 to launch fileview access tests
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Check Applet first results */
/*********************************************************************/
response = test.selectApplication(APPLET_AID_4);
- result &= response.checkData("10" + APPLET_AID_4 + "4B" +
+ addResult(response.checkData("10" + APPLET_AID_4 + "4B" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
- "CCCCCCCC CCCCCCCC CCCCCC");
+ "CCCCCCCC CCCCCCCC CCCCCC"));
test.reset();
// Terminal Profile with Set Up Menu
@@ -344,19 +344,19 @@ public class Test_Cre_Tin_Acdo extends UiccTestModel {
// Trigger Applet4 on its menu 2 to launch admin fileview access tests
response = test.envelopeMenuSelection("100102", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Check Applet second results then delete it */
/*********************************************************************/
response = test.selectApplication(APPLET_AID_4);
- result &= response.checkData("10" + APPLET_AID_4 + "5A" +
+ addResult(response.checkData("10" + APPLET_AID_4 + "5A" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
- "CCCCCCCC CCCCCCCC CCCC");
+ "CCCCCCCC CCCCCCCC CCCC"));
test.reset();
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
@@ -404,18 +404,18 @@ public class Test_Cre_Tin_Acdo extends UiccTestModel {
// Trigger Applet5 on its menu 1 to launch fileview access tests
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Check Applet first results */
/*********************************************************************/
response = test.selectApplication(APPLET_AID_5);
- result &= response.checkData("10" + APPLET_AID_5 + "4B" +
+ addResult(response.checkData("10" + APPLET_AID_5 + "4B" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
- "CCCCCCCC CCCCCCCC CCCCCC");
+ "CCCCCCCC CCCCCCCC CCCCCC"));
test.reset();
// Terminal Profile with Set Up Menu
@@ -423,19 +423,19 @@ public class Test_Cre_Tin_Acdo extends UiccTestModel {
// Trigger Applet5 on its menu 2 to launch admin fileview access tests
response = test.envelopeMenuSelection("100102", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Check Applet second results then delete it */
/*********************************************************************/
response = test.selectApplication(APPLET_AID_5);
- result &= response.checkData("10" + APPLET_AID_5 + "5A" +
+ addResult(response.checkData("10" + APPLET_AID_5 + "5A" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
- "CCCCCCCC CCCCCCCC CCCC");
+ "CCCCCCCC CCCCCCCC CCCC"));
test.reset();
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
@@ -483,18 +483,18 @@ public class Test_Cre_Tin_Acdo extends UiccTestModel {
// Trigger Applet6 on its menu 1 to launch fileview access tests
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Check Applet first results */
/*********************************************************************/
response = test.selectApplication(APPLET_AID_6);
- result &= response.checkData("10" + APPLET_AID_6 + "4B" +
+ addResult(response.checkData("10" + APPLET_AID_6 + "4B" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
- "CCCCCCCC CCCCCCCC CCCCCC");
+ "CCCCCCCC CCCCCCCC CCCCCC"));
test.reset();
// Terminal Profile with Set Up Menu
@@ -502,19 +502,19 @@ public class Test_Cre_Tin_Acdo extends UiccTestModel {
// Trigger Applet6 on its menu 2 to launch admin fileview access tests
response = test.envelopeMenuSelection("100102", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Check Applet second results then delete it */
/*********************************************************************/
response = test.selectApplication(APPLET_AID_6);
- result &= response.checkData("10" + APPLET_AID_6 + "5A" +
+ addResult(response.checkData("10" + APPLET_AID_6 + "5A" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
- "CCCCCCCC CCCCCCCC CCCC");
+ "CCCCCCCC CCCCCCCC CCCC"));
test.reset();
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
@@ -561,13 +561,13 @@ public class Test_Cre_Tin_Acdo extends UiccTestModel {
// Trigger Applet7 on its menu 2 to launch fileview access tests
response = test.envelopeMenuSelection("100101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Check Applet second results then delete it */
/*********************************************************************/
response = test.selectApplication(APPLET_AID_7);
- result &= response.checkData("10" + APPLET_AID_7 + "03" + "CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_7 + "03" + "CCCCCC"));
test.reset();
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
@@ -609,13 +609,13 @@ public class Test_Cre_Tin_Acdo extends UiccTestModel {
// Trigger Applet7 on its menu 2 to launch fileview access tests
response = test.envelopeMenuSelection("100102", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Check Applet second results then delete it */
/*********************************************************************/
response = test.selectApplication(APPLET_AID_7);
- result &= response.checkData("10" + APPLET_AID_7 + "03" + "CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_7 + "03" + "CCCCCC"));
test.reset();
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
@@ -662,14 +662,14 @@ public class Test_Cre_Tin_Acdo extends UiccTestModel {
// Trigger Applet7 on its menu 1 to launch fileview access tests
response = test.envelopeMenuSelection("100103", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/** Check Applet second results then delete it */
/*********************************************************************/
response = test.selectApplication(APPLET_AID_7);
- result &= response.checkData("10" + APPLET_AID_7 + "06" +
- "CCCCCCCC CCCC");
+ addResult(response.checkData("10" + APPLET_AID_7 + "06" +
+ "CCCCCCCC CCCC"));
test.reset();
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
@@ -679,6 +679,6 @@ public class Test_Cre_Tin_Acdo extends UiccTestModel {
// Delete package
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_chal/Test_Cre_Tin_Chal.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_chal/Test_Cre_Tin_Chal.java
index 50aa94c03c39e0c5563fd490765fb6b9cefab5de..e0b5427f690d364a267c6cd798c59e25b015ab80 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_chal/Test_Cre_Tin_Chal.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_chal/Test_Cre_Tin_Chal.java
@@ -29,7 +29,7 @@ public class Test_Cre_Tin_Chal extends UiccTestModel {
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -54,11 +54,11 @@ public class Test_Cre_Tin_Chal extends UiccTestModel {
"00" + // LV TAR Value(s)
"00"); // V Maximum number of services
- result = response.checkSw("6A80");
+ addResult(response.checkSw("6A80"));
// Select applet1
response = test.selectApplication(APPLET_AID_1);
- result &= response.getStatusWord().substring(1,3).compareTo("61") != 0;
+ addResult(response.getStatusWord().substring(1,3).compareTo("61") != 0);
// Card Initialisation
@@ -83,6 +83,9 @@ public class Test_Cre_Tin_Chal extends UiccTestModel {
"00" + // LV Minimum Security Level field
"00" + // LV TAR Value(s)
"00"); // V Maximum number of services
+
+
+ addResult(response.checkSw("9000"));
// Fetch SetUpMenu
test.fetch("20");
@@ -98,15 +101,15 @@ public class Test_Cre_Tin_Chal extends UiccTestModel {
// Fetch 4 Open Channel send the Terminal Response OK on channel 1 to 4
for (byte i = 1; i < 5; i++)
{
- result &= response.checkSw("911A");
+ addResult(response.checkSw("911A"));
response = test.fetch("1A");
- result &= response.checkData("D0188103 01400182 02818206 05815566" +
- "77883502 03003902 000A");
+ addResult(response.checkData("D0188103 01400182 02818206 05815566" +
+ "77883502 03003902 000A"));
response = test.terminalResponse("81030140 01820282 81830100 3802" +
"8" + String.valueOf(i) + "00" +
"35020300 3902000A");
}
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -127,6 +130,9 @@ public class Test_Cre_Tin_Chal extends UiccTestModel {
"00" + // LV TAR Value(s)
"00"); // V Maximum number of services
+ addResult(response.checkSw("9000"));
+
+
// Fetch SetUpMenu
test.fetch("2A");
test.terminalResponse("81030125 00820282 81830100");
@@ -141,19 +147,19 @@ public class Test_Cre_Tin_Chal extends UiccTestModel {
// Fetch 3 Open Channel send the Terminal Response OK on channel 5 to 7
for (byte i = 5; i < 8; i++)
{
- result &= response.checkSw("911A");
+ addResult(response.checkSw("911A"));
response = test.fetch("1A");
- result &= response.checkData("D0188103 01400182 02818206 05815566" +
- "77883502 03003902 000A");
+ addResult(response.checkData("D0188103 01400182 02818206 05815566" +
+ "77883502 03003902 000A"));
response = test.terminalResponse("81030140 01820282 81830100 3802" +
"8" + String.valueOf(i) + "00" +
"35020300 3902000A");
}
- result &= response.checkSw("911A");
+ addResult(response.checkSw("911A"));
// Fetch last Open channel and send a NOK Terminal Response
response = test.fetch("1A");
- result &= response.checkData("D0188103 01400182 02818206 05815566" +
- "77883502 03003902 000A");
+ addResult(response.checkData("D0188103 01400182 02818206 05815566" +
+ "77883502 03003902 000A"));
test.terminalResponse("81030140 01820282 8183023A 01");
@@ -164,9 +170,9 @@ public class Test_Cre_Tin_Chal extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_2);
- result &= response.checkData("10" + APPLET_AID_2 + "05" + "CCCCCCCC CC");
+ addResult(response.checkData("10" + APPLET_AID_2 + "05" + "CCCCCCCC CC"));
response = test.selectApplication(APPLET_AID_3);
- result &= response.checkData("10" + APPLET_AID_3 + "04" + "CCCCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_3 + "04" + "CCCCCCCC"));
/*********************************************************************/
@@ -183,6 +189,6 @@ public class Test_Cre_Tin_Chal extends UiccTestModel {
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_genb/Test_Cre_Tin_Genb.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_genb/Test_Cre_Tin_Genb.java
index 8a503baacae1f81badd3ac1230a7c020c052f758..889fa30586e329f858998b9d8620f4a8246ea86b 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_genb/Test_Cre_Tin_Genb.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_genb/Test_Cre_Tin_Genb.java
@@ -27,7 +27,7 @@ public class Test_Cre_Tin_Genb extends UiccTestModel {
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -54,7 +54,7 @@ public class Test_Cre_Tin_Genb extends UiccTestModel {
// Select applet1
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("4F4B2031 31"); // "OK 11"
+ addResult(response.checkData("4F4B2031 31")); // "OK 11"
//delete Applet1
test.reset();
@@ -81,7 +81,7 @@ public class Test_Cre_Tin_Genb extends UiccTestModel {
// Select applet1
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("4F4B2031 31"); // "OK 11"
+ addResult(response.checkData("4F4B2031 31")); // "OK 11"
/*********************************************************************/
@@ -99,7 +99,7 @@ public class Test_Cre_Tin_Genb extends UiccTestModel {
// Select applet2
response = test.selectApplication(APPLET_AID_2);
- result &= response.checkData("4F4B2032"); // "OK 2"
+ addResult(response.checkData("4F4B2032")); // "OK 2"
/*********************************************************************/
@@ -116,6 +116,6 @@ public class Test_Cre_Tin_Genb extends UiccTestModel {
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_itid/Test_Cre_Tin_Itid.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_itid/Test_Cre_Tin_Itid.java
index b212bd58023a4e584ebdf4fa89da7712d15955fd..0b3e9662d8f0a087548a8336860036cf54995476 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_itid/Test_Cre_Tin_Itid.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_itid/Test_Cre_Tin_Itid.java
@@ -29,7 +29,7 @@ public class Test_Cre_Tin_Itid extends UiccTestModel {
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
String[] menuList = new String[4];
String[] menuIdList = new String[4];
@@ -61,11 +61,11 @@ public class Test_Cre_Tin_Itid extends UiccTestModel {
"00" + // LV TAR Value(s)
"00" ); // V Maximum number of services
- result = response.checkSw("6A80");
+ addResult(response.checkSw("6A80"));
// Select applet1
response = test.selectApplication(APPLET_AID_1);
- result &= !(response.checkData("10" + APPLET_AID_1 + "00") && response.checkSw("9000"));
+ addResult(!(response.checkData("10" + APPLET_AID_1 + "00") && response.checkSw("9000")));
/*********************************************************************/
@@ -92,11 +92,11 @@ public class Test_Cre_Tin_Itid extends UiccTestModel {
// Card Initialisation
test.reset();
response = test.terminalProfile("09030020");
- result &= response.checkSw("9128");
+ addResult(response.checkSw("9128"));
// Fetch & Terminal response
menuList[0] = "Menu11"; menuIdList[0] = "01";
menuList[1] = "Menu12"; menuIdList[1] = "7F";
- result &= fetchSetUpMenu("UICC TEST", null, (byte)2, menuIdList, menuList, null, null);
+ fetchSetUpMenu("UICC TEST", null, (byte)2, menuIdList, menuList, null, null);
/*********************************************************************/
/** Testcase 3 */
@@ -117,11 +117,11 @@ public class Test_Cre_Tin_Itid extends UiccTestModel {
"00" ); // V Maximum number of services
- result &= response.checkSw("6A80");
+ addResult(response.checkSw("6A80"));
// Select applet1
response = test.selectApplication(APPLET_AID_2);
- result &= !(response.checkData("10" + APPLET_AID_1 + "00") && response.checkSw("9000"));
+ addResult(!(response.checkData("10" + APPLET_AID_1 + "00") && response.checkSw("9000")));
/*********************************************************************/
@@ -144,12 +144,12 @@ public class Test_Cre_Tin_Itid extends UiccTestModel {
// Send a status command to be sure to retrieve the correct status word in the RAPDU
response = test.status("00","0C","00");
- result &= response.checkSw("9131");
+ addResult(response.checkSw("9131"));
// Fetch & Terminal response
menuList[0] = "Menu11"; menuIdList[0] = "01";
menuList[1] = "Menu12"; menuIdList[1] = "7F";
menuList[2] = "Menu21"; menuIdList[2] = "80";
- result &= fetchSetUpMenu("UICC TEST", null, (byte)3, menuIdList, menuList, null, null);
+ fetchSetUpMenu("UICC TEST", null, (byte)3, menuIdList, menuList, null, null);
/*********************************************************************/
@@ -172,13 +172,13 @@ public class Test_Cre_Tin_Itid extends UiccTestModel {
// Send a status command to be sure to retrieve the correct status word in the RAPDU
response = test.status("00","0C","00");
- result &= response.checkSw("913A");
+ addResult(response.checkSw("913A"));
// Fetch & Terminal response
menuList[0] = "Menu11"; menuIdList[0] = "01";
menuList[1] = "Menu12"; menuIdList[1] = "7F";
menuList[2] = "Menu21"; menuIdList[2] = "80";
menuList[3] = "Menu31"; menuIdList[3] = "81";
- result &= fetchSetUpMenu("UICC TEST", null, (byte)4, menuIdList, menuList, null, null);
+ fetchSetUpMenu("UICC TEST", null, (byte)4, menuIdList, menuList, null, null);
/*********************************************************************/
@@ -190,12 +190,12 @@ public class Test_Cre_Tin_Itid extends UiccTestModel {
// Send a status command to be sure to retrieve the correct status word in the RAPDU
response = test.status("00","0C","00");
- result &= response.checkSw("9131");
+ addResult(response.checkSw("9131"));
// Fetch & Terminal response
menuList[0] = "Menu11"; menuIdList[0] = "01";
menuList[1] = "Menu12"; menuIdList[1] = "7F";
menuList[2] = "Menu31"; menuIdList[2] = "81";
- result &= fetchSetUpMenu("UICC TEST", null, (byte)3, menuIdList, menuList, null, null);
+ fetchSetUpMenu("UICC TEST", null, (byte)3, menuIdList, menuList, null, null);
// Good Install Applet2
response = test.installApplet(CAP_FILE_PATH, CLASS_AID_2, APPLET_AID_2,
@@ -213,13 +213,13 @@ public class Test_Cre_Tin_Itid extends UiccTestModel {
// Send a status command to be sure to retrieve the correct status word in the RAPDU
response = test.status("00","0C","00");
- result &= response.checkSw("913A");
+ addResult(response.checkSw("913A"));
// Fetch & Terminal response
menuList[0] = "Menu11"; menuIdList[0] = "01";
menuList[1] = "Menu12"; menuIdList[1] = "7F";
menuList[2] = "Menu21"; menuIdList[2] = "80";
menuList[3] = "Menu31"; menuIdList[3] = "81";
- result &= fetchSetUpMenu("UICC TEST", null, (byte)4, menuIdList, menuList, null, null);
+ fetchSetUpMenu("UICC TEST", null, (byte)4, menuIdList, menuList, null, null);
/*********************************************************************/
@@ -237,14 +237,14 @@ public class Test_Cre_Tin_Itid extends UiccTestModel {
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
// Fetch a sepUpMenu command, check it according to the parameters
// and send the Terminal Response.
- // Return true if the recieved command correspond to the one rebuild using
+ // Logs test result indicating whether the received command correspond to the one rebuild using
// the paramaters
- private boolean fetchSetUpMenu(
+ private void fetchSetUpMenu(
String alphaId, // AlphaId TLV Value
String alphaIdTextAtt, // AlphaId Text Attribute TLV Value
byte nbMenu, // Number of menus
@@ -253,7 +253,6 @@ public class Test_Cre_Tin_Itid extends UiccTestModel {
String nextActionTLV, // Next Action List TLV
String itemTextAttListTLV) // Item Text Attribute List TLV
{
- boolean result;
String setUpMenuCmd = "";
String endOfCmd = "";
String Cmd = "";
@@ -291,11 +290,9 @@ public class Test_Cre_Tin_Itid extends UiccTestModel {
setUpMenuCmd = "D0" + ToString((byte)(Cmd.length()/2)) + Cmd;
response = test.fetch(ToString((byte)(setUpMenuCmd.length()/2)));
- result = response.checkData(setUpMenuCmd);
+ addResult(response.checkData(setUpMenuCmd));
test.terminalResponse("81030125 00820282 81830100");
-
- return result;
}
private String ByteToString( byte tab[] )
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_itpo/Test_Cre_Tin_Itpo.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_itpo/Test_Cre_Tin_Itpo.java
index c56443bce3f66e2d56d0f2827836953261d45d39..6fef8713cf47e1aed15e88c760501685d9d93f62 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_itpo/Test_Cre_Tin_Itpo.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_itpo/Test_Cre_Tin_Itpo.java
@@ -35,7 +35,7 @@ public class Test_Cre_Tin_Itpo extends UiccTestModel {
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
String[] menuList = new String[12];
String[] menuIdList = new String[12];
@@ -73,13 +73,13 @@ public class Test_Cre_Tin_Itpo extends UiccTestModel {
// Send a status command to be sure to retrieve the correct status word in the RAPDU
response = test.status("00","0C","00");
- result = response.getStatusWord().substring(0,2).compareTo("91") == 0;
+ addResult(response.getStatusWord().substring(0,2).compareTo("91") == 0);
// Fetch & Terminal response
menuList[0] = "Menu11"; menuIdList[0] = "01";
menuList[1] = "Menu12"; menuIdList[1] = "02";
menuList[2] = "Menu13"; menuIdList[2] = "03";
menuList[3] = "Menu14"; menuIdList[3] = "04";
- result &= fetchSetUpMenu("UICC TEST", null, (byte)4, menuIdList, menuList, null, null);
+ fetchSetUpMenu("UICC TEST", null, (byte)4, menuIdList, menuList, null, null);
/*********************************************************************/
@@ -103,14 +103,14 @@ public class Test_Cre_Tin_Itpo extends UiccTestModel {
// Send a status command to be sure to retrieve the correct status word in the RAPDU
response = test.status("00","0C","00");
- result &= response.getStatusWord().substring(0,2).compareTo("91") == 0;
+ addResult(response.getStatusWord().substring(0,2).compareTo("91") == 0);
// Fetch & Terminal response
menuList[0] = "Menu11"; menuIdList[0] = "01";
menuList[1] = "Menu12"; menuIdList[1] = "02";
menuList[2] = "Menu21"; menuIdList[2] = "05";
menuList[3] = "Menu13"; menuIdList[3] = "03";
menuList[4] = "Menu14"; menuIdList[4] = "04";
- result &= fetchSetUpMenu("UICC TEST", null, (byte)5, menuIdList, menuList, null, null);
+ fetchSetUpMenu("UICC TEST", null, (byte)5, menuIdList, menuList, null, null);
/*********************************************************************/
@@ -139,7 +139,7 @@ public class Test_Cre_Tin_Itpo extends UiccTestModel {
// Send a status command to be sure to retrieve the correct status word in the RAPDU
response = test.status("00","0C","00");
- result &= response.getStatusWord().substring(0,2).compareTo("91") == 0;
+ addResult(response.getStatusWord().substring(0,2).compareTo("91") == 0);
// Fetch & Terminal response
menuList[0] = "Menu11"; menuIdList[0] = "01";
menuList[1] = "Menu31"; menuIdList[1] = "06";
@@ -148,7 +148,7 @@ public class Test_Cre_Tin_Itpo extends UiccTestModel {
menuList[4] = "Menu21"; menuIdList[4] = "05";
menuList[5] = "Menu13"; menuIdList[5] = "03";
menuList[6] = "Menu14"; menuIdList[6] = "04";
- result &= fetchSetUpMenu("UICC TEST", null, (byte)7, menuIdList, menuList, null, null);
+ fetchSetUpMenu("UICC TEST", null, (byte)7, menuIdList, menuList, null, null);
/*********************************************************************/
@@ -171,7 +171,7 @@ public class Test_Cre_Tin_Itpo extends UiccTestModel {
// Send a status command to be sure to retrieve the correct status word in the RAPDU
response = test.status("00","0C","00");
- result &= response.getStatusWord().substring(0,2).compareTo("91") == 0;
+ addResult(response.getStatusWord().substring(0,2).compareTo("91") == 0);
// Fetch & Terminal response
menuList[0] = "Menu11"; menuIdList[0] = "01";
menuList[1] = "Menu31"; menuIdList[1] = "06";
@@ -181,7 +181,7 @@ public class Test_Cre_Tin_Itpo extends UiccTestModel {
menuList[5] = "Menu13"; menuIdList[5] = "03";
menuList[6] = "Menu14"; menuIdList[6] = "04";
menuList[7] = "Menu41"; menuIdList[7] = "08";
- result &= fetchSetUpMenu("UICC TEST", null, (byte)8, menuIdList, menuList, null, null);
+ fetchSetUpMenu("UICC TEST", null, (byte)8, menuIdList, menuList, null, null);
/*********************************************************************/
@@ -204,7 +204,7 @@ public class Test_Cre_Tin_Itpo extends UiccTestModel {
// Send a status command to be sure to retrieve the correct status word in the RAPDU
response = test.status("00","0C","00");
- result &= response.getStatusWord().substring(0,2).compareTo("91") == 0;
+ addResult(response.getStatusWord().substring(0,2).compareTo("91") == 0);
// Fetch & Terminal response
menuList[0] = "Menu11"; menuIdList[0] = "01";
menuList[1] = "Menu31"; menuIdList[1] = "06";
@@ -215,7 +215,7 @@ public class Test_Cre_Tin_Itpo extends UiccTestModel {
menuList[6] = "Menu14"; menuIdList[6] = "04";
menuList[7] = "Menu41"; menuIdList[7] = "08";
menuList[8] = "Menu51"; menuIdList[8] = "09";
- result &= fetchSetUpMenu("UICC TEST", null, (byte)9, menuIdList, menuList, null, null);
+ fetchSetUpMenu("UICC TEST", null, (byte)9, menuIdList, menuList, null, null);
/*********************************************************************/
@@ -224,7 +224,7 @@ public class Test_Cre_Tin_Itpo extends UiccTestModel {
// Trigger Applet1
response = test.envelopeMenuSelection("100101","");
- result &= response.getStatusWord().substring(0,2).compareTo("91") == 0;
+ addResult(response.getStatusWord().substring(0,2).compareTo("91") == 0);
// Fetch & Terminal response
menuList[0] = "Menu31"; menuIdList[0] = "06";
menuList[1] = "Menu32"; menuIdList[1] = "07";
@@ -234,13 +234,13 @@ public class Test_Cre_Tin_Itpo extends UiccTestModel {
menuList[5] = "Menu14"; menuIdList[5] = "04";
menuList[6] = "Menu41"; menuIdList[6] = "08";
menuList[7] = "Menu51"; menuIdList[7] = "09";
- result &= fetchSetUpMenu("UICC TEST", null, (byte)8, menuIdList, menuList, null, null);
+ fetchSetUpMenu("UICC TEST", null, (byte)8, menuIdList, menuList, null, null);
// Lock Applet2
response = test.lockApplication(APPLET_AID_2);
// Send a status command to be sure to retrieve the correct status word in the RAPDU
response = test.status("00","0C","00");
- result &= response.getStatusWord().substring(0,2).compareTo("91") == 0;
+ addResult(response.getStatusWord().substring(0,2).compareTo("91") == 0);
// Fetch & Terminal response
menuList[0] = "Menu31"; menuIdList[0] = "06";
menuList[1] = "Menu32"; menuIdList[1] = "07";
@@ -249,7 +249,7 @@ public class Test_Cre_Tin_Itpo extends UiccTestModel {
menuList[4] = "Menu14"; menuIdList[4] = "04";
menuList[5] = "Menu41"; menuIdList[5] = "08";
menuList[6] = "Menu51"; menuIdList[6] = "09";
- result &= fetchSetUpMenu("UICC TEST", null, (byte)7, menuIdList, menuList, null, null);
+ fetchSetUpMenu("UICC TEST", null, (byte)7, menuIdList, menuList, null, null);
/*********************************************************************/
@@ -276,7 +276,7 @@ public class Test_Cre_Tin_Itpo extends UiccTestModel {
// Send a status command to be sure to retrieve the correct status word in the RAPDU
response = test.status("00","0C","00");
- result &= response.getStatusWord().substring(0,2).compareTo("91") == 0;
+ addResult(response.getStatusWord().substring(0,2).compareTo("91") == 0);
// Fetch & Terminal response
menuList[0] = "Menu61"; menuIdList[0] = "10";
menuList[1] = "Menu31"; menuIdList[1] = "06";
@@ -288,7 +288,7 @@ public class Test_Cre_Tin_Itpo extends UiccTestModel {
menuList[7] = "Menu41"; menuIdList[7] = "08";
menuList[8] = "Menu51"; menuIdList[8] = "09";
menuList[9] = "Menu63"; menuIdList[9] = "12";
- result &= fetchSetUpMenu("UICC TEST", null, (byte)10, menuIdList, menuList, null, null);
+ fetchSetUpMenu("UICC TEST", null, (byte)10, menuIdList, menuList, null, null);
/*********************************************************************/
@@ -297,7 +297,7 @@ public class Test_Cre_Tin_Itpo extends UiccTestModel {
// Trigger Applet1
response = test.envelopeMenuSelection("100102","");
- result &= response.getStatusWord().substring(0,2).compareTo("91") == 0;
+ addResult(response.getStatusWord().substring(0,2).compareTo("91") == 0);
// Fetch & Terminal response
menuList[0] = "Menu61"; menuIdList[0] = "10";
menuList[1] = "Menu11"; menuIdList[1] = "01";
@@ -310,13 +310,13 @@ public class Test_Cre_Tin_Itpo extends UiccTestModel {
menuList[8] = "Menu41"; menuIdList[8] = "08";
menuList[9] = "Menu51"; menuIdList[9] = "09";
menuList[10] = "Menu63"; menuIdList[10] = "12";
- result &= fetchSetUpMenu("UICC TEST", null, (byte)11, menuIdList, menuList, null, null);
+ fetchSetUpMenu("UICC TEST", null, (byte)11, menuIdList, menuList, null, null);
// Unlock Applet2
response = test.unlockApplication(APPLET_AID_2);
// Send a status command to be sure to retrieve the correct status word in the RAPDU
response = test.status("00","0C","00");
- result &= response.getStatusWord().substring(0,2).compareTo("91") == 0;
+ addResult(response.getStatusWord().substring(0,2).compareTo("91") == 0);
// Fetch & Terminal response
menuList[0] = "Menu61"; menuIdList[0] = "10";
menuList[1] = "Menu11"; menuIdList[1] = "01";
@@ -330,7 +330,7 @@ public class Test_Cre_Tin_Itpo extends UiccTestModel {
menuList[9] = "Menu41"; menuIdList[9] = "08";
menuList[10] = "Menu51"; menuIdList[10] = "09";
menuList[11] = "Menu63"; menuIdList[11] = "12";
- result &= fetchSetUpMenu("UICC TEST", null, (byte)12, menuIdList, menuList, null, null);
+ fetchSetUpMenu("UICC TEST", null, (byte)12, menuIdList, menuList, null, null);
/*********************************************************************/
@@ -341,7 +341,7 @@ public class Test_Cre_Tin_Itpo extends UiccTestModel {
response = test.deleteApplet(APPLET_AID_2);
// Send a status command to be sure to retrieve the correct status word in the RAPDU
response = test.status("00","0C","00");
- result &= response.getStatusWord().substring(0,2).compareTo("91") == 0;
+ addResult(response.getStatusWord().substring(0,2).compareTo("91") == 0);
// Fetch & Terminal response
menuList[0] = "Menu61"; menuIdList[0] = "10";
menuList[1] = "Menu11"; menuIdList[1] = "01";
@@ -354,7 +354,7 @@ public class Test_Cre_Tin_Itpo extends UiccTestModel {
menuList[8] = "Menu41"; menuIdList[8] = "08";
menuList[9] = "Menu51"; menuIdList[9] = "09";
menuList[10] = "Menu63"; menuIdList[10] = "12";
- result &= fetchSetUpMenu("UICC TEST", null, (byte)11, menuIdList, menuList, null, null);
+ fetchSetUpMenu("UICC TEST", null, (byte)11, menuIdList, menuList, null, null);
/*********************************************************************/
@@ -377,7 +377,7 @@ public class Test_Cre_Tin_Itpo extends UiccTestModel {
// Send a status command to be sure to retrieve the correct status word in the RAPDU
response = test.status("00","0C","00");
- result &= response.getStatusWord().substring(0,2).compareTo("91") == 0;
+ addResult(response.getStatusWord().substring(0,2).compareTo("91") == 0);
// Fetch & Terminal response
menuList[0] = "Menu61"; menuIdList[0] = "10";
menuList[1] = "Menu11"; menuIdList[1] = "01";
@@ -391,7 +391,7 @@ public class Test_Cre_Tin_Itpo extends UiccTestModel {
menuList[9] = "Menu41"; menuIdList[9] = "08";
menuList[10] = "Menu51"; menuIdList[10] = "09";
menuList[11] = "Menu63"; menuIdList[11] = "12";
- result &= fetchSetUpMenu("UICC TEST", null, (byte)12, menuIdList, menuList, null, null);
+ fetchSetUpMenu("UICC TEST", null, (byte)12, menuIdList, menuList, null, null);
/*********************************************************************/
@@ -412,14 +412,14 @@ public class Test_Cre_Tin_Itpo extends UiccTestModel {
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
// Fetch a sepUpMenu command, check it according to the parameters
// and send the Terminal Response.
- // Return true if the recieved command correspond to the one rebuild using
+ // Logs test result indicating whether the received command correspond to the one rebuild using
// the paramaters
- private boolean fetchSetUpMenu(
+ private void fetchSetUpMenu(
String alphaId, // AlphaId TLV Value
String alphaIdTextAtt, // AlphaId Text Attribute TLV Value
byte nbMenu, // Number of menus
@@ -428,7 +428,6 @@ public class Test_Cre_Tin_Itpo extends UiccTestModel {
String nextActionTLV, // Next Action List TLV
String itemTextAttListTLV) // Item Text Attribute List TLV
{
- boolean result;
String setUpMenuCmd = "";
String endOfCmd = "";
String Cmd = "";
@@ -473,11 +472,9 @@ public class Test_Cre_Tin_Itpo extends UiccTestModel {
}
response = test.fetch(ToString((byte)(setUpMenuCmd.length()/2)));
- result = response.checkData(setUpMenuCmd);
+ addResult(response.checkData(setUpMenuCmd));
test.terminalResponse("81030125 00820282 81830100");
-
- return result;
}
private String ByteToString( byte tab[] )
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_mlme/Test_Cre_Tin_Mlme.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_mlme/Test_Cre_Tin_Mlme.java
index 071ff0f2380f6fee1833ee9d7997b8bc1662a1a9..8d2602ac8f863cd5470e4251939541925afa64a3 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_mlme/Test_Cre_Tin_Mlme.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_mlme/Test_Cre_Tin_Mlme.java
@@ -25,7 +25,7 @@ public class Test_Cre_Tin_Mlme extends UiccTestModel {
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
String[] menuList = new String[3];
String[] menuIdList = new String[3];
@@ -66,7 +66,7 @@ public class Test_Cre_Tin_Mlme extends UiccTestModel {
menuList[0] = "MenuEntry1"; menuIdList[0] = "01";
menuList[1] = "MenuEntry2"; menuIdList[1] = "02";
menuList[2] = "MenuEntry3"; menuIdList[2] = "03";
- result = fetchSetUpMenu("UICC TEST", null, (byte)3, menuIdList, menuList, null, null);
+ fetchSetUpMenu("UICC TEST", null, (byte)3, menuIdList, menuList, null, null);
/*********************************************************************/
@@ -80,7 +80,7 @@ public class Test_Cre_Tin_Mlme extends UiccTestModel {
menuList[0] = "MenuEntry4"; menuIdList[0] = "01";
menuList[1] = "MenuEntry2"; menuIdList[1] = "02";
menuList[2] = "MenuEntry3"; menuIdList[2] = "03";
- result = fetchSetUpMenu("UICC TEST", null, (byte)3, menuIdList, menuList, null, null);
+ fetchSetUpMenu("UICC TEST", null, (byte)3, menuIdList, menuList, null, null);
/*********************************************************************/
/** Testcase 5 */
@@ -88,7 +88,7 @@ public class Test_Cre_Tin_Mlme extends UiccTestModel {
// Trigger Applet1
response = test.envelopeMenuSelection("100102","");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -98,7 +98,7 @@ public class Test_Cre_Tin_Mlme extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "05" + "CCCCCCCC CC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "05" + "CCCCCCCC CC"));
/*********************************************************************/
@@ -114,14 +114,14 @@ public class Test_Cre_Tin_Mlme extends UiccTestModel {
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
// Fetch a sepUpMenu command, check it according to the parameters
// and send the Terminal Response.
- // Return true if the recieved command correspond to the one rebuild using
+ // Logs test result indicating whether the received command correspond to the one rebuild using
// the paramaters
- private boolean fetchSetUpMenu(
+ private void fetchSetUpMenu(
String alphaId, // AlphaId TLV Value
String alphaIdTextAtt, // AlphaId Text Attribute TLV Value
byte nbMenu, // Number of menus
@@ -130,7 +130,6 @@ public class Test_Cre_Tin_Mlme extends UiccTestModel {
String nextActionTLV, // Next Action List TLV
String itemTextAttListTLV) // Item Text Attribute List TLV
{
- boolean result;
String setUpMenuCmd = "";
String endOfCmd = "";
String Cmd = "";
@@ -168,11 +167,9 @@ public class Test_Cre_Tin_Mlme extends UiccTestModel {
setUpMenuCmd = "D0" + ToString((byte)(Cmd.length()/2)) + Cmd;
response = test.fetch(ToString((byte)(setUpMenuCmd.length()/2)));
- result = response.checkData(setUpMenuCmd);
+ addResult(response.checkData(setUpMenuCmd));
test.terminalResponse("81030125 00820282 81830100");
-
- return result;
}
private String ByteToString( byte tab[] )
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_nbme/Test_Cre_Tin_Nbme.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_nbme/Test_Cre_Tin_Nbme.java
index 8ad2a07da67d17bbc9b94af734bcecf503df4b9c..0f50d477fba5723b1b72e2a9d13f846b9a925af0 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_nbme/Test_Cre_Tin_Nbme.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_nbme/Test_Cre_Tin_Nbme.java
@@ -27,7 +27,7 @@ public class Test_Cre_Tin_Nbme extends UiccTestModel {
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
String[] menuList = new String[3];
String[] menuIdList = new String[3];
@@ -69,7 +69,7 @@ public class Test_Cre_Tin_Nbme extends UiccTestModel {
menuList[0] = "Menu1"; menuIdList[0] = "01";
menuList[1] = "Menu2"; menuIdList[1] = "02";
menuList[2] = "Menu3"; menuIdList[2] = "03";
- result = fetchSetUpMenu("UICC TEST", null, (byte)3, menuIdList, menuList, null, null);
+ fetchSetUpMenu("UICC TEST", null, (byte)3, menuIdList, menuList, null, null);
/*********************************************************************/
@@ -96,7 +96,7 @@ public class Test_Cre_Tin_Nbme extends UiccTestModel {
menuList[0] = "Menu1"; menuIdList[0] = "01";
menuList[1] = "Menu2"; menuIdList[1] = "02";
menuList[2] = "Menu3"; menuIdList[2] = "03";
- result &= fetchSetUpMenu("UICC TEST", null, (byte)3, menuIdList, menuList, null, null);
+ fetchSetUpMenu("UICC TEST", null, (byte)3, menuIdList, menuList, null, null);
/*********************************************************************/
@@ -106,9 +106,9 @@ public class Test_Cre_Tin_Nbme extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "04" + "CCCCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "04" + "CCCCCCCC"));
response = test.selectApplication(APPLET_AID_2);
- result &= response.checkData("10" + APPLET_AID_2 + "01" + "CC");
+ addResult(response.checkData("10" + APPLET_AID_2 + "01" + "CC"));
/*********************************************************************/
@@ -125,14 +125,14 @@ public class Test_Cre_Tin_Nbme extends UiccTestModel {
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
// Fetch a sepUpMenu command, check it according to the parameters
// and send the Terminal Response.
- // Return true if the recieved command correspond to the one rebuild using
+ // Logs test result indicating whether the received command correspond to the one rebuild using
// the paramaters
- private boolean fetchSetUpMenu(
+ private void fetchSetUpMenu(
String alphaId, // AlphaId TLV Value
String alphaIdTextAtt, // AlphaId Text Attribute TLV Value
byte nbMenu, // Number of menus
@@ -141,7 +141,6 @@ public class Test_Cre_Tin_Nbme extends UiccTestModel {
String nextActionTLV, // Next Action List TLV
String itemTextAttListTLV) // Item Text Attribute List TLV
{
- boolean result;
String setUpMenuCmd = "";
String endOfCmd = "";
String Cmd = "";
@@ -179,11 +178,9 @@ public class Test_Cre_Tin_Nbme extends UiccTestModel {
setUpMenuCmd = "D0" + ToString((byte)(Cmd.length()/2)) + Cmd;
response = test.fetch(ToString((byte)(setUpMenuCmd.length()/2)));
- result = response.checkData(setUpMenuCmd);
+ addResult(response.checkData(setUpMenuCmd));
test.terminalResponse("81030125 00820282 81830100");
-
- return result;
}
private String ByteToString( byte tab[] )
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_1/Test_Cre_Tin_Prlv_1.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_1/Test_Cre_Tin_Prlv_1.java
index f2b7010fc9c34c7aa3ecb07ea41357249aaa491c..2e0c4b9ee272cc2fb0069f74c4bc89915accd0d4 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_1/Test_Cre_Tin_Prlv_1.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_1/Test_Cre_Tin_Prlv_1.java
@@ -26,7 +26,7 @@ public class Test_Cre_Tin_Prlv_1 extends UiccTestModel {
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -69,7 +69,7 @@ public class Test_Cre_Tin_Prlv_1 extends UiccTestModel {
// Trigger the applets
response = test.envelopeEventDownloadUserActivity();
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -79,9 +79,9 @@ public class Test_Cre_Tin_Prlv_1 extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "01" + "CC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "01" + "CC"));
response = test.selectApplication(APPLET_AID_2);
- result &= response.checkData("10" + APPLET_AID_2 + "01" + "CC");
+ addResult(response.checkData("10" + APPLET_AID_2 + "01" + "CC"));
/*********************************************************************/
@@ -98,6 +98,6 @@ public class Test_Cre_Tin_Prlv_1 extends UiccTestModel {
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_10/Test_Cre_Tin_Prlv_10.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_10/Test_Cre_Tin_Prlv_10.java
index 93ec866c69d596a51a62c0832c0158b857be7976..c8b46bfd8f52c485c0c4f40a4d49c8cfda86f135 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_10/Test_Cre_Tin_Prlv_10.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_10/Test_Cre_Tin_Prlv_10.java
@@ -31,7 +31,7 @@ public class Test_Cre_Tin_Prlv_10 extends UiccTestModel {
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -77,7 +77,7 @@ public class Test_Cre_Tin_Prlv_10 extends UiccTestModel {
// Trigger the applets
response = test.envelopeEventDownloadUserActivity();
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -87,9 +87,9 @@ public class Test_Cre_Tin_Prlv_10 extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_A1);
- result &= response.checkData("10" + APPLET_AID_A1 + "01" + "CC");
+ addResult(response.checkData("10" + APPLET_AID_A1 + "01" + "CC"));
response = test.selectApplication(APPLET_AID_A2);
- result &= response.checkData("10" + APPLET_AID_A2 + "01" + "CC");
+ addResult(response.checkData("10" + APPLET_AID_A2 + "01" + "CC"));
// Card Initialisation
@@ -125,7 +125,7 @@ public class Test_Cre_Tin_Prlv_10 extends UiccTestModel {
// Trigger the applets
response = test.envelopeEventDownloadUserActivity();
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -135,13 +135,13 @@ public class Test_Cre_Tin_Prlv_10 extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_A1);
- result &= response.checkData("10" + APPLET_AID_A1 + "02" + "CCCC");
+ addResult(response.checkData("10" + APPLET_AID_A1 + "02" + "CCCC"));
response = test.selectApplication(APPLET_AID_A2);
- result &= response.checkData("10" + APPLET_AID_A2 + "02" + "CCCC");
+ addResult(response.checkData("10" + APPLET_AID_A2 + "02" + "CCCC"));
response = test.selectApplication(APPLET_AID_B1);
- result &= response.checkData("10" + APPLET_AID_B1 + "01" + "CC");
+ addResult(response.checkData("10" + APPLET_AID_B1 + "01" + "CC"));
response = test.selectApplication(APPLET_AID_B2);
- result &= response.checkData("10" + APPLET_AID_B2 + "01" + "CC");
+ addResult(response.checkData("10" + APPLET_AID_B2 + "01" + "CC"));
/*********************************************************************/
@@ -162,6 +162,6 @@ public class Test_Cre_Tin_Prlv_10 extends UiccTestModel {
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_11/Test_Cre_Tin_Prlv_11.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_11/Test_Cre_Tin_Prlv_11.java
index 9211fec2d05de6ed94d5c098f9897917ce132df1..c85b92126e5d98589a5b1878e59ddca9172b1376 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_11/Test_Cre_Tin_Prlv_11.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_11/Test_Cre_Tin_Prlv_11.java
@@ -28,7 +28,7 @@ public class Test_Cre_Tin_Prlv_11 extends UiccTestModel {
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -96,7 +96,7 @@ public class Test_Cre_Tin_Prlv_11 extends UiccTestModel {
// Trigger the applets
response = test.envelopeEventDownloadUserActivity();
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -106,13 +106,13 @@ public class Test_Cre_Tin_Prlv_11 extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "01" + "CC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "01" + "CC"));
response = test.selectApplication(APPLET_AID_2);
- result &= response.checkData("10" + APPLET_AID_2 + "01" + "CC");
+ addResult(response.checkData("10" + APPLET_AID_2 + "01" + "CC"));
response = test.selectApplication(APPLET_AID_3);
- result &= response.checkData("10" + APPLET_AID_3 + "01" + "CC");
+ addResult(response.checkData("10" + APPLET_AID_3 + "01" + "CC"));
response = test.selectApplication(APPLET_AID_4);
- result &= response.checkData("10" + APPLET_AID_4 + "01" + "CC");
+ addResult(response.checkData("10" + APPLET_AID_4 + "01" + "CC"));
// Card Initialisation
@@ -126,7 +126,7 @@ public class Test_Cre_Tin_Prlv_11 extends UiccTestModel {
test.terminalProfileSession("09030020 21");
// Trigger the applets
response = test.envelopeEventDownloadUserActivity();
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -136,11 +136,11 @@ public class Test_Cre_Tin_Prlv_11 extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "02" + "CCCC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "02" + "CCCC"));
response = test.selectApplication(APPLET_AID_2);
- result &= response.checkData("10" + APPLET_AID_2 + "02" + "CCCC");
+ addResult(response.checkData("10" + APPLET_AID_2 + "02" + "CCCC"));
response = test.selectApplication(APPLET_AID_3);
- result &= response.checkData("10" + APPLET_AID_3 + "02" + "CCCC");
+ addResult(response.checkData("10" + APPLET_AID_3 + "02" + "CCCC"));
// Card Initialisation
@@ -154,7 +154,7 @@ public class Test_Cre_Tin_Prlv_11 extends UiccTestModel {
test.terminalProfileSession("09030020 21");
// Trigger the applets
response = test.envelopeEventDownloadUserActivity();
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -164,9 +164,9 @@ public class Test_Cre_Tin_Prlv_11 extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "03" + "CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "03" + "CCCCCC"));
response = test.selectApplication(APPLET_AID_2);
- result &= response.checkData("10" + APPLET_AID_2 + "03" + "CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_2 + "03" + "CCCCCC"));
/*********************************************************************/
@@ -183,6 +183,6 @@ public class Test_Cre_Tin_Prlv_11 extends UiccTestModel {
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_12/Test_Cre_Tin_Prlv_12.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_12/Test_Cre_Tin_Prlv_12.java
index 613b4b83e8112dd7b0f1c41c7587d0a109e8dc5d..6fa36d40dd29deebc4c3c61a01fe63b70542c508 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_12/Test_Cre_Tin_Prlv_12.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_12/Test_Cre_Tin_Prlv_12.java
@@ -29,7 +29,7 @@ public class Test_Cre_Tin_Prlv_12 extends UiccTestModel {
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
String[] menuList = new String[3];
String[] menuIdList = new String[3];
@@ -100,7 +100,7 @@ public class Test_Cre_Tin_Prlv_12 extends UiccTestModel {
// Trigger the applets
response = test.envelopeEventDownloadUserActivity();
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -110,13 +110,13 @@ public class Test_Cre_Tin_Prlv_12 extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "01" + "CC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "01" + "CC"));
response = test.selectApplication(APPLET_AID_2);
- result &= response.checkData("10" + APPLET_AID_2 + "01" + "CC");
+ addResult(response.checkData("10" + APPLET_AID_2 + "01" + "CC"));
response = test.selectApplication(APPLET_AID_3);
- result &= response.checkData("10" + APPLET_AID_3 + "01" + "CC");
+ addResult(response.checkData("10" + APPLET_AID_3 + "01" + "CC"));
response = test.selectApplication(APPLET_AID_4);
- result &= response.checkData("10" + APPLET_AID_4 + "01" + "CC");
+ addResult(response.checkData("10" + APPLET_AID_4 + "01" + "CC"));
// Card Initialisation
@@ -141,7 +141,7 @@ public class Test_Cre_Tin_Prlv_12 extends UiccTestModel {
test.terminalProfileSession("09030020 21");
// Trigger the applets
response = test.envelopeEventDownloadUserActivity();
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -151,13 +151,13 @@ public class Test_Cre_Tin_Prlv_12 extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_2);
- result &= response.checkData("10" + APPLET_AID_2 + "02" + "CCCC");
+ addResult(response.checkData("10" + APPLET_AID_2 + "02" + "CCCC"));
response = test.selectApplication(APPLET_AID_3);
- result &= response.checkData("10" + APPLET_AID_3 + "02" + "CCCC");
+ addResult(response.checkData("10" + APPLET_AID_3 + "02" + "CCCC"));
response = test.selectApplication(APPLET_AID_4);
- result &= response.checkData("10" + APPLET_AID_4 + "02" + "CCCC");
+ addResult(response.checkData("10" + APPLET_AID_4 + "02" + "CCCC"));
response = test.selectApplication(APPLET_AID_5);
- result &= response.checkData("10" + APPLET_AID_5 + "01" + "CC");
+ addResult(response.checkData("10" + APPLET_AID_5 + "01" + "CC"));
// Card Initialisation
@@ -181,7 +181,7 @@ public class Test_Cre_Tin_Prlv_12 extends UiccTestModel {
test.terminalProfileSession("09030020 21");
// Trigger the applets
response = test.envelopeEventDownloadUserActivity();
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -191,15 +191,15 @@ public class Test_Cre_Tin_Prlv_12 extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "01" + "CC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "01" + "CC"));
response = test.selectApplication(APPLET_AID_2);
- result &= response.checkData("10" + APPLET_AID_2 + "03" + "CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_2 + "03" + "CCCCCC"));
response = test.selectApplication(APPLET_AID_3);
- result &= response.checkData("10" + APPLET_AID_3 + "03" + "CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_3 + "03" + "CCCCCC"));
response = test.selectApplication(APPLET_AID_4);
- result &= response.checkData("10" + APPLET_AID_4 + "03" + "CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_4 + "03" + "CCCCCC"));
response = test.selectApplication(APPLET_AID_5);
- result &= response.checkData("10" + APPLET_AID_5 + "02" + "CCCC");
+ addResult(response.checkData("10" + APPLET_AID_5 + "02" + "CCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -218,6 +218,6 @@ public class Test_Cre_Tin_Prlv_12 extends UiccTestModel {
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_2/Test_Cre_Tin_Prlv_2.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_2/Test_Cre_Tin_Prlv_2.java
index d5e617ed6483ac516a3e2633033cea1cd8979d16..8d538a757364944038c1e185ac051b51d56f80fa 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_2/Test_Cre_Tin_Prlv_2.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_2/Test_Cre_Tin_Prlv_2.java
@@ -26,7 +26,7 @@ public class Test_Cre_Tin_Prlv_2 extends UiccTestModel {
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -69,7 +69,7 @@ public class Test_Cre_Tin_Prlv_2 extends UiccTestModel {
// Trigger the applets
response = test.envelopeEventDownloadUserActivity();
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -79,9 +79,9 @@ public class Test_Cre_Tin_Prlv_2 extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "01" + "CC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "01" + "CC"));
response = test.selectApplication(APPLET_AID_2);
- result &= response.checkData("10" + APPLET_AID_2 + "01" + "CC");
+ addResult(response.checkData("10" + APPLET_AID_2 + "01" + "CC"));
/*********************************************************************/
@@ -98,6 +98,6 @@ public class Test_Cre_Tin_Prlv_2 extends UiccTestModel {
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_3/Test_Cre_Tin_Prlv_3.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_3/Test_Cre_Tin_Prlv_3.java
index 55cedc3e186f84acadcdbd413507eb007a896045..cee24e420bc3100fb9f41486c3964f7f8e59839e 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_3/Test_Cre_Tin_Prlv_3.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_3/Test_Cre_Tin_Prlv_3.java
@@ -26,7 +26,7 @@ public class Test_Cre_Tin_Prlv_3 extends UiccTestModel {
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -69,7 +69,7 @@ public class Test_Cre_Tin_Prlv_3 extends UiccTestModel {
// Trigger the applets
response = test.envelopeEventDownloadUserActivity();
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -79,9 +79,9 @@ public class Test_Cre_Tin_Prlv_3 extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "01" + "CC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "01" + "CC"));
response = test.selectApplication(APPLET_AID_2);
- result &= response.checkData("10" + APPLET_AID_2 + "01" + "CC");
+ addResult(response.checkData("10" + APPLET_AID_2 + "01" + "CC"));
/*********************************************************************/
@@ -98,6 +98,6 @@ public class Test_Cre_Tin_Prlv_3 extends UiccTestModel {
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_4/Test_Cre_Tin_Prlv_4.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_4/Test_Cre_Tin_Prlv_4.java
index a538f5760c1fe1b756252eeb3d96fb2ec297799b..b7b7614dd59ad1d349f692cfc4352b4cb963b754 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_4/Test_Cre_Tin_Prlv_4.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_4/Test_Cre_Tin_Prlv_4.java
@@ -26,7 +26,7 @@ public class Test_Cre_Tin_Prlv_4 extends UiccTestModel {
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -69,7 +69,7 @@ public class Test_Cre_Tin_Prlv_4 extends UiccTestModel {
// Trigger the applets
response = test.envelopeEventDownloadUserActivity();
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -79,9 +79,9 @@ public class Test_Cre_Tin_Prlv_4 extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "01" + "CC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "01" + "CC"));
response = test.selectApplication(APPLET_AID_2);
- result &= response.checkData("10" + APPLET_AID_2 + "01" + "CC");
+ addResult(response.checkData("10" + APPLET_AID_2 + "01" + "CC"));
/*********************************************************************/
@@ -98,6 +98,6 @@ public class Test_Cre_Tin_Prlv_4 extends UiccTestModel {
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_5/Test_Cre_Tin_Prlv_5.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_5/Test_Cre_Tin_Prlv_5.java
index 49cbc356fb9ab002ba6ab091de6dd8338b4adcee..a7cbd9532886fb69e150ecfdf99a7c84cbd04a09 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_5/Test_Cre_Tin_Prlv_5.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_5/Test_Cre_Tin_Prlv_5.java
@@ -27,7 +27,7 @@ public class Test_Cre_Tin_Prlv_5 extends UiccTestModel {
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -82,7 +82,7 @@ public class Test_Cre_Tin_Prlv_5 extends UiccTestModel {
// Trigger the applets
response = test.envelopeEventDownloadUserActivity();
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -92,11 +92,11 @@ public class Test_Cre_Tin_Prlv_5 extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "01" + "CC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "01" + "CC"));
response = test.selectApplication(APPLET_AID_2);
- result &= response.checkData("10" + APPLET_AID_2 + "01" + "CC");
+ addResult(response.checkData("10" + APPLET_AID_2 + "01" + "CC"));
response = test.selectApplication(APPLET_AID_3);
- result &= response.checkData("10" + APPLET_AID_3 + "01" + "CC");
+ addResult(response.checkData("10" + APPLET_AID_3 + "01" + "CC"));
/*********************************************************************/
@@ -114,6 +114,6 @@ public class Test_Cre_Tin_Prlv_5 extends UiccTestModel {
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_6/Test_Cre_Tin_Prlv_6.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_6/Test_Cre_Tin_Prlv_6.java
index 1558d05c02ea6ba4f39bf6b1a2e7d6a1382e3365..3ff3e8fde543b925bbd20adcb76ed736e2da9717 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_6/Test_Cre_Tin_Prlv_6.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_6/Test_Cre_Tin_Prlv_6.java
@@ -27,7 +27,7 @@ public class Test_Cre_Tin_Prlv_6 extends UiccTestModel {
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -71,7 +71,7 @@ public class Test_Cre_Tin_Prlv_6 extends UiccTestModel {
// Trigger the applets
response = test.envelopeEventDownloadUserActivity();
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -81,9 +81,9 @@ public class Test_Cre_Tin_Prlv_6 extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "01" + "CC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "01" + "CC"));
response = test.selectApplication(APPLET_AID_2);
- result &= response.checkData("10" + APPLET_AID_2 + "01" + "CC");
+ addResult(response.checkData("10" + APPLET_AID_2 + "01" + "CC"));
/*********************************************************************/
@@ -100,6 +100,6 @@ public class Test_Cre_Tin_Prlv_6 extends UiccTestModel {
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_7/Test_Cre_Tin_Prlv_7.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_7/Test_Cre_Tin_Prlv_7.java
index fdc2282149c32ab5d1c6dda2612f108c0905af5f..51a6896ebbc3eda11518c77363ade8319d530640 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_7/Test_Cre_Tin_Prlv_7.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_7/Test_Cre_Tin_Prlv_7.java
@@ -27,7 +27,7 @@ public class Test_Cre_Tin_Prlv_7 extends UiccTestModel {
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
String[] menuList = new String[3];
String[] menuIdList = new String[3];
@@ -74,7 +74,7 @@ public class Test_Cre_Tin_Prlv_7 extends UiccTestModel {
// Trigger the applets
response = test.envelopeEventDownloadUserActivity();
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -84,9 +84,9 @@ public class Test_Cre_Tin_Prlv_7 extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "01" + "CC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "01" + "CC"));
response = test.selectApplication(APPLET_AID_2);
- result &= response.checkData("10" + APPLET_AID_2 + "01" + "CC");
+ addResult(response.checkData("10" + APPLET_AID_2 + "01" + "CC"));
/*********************************************************************/
@@ -103,6 +103,6 @@ public class Test_Cre_Tin_Prlv_7 extends UiccTestModel {
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_8/Test_Cre_Tin_Prlv_8.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_8/Test_Cre_Tin_Prlv_8.java
index 04b7b351296075f149b783131116a6b6a33a851b..04dab4738561eb6b036c7f0f4060a45e8ae76416 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_8/Test_Cre_Tin_Prlv_8.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_8/Test_Cre_Tin_Prlv_8.java
@@ -29,7 +29,7 @@ public class Test_Cre_Tin_Prlv_8 extends UiccTestModel {
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -75,7 +75,7 @@ public class Test_Cre_Tin_Prlv_8 extends UiccTestModel {
// Trigger the applets
response = test.envelopeEventDownloadUserActivity();
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -85,9 +85,9 @@ public class Test_Cre_Tin_Prlv_8 extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "01" + "CC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "01" + "CC"));
response = test.selectApplication(APPLET_AID_2);
- result &= response.checkData("10" + APPLET_AID_2 + "01" + "CC");
+ addResult(response.checkData("10" + APPLET_AID_2 + "01" + "CC"));
/*********************************************************************/
@@ -106,6 +106,6 @@ public class Test_Cre_Tin_Prlv_8 extends UiccTestModel {
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_9/Test_Cre_Tin_Prlv_9.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_9/Test_Cre_Tin_Prlv_9.java
index 9570eaabf5140babbbaca936544df84a32f0d149..42f581ee07245321013a735175fd0f6c5a6e3da9 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_9/Test_Cre_Tin_Prlv_9.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_9/Test_Cre_Tin_Prlv_9.java
@@ -29,7 +29,7 @@ public class Test_Cre_Tin_Prlv_9 extends UiccTestModel {
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
String[] menuList = new String[3];
String[] menuIdList = new String[3];
@@ -78,7 +78,7 @@ public class Test_Cre_Tin_Prlv_9 extends UiccTestModel {
// Trigger the applets
response = test.envelopeEventDownloadUserActivity();
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -88,9 +88,9 @@ public class Test_Cre_Tin_Prlv_9 extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "01" + "CC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "01" + "CC"));
response = test.selectApplication(APPLET_AID_2);
- result &= response.checkData("10" + APPLET_AID_2 + "01" + "CC");
+ addResult(response.checkData("10" + APPLET_AID_2 + "01" + "CC"));
/*********************************************************************/
@@ -109,6 +109,6 @@ public class Test_Cre_Tin_Prlv_9 extends UiccTestModel {
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_sval/Test_Cre_Tin_Sval.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_sval/Test_Cre_Tin_Sval.java
index d60697b30b645a0b072f11470a8fc3d60f0496d9..82c7b73a8f8866df497d7f6b73a48f6095f7990f 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_sval/Test_Cre_Tin_Sval.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_sval/Test_Cre_Tin_Sval.java
@@ -29,7 +29,7 @@ public class Test_Cre_Tin_Sval extends UiccTestModel {
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -54,11 +54,11 @@ public class Test_Cre_Tin_Sval extends UiccTestModel {
"00" + // LV TAR Value(s)
"09"); // V Maximum number of services
- result = response.checkSw("6A80");
+ addResult(response.checkSw("6A80"));
// Select applet1
response = test.selectApplication(APPLET_AID_1);
- result &= response.getStatusWord().substring(1,3).compareTo("61") != 0;
+ addResult(response.getStatusWord().substring(1,3).compareTo("61") != 0);
/*********************************************************************/
@@ -82,15 +82,15 @@ public class Test_Cre_Tin_Sval extends UiccTestModel {
"00" + // LV TAR Value(s)
"04"); // V Maximum number of services
- result &= response.checkData("00");
- result &= response.checkSw("9000");
+ addResult(response.checkData("00"));
+ addResult(response.checkSw("9000"));
test.reset();
test.terminalProfileSession("09030120");
// Trigger Applet2
response = test.envelopeMenuSelection("100102", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
/** Testcase 5-8 */
@@ -112,15 +112,15 @@ public class Test_Cre_Tin_Sval extends UiccTestModel {
"00" + // LV Minimum Security Level field
"00" + // LV TAR Value(s)
"08"); // V Maximum number of services
- result &= response.checkData("00");
- result &= response.checkSw("9000");
+ addResult(response.checkData("00"));
+ addResult(response.checkSw("9000"));
test.reset();
test.terminalProfileSession("09030120");
// Trigger Applet3
response = test.envelopeMenuSelection("100103", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -130,9 +130,9 @@ public class Test_Cre_Tin_Sval extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_2);
- result &= response.checkData("10" + APPLET_AID_2 + "02" + "CCCC");
+ addResult(response.checkData("10" + APPLET_AID_2 + "02" + "CCCC"));
response = test.selectApplication(APPLET_AID_3);
- result &= response.checkData("10" + APPLET_AID_3 + "03" + "CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_3 + "03" + "CCCCCC"));
/*********************************************************************/
@@ -152,6 +152,6 @@ public class Test_Cre_Tin_Sval extends UiccTestModel {
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_tarv/Test_Cre_Tin_Tarv.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_tarv/Test_Cre_Tin_Tarv.java
index 674c0cb7ec51ea70b4fe863e7bc5b835768f3380..73f9da86fac1a53b3e69f4dee0e60b720ccc24ff 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_tarv/Test_Cre_Tin_Tarv.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_tarv/Test_Cre_Tin_Tarv.java
@@ -27,7 +27,7 @@ public class Test_Cre_Tin_Tarv extends UiccTestModel {
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -41,7 +41,7 @@ public class Test_Cre_Tin_Tarv extends UiccTestModel {
/** Testcase 1 */
/*********************************************************************/
- // Install Applet2 with TAR "020202é
+ // Install Applet2 with TAR "020202�
response = test.installApplet(CAP_FILE_PATH, CLASS_AID_2, APPLET_AID_2,
"800B" + // TLV UICC Toolkit application specific parameters
"FF" + // V Priority Level
@@ -55,8 +55,8 @@ public class Test_Cre_Tin_Tarv extends UiccTestModel {
"00"); // V Maximum number of services
// Check correct installation
- result = response.checkSw("9000");
- result = response.checkData("00");
+ addResult(response.checkSw("9000"));
+ addResult(response.checkData("00"));
test.reset();
@@ -76,7 +76,7 @@ public class Test_Cre_Tin_Tarv extends UiccTestModel {
"09010101020202030303" +
"00"); // V Maximum number of services
- result &= response.checkSw("6A80");
+ addResult(response.checkSw("6A80"));
/*********************************************************************/
/** Testcase 2 */
@@ -97,7 +97,7 @@ public class Test_Cre_Tin_Tarv extends UiccTestModel {
"050101010303" +
"00"); // V Maximum number of services
- result &= response.checkSw("6A80");
+ addResult(response.checkSw("6A80"));
/*********************************************************************/
@@ -114,6 +114,6 @@ public class Test_Cre_Tin_Tarv extends UiccTestModel {
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_tmal/Test_Cre_Tin_Tmal.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_tmal/Test_Cre_Tin_Tmal.java
index b363888ac267ac8cfed65be51ea3b94491c42bce..db9570a7f997aafcfbb43780fafaba5a706143d3 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_tmal/Test_Cre_Tin_Tmal.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_tmal/Test_Cre_Tin_Tmal.java
@@ -29,7 +29,7 @@ public class Test_Cre_Tin_Tmal extends UiccTestModel {
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -54,11 +54,11 @@ public class Test_Cre_Tin_Tmal extends UiccTestModel {
"00" + // LV TAR Value(s)
"00"); // V Maximum number of services
- result = response.checkSw("6A80");
+ addResult(response.checkSw("6A80"));
// Select applet1
response = test.selectApplication(APPLET_AID_1);
- result &= !(response.checkData("10" + APPLET_AID_1 + "00") && response.checkSw("9000"));
+ addResult(!(response.checkData("10" + APPLET_AID_1 + "00") && response.checkSw("9000")));
// test script
@@ -71,7 +71,7 @@ public class Test_Cre_Tin_Tmal extends UiccTestModel {
/*********************************************************************/
// Install Applet2
- test.installApplet(CAP_FILE_PATH, CLASS_AID_2, APPLET_AID_2,
+ response = test.installApplet(CAP_FILE_PATH, CLASS_AID_2, APPLET_AID_2,
"800A" + // TLV UICC Toolkit application specific parameters
"FF" + // V Priority Level
"04" + // V Max. number of timers
@@ -84,19 +84,22 @@ public class Test_Cre_Tin_Tmal extends UiccTestModel {
"00" + // LV TAR Value(s)
"00"); // V Maximum number of services
- test.reset();
+ addResult(response.checkSw("9000"));
+
+
+ test.reset();
test.terminalProfileSession("09030120");
// Trigger Applet2
response = test.envelopeMenuSelection("100102", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
/** Testcase 5-8 */
/*********************************************************************/
// Install Applet3
- test.installApplet(CAP_FILE_PATH, CLASS_AID_3, APPLET_AID_3,
+ response = test.installApplet(CAP_FILE_PATH, CLASS_AID_3, APPLET_AID_3,
"800A" + // TLV UICC Toolkit application specific parameters
"FF" + // V Priority Level
"08" + // V Max. number of timers
@@ -109,12 +112,16 @@ public class Test_Cre_Tin_Tmal extends UiccTestModel {
"00" + // LV TAR Value(s)
"00"); // V Maximum number of services
- test.reset();
+
+ addResult(response.checkSw("9000"));
+
+
+ test.reset();
test.terminalProfileSession("09030120");
// Trigger Applet3
response = test.envelopeMenuSelection("100103", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -124,9 +131,9 @@ public class Test_Cre_Tin_Tmal extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_2);
- result &= response.checkData("10" + APPLET_AID_2 + "02" + "CCCC");
+ addResult(response.checkData("10" + APPLET_AID_2 + "02" + "CCCC"));
response = test.selectApplication(APPLET_AID_3);
- result &= response.checkData("10" + APPLET_AID_3 + "03" + "CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_3 + "03" + "CCCCCC"));
/*********************************************************************/
@@ -146,6 +153,6 @@ public class Test_Cre_Tin_Tmal extends UiccTestModel {
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_ufa_view/Test_Cre_Ufa_View.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_ufa_view/Test_Cre_Ufa_View.java
index dd5d5117ba5e738872ef24b1a02979b0c4faf863..34ea461b2a57c058ba9693dcd6adf1bb91c4da0f 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_ufa_view/Test_Cre_Ufa_View.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_ufa_view/Test_Cre_Ufa_View.java
@@ -28,7 +28,7 @@ public class Test_Cre_Ufa_View extends UiccTestModel {
public boolean run() {
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -95,34 +95,34 @@ public class Test_Cre_Ufa_View extends UiccTestModel {
// test case 7: File Context integrity
response = test.envelopeMenuSelection("100101","");
- result = response.checkSw("9113");
+ addResult(response.checkSw("9113"));
response = test.fetch("13");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
response = test.envelopeCallControlByNAA();
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
response = test.terminalResponse("81030121 80020282 81030100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test case 8: Applet2 can get a FileView
response = test.selectApplication(APPLET_AID_2);
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test cases 9 to 13
for (byte i=0; i<2; i++) {
response = test.selectApplication(APPLET_AID_2);
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
test.reset();
test.terminalProfileSession("09010020");
response = test.selectApplication(APPLET_AID_2);
}
// check applet2 results
- result &= response.checkData("10" + APPLET_AID_2 + "0ACCCCCC CCCCCCCC CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_2 + "0ACCCCCC CCCCCCCC CCCCCC"));
// check applet1 results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "0BCCCCCC CCCCCCCC CCCCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "0BCCCCCC CCCCCCCC CCCCCCCC"));
// delete applet and package
test.reset();
@@ -131,6 +131,6 @@ public class Test_Cre_Ufa_View extends UiccTestModel {
test.deleteApplet(APPLET_AID_2);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_adel/Test_Cre_Uta_Adel.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_adel/Test_Cre_Uta_Adel.java
index 397bb423b074f8eb65d5b7a12feb57bdccf66561..3ad4c4bf85fe63930c221e5d2c44408577a43029 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_adel/Test_Cre_Uta_Adel.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_adel/Test_Cre_Uta_Adel.java
@@ -35,7 +35,7 @@ public class Test_Cre_Uta_Adel extends UiccTestModel {
}
public boolean run() {
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -128,7 +128,7 @@ public class Test_Cre_Uta_Adel extends UiccTestModel {
// 5- Delete AppletA1
response = test.deleteApplet(APPLET_AID_A_1);
- result = !response.checkSw("9000"); //response shall be different from 90 00
+ addResult(!response.checkSw("9000")); //response shall be different from 90 00
test.reset();
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
@@ -138,11 +138,11 @@ public class Test_Cre_Uta_Adel extends UiccTestModel {
// 7- Trigger AppletA2
response = test.envelopeMenuSelection("100102", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// 9- Delete AppletA1
response = test.deleteApplet(APPLET_AID_A_1);
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// 10- Install AppletA1
response = test.installApplet(CAP_FILE_PATH_A, CLASS_AID_A_1, APPLET_AID_A_1,
@@ -158,8 +158,8 @@ public class Test_Cre_Uta_Adel extends UiccTestModel {
"00" + // LV TAR Value(s)
"00" ); // V Maximum number of services
- result &= response.checkData("00");
- result &= response.checkSw("9000");
+ addResult(response.checkData("00"));
+ addResult(response.checkSw("9000"));
test.reset();
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
@@ -172,7 +172,7 @@ public class Test_Cre_Uta_Adel extends UiccTestModel {
// 15- Delete AppletA1
response = test.deleteApplet(APPLET_AID_A_1);
- result &= !response.checkSw("9000"); //response shall be different from 90 00
+ addResult(!response.checkSw("9000")); //response shall be different from 90 00
test.reset();
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
@@ -182,11 +182,11 @@ public class Test_Cre_Uta_Adel extends UiccTestModel {
// 17- Trigger AppletB2
response = test.envelopeMenuSelection("100104", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// 19- Delete AppletA1
response = test.deleteApplet(APPLET_AID_A_1);
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// 20- Install AppletA1
response = test.installApplet(CAP_FILE_PATH_A, CLASS_AID_A_1, APPLET_AID_A_1,
@@ -202,8 +202,8 @@ public class Test_Cre_Uta_Adel extends UiccTestModel {
"00" + // LV TAR Value(s)
"00" ); // V Maximum number of services
- result &= response.checkData("00");
- result &= response.checkSw("9000");
+ addResult(response.checkData("00"));
+ addResult(response.checkSw("9000"));
test.reset();
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
@@ -223,11 +223,11 @@ public class Test_Cre_Uta_Adel extends UiccTestModel {
// 5- Delete AppletA2
response = test.deleteApplet(APPLET_AID_A_2);
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// 6- Delete AppletA1
response = test.deleteApplet(APPLET_AID_A_1);
- result &= !response.checkSw("9000"); //response shall be different from 90 00
+ addResult(!response.checkSw("9000")); //response shall be different from 90 00
test.reset();
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
@@ -237,7 +237,7 @@ public class Test_Cre_Uta_Adel extends UiccTestModel {
// 9- Delete AppletA1
response = test.deleteApplet(APPLET_AID_A_1);
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// 10- Install AppletA1
response = test.installApplet(CAP_FILE_PATH_A, CLASS_AID_A_1, APPLET_AID_A_1,
@@ -253,8 +253,8 @@ public class Test_Cre_Uta_Adel extends UiccTestModel {
"00" + // LV TAR Value(s)
"00" ); // V Maximum number of services
- result &= response.checkData("00");
- result &= response.checkSw("9000");
+ addResult(response.checkData("00"));
+ addResult(response.checkSw("9000"));
test.reset();
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
@@ -267,11 +267,11 @@ public class Test_Cre_Uta_Adel extends UiccTestModel {
// 15- Delete AppletB2
response = test.deleteApplet(APPLET_AID_B_2);
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// 16- Delete AppletA1
response = test.deleteApplet(APPLET_AID_A_1);
- result &= !response.checkSw("9000"); //response shall be different from 90 00
+ addResult(!response.checkSw("9000")); //response shall be different from 90 00
test.reset();
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
@@ -284,14 +284,14 @@ public class Test_Cre_Uta_Adel extends UiccTestModel {
//check data
response = test.selectApplication(APPLET_AID_A_1);
- result &= response.checkData("10" + APPLET_AID_A_1 +
- "08CCCCCC CCCCCCCC CC");
+ addResult(response.checkData("10" + APPLET_AID_A_1 +
+ "08CCCCCC CCCCCCCC CC"));
test.reset();
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
// 20- Delete AppletA1
response = test.deleteApplet(APPLET_AID_A_1);
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// 21- Install AppletA1
response = test.installApplet(CAP_FILE_PATH_A, CLASS_AID_A_1, APPLET_AID_A_1,
@@ -307,8 +307,8 @@ public class Test_Cre_Uta_Adel extends UiccTestModel {
"00" + // LV TAR Value(s)
"00" ); // V Maximum number of services
- result &= response.checkData("00");
- result &= response.checkSw("9000");
+ addResult(response.checkData("00"));
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -318,7 +318,7 @@ public class Test_Cre_Uta_Adel extends UiccTestModel {
// 1- Delete AppletB1
response = test.deleteApplet(APPLET_AID_B_1);
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// 2- Install AppletB1
response = test.installApplet(CAP_FILE_PATH_B, CLASS_AID_B_1, APPLET_AID_B_1,
@@ -334,8 +334,8 @@ public class Test_Cre_Uta_Adel extends UiccTestModel {
"00" + // LV TAR Value(s)
"00" ); // V Maximum number of services
- result &= response.checkData("00");
- result &= response.checkSw("9000");
+ addResult(response.checkData("00"));
+ addResult(response.checkSw("9000"));
test.reset();
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
@@ -343,20 +343,20 @@ public class Test_Cre_Uta_Adel extends UiccTestModel {
// 3- Select AppletB1 on a different channel
response = test.manageChannel("00", "00");//Open channel if P1=00 P2 is reserved
response = test.selectApplication(response.getData(), APPLET_AID_B_1);
- result &= response.checkData("10" + APPLET_AID_B_1 +
- "00");
- result &= response.checkSw("9000");
+ addResult(response.checkData("10" + APPLET_AID_B_1 +
+ "00"));
+ addResult(response.checkSw("9000"));
// 4- Delete AppletB1
response = test.deleteApplet(APPLET_AID_B_1);
- result &= !response.checkSw("9000"); //response shall be different from 90 00
+ addResult(!response.checkSw("9000")); //response shall be different from 90 00
// 5- Select AppletB1
response = test.selectApplication(APPLET_AID_B_1);
- result &= response.checkData("10" + APPLET_AID_B_1 +
- "00");
- result &= response.checkSw("9000");
+ addResult(response.checkData("10" + APPLET_AID_B_1 +
+ "00"));
+ addResult(response.checkSw("9000"));
// 6- reset
test.reset();
@@ -371,11 +371,11 @@ public class Test_Cre_Uta_Adel extends UiccTestModel {
// 1- Delete AppletB1
response = test.deleteApplet(APPLET_AID_B_1);
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// 2- Select AppletB1
response = test.selectApplication(APPLET_AID_B_1);
- result &= !response.checkSw("9000"); //response shall be different from 90 00
+ addResult(!response.checkSw("9000")); //response shall be different from 90 00
// 3- Install AppletB1
response = test.installApplet(CAP_FILE_PATH_B, CLASS_AID_B_1, APPLET_AID_B_1,
@@ -391,19 +391,19 @@ public class Test_Cre_Uta_Adel extends UiccTestModel {
"00" + // LV TAR Value(s)
"00" ); // V Maximum number of services
- result &= response.checkData("00");
- result &= response.checkSw("9000");
+ addResult(response.checkData("00"));
+ addResult(response.checkSw("9000"));
/*********************************************************************/
/** Testcase 5 */
/*********************************************************************/
- // Object owned by a deleted applet can’t be accessed by other applets
+ // Object owned by a deleted applet can�t be accessed by other applets
// 1- Delete AppletA1
response = test.deleteApplet(APPLET_AID_A_1);
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
test.reset();
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
@@ -412,8 +412,8 @@ public class Test_Cre_Uta_Adel extends UiccTestModel {
test.envelopeMenuSelection("100103", "");
response = test.selectApplication(APPLET_AID_B_1);
- result &= response.checkData("10" + APPLET_AID_B_1 +
- "01CC");
+ addResult(response.checkData("10" + APPLET_AID_B_1 +
+ "01CC"));
test.reset();
@@ -431,6 +431,6 @@ public class Test_Cre_Uta_Adel extends UiccTestModel {
test.deletePackage(CAP_FILE_PATH_B);
test.deletePackage(CAP_FILE_PATH_A);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_dafs/Test_Cre_Uta_Dafs.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_dafs/Test_Cre_Uta_Dafs.java
index a9abc6509d6804097b013d826c664778ac74b0ff..1506217be904688752468577281eea7a467fb2c2 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_dafs/Test_Cre_Uta_Dafs.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_dafs/Test_Cre_Uta_Dafs.java
@@ -31,7 +31,7 @@ public class Test_Cre_Uta_Dafs extends UiccTestModel {
public boolean run() {
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -96,8 +96,8 @@ public class Test_Cre_Uta_Dafs extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_B_1);
- result = response.checkData("10" + APPLET_AID_B_1 +
- "01CC");
+ addResult(response.checkData("10" + APPLET_AID_B_1 +
+ "01CC"));
test.reset();
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
@@ -114,6 +114,6 @@ public class Test_Cre_Uta_Dafs extends UiccTestModel {
test.deletePackage(CAP_FILE_PATH_A);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_odel/Test_Cre_Uta_Odel.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_odel/Test_Cre_Uta_Odel.java
index ffec940f7b649bf7763fdf31c1d0acb747cfff39..42a2769029211aa2c289de8e370fbb2494da7a7e 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_odel/Test_Cre_Uta_Odel.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_odel/Test_Cre_Uta_Odel.java
@@ -25,7 +25,7 @@ public class Test_Cre_Uta_Odel extends UiccTestModel {
}
public boolean run() {
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -55,8 +55,8 @@ public class Test_Cre_Uta_Odel extends UiccTestModel {
test.terminalProfile("0101");
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1 +
- "01CC");
+ addResult(response.checkData("10" + APPLET_AID_1 +
+ "01CC"));
test.reset();
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
@@ -71,6 +71,6 @@ public class Test_Cre_Uta_Odel extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_pdel/Test_Cre_Uta_Pdel.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_pdel/Test_Cre_Uta_Pdel.java
index a41bdcfe04bfe3d442960b0a49f67be3d76b65bf..73bdddf9ce88c474944192951dd7b471a5794a70 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_pdel/Test_Cre_Uta_Pdel.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_pdel/Test_Cre_Uta_Pdel.java
@@ -35,7 +35,7 @@ public class Test_Cre_Uta_Pdel extends UiccTestModel {
}
public boolean run() {
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -76,7 +76,7 @@ public class Test_Cre_Uta_Pdel extends UiccTestModel {
// Delete PackageB
response = test.deletePackage(CAP_FILE_PATH_B);
- result = !response.checkSw("9000"); //response shall be different from 90 00
+ addResult(!response.checkSw("9000")); //response shall be different from 90 00
// Install AppletB2
@@ -90,8 +90,8 @@ public class Test_Cre_Uta_Pdel extends UiccTestModel {
"00" + // LV Minimum Security Level field
"00" + // LV TAR Value(s)
"00" ); // V Maximum number of services
- result &= response.checkData("00");
- result &= response.checkSw("9000");
+ addResult(response.checkData("00"));
+ addResult(response.checkSw("9000"));
// Delete AppletB1 and AppletB2
test.deleteApplet(APPLET_AID_B_1);
@@ -107,7 +107,7 @@ public class Test_Cre_Uta_Pdel extends UiccTestModel {
// Delete PackageA
response = test.deletePackage(CAP_FILE_PATH_A);
- result &= !response.checkSw("9000"); //response shall be different from 90 00
+ addResult(!response.checkSw("9000")); //response shall be different from 90 00
// Install AppletA1
response = test.installApplet(CAP_FILE_PATH_A, CLASS_AID_A_1, APPLET_AID_A_1,
@@ -120,8 +120,8 @@ public class Test_Cre_Uta_Pdel extends UiccTestModel {
"00" + // LV Minimum Security Level field
"00" + // LV TAR Value(s)
"00" ); // V Maximum number of services
- result &= response.checkData("00");
- result &= response.checkSw("9000");
+ addResult(response.checkData("00"));
+ addResult(response.checkSw("9000"));
// Delete AppletA1
test.deleteApplet(APPLET_AID_A_1);
@@ -136,15 +136,15 @@ public class Test_Cre_Uta_Pdel extends UiccTestModel {
// Delete PackageB
response = test.deletePackage(CAP_FILE_PATH_B);
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// Delete PackageA
response = test.deletePackage(CAP_FILE_PATH_A);
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// Install packageB
response = test.loadPackage(CAP_FILE_PATH_B);
- result &= !response.checkSw("9000"); //response shall be different from 90 00
+ addResult(!response.checkSw("9000")); //response shall be different from 90 00
/*********************************************************************/
/** Testcase 4 */
@@ -163,7 +163,7 @@ public class Test_Cre_Uta_Pdel extends UiccTestModel {
"00" + // LV Minimum Security Level field
"00" + // LV TAR Value(s)
"00" ); // V Maximum number of services
- result &= !response.checkSw("9000"); //response shall be different from 90 00
+ addResult(!response.checkSw("9000")); //response shall be different from 90 00
// Install AppletB2
response = test.installApplet(CAP_FILE_PATH_B, CLASS_AID_B_2, APPLET_AID_B_2,
@@ -176,7 +176,7 @@ public class Test_Cre_Uta_Pdel extends UiccTestModel {
"00" + // LV Minimum Security Level field
"00" + // LV TAR Value(s)
"00" ); // V Maximum number of services
- result &= !response.checkSw("9000"); //response shall be different from 90 00
+ addResult(!response.checkSw("9000")); //response shall be different from 90 00
/*********************************************************************/
/** Testcase 5 */
@@ -197,8 +197,8 @@ public class Test_Cre_Uta_Pdel extends UiccTestModel {
"00" + // LV Minimum Security Level field
"00" + // LV TAR Value(s)
"00" ); // V Maximum number of services
- result &= response.checkData("00");
- result &= response.checkSw("9000");
+ addResult(response.checkData("00"));
+ addResult(response.checkSw("9000"));
/*********************************************************************/
/*********************************************************************/
@@ -212,6 +212,6 @@ public class Test_Cre_Uta_Pdel extends UiccTestModel {
test.deleteApplet(APPLET_AID_A_1);
test.deletePackage(CAP_FILE_PATH_A);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/system/api_3_hbd_bthdbs/Test_Api_3_Hbd_Bthdbs.java b/source/Annex_E_SourceCode/uicc/test/system/api_3_hbd_bthdbs/Test_Api_3_Hbd_Bthdbs.java
index 63413f9c1754c601c0c96bcc9caf3c39d4f1eb95..14305c730a4457fcd939aa767f3ce2276e380081 100644
--- a/source/Annex_E_SourceCode/uicc/test/system/api_3_hbd_bthdbs/Test_Api_3_Hbd_Bthdbs.java
+++ b/source/Annex_E_SourceCode/uicc/test/system/api_3_hbd_bthdbs/Test_Api_3_Hbd_Bthdbs.java
@@ -30,7 +30,7 @@ public class Test_Api_3_Hbd_Bthdbs extends UiccTestModel {
public boolean run() {
- boolean result = false;
+ initialiseResults();
// start test
test.reset();
@@ -55,11 +55,11 @@ public class Test_Api_3_Hbd_Bthdbs extends UiccTestModel {
// test case 1 to 5: trigger applet1
response = test.unrecognizedEnvelope();
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "05CCCC CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "05CCCC CCCCCC"));
// delete applet and package
test.reset();
@@ -67,7 +67,7 @@ public class Test_Api_3_Hbd_Bthdbs extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/system/api_3_hbd_bthdbs_bss/Test_Api_3_Hbd_Bthdbs_Bss.java b/source/Annex_E_SourceCode/uicc/test/system/api_3_hbd_bthdbs_bss/Test_Api_3_Hbd_Bthdbs_Bss.java
index 8b40305d01a8ea8abbdc42c5d300fd65f84e7621..397f29622719db2e72cdb1c03960ca6288ab7b2b 100644
--- a/source/Annex_E_SourceCode/uicc/test/system/api_3_hbd_bthdbs_bss/Test_Api_3_Hbd_Bthdbs_Bss.java
+++ b/source/Annex_E_SourceCode/uicc/test/system/api_3_hbd_bthdbs_bss/Test_Api_3_Hbd_Bthdbs_Bss.java
@@ -29,7 +29,7 @@ public class Test_Api_3_Hbd_Bthdbs_Bss extends UiccTestModel {
public boolean run() {
- boolean result = false;
+ initialiseResults();
// start test
test.reset();
@@ -54,11 +54,11 @@ public class Test_Api_3_Hbd_Bthdbs_Bss extends UiccTestModel {
// test case 1 to 11: trigger applet1
response = test.unrecognizedEnvelope();
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "0BCCCCCC CCCCCCCC CCCCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "0BCCCCCC CCCCCCCC CCCCCCCC"));
// delete applet and package
test.reset();
@@ -66,6 +66,6 @@ public class Test_Api_3_Hbd_Bthdbs_Bss extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/system/api_3_upf_gvba/Test_Api_3_Upf_Gvba.java b/source/Annex_E_SourceCode/uicc/test/system/api_3_upf_gvba/Test_Api_3_Upf_Gvba.java
index 8347cbeb45b9d633b2912d82ffb6e8f9715e7d67..de4b2fc7bb4006c419ec0d10935126234da77bd3 100644
--- a/source/Annex_E_SourceCode/uicc/test/system/api_3_upf_gvba/Test_Api_3_Upf_Gvba.java
+++ b/source/Annex_E_SourceCode/uicc/test/system/api_3_upf_gvba/Test_Api_3_Upf_Gvba.java
@@ -35,7 +35,7 @@ public class Test_Api_3_Upf_Gvba extends UiccTestModel {
public boolean run() {
- boolean result = false;
+ initialiseResults();
// start test
test.reset();
@@ -73,21 +73,21 @@ public class Test_Api_3_Upf_Gvba extends UiccTestModel {
// test case 1, 3 to 5: trigger applet1
response = test.unrecognizedEnvelope();
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test case 2: select client applet. It calls applet1 shared method.
test.selectApplication(APPLET_AID_2);
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test case 1: select applet1
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "06CCCC CCCCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "06CCCC CCCCCCCC"));
// delete applet and package
test.reset();
@@ -97,6 +97,6 @@ public class Test_Api_3_Upf_Gvba extends UiccTestModel {
test.deletePackage(CAP_FILE_PATH2);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_apda/Test_Api_2_Bte_Apda.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_apda/Test_Api_2_Bte_Apda.java
index a6abfa0da924e54184ac880bc964d59f5093cd5f..6c94c657d8d758ce601b5658e7b38b280051aa2b 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_apda/Test_Api_2_Bte_Apda.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_apda/Test_Api_2_Bte_Apda.java
@@ -29,8 +29,6 @@ public class Test_Api_2_Bte_Apda 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;
/**
@@ -43,6 +41,8 @@ public class Test_Api_2_Bte_Apda extends UiccTestModel {
* Installs the applet, runs the tests and checks the test result.
*/
public boolean run(){
+ initialiseResults();
+
test.reset();
test.terminalProfileSession("13");
//install the test applet
@@ -68,14 +68,14 @@ public class Test_Api_2_Bte_Apda extends UiccTestModel {
test.unrecognizedEnvelope();
// check test results
response = test.selectApplication(APPLET_AID_1);
- testresult = response.checkData("10" +APPLET_AID_1 +
- "0CCCCCCC CCCCCCCC CCCCCCCC CC");
+ addResult(response.checkData("10" +APPLET_AID_1 +
+ "0CCCCCCC CCCCCCCC CCCCCCCC CC"));
// delete applet and package
test.reset();
test.terminalProfileSession("13");
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return testresult;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlb_bss/Test_Api_2_Bte_Aptlb_Bss.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlb_bss/Test_Api_2_Bte_Aptlb_Bss.java
index e11a2b6ae12a4e2696a634e4831677f4b3bd36ab..769dbdc85e4d9b89675348a43abe958a25d24d2a 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlb_bss/Test_Api_2_Bte_Aptlb_Bss.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlb_bss/Test_Api_2_Bte_Aptlb_Bss.java
@@ -29,8 +29,6 @@ public class Test_Api_2_Bte_Aptlb_Bss 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;
/**
@@ -43,7 +41,9 @@ public class Test_Api_2_Bte_Aptlb_Bss extends UiccTestModel
* Installs the applet, runs the tests and checks the test result.
*/
public boolean run(){
- test.reset();
+ initialiseResults();
+
+ test.reset();
test.terminalProfileSession("13");
//Install package
test.loadPackage(CAP_FILE_PATH);
@@ -69,8 +69,8 @@ public class Test_Api_2_Bte_Aptlb_Bss extends UiccTestModel
test.unrecognizedEnvelope();
// check test results
response = test.selectApplication(APPLET_AID_1);
- testresult = response.checkData("10" +APPLET_AID_1 +
- "0ECCCCCC CCCCCCCC CCCCCCCC CCCCCC");
+ addResult(response.checkData("10" +APPLET_AID_1 +
+ "0ECCCCCC CCCCCCCC CCCCCCCC CCCCCC"));
// delete applet and package
test.reset();
@@ -78,7 +78,7 @@ public class Test_Api_2_Bte_Aptlb_Bss extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return testresult;
+ return getOverallResult();
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlb_bss_bss/Api_2_Bte_Aptlb_Bss_Bss_1.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlb_bss_bss/Api_2_Bte_Aptlb_Bss_Bss_1.java
index 3ee164abbf34431048611d29ba26d72cf4386c43..8660736832e9c9503428cd14e32213fb26120395 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlb_bss_bss/Api_2_Bte_Aptlb_Bss_Bss_1.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlb_bss_bss/Api_2_Bte_Aptlb_Bss_Bss_1.java
@@ -316,35 +316,50 @@ public class Api_2_Bte_Aptlb_Bss_Bss_1 extends TestToolkitApplet {
bRes=false;
}
this.reportTestOutcome(testCaseNb,bRes);
+
//-------------- TESTCASE 16 --------------
try {
bRes = false;
testCaseNb = (byte) 0x10;
bte_handler.clear();
- bte_handler.appendTLV((byte)0x81,new byte[]{(byte)0x11,(byte)0x22,(byte)0x33},(short)0,(short)3);
- bte_handler.appendTLV((byte)0x82,new byte[]{(byte)0x99,(byte)0x77,},(short)0,(short)2);
+ bte_handler.appendTLV((byte)0x81, new byte[]{(byte)0x11,(byte)0x22,(byte)0x33}, (byte)0, (byte)3);
+ bte_handler.appendTLV((byte)0x82, new byte[]{(byte)0x99,(byte)0x77}, (byte)0, (byte)2);
//-select Command details TLV
- bte_handler.findTLV((byte)0x81,(byte)0x01);
+ bte_handler.findTLV((byte)0x81, (byte)0x01);
+ bte_handler.findTLV((byte)0x82, (byte)0x01);
+ bRes = true;
+ }
+ catch(Exception exp){
+ bRes=false;
+ }
+ this.reportTestOutcome(testCaseNb,bRes);
+
+ //-----------------TESTCASE 17-----------------
+ try {
+ bRes = false;
+ testCaseNb = (byte) 0x11;
+ bte_handler.clear();
//-successful call
- buffer1= new byte[]{(byte)0xFF,(byte)0xFE,(byte)0xFD,(byte)0xFC,(byte)0xFB,(byte)0xFA,(byte)0x09,(byte)0x08};
- buffer2= new byte[]{(byte)0xF7,(byte)0xF6,(byte)0xF5,(byte)0xF4,(byte)0xF3,(byte)0xF2,(byte)0xF1,(byte)0xF0};
- bte_handler.appendTLV((byte)0x04,buffer1,(short)0,(short)8,buffer2,(short)0,(short)8);
- if(bte_handler.getValueLength()==(short)3){
+ buffer1 = new byte[]{(byte)0xFF,(byte)0xFE,(byte)0xFD,(byte)0xFC,(byte)0xFB,(byte)0xFA,(byte)0xF9,(byte)0xF8};
+ buffer2 = new byte[]{(byte)0xF7,(byte)0xF6,(byte)0xF5,(byte)0xF4,(byte)0xF3,(byte)0xF2,(byte)0xF1,(byte)0xF0};
+ bte_handler.appendTLV((byte)0x04, buffer1, (short)0, (short)8, buffer2, (short)0, (short)8);
+ bte_handler.findTLV((byte)0x04, (byte)0x01);
+ if(bte_handler.getValueLength() == 16) {
bRes=true;
}
-
- }
+ }
catch(Exception exp){
bRes=false;
}
this.reportTestOutcome(testCaseNb,bRes);
- //-------------- TESTCASE 17 --------------
+
+ //-------------- TESTCASE 18 --------------
try {
bRes = false;
- testCaseNb = (byte) 0x11;
+ testCaseNb = (byte) 0x12;
bte_handler.clear();
//-successful call
- buffer1= new byte[]{(byte)0xFF,(byte)0xFE,(byte)0xFD,(byte)0xFC,(byte)0xFB,(byte)0xFA,(byte)0x09,(byte)0x08};
+ buffer1= new byte[]{(byte)0xFF,(byte)0xFE,(byte)0xFD,(byte)0xFC,(byte)0xFB,(byte)0xFA,(byte)0xF9,(byte)0xF8};
buffer2= new byte[]{(byte)0xF7,(byte)0xF6,(byte)0xF5,(byte)0xF4,(byte)0xF3,(byte)0xF2,(byte)0xF1,(byte)0xF0};
compareBuffer = new byte[42];
compareBuffer[0]=(byte)0x04;
@@ -363,10 +378,10 @@ public class Api_2_Bte_Aptlb_Bss_Bss_1 extends TestToolkitApplet {
bRes=false;
}
this.reportTestOutcome(testCaseNb,bRes);
- //-------------- TESTCASE 18 --------------
+ //-------------- TESTCASE 19 --------------
try {
bRes = false;
- testCaseNb = (byte) 0x12;
+ testCaseNb = (byte) 0x13;
//-successful call
buffer1= new byte[]{(byte)0x00,(byte)0x01,(byte)0x02,(byte)0x03,(byte)0x04,(byte)0x05,(byte)0x06,(byte)0x07};
@@ -387,10 +402,10 @@ public class Api_2_Bte_Aptlb_Bss_Bss_1 extends TestToolkitApplet {
bRes=false;
}
this.reportTestOutcome(testCaseNb,bRes);
- //-------------- TESTCASE 19 --------------
+ //-------------- TESTCASE 20 --------------
try {
bRes = false;
- testCaseNb = (byte) 0x13;
+ testCaseNb = (byte) 0x14;
//-successful call
buffer1= new byte[]{(byte)0x11,(byte)0x22,(byte)0x33,(byte)0x44,(byte)0x55,(byte)0x66,(byte)0x77,(byte)0x88};
buffer2= new byte[]{(byte)0x99,(byte)0xAA,(byte)0xBB,(byte)0xCC,(byte)0xDD,(byte)0xEE,(byte)0xFF,(byte)0x00};
@@ -410,10 +425,10 @@ public class Api_2_Bte_Aptlb_Bss_Bss_1 extends TestToolkitApplet {
bRes=false;
}
this.reportTestOutcome(testCaseNb,bRes);
- //-------------- TESTCASE 20 --------------
+ //-------------- TESTCASE 21 --------------
try {
bRes = false;
- testCaseNb = (byte) 0x14;
+ testCaseNb = (byte) 0x15;
//-successful call
bte_handler.clear();
buffer1 = new byte[128];
@@ -443,7 +458,5 @@ public class Api_2_Bte_Aptlb_Bss_Bss_1 extends TestToolkitApplet {
bRes=false;
}
this.reportTestOutcome(testCaseNb,bRes);
-
-
}
}
\ No newline at end of file
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlb_bss_bss/Test_Api_2_Bte_Aptlb_Bss_Bss.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlb_bss_bss/Test_Api_2_Bte_Aptlb_Bss_Bss.java
index 9bce6173ebd1ead1b1a74ac9230e409e2f0902b9..b92f562f364d329831ed0e2897260e926e8bcfc5 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlb_bss_bss/Test_Api_2_Bte_Aptlb_Bss_Bss.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlb_bss_bss/Test_Api_2_Bte_Aptlb_Bss_Bss.java
@@ -31,8 +31,6 @@ public class Test_Api_2_Bte_Aptlb_Bss_Bss 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;
/**
@@ -45,6 +43,8 @@ public class Test_Api_2_Bte_Aptlb_Bss_Bss extends UiccTestModel
* Installs the applet, runs the tests and checks the test result.
*/
public boolean run(){
+ initialiseResults();
+
test.reset();
test.terminalProfileSession("13");
//Install package
@@ -71,9 +71,9 @@ public class Test_Api_2_Bte_Aptlb_Bss_Bss extends UiccTestModel
test.unrecognizedEnvelope();
// check test results
response = test.selectApplication(APPLET_AID_1);
- testresult = response.checkData("10" +APPLET_AID_1 +
- "14CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC " +
- "CCCCCCCC CC");
+ addResult(response.checkData("10" +APPLET_AID_1 +
+ "15CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC " +
+ "CCCCCCCC CCCC"));
// delete applet and package
test.reset();
@@ -81,7 +81,7 @@ public class Test_Api_2_Bte_Aptlb_Bss_Bss extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return testresult;
+ return getOverallResult();
}
}
\ No newline at end of file
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbb/Test_Api_2_Bte_Aptlbb.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbb/Test_Api_2_Bte_Aptlbb.java
index e160c5de83d421dad125fb2edf317905f201c3b0..3c6cda5cf90decd9f1beece39ba9a2a351388b88 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbb/Test_Api_2_Bte_Aptlbb.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbb/Test_Api_2_Bte_Aptlbb.java
@@ -28,8 +28,6 @@ public class Test_Api_2_Bte_Aptlbb 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;
/**
*
@@ -41,7 +39,9 @@ public class Test_Api_2_Bte_Aptlbb extends UiccTestModel{
* Installs the applet, runs the tests and checks the test result.
*/
public boolean run(){
- test.reset();
+ initialiseResults();
+
+ test.reset();
test.terminalProfileSession("13");
//Install package
test.loadPackage(CAP_FILE_PATH);
@@ -68,7 +68,7 @@ public class Test_Api_2_Bte_Aptlbb extends UiccTestModel{
test.unrecognizedEnvelope();
// check test results
response = test.selectApplication(APPLET_AID_1);
- testresult = response.checkData("10"+APPLET_AID_1+"05CCCCCC CCCC");
+ addResult(response.checkData("10"+APPLET_AID_1+"05CCCCCC CCCC"));
// delete applet and package
test.reset();
@@ -76,7 +76,7 @@ public class Test_Api_2_Bte_Aptlbb extends UiccTestModel{
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return testresult;
+ return getOverallResult();
}
}
\ No newline at end of file
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbb_bss/Test_Api_2_Bte_Aptlbb_Bss.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbb_bss/Test_Api_2_Bte_Aptlbb_Bss.java
index 61aa276640981653e7415dba6395598cf05036e8..dcf6b092dcf0abfc874cb11da177f3865c955a69 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbb_bss/Test_Api_2_Bte_Aptlbb_Bss.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbb_bss/Test_Api_2_Bte_Aptlbb_Bss.java
@@ -28,8 +28,6 @@ public class Test_Api_2_Bte_Aptlbb_Bss 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;
/**
*
@@ -41,7 +39,9 @@ public class Test_Api_2_Bte_Aptlbb_Bss extends UiccTestModel{
* Installs the applet, runs the tests and checks the test result.
*/
public boolean run(){
- test.reset();
+ initialiseResults();
+
+ test.reset();
test.terminalProfileSession("13");
//Install package
test.loadPackage(CAP_FILE_PATH);
@@ -67,15 +67,15 @@ public class Test_Api_2_Bte_Aptlbb_Bss extends UiccTestModel{
test.unrecognizedEnvelope();
// check test results
response = test.selectApplication(APPLET_AID_1);
- testresult = response.checkData("10"+APPLET_AID_1+
- "0ECCCCCC CCCCCCCC CCCCCCCC CCCCCC");
+ addResult(response.checkData("10"+APPLET_AID_1+
+ "0ECCCCCC CCCCCCCC CCCCCCCC CCCCCC"));
// delete applet and package
test.reset();
test.terminalProfileSession("13");
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return testresult;
+ return getOverallResult();
}
}
\ No newline at end of file
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbbb/Test_Api_2_Bte_Aptlbbb.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbbb/Test_Api_2_Bte_Aptlbbb.java
index 4ea4c6b2173a24939e1485b22a93f61a9ebd30f0..7a20f52a5eb392c3e3ff5821df612f654dd3d800 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbbb/Test_Api_2_Bte_Aptlbbb.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbbb/Test_Api_2_Bte_Aptlbbb.java
@@ -28,8 +28,6 @@ public class Test_Api_2_Bte_Aptlbbb 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;
/**
*
@@ -41,7 +39,9 @@ public class Test_Api_2_Bte_Aptlbbb extends UiccTestModel{
* Installs the applet, runs the tests and checks the test result.
*/
public boolean run(){
- test.reset();
+ initialiseResults();
+
+ test.reset();
test.terminalProfileSession("13");
//Install package
test.loadPackage(CAP_FILE_PATH);
@@ -67,15 +67,15 @@ public class Test_Api_2_Bte_Aptlbbb extends UiccTestModel{
test.unrecognizedEnvelope();
// check test results
response = test.selectApplication(APPLET_AID_1);
- testresult = response.checkData("10"+APPLET_AID_1+
- "05CCCCCCCC CC");
+ addResult(response.checkData("10"+APPLET_AID_1+
+ "05CCCCCCCC CC"));
// delete applet and package
test.reset();
test.terminalProfileSession("13");
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return testresult;
+ return getOverallResult();
}
}
\ No newline at end of file
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbbs/Test_Api_2_Bte_Aptlbbs.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbbs/Test_Api_2_Bte_Aptlbbs.java
index ccac233a5e3128dd970794a296c8323ec3267d35..583d43f5e243553a015172037305d066a1d2d6e0 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbbs/Test_Api_2_Bte_Aptlbbs.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbbs/Test_Api_2_Bte_Aptlbbs.java
@@ -30,8 +30,6 @@ public class Test_Api_2_Bte_Aptlbbs 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;
/**
*
@@ -43,6 +41,8 @@ public class Test_Api_2_Bte_Aptlbbs extends UiccTestModel{
* Installs the applet, runs the tests and checks the test result.
*/
public boolean run(){
+ initialiseResults();
+
test.reset();
test.terminalProfileSession("13");
//Install package
@@ -68,15 +68,15 @@ public class Test_Api_2_Bte_Aptlbbs extends UiccTestModel{
test.unrecognizedEnvelope();
// check test results
response = test.selectApplication(APPLET_AID_1);
- testresult = response.checkData("10"+APPLET_AID_1+
- "05CCCCCC CCCC");
+ addResult(response.checkData("10"+APPLET_AID_1+
+ "05CCCCCC CCCC"));
// delete applet and package
test.reset();
test.terminalProfileSession("13");
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return testresult;
+ return getOverallResult();
}
}
\ No newline at end of file
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbs/Test_Api_2_Bte_Aptlbs.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbs/Test_Api_2_Bte_Aptlbs.java
index fe0678930b61ece076a57eada9867cb60c567110..f89e69c9136304779361f8ee676d2a215e6673d9 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbs/Test_Api_2_Bte_Aptlbs.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbs/Test_Api_2_Bte_Aptlbs.java
@@ -28,8 +28,6 @@ public class Test_Api_2_Bte_Aptlbs 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;
/**
*
@@ -41,6 +39,8 @@ public class Test_Api_2_Bte_Aptlbs extends UiccTestModel{
* Installs the applet, runs the tests and checks the test result.
*/
public boolean run(){
+ initialiseResults();
+
test.reset();
//Install package
test.loadPackage(CAP_FILE_PATH);
@@ -66,15 +66,15 @@ public class Test_Api_2_Bte_Aptlbs extends UiccTestModel{
test.unrecognizedEnvelope();
// check test results
response = test.selectApplication(APPLET_AID_1);
- testresult = response.checkData("10"+APPLET_AID_1+
- "05CCCCCC CCCC");
+ addResult(response.checkData("10"+APPLET_AID_1+
+ "05CCCCCC CCCC"));
// delete applet and package
test.reset();
test.terminalProfileSession("13");
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return testresult;
+ return getOverallResult();
}
}
\ No newline at end of file
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbss/Test_Api_2_Bte_Aptlbss.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbss/Test_Api_2_Bte_Aptlbss.java
index a178ebce5cb31e89063bb2dd51187f6c9306c3c0..f04f9a5f34eefab3ccf12bfe08a2207c1a8a4385 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbss/Test_Api_2_Bte_Aptlbss.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbss/Test_Api_2_Bte_Aptlbss.java
@@ -28,8 +28,6 @@ public class Test_Api_2_Bte_Aptlbss 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;
/**
*
@@ -41,6 +39,8 @@ public class Test_Api_2_Bte_Aptlbss extends UiccTestModel{
* Installs the applet, runs the tests and checks the test result.
*/
public boolean run(){
+ initialiseResults();
+
test.reset();
//Install package
test.loadPackage(CAP_FILE_PATH);
@@ -66,8 +66,8 @@ public class Test_Api_2_Bte_Aptlbss extends UiccTestModel{
test.unrecognizedEnvelope();
// check test results
response = test.selectApplication(APPLET_AID_1);
- testresult = response.checkData("10"+APPLET_AID_1+
- "05CCCCCC CCCC");
+ addResult(response.checkData("10"+APPLET_AID_1+
+ "05CCCCCC CCCC"));
// delete applet and package
test.reset();
test.terminalProfileSession("13");
@@ -75,6 +75,6 @@ public class Test_Api_2_Bte_Aptlbss extends UiccTestModel{
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return testresult;
+ return getOverallResult();
}
}
\ No newline at end of file
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_cler/Test_Api_2_Bte_Cler.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_cler/Test_Api_2_Bte_Cler.java
index 2dc5a3b0049c997ace327cc8beba8708496e70fe..a779ba4ffc4d534ddb4312961dc31816f92b70fe 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_cler/Test_Api_2_Bte_Cler.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_cler/Test_Api_2_Bte_Cler.java
@@ -28,8 +28,6 @@ public class Test_Api_2_Bte_Cler 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;
/**
*
@@ -41,6 +39,8 @@ public class Test_Api_2_Bte_Cler extends UiccTestModel{
* Installs the applet, runs the tests and checks the test result.
*/
public boolean run(){
+ initialiseResults();
+
test.reset();
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
//Install package
@@ -66,13 +66,13 @@ public class Test_Api_2_Bte_Cler extends UiccTestModel{
test.unrecognizedEnvelope();
// check test results
response = test.selectApplication(APPLET_AID_1);
- testresult = response.checkData("10"+APPLET_AID_1+
- "02CCCC");
+ addResult(response.checkData("10"+APPLET_AID_1+
+ "02CCCC"));
// delete applet and package
test.reset();
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return testresult;
+ return getOverallResult();
}
}
\ No newline at end of file
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_copy/Test_Api_2_Bte_Copy.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_copy/Test_Api_2_Bte_Copy.java
index b594ee999782ec357454c557299369b0e7d1ef4c..786b22a0e4073a23ab4c37e282a3dca853749338 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_copy/Test_Api_2_Bte_Copy.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_copy/Test_Api_2_Bte_Copy.java
@@ -29,8 +29,6 @@ public class Test_Api_2_Bte_Copy 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;
/**
*
@@ -42,6 +40,8 @@ public class Test_Api_2_Bte_Copy extends UiccTestModel {
* Installs the applet, runs the tests and checks the test result.
*/
public boolean run(){
+ initialiseResults();
+
test.reset();
test.terminalProfileSession("13");
//Install package
@@ -67,15 +67,15 @@ public class Test_Api_2_Bte_Copy extends UiccTestModel {
test.unrecognizedEnvelope();
// check test results
response = test.selectApplication(APPLET_AID_1);
- testresult = response.checkData("10" +APPLET_AID_1 +
- "0DCCCCCC CCCCCCCC CCCCCCCC CCCC");
+ addResult(response.checkData("10" +APPLET_AID_1 +
+ "0DCCCCCC CCCCCCCC CCCCCCCC CCCC"));
// delete applet and package
test.reset();
test.terminalProfileSession("13");
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return testresult;
+ return getOverallResult();
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_cprv/Test_Api_2_Bte_Cprv.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_cprv/Test_Api_2_Bte_Cprv.java
index 9263eb58dfe573d1cad3f2b4495fd7fc40ec0fbb..5966c88d9914be97a0d1c57087065e27fcdf46d5 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_cprv/Test_Api_2_Bte_Cprv.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_cprv/Test_Api_2_Bte_Cprv.java
@@ -28,8 +28,6 @@ public class Test_Api_2_Bte_Cprv 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;
/**
*
@@ -41,6 +39,8 @@ public class Test_Api_2_Bte_Cprv extends UiccTestModel {
* Installs the applet, runs the tests and checks the test result.
*/
public boolean run(){
+ initialiseResults();
+
test.reset();
test.terminalProfileSession("13");
//Install package
@@ -68,15 +68,15 @@ public class Test_Api_2_Bte_Cprv extends UiccTestModel {
test.unrecognizedEnvelope();
// check test results
response = test.selectApplication(APPLET_AID_1);
- testresult = response.checkData("10" +APPLET_AID_1 +
+ addResult(response.checkData("10" +APPLET_AID_1 +
"12CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC " +
- "CCCCCC");
+ "CCCCCC"));
// delete applet and package
test.reset();
test.terminalProfileSession(TERMINAL_PROFILE);
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return testresult;
+ return getOverallResult();
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_cpyv/Test_Api_2_Bte_Cpyv.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_cpyv/Test_Api_2_Bte_Cpyv.java
index 4e51734aca7955d222e452faacfc2266973cf28b..7b19ec85febcd7cb2df24a21e828cc429fb1c5b0 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_cpyv/Test_Api_2_Bte_Cpyv.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_cpyv/Test_Api_2_Bte_Cpyv.java
@@ -28,8 +28,6 @@ public class Test_Api_2_Bte_Cpyv 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;
/**
*
@@ -41,6 +39,8 @@ public class Test_Api_2_Bte_Cpyv extends UiccTestModel {
* Installs the applet, runs the tests and checks the test result.
*/
public boolean run(){
+ initialiseResults();
+
test.reset();
test.terminalProfileSession("13");
//Install package
@@ -67,8 +67,8 @@ public class Test_Api_2_Bte_Cpyv extends UiccTestModel {
test.unrecognizedEnvelope();
// check test results
response = test.selectApplication(APPLET_AID_1);
- testresult = response.checkData("10" +APPLET_AID_1 +
- "0FCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC");
+ addResult(response.checkData("10" +APPLET_AID_1 +
+ "0FCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"));
// delete applet and package
test.reset();
@@ -76,7 +76,7 @@ public class Test_Api_2_Bte_Cpyv extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return testresult;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facrb_bs/Test_Api_2_Bte_Facrb_Bs.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facrb_bs/Test_Api_2_Bte_Facrb_Bs.java
index b7b28dad2045a5dbddeb748c61dfbbfac6180001..fcb064427cd50482be78bbcd4820d352cf4529bc 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facrb_bs/Test_Api_2_Bte_Facrb_Bs.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facrb_bs/Test_Api_2_Bte_Facrb_Bs.java
@@ -29,8 +29,6 @@ public class Test_Api_2_Bte_Facrb_Bs 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;
/**
*
@@ -42,7 +40,9 @@ public class Test_Api_2_Bte_Facrb_Bs extends UiccTestModel {
* Installs the applet, runs the tests and checks the test result.
*/
public boolean run(){
- test.reset();
+ initialiseResults();
+
+ test.reset();
test.terminalProfileSession("13");
//Install package
test.loadPackage(CAP_FILE_PATH);
@@ -68,16 +68,16 @@ public class Test_Api_2_Bte_Facrb_Bs extends UiccTestModel {
test.unrecognizedEnvelope();
// check test results
response = test.selectApplication(APPLET_AID_1);
- testresult = response.checkData("10" +APPLET_AID_1 +
+ addResult(response.checkData("10" +APPLET_AID_1 +
"11CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC " +
- "CCCC");
+ "CCCC"));
// delete applet and package
test.reset();
test.terminalProfileSession("13");
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return testresult;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facrbbs_bss/Test_Api_2_Bte_Facrbbs_Bss.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facrbbs_bss/Test_Api_2_Bte_Facrbbs_Bss.java
index 5b35021617ac80c2d7d7f67ca2e410724029a155..4e5ccbcf0493daff7942f247a6120f1442eafbb9 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facrbbs_bss/Test_Api_2_Bte_Facrbbs_Bss.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facrbbs_bss/Test_Api_2_Bte_Facrbbs_Bss.java
@@ -28,8 +28,6 @@ public class Test_Api_2_Bte_Facrbbs_Bss 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;
/**
*
@@ -41,7 +39,9 @@ public class Test_Api_2_Bte_Facrbbs_Bss extends UiccTestModel {
* Installs the applet, runs the tests and checks the test result.
*/
public boolean run(){
- test.reset();
+ initialiseResults();
+
+ test.reset();
test.terminalProfileSession("13");
//Install package
test.loadPackage(CAP_FILE_PATH);
@@ -68,16 +68,16 @@ public class Test_Api_2_Bte_Facrbbs_Bss extends UiccTestModel {
test.unrecognizedEnvelope();
// check test results
response = test.selectApplication(APPLET_AID_1);
- testresult = response.checkData("10" +APPLET_AID_1 +
+ addResult(response.checkData("10" +APPLET_AID_1 +
"19CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC " +
- "CCCCCCCC CCCCCCCC CCCC");
+ "CCCCCCCC CCCCCCCC CCCC"));
// delete applet and package
test.reset();
test.terminalProfileSession("13");
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return testresult;
+ return getOverallResult();
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facyb_bs/Test_Api_2_Bte_Facyb_Bs.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facyb_bs/Test_Api_2_Bte_Facyb_Bs.java
index 1c11647a79d24303b7317edc982c2873badb96b5..01aa1e57e4e92be74b8780df302ceea66b3773d5 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facyb_bs/Test_Api_2_Bte_Facyb_Bs.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facyb_bs/Test_Api_2_Bte_Facyb_Bs.java
@@ -28,8 +28,6 @@ public class Test_Api_2_Bte_Facyb_Bs 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;
/**
*
@@ -41,6 +39,8 @@ public class Test_Api_2_Bte_Facyb_Bs extends UiccTestModel {
* Installs the applet, runs the tests and checks the test result.
*/
public boolean run(){
+ initialiseResults();
+
test.reset();
test.terminalProfileSession("13");
//Install package
@@ -67,16 +67,16 @@ public class Test_Api_2_Bte_Facyb_Bs extends UiccTestModel {
test.unrecognizedEnvelope();
// check test results
response = test.selectApplication(APPLET_AID_1);
- testresult = response.checkData("10" +APPLET_AID_1 +
+ addResult(response.checkData("10" +APPLET_AID_1 +
"10CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC " +
- "CC");
+ "CC"));
// delete applet and package
test.reset();
test.terminalProfileSession("13");
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return testresult;
+ return getOverallResult();
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facybbs_bss/Api_2_Bte_Facybbs_Bss_1.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facybbs_bss/Api_2_Bte_Facybbs_Bss_1.java
index 5f7f60544593c2ff21dc0cbebe6f9b4c01f356fd..24b39d6b53e15cd1ccaf2fa4239dcd1c94c16dfb 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facybbs_bss/Api_2_Bte_Facybbs_Bss_1.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facybbs_bss/Api_2_Bte_Facybbs_Bss_1.java
@@ -499,6 +499,26 @@ public class Api_2_Bte_Facybbs_Bss_1 extends TestToolkitApplet {
bRes=false;
}
this.reportTestOutcome(testCaseNb,bRes);
+ //-------------- TESTCASE 24 --------------
+ try{
+ bRes = false;
+ testCaseNb = (byte) 0x18;
+
+ dstBuffer = new byte[17];
+ Util.arrayFillNonAtomic(dstBuffer, (short) 0, (short) 17, (byte) 0xFF);
+ if( bte_handler.findAndCopyValue((byte)0x0D,(byte)0x00,(short)0,dstBuffer,(short)0,(short)17)==(short)17){
+ bRes=true;
+ }
+ }
+ catch(ToolkitException ex){
+ if(ex.getReason()==ToolkitException.BAD_INPUT_PARAMETER){
+ bRes=true;
+ }
+ }
+ this.reportTestOutcome(testCaseNb,bRes);
+
+
+
}
}
\ No newline at end of file
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facybbs_bss/Test_Api_2_Bte_Facybbs_Bss.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facybbs_bss/Test_Api_2_Bte_Facybbs_Bss.java
index 4fc013bc731fce6baaa1d0fabf2ab32b098d4ee8..ff4db978cfaed7e676e583c4ef4e0cbcac0df828 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facybbs_bss/Test_Api_2_Bte_Facybbs_Bss.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facybbs_bss/Test_Api_2_Bte_Facybbs_Bss.java
@@ -28,8 +28,6 @@ public class Test_Api_2_Bte_Facybbs_Bss 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;
/**
*
@@ -41,6 +39,8 @@ public class Test_Api_2_Bte_Facybbs_Bss extends UiccTestModel {
* Installs the applet, runs the tests and checks the test result.
*/
public boolean run(){
+ initialiseResults();
+
test.reset();
test.terminalProfileSession("13");
//Install package
@@ -67,15 +67,15 @@ public class Test_Api_2_Bte_Facybbs_Bss extends UiccTestModel {
test.unrecognizedEnvelope();
// check test results
response = test.selectApplication(APPLET_AID_1);
- testresult = response.checkData("10" +APPLET_AID_1 +
- "17CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
- "CCCCCCCC CCCCCCCC");
+ addResult(response.checkData("10" +APPLET_AID_1 +
+ "18CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
+ "CCCCCCCC CCCCCCCCCC"));
// delete applet and package
test.reset();
test.terminalProfileSession("13");
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return testresult;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_find/Test_Api_2_Bte_Find.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_find/Test_Api_2_Bte_Find.java
index 1d34a41061ff20a98102d5c649321b288f93eec1..c79d42352a0772e86fbb32faeab6dd3c355b437d 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_find/Test_Api_2_Bte_Find.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_find/Test_Api_2_Bte_Find.java
@@ -28,8 +28,6 @@ public class Test_Api_2_Bte_Find 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;
/**
*
@@ -41,6 +39,8 @@ public class Test_Api_2_Bte_Find extends UiccTestModel {
* Installs the applet, runs the tests and checks the test result.
*/
public boolean run(){
+ initialiseResults();
+
test.reset();
test.terminalProfileSession("13");
//Install package
@@ -67,15 +67,15 @@ public class Test_Api_2_Bte_Find extends UiccTestModel {
test.unrecognizedEnvelope();
// check test results
response = test.selectApplication(APPLET_AID_1);
- testresult = response.checkData("10" +APPLET_AID_1 +
- "0DCCCCCC CCCCCCCC CCCCCC CCCCCC");
+ addResult(response.checkData("10" +APPLET_AID_1 +
+ "0DCCCCCC CCCCCCCC CCCCCC CCCCCC"));
// delete applet and package
test.reset();
test.terminalProfileSession("13");
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return testresult;
+ return getOverallResult();
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gcap/Test_Api_2_Bte_Gcap.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gcap/Test_Api_2_Bte_Gcap.java
index 4c859ddc93491593e69d16df2d54b0b426c20ec3..5d490e3e609f99a0a16209de67ca784f220374cf 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gcap/Test_Api_2_Bte_Gcap.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gcap/Test_Api_2_Bte_Gcap.java
@@ -28,8 +28,6 @@ public class Test_Api_2_Bte_Gcap 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;
/**
*
@@ -41,6 +39,8 @@ public class Test_Api_2_Bte_Gcap extends UiccTestModel {
* Installs the applet, runs the tests and checks the test result.
*/
public boolean run(){
+ initialiseResults();
+
test.reset();
test.terminalProfileSession("13");
//Install package
@@ -67,14 +67,14 @@ public class Test_Api_2_Bte_Gcap extends UiccTestModel {
test.unrecognizedEnvelope();
// check test results
response = test.selectApplication(APPLET_AID_1);
- testresult = response.checkData("10" +APPLET_AID_1 + "01CC");
+ addResult(response.checkData("10" +APPLET_AID_1 + "01CC"));
// delete applet and package
test.reset();
test.terminalProfileSession("13");
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return testresult;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_glen/Test_Api_2_Bte_Glen.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_glen/Test_Api_2_Bte_Glen.java
index bef82dbdf1bc8b685f197c0d49d648aa99365d6b..55193ce26d22e6d3ccb17c9b64de6edd4668a348 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_glen/Test_Api_2_Bte_Glen.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_glen/Test_Api_2_Bte_Glen.java
@@ -28,8 +28,6 @@ public class Test_Api_2_Bte_Glen 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;
/**
*
@@ -41,6 +39,8 @@ public class Test_Api_2_Bte_Glen extends UiccTestModel {
* Installs the applet, runs the tests and checks the test result.
*/
public boolean run(){
+ initialiseResults();
+
test.reset();
test.terminalProfileSession("13");
//Install package
@@ -68,8 +68,8 @@ public class Test_Api_2_Bte_Glen extends UiccTestModel {
test.unrecognizedEnvelope();
// check test results
response = test.selectApplication(APPLET_AID_1);
- testresult = response.checkData("10" +APPLET_AID_1 +
- "06CCCCCC CCCCCC");
+ addResult(response.checkData("10" +APPLET_AID_1 +
+ "06CCCCCC CCCCCC"));
// delete applet and package
test.reset();
@@ -77,7 +77,7 @@ public class Test_Api_2_Bte_Glen extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return testresult;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gtsz/Test_Api_2_Bte_Gtsz.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gtsz/Test_Api_2_Bte_Gtsz.java
index 1fdd440c0dcb9baf5fef9ee5b6508c77b9612436..b3a5c835a89520d36a21d66002ae72ded2998540 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gtsz/Test_Api_2_Bte_Gtsz.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gtsz/Test_Api_2_Bte_Gtsz.java
@@ -29,8 +29,6 @@ public class Test_Api_2_Bte_Gtsz 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;
/**
*
@@ -42,6 +40,8 @@ public class Test_Api_2_Bte_Gtsz extends UiccTestModel {
* Installs the applet, runs the tests and checks the test result.
*/
public boolean run(){
+ initialiseResults();
+
test.reset();
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
//Install package
@@ -69,14 +69,14 @@ public class Test_Api_2_Bte_Gtsz extends UiccTestModel {
test.unrecognizedEnvelope();
// check test results
response = test.selectApplication(APPLET_AID_1);
- testresult = response.checkData("10" +APPLET_AID_1 +
- "06CCCCCC CCCCCC");
+ addResult(response.checkData("10" +APPLET_AID_1 +
+ "06CCCCCC CCCCCC"));
// delete applet and package
test.reset();
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return testresult;
+ return getOverallResult();
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gvby/Test_Api_2_Bte_Gvby.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gvby/Test_Api_2_Bte_Gvby.java
index d68e470359999262ce6cb72f82674ac7e6cfbb40..b6f28ee1de4c7385a730def97d435657885d74f8 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gvby/Test_Api_2_Bte_Gvby.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gvby/Test_Api_2_Bte_Gvby.java
@@ -28,8 +28,6 @@ public class Test_Api_2_Bte_Gvby 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;
/**
*
@@ -41,6 +39,8 @@ public class Test_Api_2_Bte_Gvby extends UiccTestModel {
* Installs the applet, runs the tests and checks the test result.
*/
public boolean run(){
+ initialiseResults();
+
test.reset();
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
//Install package
@@ -67,15 +67,15 @@ public class Test_Api_2_Bte_Gvby extends UiccTestModel {
test.unrecognizedEnvelope();
// check test results
response = test.selectApplication(APPLET_AID_1);
- testresult = response.checkData("10" +APPLET_AID_1 +
- "08CCCCCC CCCCCCCC CC");
+ addResult(response.checkData("10" +APPLET_AID_1 +
+ "08CCCCCC CCCCCCCC CC"));
// delete applet and package
test.reset();
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH );
- return testresult;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gvle/Test_Api_2_Bte_Gvle.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gvle/Test_Api_2_Bte_Gvle.java
index 2955e20a117869cb0e7fed62cfbcbd19a01e63f8..13b4aa9e2d4b37aa7777aa2c80a36a9a050e5a8a 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gvle/Test_Api_2_Bte_Gvle.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gvle/Test_Api_2_Bte_Gvle.java
@@ -28,8 +28,6 @@ public class Test_Api_2_Bte_Gvle 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;
/**
*
@@ -41,6 +39,8 @@ public class Test_Api_2_Bte_Gvle extends UiccTestModel {
* Installs the applet, runs the tests and checks the test result.
*/
public boolean run(){
+ initialiseResults();
+
test.reset();
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
//Install package
@@ -66,14 +66,14 @@ public class Test_Api_2_Bte_Gvle extends UiccTestModel {
test.unrecognizedEnvelope();
// check test results
response = test.selectApplication(APPLET_AID_1);
- testresult = response.checkData("10" +APPLET_AID_1 +
- "06CCCCCC CCCCCC");
+ addResult(response.checkData("10" +APPLET_AID_1 +
+ "06CCCCCC CCCCCC"));
// delete applet and package
test.reset();
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return testresult;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gvsh/Test_Api_2_Bte_Gvsh.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gvsh/Test_Api_2_Bte_Gvsh.java
index 645c30ac24ab47453118450d0ded2d42f2ef4cc8..652c7c3579abdfdded8c5e0efcd69cca411deb5c 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gvsh/Test_Api_2_Bte_Gvsh.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gvsh/Test_Api_2_Bte_Gvsh.java
@@ -28,8 +28,6 @@ public class Test_Api_2_Bte_Gvsh 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;
/**
*
@@ -41,6 +39,8 @@ public class Test_Api_2_Bte_Gvsh extends UiccTestModel {
* Installs the applet, runs the tests and checks the test result.
*/
public boolean run(){
+ initialiseResults();
+
test.reset();
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
//Install package
@@ -67,8 +67,8 @@ public class Test_Api_2_Bte_Gvsh extends UiccTestModel {
test.unrecognizedEnvelope();
// check test results
response = test.selectApplication(APPLET_AID_1);
- testresult = response.checkData("10" +APPLET_AID_1 +
- "08CCCCCC CCCCCCCC CC");
+ addResult(response.checkData("10" +APPLET_AID_1 +
+ "08CCCCCC CCCCCCCC CC"));
// delete applet and package
test.reset();
@@ -76,7 +76,7 @@ public class Test_Api_2_Bte_Gvsh extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return testresult;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_sttg/Test_Api_2_Bte_Sttg.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_sttg/Test_Api_2_Bte_Sttg.java
index a2692edc3fcec2e1b2ed3cc2770452a6ba1403b0..f34759c8c2b038eb71d9204f483790f41000ca27 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_sttg/Test_Api_2_Bte_Sttg.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_sttg/Test_Api_2_Bte_Sttg.java
@@ -28,8 +28,6 @@ public class Test_Api_2_Bte_Sttg 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;
/**
*
@@ -41,6 +39,8 @@ public class Test_Api_2_Bte_Sttg extends UiccTestModel {
* Installs the applet, runs the tests and checks the test result.
*/
public boolean run() {
+ initialiseResults();
+
test.reset();
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
// Install package
@@ -64,7 +64,7 @@ public class Test_Api_2_Bte_Sttg extends UiccTestModel {
test.unrecognizedEnvelope();
// check test results
response = test.selectApplication(APPLET_AID_1);
- testresult = response.checkData("10" + APPLET_AID_1 + "01CC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "01CC"));
// delete applet and package
test.reset();
@@ -72,7 +72,7 @@ public class Test_Api_2_Bte_Sttg extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return testresult;
+ return getOverallResult();
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_ehs_gthd/Test_Api_2_Ehs_Gthd.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_ehs_gthd/Test_Api_2_Ehs_Gthd.java
index c3495e2b4732eda3593796c3928e7f92c01b3427..28d6c0ea7ba9ac919fc08ceca372c48d5dccad4e 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_ehs_gthd/Test_Api_2_Ehs_Gthd.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_ehs_gthd/Test_Api_2_Ehs_Gthd.java
@@ -38,7 +38,7 @@ public class Test_Api_2_Ehs_Gthd extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -88,8 +88,8 @@ public class Test_Api_2_Ehs_Gthd extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
- + "03CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "03CCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -104,6 +104,6 @@ public class Test_Api_2_Ehs_Gthd extends UiccTestModel
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_copy/Test_Api_2_Enh_Copy.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_copy/Test_Api_2_Enh_Copy.java
index bb7fd34f456d4f08faad38670b3ec3a6dcc2cdf7..41c660cd5d23a4996772490b40763ab579f216bf 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_copy/Test_Api_2_Enh_Copy.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_copy/Test_Api_2_Enh_Copy.java
@@ -40,7 +40,7 @@ public class Test_Api_2_Enh_Copy extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -79,14 +79,14 @@ public class Test_Api_2_Enh_Copy extends UiccTestModel
// Test cases 1
response = test.unrecognizedEnvelope();
- result = response.checkSw("90 00");
+ addResult(response.checkSw("90 00"));
// Test cases 1 to 7
for(byte i = 1; i < 7; i++)
{
// 1: Send Unrecognized Envelope
response = test.unrecognizedEnvelope();
- result &= response.checkSw("90 00");
+ addResult(response.checkSw("90 00"));
}
// Test case 8
@@ -252,8 +252,8 @@ public class Test_Api_2_Enh_Copy extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
- + "10CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC CC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "10CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC CC"));
/*********************************************************************/
/*********************************************************************/
@@ -268,6 +268,6 @@ public class Test_Api_2_Enh_Copy extends UiccTestModel
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_cprv/Test_Api_2_Enh_Cprv.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_cprv/Test_Api_2_Enh_Cprv.java
index ea43f35fdb0f0ebd0a0f2b0d9aeb12e5ba6b2c73..e12bada2ecfdb95b664aa8c20ec97af5ca6c0b5f 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_cprv/Test_Api_2_Enh_Cprv.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_cprv/Test_Api_2_Enh_Cprv.java
@@ -38,7 +38,7 @@ public class Test_Api_2_Enh_Cprv extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -90,9 +90,9 @@ public class Test_Api_2_Enh_Cprv extends UiccTestModel
+ "13027000 000E0D08 00000028 83850000"
+ "00000100");
if(i == 0)
- result = response.checkSw("90 00");
+ addResult(response.checkSw("90 00"));
else
- result &= response.checkSw("90 00");
+ addResult(response.checkSw("90 00"));
}
/*********************************************************************/
/*********************************************************************/
@@ -101,8 +101,8 @@ public class Test_Api_2_Enh_Cprv extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 +
- "12CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1 +
+ "12CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC CCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -115,6 +115,6 @@ public class Test_Api_2_Enh_Cprv extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_cpyv/Test_Api_2_Enh_Cpyv.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_cpyv/Test_Api_2_Enh_Cpyv.java
index a2482de9c2fb30dc6003f6be830d3d68f15a8769..0a01e67491a7bf0f9b8250f55d3fc9a35fa414bf 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_cpyv/Test_Api_2_Enh_Cpyv.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_cpyv/Test_Api_2_Enh_Cpyv.java
@@ -38,7 +38,7 @@ public class Test_Api_2_Enh_Cpyv extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -100,9 +100,9 @@ public class Test_Api_2_Enh_Cpyv extends UiccTestModel
+ "01010101 01010101 01010101 01010101"
+ "01010101 010101");
if(i == 0)
- result = response.checkSw("90 00");
+ addResult(response.checkSw("90 00"));
else
- result &= response.checkSw("90 00");
+ addResult(response.checkSw("90 00"));
}
/*********************************************************************/
/*********************************************************************/
@@ -111,8 +111,8 @@ public class Test_Api_2_Enh_Cpyv extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
- + "10CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC CC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "10CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC CC"));
/*********************************************************************/
/*********************************************************************/
@@ -125,6 +125,6 @@ public class Test_Api_2_Enh_Cpyv extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_facrb_bs/Test_Api_2_Enh_Facrb_Bs.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_facrb_bs/Test_Api_2_Enh_Facrb_Bs.java
index 38d5a4feae1fe8394300bfa291cf9da334759f91..f61fbd1ae18070e482bd6791a4ab7572a00815a0 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_facrb_bs/Test_Api_2_Enh_Facrb_Bs.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_facrb_bs/Test_Api_2_Enh_Facrb_Bs.java
@@ -38,7 +38,7 @@ public class Test_Api_2_Enh_Facrb_Bs extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -101,9 +101,9 @@ public class Test_Api_2_Enh_Facrb_Bs extends UiccTestModel
+ "B1B2B3B4 B5B6B7B8 B9BABB BCBDBEBFC0"
+ "C1C2C3C4");
if(i==0)
- result = response.checkSw("90 00");
+ addResult(response.checkSw("90 00"));
else
- result &= response.checkSw("90 00");
+ addResult(response.checkSw("90 00"));
}
/*********************************************************************/
/*********************************************************************/
@@ -112,8 +112,8 @@ public class Test_Api_2_Enh_Facrb_Bs extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
- + "11CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC CCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "11CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC CCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -126,6 +126,6 @@ public class Test_Api_2_Enh_Facrb_Bs extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_facrbbs_bss/Test_Api_2_Enh_Facrbbs_Bss.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_facrbbs_bss/Test_Api_2_Enh_Facrbbs_Bss.java
index e0421e215060f8fe0d4be3d60dec7aaf7c166bdc..25598d679d0fcb587f415571ed2bfa7d1724e02c 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_facrbbs_bss/Test_Api_2_Enh_Facrbbs_Bss.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_facrbbs_bss/Test_Api_2_Enh_Facrbbs_Bss.java
@@ -38,7 +38,7 @@ public class Test_Api_2_Enh_Facrbbs_Bss extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -101,9 +101,9 @@ public class Test_Api_2_Enh_Facrbbs_Bss extends UiccTestModel
+ "B1B2B3B4 B5B6B7B8 B9BABB BCBDBEBFC0"
+ "C1C2C3C4");
if(i == 0)
- result = response.checkSw("90 00");
+ addResult(response.checkSw("90 00"));
else
- result &= response.checkSw("90 00");
+ addResult(response.checkSw("90 00"));
}
/*********************************************************************/
/*********************************************************************/
@@ -112,9 +112,9 @@ public class Test_Api_2_Enh_Facrbbs_Bss extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
- + "1ACCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"
- + "CCCCCCCC CCCCCCCC CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "1ACCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"
+ + "CCCCCCCC CCCCCCCC CCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -128,6 +128,6 @@ public class Test_Api_2_Enh_Facrbbs_Bss extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_facyb_bs/Test_Api_2_Enh_Facyb_Bs.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_facyb_bs/Test_Api_2_Enh_Facyb_Bs.java
index 0bca5d1b0cd06ab61ccec2718a629f73412f68d6..0638814abc30e344e375ecd53c3341b9b2629ced 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_facyb_bs/Test_Api_2_Enh_Facyb_Bs.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_facyb_bs/Test_Api_2_Enh_Facyb_Bs.java
@@ -38,7 +38,7 @@ public class Test_Api_2_Enh_Facyb_Bs extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -102,9 +102,9 @@ public class Test_Api_2_Enh_Facyb_Bs extends UiccTestModel
+ "B1B2B3B4 B5B6B7B8 B9BABB BCBDBEBFC0"
+ "C1C2C3C4");
if(i==0)
- result = response.checkSw("90 00");
+ addResult(response.checkSw("90 00"));
else
- result &= response.checkSw("90 00");
+ addResult(response.checkSw("90 00"));
}
/*********************************************************************/
/*********************************************************************/
@@ -113,8 +113,8 @@ public class Test_Api_2_Enh_Facyb_Bs extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
- + "11CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC CCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "11CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC CCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -127,6 +127,6 @@ public class Test_Api_2_Enh_Facyb_Bs extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_facyb_bss/Test_Api_2_Enh_Facyb_Bss.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_facyb_bss/Test_Api_2_Enh_Facyb_Bss.java
index d10b3af05e9e34cf1ec51cdd7156564417af341f..68ef09e7d99cdc993f3805187db395af2e1633f9 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_facyb_bss/Test_Api_2_Enh_Facyb_Bss.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_facyb_bss/Test_Api_2_Enh_Facyb_Bss.java
@@ -38,7 +38,7 @@ public class Test_Api_2_Enh_Facyb_Bss extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -101,9 +101,9 @@ public class Test_Api_2_Enh_Facyb_Bss extends UiccTestModel
+ "B1B2B3B4 B5B6B7B8 B9BABB BCBDBEBFC0"
+ "C1C2C3C4");
if(i == 0)
- result = response.checkSw("90 00");
+ addResult(response.checkSw("90 00"));
else
- result &= response.checkSw("90 00");
+ addResult(response.checkSw("90 00"));
}
/*********************************************************************/
/*********************************************************************/
@@ -112,9 +112,9 @@ public class Test_Api_2_Enh_Facyb_Bss extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
- + "1ACCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"
- + "CCCCCCCC CCCCCCCC CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "1ACCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"
+ + "CCCCCCCC CCCCCCCC CCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -127,6 +127,6 @@ public class Test_Api_2_Enh_Facyb_Bss extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_find/Test_Api_2_Enh_Find.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_find/Test_Api_2_Enh_Find.java
index 98ba1e3f2cb4a548fa59c2e48c0ddeb41c90d07c..9dd151b136ad9cbb90f766a44890e0464411182e 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_find/Test_Api_2_Enh_Find.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_find/Test_Api_2_Enh_Find.java
@@ -39,7 +39,7 @@ public class Test_Api_2_Enh_Find extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -90,9 +90,9 @@ public class Test_Api_2_Enh_Find extends UiccTestModel
+ "04 0D"
+ "01020304 05060708 090A0B0C 0D");
if(i == 0)
- result = response.checkSw("90 00");
+ addResult(response.checkSw("90 00"));
else
- result &= response.checkSw("90 00");
+ addResult(response.checkSw("90 00"));
}
/*********************************************************************/
/*********************************************************************/
@@ -101,8 +101,8 @@ public class Test_Api_2_Enh_Find extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
- + "0DCCCCCC CCCCCCCC CCCCCCCC CCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "0DCCCCCC CCCCCCCC CCCCCCCC CCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -116,7 +116,7 @@ public class Test_Api_2_Enh_Find extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gcap/Test_Api_2_Enh_Gcap.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gcap/Test_Api_2_Enh_Gcap.java
index c5ba48a9761689aa54d6723a0ba2296282149c94..e650ee375094f31fa85a0785ac0e17758b243c40 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gcap/Test_Api_2_Enh_Gcap.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gcap/Test_Api_2_Enh_Gcap.java
@@ -39,7 +39,7 @@ public class Test_Api_2_Enh_Gcap extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -78,7 +78,7 @@ public class Test_Api_2_Enh_Gcap extends UiccTestModel
// 1: Send Unrecognized Envelope to trig the Applet
response = test.unrecognizedEnvelope();
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
/*********************************************************************/
@@ -87,7 +87,7 @@ public class Test_Api_2_Enh_Gcap extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "01CC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "01CC"));
/*********************************************************************/
/*********************************************************************/
@@ -100,6 +100,6 @@ public class Test_Api_2_Enh_Gcap extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gcid/Test_Api_2_Enh_Gcid.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gcid/Test_Api_2_Enh_Gcid.java
index 4419caf5b2c24c5764df54c8f8efceb50a1974b1..08fee02d7e9c38099a9b067bed69ef3afae7fb16 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gcid/Test_Api_2_Enh_Gcid.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gcid/Test_Api_2_Enh_Gcid.java
@@ -39,7 +39,7 @@ public class Test_Api_2_Enh_Gcid extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -83,50 +83,50 @@ public class Test_Api_2_Enh_Gcid extends UiccTestModel
// Fetch the first OPEN CHANNEL proactive command
response = test.fetch("1C");
- result = response.checkData("D01A8103 01400182 02818206 05911122"
- + "33443504 01000000 39020080");
+ addResult(response.checkData("D01A8103 01400182 02818206 05911122"
+ + "33443504 01000000 39020080"));
test.terminalResponse("81030140 01820282 81030100 38028100"
+ "35040100 00003902 0080");
// Fetch the second OPEN CHANNEL proactive command
response = test.fetch("1C");
- result &= response.checkData("D01A8103 01400182 02818206 05911122"
- + "33443504 01000000 39020080");
+ addResult(response.checkData("D01A8103 01400182 02818206 05911122"
+ + "33443504 01000000 39020080"));
test.terminalResponse("81030140 01820282 81030100 38028200"
+ "35040100 00003902 0080");
// Fetch the third OPEN CHANNEL proactive command
response = test.fetch("1C");
- result &= response.checkData("D01A8103 01400182 02818206 05911122"
- + "33443504 01000000 39020080");
+ addResult(response.checkData("D01A8103 01400182 02818206 05911122"
+ + "33443504 01000000 39020080"));
test.terminalResponse("81030140 01820282 81030100 38028300"
+ "35040100 00003902 0080");
// Fetch the fourth OPEN CHANNEL proactive command
response = test.fetch("1C");
- result &= response.checkData("D01A8103 01400182 02818206 05911122"
- + "33443504 01000000 39020080");
+ addResult(response.checkData("D01A8103 01400182 02818206 05911122"
+ + "33443504 01000000 39020080"));
test.terminalResponse("81030140 01820282 81030100 38028400"
+ "35040100 00003902 0080");
// Fetch the fifth OPEN CHANNEL proactive command
response = test.fetch("1C");
- result &= response.checkData("D01A8103 01400182 02818206 05911122"
- + "33443504 01000000 39020080");
+ addResult(response.checkData("D01A8103 01400182 02818206 05911122"
+ + "33443504 01000000 39020080"));
test.terminalResponse("81030140 01820282 81030100 38028500"
+ "35040100 00003902 0080");
// Fetch the sixth OPEN CHANNEL proactive command
response = test.fetch("1C");
- result &= response.checkData("D01A8103 01400182 02818206 05911122"
- + "33443504 01000000 39020080");
+ addResult(response.checkData("D01A8103 01400182 02818206 05911122"
+ + "33443504 01000000 39020080"));
test.terminalResponse("81030140 01820282 81030100 38028600"
+ "35040100 00003902 0080");
// Fetch the seventh OPEN CHANNEL proactive command
response = test.fetch("1C");
- result &= response.checkData("D01A8103 01400182 02818206 05911122"
- + "33443504 01000000 39020080");
+ addResult(response.checkData("D01A8103 01400182 02818206 05911122"
+ + "33443504 01000000 39020080"));
test.terminalResponse("81030140 01820282 81030100 38028700"
+ "35040100 00003902 0080");
@@ -155,8 +155,8 @@ public class Test_Api_2_Enh_Gcid extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
- + "06CCCCCC CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "06CCCCCC CCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -170,7 +170,7 @@ public class Test_Api_2_Enh_Gcid extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gcst/Test_Api_2_Enh_Gcst.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gcst/Test_Api_2_Enh_Gcst.java
index c608ec187a862ee853e6b9bf8275c5b8bd49e609..efbb85cb584b38f879ac6e2ddc322dc0e539040c 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gcst/Test_Api_2_Enh_Gcst.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gcst/Test_Api_2_Enh_Gcst.java
@@ -38,7 +38,7 @@ public class Test_Api_2_Enh_Gcst extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -82,8 +82,8 @@ public class Test_Api_2_Enh_Gcst extends UiccTestModel
// Fetch the first OPEN CHANNEL proactive command
response = test.fetch("1C");
- result = response.checkData("D01A8103 01400182 02818206 05911122"
- + "33443504 01000000 39020080");
+ addResult(response.checkData("D01A8103 01400182 02818206 05911122"
+ + "33443504 01000000 39020080"));
test.terminalResponse("81030140 01820282 81030100 38028100"
+ "35040100 00003902 0080");
@@ -113,8 +113,8 @@ public class Test_Api_2_Enh_Gcst extends UiccTestModel
test.envelopeEventDownloadChannelStatus("38028100");
// Fetch the display text proactive command
response = test.fetch("15");
- result &= response.checkData("D0138103 01210082 0281028D 08F64150"
- + "504C4554 31");
+ addResult(response.checkData("D0138103 01210082 0281028D 08F64150"
+ + "504C4554 31"));
test.terminalResponse("81030121 00020282 81030100");
/*********************************************************************/
@@ -124,8 +124,8 @@ public class Test_Api_2_Enh_Gcst extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 +
- "08CCCCCC CCCCCCCC CC");
+ addResult(response.checkData("10" + APPLET_AID_1 +
+ "08CCCCCC CCCCCCCC CC"));
/*********************************************************************/
/*********************************************************************/
@@ -138,7 +138,7 @@ public class Test_Api_2_Enh_Gcst extends UiccTestModel
// delete applets and package
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_giid/Test_Api_2_Enh_Giid.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_giid/Test_Api_2_Enh_Giid.java
index 93a4e21f9237cb7c47ba30e82ef5207ff45d23a4..b4c8e9728f2011e9e7a08f0c124835bda687951a 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_giid/Test_Api_2_Enh_Giid.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_giid/Test_Api_2_Enh_Giid.java
@@ -36,7 +36,7 @@ public class Test_Api_2_Enh_Giid extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -98,13 +98,13 @@ public class Test_Api_2_Enh_Giid extends UiccTestModel
// Fetch the proactive command
response = test.fetch("13");
- result = response.checkData("D0118103 01218082 0281028D 06044845"
- + "4C4C4F");
+ addResult(response.checkData("D0118103 01218082 0281028D 06044845"
+ + "4C4C4F"));
test.terminalResponse("81030121 80020282 81030100");
// 7 : Send Unrecognized envelope with item Identifier TLV but without Item Number
response = test.sendApdu("80C20000 08010682 02018110 00");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
/*********************************************************************/
@@ -113,8 +113,8 @@ public class Test_Api_2_Enh_Giid extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
- + "07CCCCCC CCCCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "07CCCCCC CCCCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -128,7 +128,7 @@ public class Test_Api_2_Enh_Giid extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_glen/Test_Api_2_Enh_Glen.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_glen/Test_Api_2_Enh_Glen.java
index dfab5656ad5a1c89825812c6bbc7ef8dc691792a..18156d9970734c6652b667f73b356ad2ee844746 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_glen/Test_Api_2_Enh_Glen.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_glen/Test_Api_2_Enh_Glen.java
@@ -39,7 +39,7 @@ public class Test_Api_2_Enh_Glen extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -85,7 +85,7 @@ public class Test_Api_2_Enh_Glen extends UiccTestModel
+ "01020304 05060708 090A0B0C 0D0E0F10"
+ "01020304 05060708 090A0B");
- result = response.checkSw("90 00");
+ addResult(response.checkSw("90 00"));
// 2 : Send Unrecognized Envelope with BER TLV Length set to 7F
response = test.sendApdu( "80 C2 00 00 81"
@@ -100,7 +100,7 @@ public class Test_Api_2_Enh_Glen extends UiccTestModel
+ "01020304 05060708 090A0B0C 0D0E0F10"
+ "01020304 05060708 090A0B0C 0D0E0F10"
+ "01020304 05060708 09");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// 2 : Send Unrecognized Envelope with BER TLV Length set to 80
response = test.sendApdu( "80 C2 00 00 83"
@@ -115,7 +115,7 @@ public class Test_Api_2_Enh_Glen extends UiccTestModel
+ "01020304 05060708 090A0B0C 0D0E0F10"
+ "01020304 05060708 090A0B0C 0D0E0F10"
+ "01020304 05060708 090A");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// 3 : Send Unrecognized Envelope with BER TLV Length set to FC
@@ -139,7 +139,7 @@ public class Test_Api_2_Enh_Glen extends UiccTestModel
+ "01020304 05060708 090A0B0C 0D0E0F10"
+ "01020304 05060708 090A0B0C 0D0E0F10"
+ "01020304 05");
- result &= response.checkSw("90 00");
+ addResult(response.checkSw("90 00"));
/*********************************************************************/
/*********************************************************************/
@@ -148,8 +148,8 @@ public class Test_Api_2_Enh_Glen extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
- + "04CCCCCC CC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "04CCCCCC CC"));
/*********************************************************************/
/*********************************************************************/
@@ -163,6 +163,6 @@ public class Test_Api_2_Enh_Glen extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gtsz/Test_Api_2_Enh_Gtsz.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gtsz/Test_Api_2_Enh_Gtsz.java
index 5aa63ac965fd6b9bff4c08050ebba3c8d342cce1..bff6763379ed4ee90f6d44d54d926bfe626cf13a 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gtsz/Test_Api_2_Enh_Gtsz.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gtsz/Test_Api_2_Enh_Gtsz.java
@@ -39,7 +39,7 @@ public class Test_Api_2_Enh_Gtsz extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -87,8 +87,8 @@ public class Test_Api_2_Enh_Gtsz extends UiccTestModel
+ "01020304 05060708 090A0B0C 0D0E0F10"
+ "01020304 05060708 090A0B");
response = test.fetch("15");
- result = response.checkData("D0138103 01210082 0281028D 08F64150"
- + "504C4554 31");
+ addResult(response.checkData("D0138103 01210082 0281028D 08F64150"
+ + "504C4554 31"));
test.terminalResponse("81030121 00020282 81030100");
/*********************************************************************/
@@ -98,8 +98,8 @@ public class Test_Api_2_Enh_Gtsz extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
- + "02CCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "02CCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -113,6 +113,6 @@ public class Test_Api_2_Enh_Gtsz extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gttg/Test_Api_2_Enh_Gttg.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gttg/Test_Api_2_Enh_Gttg.java
index 9875d57459f65dbc388468b68446f7ccd0acf7cd..5531e11ca59dc1a5a192539e61ec85f364bb1b10 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gttg/Test_Api_2_Enh_Gttg.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gttg/Test_Api_2_Enh_Gttg.java
@@ -39,7 +39,7 @@ public class Test_Api_2_Enh_Gttg extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -87,8 +87,8 @@ public class Test_Api_2_Enh_Gttg extends UiccTestModel
+ "01020304 05060708 090A0B");
response = test.fetch("15");
- result = response.checkData("D0138103 01210082 0281028D 08F64150"
- + "504C4554 31");
+ addResult(response.checkData("D0138103 01210082 0281028D 08F64150"
+ + "504C4554 31"));
test.terminalResponse("81030121 00020282 81030100");
/*********************************************************************/
@@ -98,8 +98,8 @@ public class Test_Api_2_Enh_Gttg extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
- + "02CCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "02CCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -113,6 +113,6 @@ public class Test_Api_2_Enh_Gttg extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gvby/Test_Api_2_Enh_Gvby.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gvby/Test_Api_2_Enh_Gvby.java
index 99798bffaa7cafcb845a5003ecc226826165cabd..7608ae107b255e1f7ce6e14e88397cd6c0ecde30 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gvby/Test_Api_2_Enh_Gvby.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gvby/Test_Api_2_Enh_Gvby.java
@@ -38,7 +38,7 @@ public class Test_Api_2_Enh_Gvby extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -100,9 +100,9 @@ public class Test_Api_2_Enh_Gvby extends UiccTestModel
+ "B1B2B3B4 B5B6B7B8 B9BABBBC BDBEBFC0"
+ "C1C2C3C4 C5C6C7C8 ");
if(i == 0)
- result = response.checkSw("90 00");
+ addResult(response.checkSw("90 00"));
else
- result &= response.checkSw("90 00");
+ addResult(response.checkSw("90 00"));
}
/*********************************************************************/
/*********************************************************************/
@@ -111,8 +111,8 @@ public class Test_Api_2_Enh_Gvby extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
- + "08CCCCCC CCCCCCCC CC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "08CCCCCC CCCCCCCC CC"));
/*********************************************************************/
/*********************************************************************/
@@ -126,6 +126,6 @@ public class Test_Api_2_Enh_Gvby extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gvle/Test_Api_2_Enh_Gvle.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gvle/Test_Api_2_Enh_Gvle.java
index a413cf1f85b9b2991f630cf49448a0d3a13dccd0..a18e2300a7f5ba8d3a08d9fbde577f8e396cb874 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gvle/Test_Api_2_Enh_Gvle.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gvle/Test_Api_2_Enh_Gvle.java
@@ -39,7 +39,7 @@ public class Test_Api_2_Enh_Gvle extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -108,9 +108,9 @@ public class Test_Api_2_Enh_Gvle extends UiccTestModel
+ "01020304 05060708");
if(i == 0)
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
else
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
}
/*********************************************************************/
@@ -120,8 +120,8 @@ public class Test_Api_2_Enh_Gvle extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
- + "04CCCCCC CC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "04CCCCCC CC"));
/*********************************************************************/
/*********************************************************************/
@@ -135,6 +135,6 @@ public class Test_Api_2_Enh_Gvle extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gvsh/Test_Api_2_Enh_Gvsh.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gvsh/Test_Api_2_Enh_Gvsh.java
index 9cf80d2e38d9a606b0003e47e46da81d17069348..db5356569c7634e650d42adff2d5de211e8845f9 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gvsh/Test_Api_2_Enh_Gvsh.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gvsh/Test_Api_2_Enh_Gvsh.java
@@ -39,7 +39,7 @@ public class Test_Api_2_Enh_Gvsh extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -103,9 +103,9 @@ public class Test_Api_2_Enh_Gvsh extends UiccTestModel
+ "B1B2B3B4 B5B6B7B8 B9BABB BCBDBEBFC0"
+ "C1C2C3C4 C5C6C7C8 C9");
if(i == 0)
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
else
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
}
/*********************************************************************/
/*********************************************************************/
@@ -114,8 +114,8 @@ public class Test_Api_2_Enh_Gvsh extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
- + "08CCCCCC CCCCCCCC CC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "08CCCCCC CCCCCCCC CC"));
/*********************************************************************/
/*********************************************************************/
@@ -129,6 +129,6 @@ public class Test_Api_2_Enh_Gvsh extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_apda_bss/Test_Api_2_Erh_Apda_Bss.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_apda_bss/Test_Api_2_Erh_Apda_Bss.java
index 41b39013602f30c8d56ffc61f2624c3cf6776e61..7b036bab0b269bb405da962ab61b46b642181834 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_apda_bss/Test_Api_2_Erh_Apda_Bss.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_apda_bss/Test_Api_2_Erh_Apda_Bss.java
@@ -39,7 +39,7 @@ public class Test_Api_2_Erh_Apda_Bss extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -85,8 +85,8 @@ public class Test_Api_2_Erh_Apda_Bss extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
- + "0CCCCCCC CCCCCCCC CCCCCCCC CC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "0CCCCCCC CCCCCCCC CCCCCCCC CC"));
/*********************************************************************/
@@ -102,7 +102,7 @@ public class Test_Api_2_Erh_Apda_Bss extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlb_bss/Api_2_Erh_Aptlb_Bss_1.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlb_bss/Api_2_Erh_Aptlb_Bss_1.java
index 600fcd46a24a57b1e50e5aab26deab7ffd8cb0b2..0ad556c1153b6ce74d16f8084be114f338e1fe9e 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlb_bss/Api_2_Erh_Aptlb_Bss_1.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlb_bss/Api_2_Erh_Aptlb_Bss_1.java
@@ -215,25 +215,29 @@ public class Api_2_Erh_Aptlb_Bss_1 extends TestToolkitApplet {
// --------------------------------------------
// Test Case 7 : handler overflow
- testCaseNb = (byte) 7 ;
- bRes = false ;
-
- try {
- tag = (byte)1 ;
- valueOffset = (short)0 ;
- valueLength = (short)(EnvRespHdlr.getCapacity() - 1) ;
-
- try {
- EnvRespHdlr.appendTLV(tag, buffer256, valueOffset, valueLength) ;
- }
- catch (ToolkitException e) {
- bRes = (e.getReason() == ToolkitException.HANDLER_OVERFLOW) ;
- }
-
- }
- catch (Exception e) {
- bRes = false ;
- }
+ testCaseNb = (byte) 7 ;
+ bRes = false ;
+
+ try {
+ tag = (byte)1 ;
+ valueOffset = (short)0 ;
+ valueLength = (short)(EnvRespHdlr.getCapacity() - 1) ;
+ while (valueLength > 255){
+ EnvRespHdlr.appendTLV(tag, buffer256, valueOffset, (short) 252);
+ valueLength = (short) (valueLength - (short) 255);
+ }
+ try {
+ EnvRespHdlr.appendTLV(tag, buffer256, valueOffset, valueLength) ;
+ }
+ catch (ToolkitException e) {
+ bRes = (e.getReason() == ToolkitException.HANDLER_OVERFLOW) ;
+ }
+
+ }
+ catch (Exception e) {
+ bRes = false ;
+ }
+
reportTestOutcome(testCaseNb, bRes) ;
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlb_bss/Test_Api_2_Erh_Aptlb_Bss.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlb_bss/Test_Api_2_Erh_Aptlb_Bss.java
index c0c084a08817d8fd024ff9e6d27fe517e25803ae..160d95b6ad73d00898bd95159d7f85a41c6a98f5 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlb_bss/Test_Api_2_Erh_Aptlb_Bss.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlb_bss/Test_Api_2_Erh_Aptlb_Bss.java
@@ -39,7 +39,7 @@ public class Test_Api_2_Erh_Aptlb_Bss extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -85,8 +85,8 @@ public class Test_Api_2_Erh_Aptlb_Bss extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
- + "0ECCCCCC CCCCCCCC CCCCCCCC CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "0ECCCCCC CCCCCCCC CCCCCCCC CCCCCC"));
/*********************************************************************/
@@ -101,7 +101,7 @@ public class Test_Api_2_Erh_Aptlb_Bss extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlb_bss_bss/Api_2_Erh_Aptlb_Bss_Bss_1.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlb_bss_bss/Api_2_Erh_Aptlb_Bss_Bss_1.java
index c277e3ac991f1a1b9d5e415c0454231ceb6e3819..b0861e21f0dedff8e039d53ede0e400f62239f63 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlb_bss_bss/Api_2_Erh_Aptlb_Bss_Bss_1.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlb_bss_bss/Api_2_Erh_Aptlb_Bss_Bss_1.java
@@ -74,6 +74,7 @@ public class Api_2_Erh_Aptlb_Bss_Bss_1 extends TestToolkitApplet {
short value1Length = 0 ;
short value2Length = 0 ;
short value2Offset = 0 ;
+ short length = 0;
// --------------------------------------------
@@ -348,22 +349,28 @@ public class Api_2_Erh_Aptlb_Bss_Bss_1 extends TestToolkitApplet {
// --------------------------------------------
// Test Case 13 : handler overflow
- testCaseNb = (byte) 13 ;
- bRes = false ;
-
- try {
- tag = (byte)1 ;
- EnvRespHdlr.appendArray(buffer256,(short)0,(short)(EnvRespHdlr.getCapacity() - 1));
-
- try {
- EnvRespHdlr.appendTLV(tag, buffer256,(short)0,(short)1,buffer256,(short)0,(short)1) ;
- }
- catch (ToolkitException e) {
- bRes = (e.getReason() == ToolkitException.HANDLER_OVERFLOW) ;
- }
- } catch (Exception e) {
- bRes = false ;
- }
+ testCaseNb = (byte) 13 ;
+ bRes = false ;
+
+ try {
+ tag = (byte)1 ;
+ length = (short)(EnvRespHdlr.getCapacity() - 1);
+ while (length > 255){
+ EnvRespHdlr.appendArray(buffer256, (short)0, (short) 255) ;
+ length = (short) (length - (short) 255);
+ }
+ EnvRespHdlr.appendArray(buffer256, (short)0, length);
+
+ try {
+ EnvRespHdlr.appendTLV(tag, buffer256,(short)0,(short)1,buffer256,(short)0,(short)1) ;
+ }
+ catch (ToolkitException e) {
+ bRes = (e.getReason() == ToolkitException.HANDLER_OVERFLOW) ;
+ }
+ } catch (Exception e) {
+ bRes = false ;
+ }
+
reportTestOutcome(testCaseNb, bRes) ;
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlb_bss_bss/Test_Api_2_Erh_Aptlb_Bss_Bss.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlb_bss_bss/Test_Api_2_Erh_Aptlb_Bss_Bss.java
index f1e9b4f3edf603a6bc2b213af08e7b505b03f94c..4be827773216aa9a99ac1a7dd02d5998df5e2b93 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlb_bss_bss/Test_Api_2_Erh_Aptlb_Bss_Bss.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlb_bss_bss/Test_Api_2_Erh_Aptlb_Bss_Bss.java
@@ -39,7 +39,7 @@ public class Test_Api_2_Erh_Aptlb_Bss_Bss extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -85,9 +85,9 @@ public class Test_Api_2_Erh_Aptlb_Bss_Bss extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
+ addResult(response.checkData("10" + APPLET_AID_1
+ "15CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"
- + "CCCCCCCC CCCC");
+ + "CCCCCCCC CCCC"));
/*********************************************************************/
@@ -102,7 +102,7 @@ public class Test_Api_2_Erh_Aptlb_Bss_Bss extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbb/Api_2_Erh_Aptlbb_1.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbb/Api_2_Erh_Aptlbb_1.java
index f3bdd8a4fce76e5d70f718e3c8f05c46a19810fe..1abdd102c90c043852dd94f1d3fb2c30e6de1181 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbb/Api_2_Erh_Aptlbb_1.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbb/Api_2_Erh_Aptlbb_1.java
@@ -72,30 +72,36 @@ public class Api_2_Erh_Aptlbb_1 extends TestToolkitApplet {
// --------------------------------------------
// Test Case 1 : handler overflow
- testCaseNb = (byte) 1 ;
- bRes = false ;
-
- try {
-
- // Initialise the handler
- offset = (short)0 ;
- buffer[1] = (byte) 0x81;
- buffer[2] = (byte) 250;
- length = (short)(EnvRespHdlr.getCapacity() - 1) ;
- EnvRespHdlr.appendArray(buffer, offset, length) ;
-
- // appendTLV
- try {
- EnvRespHdlr.appendTLV(tag, value) ;
- EnvRespHdlr.appendTLV(tag, value) ;
- }
- catch (ToolkitException e) {
- bRes = (e.getReason() == ToolkitException.HANDLER_OVERFLOW) ;
- }
- }
- catch (Exception e) {
- bRes = false ;
- }
+ testCaseNb = (byte) 1 ;
+ bRes = false ;
+
+ try {
+
+ // Initialise the handler
+ offset = (short)0 ;
+ buffer[1] = (byte) 0x81;
+ buffer[2] = (byte) 250;
+ length = (short)(EnvRespHdlr.getCapacity() - 1) ;
+ while (length > 255){
+ EnvRespHdlr.appendArray(buffer, offset, (short) 255) ;
+ length = (short) (length - (short) 255);
+ }
+
+ EnvRespHdlr.appendArray(buffer, offset, length) ;
+
+ // appendTLV
+ try {
+ EnvRespHdlr.appendTLV(tag, value) ;
+ EnvRespHdlr.appendTLV(tag, value) ;
+ }
+ catch (ToolkitException e) {
+ bRes = (e.getReason() == ToolkitException.HANDLER_OVERFLOW) ;
+ }
+ }
+ catch (Exception e) {
+ bRes = false ;
+ }
+
reportTestOutcome(testCaseNb, bRes) ;
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbb/Test_Api_2_Erh_Aptlbb.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbb/Test_Api_2_Erh_Aptlbb.java
index 56aa79d010c00b1d712ee0e070d27753517b6666..3a9e6b39ee0a71a2b1b4112e73a3a4d77f0c1635 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbb/Test_Api_2_Erh_Aptlbb.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbb/Test_Api_2_Erh_Aptlbb.java
@@ -39,7 +39,7 @@ public class Test_Api_2_Erh_Aptlbb extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -85,8 +85,8 @@ public class Test_Api_2_Erh_Aptlbb extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
- + "05CCCCCC CCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "05CCCCCC CCCC"));
/*********************************************************************/
@@ -101,7 +101,7 @@ public class Test_Api_2_Erh_Aptlbb extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbb_bss/Test_Api_2_Erh_Aptlbb_Bss.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbb_bss/Test_Api_2_Erh_Aptlbb_Bss.java
index d9a7f109b128b28f9415b86ae69df993adf77bcc..7438a4567ef4e18ad8b55641be821574b64a384e 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbb_bss/Test_Api_2_Erh_Aptlbb_Bss.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbb_bss/Test_Api_2_Erh_Aptlbb_Bss.java
@@ -39,7 +39,7 @@ public class Test_Api_2_Erh_Aptlbb_Bss extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -85,8 +85,8 @@ public class Test_Api_2_Erh_Aptlbb_Bss extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
- + "0ECCCCCC CCCCCCCC CCCCCCCC CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "0ECCCCCC CCCCCCCC CCCCCCCC CCCCCC"));
/*********************************************************************/
@@ -101,7 +101,7 @@ public class Test_Api_2_Erh_Aptlbb_Bss extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbbb/Api_2_Erh_Aptlbbb_1.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbbb/Api_2_Erh_Aptlbbb_1.java
index 2df645d3bf1df6d31df25cdde576baf8a5dc16b1..9d8b2e1a4437e9bed3aa84a80591a388dd40b608 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbbb/Api_2_Erh_Aptlbbb_1.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbbb/Api_2_Erh_Aptlbbb_1.java
@@ -74,26 +74,31 @@ public class Api_2_Erh_Aptlbbb_1 extends TestToolkitApplet {
// --------------------------------------------
// Test Case 1 : handler overflow
testCaseNb = (byte) 1 ;
- bRes = false ;
-
- try {
-
- // Initialise the handler
- offset = (short)0 ;
- length = (short)(EnvRespHdlr.getCapacity() - 1) ;
- EnvRespHdlr.appendArray(buffer, offset, length) ;
-
- // appendTLV
- try {
- EnvRespHdlr.appendTLV(tag, value1, value2) ;
- }
- catch (ToolkitException e) {
- bRes = (e.getReason() == ToolkitException.HANDLER_OVERFLOW) ;
- }
- }
- catch (Exception e) {
- bRes = false ;
- }
+ bRes = false ;
+
+ try {
+
+ // Initialise the handler
+ offset = (short)0 ;
+ length = (short)(EnvRespHdlr.getCapacity() - 1) ;
+ while (length > 255){
+ EnvRespHdlr.appendArray(buffer, offset, (short) 255) ;
+ length = (short) (length - (short) 255);
+ }
+ EnvRespHdlr.appendArray(buffer, offset, length) ;
+
+ // appendTLV
+ try {
+ EnvRespHdlr.appendTLV(tag, value1, value2) ;
+ }
+ catch (ToolkitException e) {
+ bRes = (e.getReason() == ToolkitException.HANDLER_OVERFLOW) ;
+ }
+ }
+ catch (Exception e) {
+ bRes = false ;
+ }
+
reportTestOutcome(testCaseNb, bRes) ;
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbbb/Test_Api_2_Erh_Aptlbbb.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbbb/Test_Api_2_Erh_Aptlbbb.java
index 1dd4c93759ad82a351d255894ff8790a7f44a732..caebe95b6ac7499e4ea5acd69b2b8e619ae021e0 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbbb/Test_Api_2_Erh_Aptlbbb.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbbb/Test_Api_2_Erh_Aptlbbb.java
@@ -39,7 +39,7 @@ public class Test_Api_2_Erh_Aptlbbb extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -85,8 +85,8 @@ public class Test_Api_2_Erh_Aptlbbb extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
- + "05CCCCCC CCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "05CCCCCC CCCC"));
/*********************************************************************/
@@ -101,7 +101,7 @@ public class Test_Api_2_Erh_Aptlbbb extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbbs/Api_2_Erh_Aptlbbs_1.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbbs/Api_2_Erh_Aptlbbs_1.java
index 813e28ad60541c2e1a3ecdf8bdfd02e51ac74482..613204e48115b2e86dc622dd132685dc439bab11 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbbs/Api_2_Erh_Aptlbbs_1.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbbs/Api_2_Erh_Aptlbbs_1.java
@@ -73,26 +73,31 @@ public class Api_2_Erh_Aptlbbs_1 extends TestToolkitApplet {
// --------------------------------------------
// Test Case 1 : handler overflow
testCaseNb = (byte) 1 ;
- bRes = false ;
-
- try {
-
- // Initialise the handler
- offset = (short)0 ;
- length = (short)(EnvRespHdlr.getCapacity() - 1) ;
- EnvRespHdlr.appendArray(buffer, offset, length) ;
-
- // appendTLV
- try {
- EnvRespHdlr.appendTLV(tag, value1, value2) ;
- }
- catch (ToolkitException e) {
- bRes = (e.getReason() == ToolkitException.HANDLER_OVERFLOW) ;
- }
- }
- catch (Exception e) {
- bRes = false ;
- }
+ bRes = false ;
+
+ try {
+
+ // Initialise the handler
+ offset = (short)0 ;
+ length = (short)(EnvRespHdlr.getCapacity() - 1) ;
+ while (length > 255){
+ EnvRespHdlr.appendArray(buffer, offset, (short) 255) ;
+ length = (short) (length - (short) 255);
+ }
+ EnvRespHdlr.appendArray(buffer, offset, length) ;
+
+ // appendTLV
+ try {
+ EnvRespHdlr.appendTLV(tag, value1, value2) ;
+ }
+ catch (ToolkitException e) {
+ bRes = (e.getReason() == ToolkitException.HANDLER_OVERFLOW) ;
+ }
+ }
+ catch (Exception e) {
+ bRes = false ;
+ }
+
reportTestOutcome(testCaseNb, bRes) ;
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbbs/Test_Api_2_Erh_Aptlbbs.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbbs/Test_Api_2_Erh_Aptlbbs.java
index 0db5163ef1b30c49ec2a87733fe3e19afaf11a0c..d045ea1f59d1dfc567f4d92b373bbbb3256c4d8f 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbbs/Test_Api_2_Erh_Aptlbbs.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbbs/Test_Api_2_Erh_Aptlbbs.java
@@ -37,7 +37,7 @@ public class Test_Api_2_Erh_Aptlbbs extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -83,8 +83,8 @@ public class Test_Api_2_Erh_Aptlbbs extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
- + "05CCCCCC CCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "05CCCCCC CCCC"));
/*********************************************************************/
@@ -99,7 +99,7 @@ public class Test_Api_2_Erh_Aptlbbs extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbs/Api_2_Erh_Aptlbs_1.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbs/Api_2_Erh_Aptlbs_1.java
index 6d8be677bc66398d37618b4bbc9fcb90efc47d02..209375424a0c54b933f0a70f270023fa36df3d5f 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbs/Api_2_Erh_Aptlbs_1.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbs/Api_2_Erh_Aptlbs_1.java
@@ -72,28 +72,33 @@ public class Api_2_Erh_Aptlbs_1 extends TestToolkitApplet {
// --------------------------------------------
// Test Case 1 : handler overflow
testCaseNb = (byte) 1 ;
- bRes = false ;
-
- try {
-
- // Initialise the handler
- offset = (short)0 ;
- buffer[1] = (byte) 0x81;
- buffer[2] = (byte) 250;
- length = (short)(EnvRespHdlr.getCapacity() - 1);
- EnvRespHdlr.appendArray(buffer, offset, length) ;
-
- // appendTLV
- try {
- EnvRespHdlr.appendTLV(tag, value) ;
- }
- catch (ToolkitException e) {
- bRes = (e.getReason() == ToolkitException.HANDLER_OVERFLOW) ;
- }
- }
- catch (Exception e) {
- bRes = false ;
- }
+ bRes = false ;
+
+ try {
+
+ // Initialise the handler
+ offset = (short)0 ;
+ buffer[1] = (byte) 0x81;
+ buffer[2] = (byte) 250;
+ length = (short)(EnvRespHdlr.getCapacity() - 1);
+ while (length > 255){
+ EnvRespHdlr.appendArray(buffer, offset, (short) 255) ;
+ length = (short) (length - (short) 255);
+ }
+ EnvRespHdlr.appendArray(buffer, offset, length) ;
+
+ // appendTLV
+ try {
+ EnvRespHdlr.appendTLV(tag, value) ;
+ }
+ catch (ToolkitException e) {
+ bRes = (e.getReason() == ToolkitException.HANDLER_OVERFLOW) ;
+ }
+ }
+ catch (Exception e) {
+ bRes = false ;
+ }
+
reportTestOutcome(testCaseNb, bRes) ;
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbs/Test_Api_2_Erh_Aptlbs.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbs/Test_Api_2_Erh_Aptlbs.java
index d19baae5bc220e0c25214eb7c95d80858f97b5bf..067340008233f5365df6a06ddda1c590a60e9a80 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbs/Test_Api_2_Erh_Aptlbs.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbs/Test_Api_2_Erh_Aptlbs.java
@@ -39,7 +39,7 @@ public class Test_Api_2_Erh_Aptlbs extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -85,8 +85,8 @@ public class Test_Api_2_Erh_Aptlbs extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
- + "05CCCCCC CCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "05CCCCCC CCCC"));
/*********************************************************************/
@@ -101,7 +101,7 @@ public class Test_Api_2_Erh_Aptlbs extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbss/Api_2_Erh_Aptlbss_1.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbss/Api_2_Erh_Aptlbss_1.java
index 9299f66ff57b79a6d53b353fb33fb33a222d4375..7e76dfec631fe33f1c38f8c549ed6b462a36b5fb 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbss/Api_2_Erh_Aptlbss_1.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbss/Api_2_Erh_Aptlbss_1.java
@@ -72,26 +72,31 @@ public class Api_2_Erh_Aptlbss_1 extends TestToolkitApplet {
// --------------------------------------------
// Test Case 1 : handler overflow
testCaseNb = (byte) 1 ;
- bRes = false ;
-
- try {
-
- // Initialise the handler
- offset = (short)0 ;
- length = (short)(EnvRespHdlr.getCapacity() - 1) ;
- EnvRespHdlr.appendArray(buffer, offset, length) ;
-
- // appendTLV
- try {
- EnvRespHdlr.appendTLV(tag, value1, value2) ;
- }
- catch (ToolkitException e) {
- bRes = (e.getReason() == ToolkitException.HANDLER_OVERFLOW) ;
- }
- }
- catch (Exception e) {
- bRes = false ;
- }
+ bRes = false ;
+
+ try {
+
+ // Initialise the handler
+ offset = (short)0 ;
+ length = (short)(EnvRespHdlr.getCapacity() - 1) ;
+ while (length > 255){
+ EnvRespHdlr.appendArray(buffer, offset, (short) 255) ;
+ length = (short) (length - (short) 255);
+ }
+ EnvRespHdlr.appendArray(buffer, offset, length) ;
+
+ // appendTLV
+ try {
+ EnvRespHdlr.appendTLV(tag, value1, value2) ;
+ }
+ catch (ToolkitException e) {
+ bRes = (e.getReason() == ToolkitException.HANDLER_OVERFLOW) ;
+ }
+ }
+ catch (Exception e) {
+ bRes = false ;
+ }
+
reportTestOutcome(testCaseNb, bRes) ;
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbss/Test_Api_2_Erh_Aptlbss.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbss/Test_Api_2_Erh_Aptlbss.java
index 217d9f6fea962f814a63fb9e61a81e0bcad8ab1e..2954e1cb8f852384f6189af67471374c097cc6aa 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbss/Test_Api_2_Erh_Aptlbss.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbss/Test_Api_2_Erh_Aptlbss.java
@@ -37,7 +37,7 @@ public class Test_Api_2_Erh_Aptlbss extends UiccTestModel
public boolean run()
{
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -83,8 +83,8 @@ public class Test_Api_2_Erh_Aptlbss extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
- + "05CCCCCC CCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "05CCCCCC CCCC"));
/*********************************************************************/
@@ -99,7 +99,7 @@ public class Test_Api_2_Erh_Aptlbss extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_cler/Test_Api_2_Erh_Cler.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_cler/Test_Api_2_Erh_Cler.java
index 827e55af4726ce1d76fe9914b2f2bd6b1b1de804..e7dd359978e624c95fde6c04f8c40bd6f3190ee1 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_cler/Test_Api_2_Erh_Cler.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_cler/Test_Api_2_Erh_Cler.java
@@ -39,7 +39,7 @@ public class Test_Api_2_Erh_Cler extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -85,8 +85,8 @@ public class Test_Api_2_Erh_Cler extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
- + "03CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "03CCCCCC"));
/*********************************************************************/
@@ -101,7 +101,7 @@ public class Test_Api_2_Erh_Cler extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_copy/Test_Api_2_Erh_Copy.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_copy/Test_Api_2_Erh_Copy.java
index a018d8c5a807311e3c8062b88982a412783f0707..bfa03f5fd9a47d3dda861dc87d20d4cd173b1166 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_copy/Test_Api_2_Erh_Copy.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_copy/Test_Api_2_Erh_Copy.java
@@ -37,7 +37,7 @@ public class Test_Api_2_Erh_Copy extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -89,8 +89,8 @@ public class Test_Api_2_Erh_Copy extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
- + "0FCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "0FCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -105,7 +105,7 @@ public class Test_Api_2_Erh_Copy extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_cprv/Test_Api_2_Erh_Cprv.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_cprv/Test_Api_2_Erh_Cprv.java
index c73c0e9186b7bda2b7a907dfad65989c1e9a0f6e..ce4386ff7405ee2f769e34d03c509c5eb0b243d1 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_cprv/Test_Api_2_Erh_Cprv.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_cprv/Test_Api_2_Erh_Cprv.java
@@ -37,7 +37,7 @@ public class Test_Api_2_Erh_Cprv extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -83,9 +83,9 @@ public class Test_Api_2_Erh_Cprv extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
+ addResult(response.checkData("10" + APPLET_AID_1
+ "13CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"
- + "CCCCCCCC");
+ + "CCCCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -100,7 +100,7 @@ public class Test_Api_2_Erh_Cprv extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_cpyv/Test_Api_2_Erh_Cpyv.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_cpyv/Test_Api_2_Erh_Cpyv.java
index ee6fad64ff3297450ad8df198007293704ce4b4d..06b4f1be805162911c257e712e44837d435f40a9 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_cpyv/Test_Api_2_Erh_Cpyv.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_cpyv/Test_Api_2_Erh_Cpyv.java
@@ -37,7 +37,7 @@ public class Test_Api_2_Erh_Cpyv extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -83,9 +83,9 @@ public class Test_Api_2_Erh_Cpyv extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
+ addResult(response.checkData("10" + APPLET_AID_1
+ "11CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"
- + "CCCC");
+ + "CCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -100,7 +100,7 @@ public class Test_Api_2_Erh_Cpyv extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_facrb_bs/Test_Api_2_Erh_Facrb_Bs.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_facrb_bs/Test_Api_2_Erh_Facrb_Bs.java
index 289f21085f09ec21886ea209980a9a4a9a6ba774..608348b5e05ebdbe3e8673e6849d941e95d68795 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_facrb_bs/Test_Api_2_Erh_Facrb_Bs.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_facrb_bs/Test_Api_2_Erh_Facrb_Bs.java
@@ -37,7 +37,7 @@ public class Test_Api_2_Erh_Facrb_Bs extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -83,9 +83,9 @@ public class Test_Api_2_Erh_Facrb_Bs extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
+ addResult(response.checkData("10" + APPLET_AID_1
+ "12CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"
- + "CCCCCC");
+ + "CCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -100,7 +100,7 @@ public class Test_Api_2_Erh_Facrb_Bs extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_facrbbs_bss/Test_Api_2_Erh_Facrbbs_Bss.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_facrbbs_bss/Test_Api_2_Erh_Facrbbs_Bss.java
index 985c718c4f19763c310a3d4787d1abad2340ba04..2adb1d9ad46f1b780d1a484f8415ecd7b6832c01 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_facrbbs_bss/Test_Api_2_Erh_Facrbbs_Bss.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_facrbbs_bss/Test_Api_2_Erh_Facrbbs_Bss.java
@@ -39,7 +39,7 @@ public class Test_Api_2_Erh_Facrbbs_Bss extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -85,9 +85,9 @@ public class Test_Api_2_Erh_Facrbbs_Bss extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
+ addResult(response.checkData("10" + APPLET_AID_1
+ "1BCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"
- + "CCCCCCCC CCCCCCCC CCCCCCCC");
+ + "CCCCCCCC CCCCCCCC CCCCCCCC"));
/*********************************************************************/
@@ -103,7 +103,7 @@ public class Test_Api_2_Erh_Facrbbs_Bss extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_facyb_bs/Test_Api_2_Erh_Facyb_Bs.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_facyb_bs/Test_Api_2_Erh_Facyb_Bs.java
index e8afd5e4aef263c3c9fbded4d6434e029b340deb..8672666e22af43cbb8f826f3cf432caebe0428c0 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_facyb_bs/Test_Api_2_Erh_Facyb_Bs.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_facyb_bs/Test_Api_2_Erh_Facyb_Bs.java
@@ -37,7 +37,7 @@ public class Test_Api_2_Erh_Facyb_Bs extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -83,9 +83,9 @@ public class Test_Api_2_Erh_Facyb_Bs extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
+ addResult(response.checkData("10" + APPLET_AID_1
+ "11CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"
- + "CCCC");
+ + "CCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -100,7 +100,7 @@ public class Test_Api_2_Erh_Facyb_Bs extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_facybbs_bss/Test_Api_2_Erh_Facybbs_Bss.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_facybbs_bss/Test_Api_2_Erh_Facybbs_Bss.java
index 1f3276f493e5a722cb8c492ee5f82c09f771bf7a..0f10319ff92f0aab7608720e8eca3b216a855bbe 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_facybbs_bss/Test_Api_2_Erh_Facybbs_Bss.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_facybbs_bss/Test_Api_2_Erh_Facybbs_Bss.java
@@ -37,7 +37,7 @@ public class Test_Api_2_Erh_Facybbs_Bss extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -83,9 +83,9 @@ public class Test_Api_2_Erh_Facybbs_Bss extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
+ addResult(response.checkData("10" + APPLET_AID_1
+ "1ACCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"
- + "CCCCCCCC CCCCCCCC CCCCCC");
+ + "CCCCCCCC CCCCCCCC CCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -100,7 +100,7 @@ public class Test_Api_2_Erh_Facybbs_Bss extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_find/Test_Api_2_Erh_Find.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_find/Test_Api_2_Erh_Find.java
index 18bc26395083bcda3331fc662fe5c64b6259b718..842d8e3c0bd25c4ffcc14a703ba198a9b9893c1c 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_find/Test_Api_2_Erh_Find.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_find/Test_Api_2_Erh_Find.java
@@ -37,7 +37,7 @@ public class Test_Api_2_Erh_Find extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -83,8 +83,8 @@ public class Test_Api_2_Erh_Find extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
- + "0ECCCCCC CCCCCCCC CCCCCCCC CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "0ECCCCCC CCCCCCCC CCCCCCCC CCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -99,7 +99,7 @@ public class Test_Api_2_Erh_Find extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gcap/Api_2_Erh_Gcap_1.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gcap/Api_2_Erh_Gcap_1.java
index 1976943477b529aa6a7581efae2831fdc30b534b..cc88e3d7ed7a0155fb2e27ecafc4566d05f4fc62 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gcap/Api_2_Erh_Gcap_1.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gcap/Api_2_Erh_Gcap_1.java
@@ -90,10 +90,7 @@ public class Api_2_Erh_Gcap_1 extends TestToolkitApplet {
{
envRespHdlr.appendTLV((byte)0xAA, Buffer, (short)0x00, (short)(sCapacity - 3));
}
- else if (sCapacity > 0x102)
- {
- envRespHdlr.appendTLV((byte)0xAA, Buffer, (short)0x00, (short)(sCapacity - 4));
- }
+
bRes &= true;
}
catch (Exception e) {
@@ -121,7 +118,7 @@ public class Api_2_Erh_Gcap_1 extends TestToolkitApplet {
}
else if (sCapacity > 0x102)
{
- envRespHdlr.appendTLV((byte)0xAA, Buffer, (short)0x00, (short)(sCapacity - 3));
+ ToolkitException.throwIt(ToolkitException.HANDLER_OVERFLOW);
}
bRes = false;
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gcap/Test_Api_2_Erh_Gcap.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gcap/Test_Api_2_Erh_Gcap.java
index da9cfd9d3f0199c1202f6196969f89535e3b5f52..645531a2e25ea30f69a7dfe314cf08fc096a583f 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gcap/Test_Api_2_Erh_Gcap.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gcap/Test_Api_2_Erh_Gcap.java
@@ -39,7 +39,7 @@ public class Test_Api_2_Erh_Gcap extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -85,8 +85,8 @@ public class Test_Api_2_Erh_Gcap extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
- + "01CC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "01CC"));
/*********************************************************************/
@@ -101,7 +101,7 @@ public class Test_Api_2_Erh_Gcap extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_glen/Api_2_Erh_Glen_1.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_glen/Api_2_Erh_Glen_1.java
index 17f8bc537b6e578ef985c75ad7da154f18bbc761..20d79cb0ee2aec26b49a56b3e2de7bc945e93eb2 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_glen/Api_2_Erh_Glen_1.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_glen/Api_2_Erh_Glen_1.java
@@ -69,6 +69,14 @@ public class Api_2_Erh_Glen_1 extends TestToolkitApplet {
}
public void processToolkit(short event) {
+
+ short length = (short) 0x00 ;
+ short offset = (short) 0x00 ;
+
+ // additional byte if TLV length < 0x7F
+ short adjustLen = 0;
+
+
// Result of tests
boolean bRes ;
@@ -113,19 +121,28 @@ public class Api_2_Erh_Glen_1 extends TestToolkitApplet {
case (byte) 2 :
// --------------------------------------------
- // Test Case 3 : length = getCapacity()
- testCaseNb = (byte) 3 ;
- bRes = false ;
-
- try {
- EnvRespHdlr.clear();
- EnvRespHdlr.appendTLV((byte)0x01,data,(short) 0x00, (short)(EnvRespHdlr.getCapacity()- 3));
- bRes = (EnvRespHdlr.getLength() == (short)EnvRespHdlr.getCapacity()) ;
-
- }
- catch (Exception e) {
- bRes = false ;
- }
+ // Test Case 3 : length = getCapacity()
+ testCaseNb = (byte) 3 ;
+ bRes = false ;
+
+ try {
+
+ EnvRespHdlr.clear();
+ length = (short)(EnvRespHdlr.getCapacity()- 3);
+ while (length > 253){
+ EnvRespHdlr.appendTLV((byte)0x01,data, offset, (short) 252);
+ length = (short) (length - (short) 255);
+ }
+ if (length < 0x80) adjustLen = 1;
+
+ EnvRespHdlr.appendTLV((byte)0x01,data, offset, length);
+ bRes = (EnvRespHdlr.getLength() == (short)(EnvRespHdlr.getCapacity() - adjustLen)) ;
+
+ }
+ catch (Exception e) {
+ bRes = false ;
+ }
+
reportTestOutcome(testCaseNb, bRes) ;
return;
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_glen/Test_Api_2_Erh_Glen.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_glen/Test_Api_2_Erh_Glen.java
index 645142efcd7ccac5edb0740f6c8b85d21ffdf088..5757b31b31bc55fbaf1e348f3a7788f41bca625c 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_glen/Test_Api_2_Erh_Glen.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_glen/Test_Api_2_Erh_Glen.java
@@ -39,7 +39,7 @@ public class Test_Api_2_Erh_Glen extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -92,7 +92,7 @@ public class Test_Api_2_Erh_Glen extends UiccTestModel
// Test case 6
response = test.unrecognizedEnvelope();
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
/*********************************************************************/
@@ -101,8 +101,8 @@ public class Test_Api_2_Erh_Glen extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
- + "06CCCCCC CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "06CCCCCC CCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -116,7 +116,7 @@ public class Test_Api_2_Erh_Glen extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gvby/Test_Api_2_Erh_Gvby.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gvby/Test_Api_2_Erh_Gvby.java
index a2e563b41bd436363e3d2970366943f3bd80326a..931c7f512cd870a5f75e2323627aab36d457a142 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gvby/Test_Api_2_Erh_Gvby.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gvby/Test_Api_2_Erh_Gvby.java
@@ -37,7 +37,7 @@ public class Test_Api_2_Erh_Gvby extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -83,8 +83,8 @@ public class Test_Api_2_Erh_Gvby extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
- + "09CCCCCC CCCCCCCC CCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "09CCCCCC CCCCCCCC CCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -98,7 +98,7 @@ public class Test_Api_2_Erh_Gvby extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gvle/Test_Api_2_Erh_Gvle.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gvle/Test_Api_2_Erh_Gvle.java
index a4d8765062129f08c3c768fbb8e6f74b6378ccfb..83ecefd285c91470e52a6ce053e18e6015a1ed1a 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gvle/Test_Api_2_Erh_Gvle.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gvle/Test_Api_2_Erh_Gvle.java
@@ -37,7 +37,7 @@ public class Test_Api_2_Erh_Gvle extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -83,8 +83,8 @@ public class Test_Api_2_Erh_Gvle extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
- + "07CCCCCC CCCCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "07CCCCCC CCCCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -99,7 +99,7 @@ public class Test_Api_2_Erh_Gvle extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gvsh/Test_Api_2_Erh_Gvsh.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gvsh/Test_Api_2_Erh_Gvsh.java
index daa3d884ce95ea89f86c069b8ac5b408e04bca31..515546e83e1c1c2cf232237a199d6a806cea9575 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gvsh/Test_Api_2_Erh_Gvsh.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gvsh/Test_Api_2_Erh_Gvsh.java
@@ -39,7 +39,7 @@ public class Test_Api_2_Erh_Gvsh extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -85,8 +85,8 @@ public class Test_Api_2_Erh_Gvsh extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
- + "09CCCCCC CCCCCCCC CCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "09CCCCCC CCCCCCCC CCCC"));
/*********************************************************************/
@@ -102,7 +102,7 @@ public class Test_Api_2_Erh_Gvsh extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_poab/Test_Api_2_Erh_Poab.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_poab/Test_Api_2_Erh_Poab.java
index b03462a7fb9b0ace738e193d6c235c01fa781949..737782b192fc972c446bbc861c391d002429840e 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_poab/Test_Api_2_Erh_Poab.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_poab/Test_Api_2_Erh_Poab.java
@@ -37,7 +37,7 @@ public class Test_Api_2_Erh_Poab extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -75,85 +75,85 @@ public class Test_Api_2_Erh_Poab extends UiccTestModel
// Test case 1
response = test.unrecognizedEnvelope();
- result = response.checkData("0100");
- result &= response.checkSw("9000");
+ addResult(response.checkData("0100"));
+ addResult(response.checkSw("9000"));
// Test case 2
response = test.unrecognizedEnvelope();
- result &= response.checkData("3381FD"
- + "0181FA01 02030405 06070809 0A0B0C0D"
- + "0E0F1011 12131415 16171819 1A1B1C1D"
- + "1E1F2021 22232425 26272829 2A2B2C2D"
- + "2E2F3031 32333435 36373839 3A3B3C3D"
- + "3E3F4041 42434445 46474849 4A4B4C4D"
- + "4E4F5051 52535455 56575859 5A5B5C5D"
- + "5E5F6061 62636465 66676869 6A6B6C6D"
- + "6E6F7071 72737475 76777879 7A7B7C7D"
- + "7E7F8081 82838485 86878889 8A8B8C8D"
- + "8E8F9091 92939495 96979899 9A9B9C9D"
- + "9E9FA0A1 A2A3A4A5 A6A7A8A9 AAABACAD"
- + "AEAFB0B1 B2B3B4B5 B6B7B8B9 BABBBCBD"
- + "BEBFC0C1 C2C3C4C5 C6C7C8C9 CACBCCCD"
- + "CECFD0D1 D2D3D4D5 D6D7D8D9 DADBDCDD"
- + "DEDFE0E1 E2E3E4E5 E6E7E8E9 EAEBECED"
- + "EEEFF0F1 F2F3F4F5 F6F7F8F9 FA");
-
- result &= response.checkSw("9000");
+ addResult(response.checkData("3381FD"
+ + "0181FA01 02030405 06070809 0A0B0C0D"
+ + "0E0F1011 12131415 16171819 1A1B1C1D"
+ + "1E1F2021 22232425 26272829 2A2B2C2D"
+ + "2E2F3031 32333435 36373839 3A3B3C3D"
+ + "3E3F4041 42434445 46474849 4A4B4C4D"
+ + "4E4F5051 52535455 56575859 5A5B5C5D"
+ + "5E5F6061 62636465 66676869 6A6B6C6D"
+ + "6E6F7071 72737475 76777879 7A7B7C7D"
+ + "7E7F8081 82838485 86878889 8A8B8C8D"
+ + "8E8F9091 92939495 96979899 9A9B9C9D"
+ + "9E9FA0A1 A2A3A4A5 A6A7A8A9 AAABACAD"
+ + "AEAFB0B1 B2B3B4B5 B6B7B8B9 BABBBCBD"
+ + "BEBFC0C1 C2C3C4C5 C6C7C8C9 CACBCCCD"
+ + "CECFD0D1 D2D3D4D5 D6D7D8D9 DADBDCDD"
+ + "DEDFE0E1 E2E3E4E5 E6E7E8E9 EAEBECED"
+ + "EEEFF0F1 F2F3F4F5 F6F7F8F9 FA"));
+
+ addResult(response.checkSw("9000"));
// Test case 3
response = test.unrecognizedEnvelope();
- result &= response.checkData("33120110 01020304 05060708 090A0B0C 0D0E0F10");
- result &= response.checkSw("9000");
+ addResult(response.checkData("33120110 01020304 05060708 090A0B0C 0D0E0F10"));
+ addResult(response.checkSw("9000"));
// Test case 4
response = test.unrecognizedEnvelope();
- result &= response.checkData("75120110 01020304 05060708 090A0B0C 0D0E0F10");
- result &= response.checkSw("6200");
+ addResult(response.checkData("75120110 01020304 05060708 090A0B0C 0D0E0F10"));
+ addResult(response.checkSw("6200"));
response = test.envelopeEventDownloadUserActivity(); // Dummy command to get the 91XX status word
- result &= response.checkSw("9115");
+ addResult(response.checkSw("9115"));
response = test.fetch("15");
- result &= response.checkData("D0138103 01218082 0281028D 08044150"
- + "504C4554 31");
+ addResult(response.checkData("D0138103 01218082 0281028D 08044150"
+ + "504C4554 31"));
test.terminalResponse("81030121 00020282 81030100");
// Test case 5
response = test.unrecognizedEnvelope();
- result &= response.checkData("3300");
- result &= response.checkSw("6200");
+ addResult(response.checkData("3300"));
+ addResult(response.checkSw("6200"));
response = test.envelopeEventDownloadUserActivity(); // Dummy command to get the 91XX status word
- result &= response.checkSw("9115");
+ addResult(response.checkSw("9115"));
response = test.fetch("15");
- result &= response.checkData("D0138103 01218082 0281028D 08044150"
- + "504C4554 31");
+ addResult(response.checkData("D0138103 01218082 0281028D 08044150"
+ + "504C4554 31"));
test.terminalResponse("81030121 00020282 81030100");
// Test case 6
response = test.unrecognizedEnvelope();
- result &= response.checkSw("9115");
+ addResult(response.checkSw("9115"));
response = test.fetch("15");
- result &= response.checkData("D0138103 01218082 0281028D 08044150"
- + "504C4554 31");
+ addResult(response.checkData("D0138103 01218082 0281028D 08044150"
+ + "504C4554 31"));
response = test.terminalResponse("81030121 00020282 81030100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// Test case 7
response = test.unrecognizedEnvelope();
- result &= response.checkData("56120110 01020304 05060708 090A0B0C 0D0E0F10");
- result &= response.checkSw("6200");
+ addResult(response.checkData("56120110 01020304 05060708 090A0B0C 0D0E0F10"));
+ addResult(response.checkSw("6200"));
// Test case 8
response = test.envelopeCallControlByNAA();
- result &= response.checkData("33120110 01020304 05060708 090A0B0C 0D0E0F10");
- result &= response.checkSw("9000");
+ addResult(response.checkData("33120110 01020304 05060708 090A0B0C 0D0E0F10"));
+ addResult(response.checkSw("9000"));
// Test case 9
response = test.envelopeCallControlByNAA();
- result &= response.checkData("28120110 11121314 15161718 191A1B1C 1D1E1F20");
- result &= response.checkSw("9000");
+ addResult(response.checkData("28120110 11121314 15161718 191A1B1C 1D1E1F20"));
+ addResult(response.checkSw("9000"));
// Test case 10
response = test.unrecognizedEnvelope();
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
/*********************************************************************/
@@ -162,8 +162,8 @@ public class Test_Api_2_Erh_Poab extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
- + "0ACCCCCC CCCCCCCC CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "0ACCCCCC CCCCCCCC CCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -178,7 +178,7 @@ public class Test_Api_2_Erh_Poab extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_post/Test_Api_2_Erh_Post.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_post/Test_Api_2_Erh_Post.java
index bef669021440a313581634af450cd7e87be8a76a..a38ceae25f23632842363d1d4c76678889bd1f24 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_post/Test_Api_2_Erh_Post.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_post/Test_Api_2_Erh_Post.java
@@ -37,7 +37,7 @@ public class Test_Api_2_Erh_Post extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -75,80 +75,80 @@ public class Test_Api_2_Erh_Post extends UiccTestModel
// Test case 1
response = test.unrecognizedEnvelope();
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// Test case 2
response = test.unrecognizedEnvelope();
- result &= response.checkData("0181FA01 02030405 06070809 0A0B0C0D"
- + "0E0F1011 12131415 16171819 1A1B1C1D"
- + "1E1F2021 22232425 26272829 2A2B2C2D"
- + "2E2F3031 32333435 36373839 3A3B3C3D"
- + "3E3F4041 42434445 46474849 4A4B4C4D"
- + "4E4F5051 52535455 56575859 5A5B5C5D"
- + "5E5F6061 62636465 66676869 6A6B6C6D"
- + "6E6F7071 72737475 76777879 7A7B7C7D"
- + "7E7F8081 82838485 86878889 8A8B8C8D"
- + "8E8F9091 92939495 96979899 9A9B9C9D"
- + "9E9FA0A1 A2A3A4A5 A6A7A8A9 AAABACAD"
- + "AEAFB0B1 B2B3B4B5 B6B7B8B9 BABBBCBD"
- + "BEBFC0C1 C2C3C4C5 C6C7C8C9 CACBCCCD"
- + "CECFD0D1 D2D3D4D5 D6D7D8D9 DADBDCDD"
- + "DEDFE0E1 E2E3E4E5 E6E7E8E9 EAEBECED"
- + "EEEFF0F1 F2F3F4F5 F6F7F8F9 FA");
-
- result &= response.checkSw("9000");
+ addResult(response.checkData("0181FA01 02030405 06070809 0A0B0C0D"
+ + "0E0F1011 12131415 16171819 1A1B1C1D"
+ + "1E1F2021 22232425 26272829 2A2B2C2D"
+ + "2E2F3031 32333435 36373839 3A3B3C3D"
+ + "3E3F4041 42434445 46474849 4A4B4C4D"
+ + "4E4F5051 52535455 56575859 5A5B5C5D"
+ + "5E5F6061 62636465 66676869 6A6B6C6D"
+ + "6E6F7071 72737475 76777879 7A7B7C7D"
+ + "7E7F8081 82838485 86878889 8A8B8C8D"
+ + "8E8F9091 92939495 96979899 9A9B9C9D"
+ + "9E9FA0A1 A2A3A4A5 A6A7A8A9 AAABACAD"
+ + "AEAFB0B1 B2B3B4B5 B6B7B8B9 BABBBCBD"
+ + "BEBFC0C1 C2C3C4C5 C6C7C8C9 CACBCCCD"
+ + "CECFD0D1 D2D3D4D5 D6D7D8D9 DADBDCDD"
+ + "DEDFE0E1 E2E3E4E5 E6E7E8E9 EAEBECED"
+ + "EEEFF0F1 F2F3F4F5 F6F7F8F9 FA"));
+
+ addResult(response.checkSw("9000"));
// Test case 3
response = test.unrecognizedEnvelope();
- result &= response.checkData("01100102 03040506 0708090A 0B0C0D0E 0F10");
- result &= response.checkSw("9000");
+ addResult(response.checkData("01100102 03040506 0708090A 0B0C0D0E 0F10"));
+ addResult(response.checkSw("9000"));
// Test case 4
response = test.unrecognizedEnvelope();
- result &= response.checkData("01100102 03040506 0708090A 0B0C0D0E 0F10");
- result &= response.checkSw("6200");
+ addResult(response.checkData("01100102 03040506 0708090A 0B0C0D0E 0F10"));
+ addResult(response.checkSw("6200"));
response = test.envelopeEventDownloadUserActivity(); // Dummy command to get the 91XX status word
- result &= response.checkSw("9115");
+ addResult(response.checkSw("9115"));
response = test.fetch("15");
- result &= response.checkData("D0138103 01218082 0281028D 08044150"
- + "504C4554 31");
+ addResult(response.checkData("D0138103 01218082 0281028D 08044150"
+ + "504C4554 31"));
test.terminalResponse("81030121 00020282 81030100");
// Test case 5
response = test.unrecognizedEnvelope();
- result &= response.checkSw("9115");
+ addResult(response.checkSw("9115"));
response = test.fetch("15");
- result &= response.checkData("D0138103 01218082 0281028D 08044150"
- + "504C4554 31");
+ addResult(response.checkData("D0138103 01218082 0281028D 08044150"
+ + "504C4554 31"));
test.terminalResponse("81030121 00020282 81030100");
// Test case 6
response = test.unrecognizedEnvelope();
- result &= response.checkSw("9115");
+ addResult(response.checkSw("9115"));
response = test.fetch("15");
- result &= response.checkData("D0138103 01218082 0281028D 08044150"
- + "504C4554 31");
+ addResult(response.checkData("D0138103 01218082 0281028D 08044150"
+ + "504C4554 31"));
response = test.terminalResponse("81030121 00020282 81030100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// Test case 7
response = test.unrecognizedEnvelope();
- result &= response.checkData("01100102 03040506 0708090A 0B0C0D0E 0F10");
- result &= response.checkSw("6200");
+ addResult(response.checkData("01100102 03040506 0708090A 0B0C0D0E 0F10"));
+ addResult(response.checkSw("6200"));
// Test case 8
response = test.envelopeCallControlByNAA();
- result &= response.checkData("01100102 03040506 0708090A 0B0C0D0E 0F10");
- result &= response.checkSw("9000");
+ addResult(response.checkData("01100102 03040506 0708090A 0B0C0D0E 0F10"));
+ addResult(response.checkSw("9000"));
// Test case 9
response = test.envelopeCallControlByNAA();
- result &= response.checkData("01101112 13141516 1718191A 1B1C1D1E 1F20");
- result &= response.checkSw("9000");
+ addResult(response.checkData("01101112 13141516 1718191A 1B1C1D1E 1F20"));
+ addResult(response.checkSw("9000"));
// Test case 10
response = test.unrecognizedEnvelope();
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
/*********************************************************************/
@@ -157,8 +157,8 @@ public class Test_Api_2_Erh_Post extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
- + "0ACCCCCC CCCCCCCC CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "0ACCCCCC CCCCCCCC CCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -173,7 +173,7 @@ public class Test_Api_2_Erh_Post extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_ers_gthd/Test_Api_2_Ers_Gthd.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_ers_gthd/Test_Api_2_Ers_Gthd.java
index d4fb91c4419b5f8e5344441a15842f62ada026eb..a7f227e4dbba0c1d4c414b981991683237ac5d4b 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_ers_gthd/Test_Api_2_Ers_Gthd.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_ers_gthd/Test_Api_2_Ers_Gthd.java
@@ -37,7 +37,7 @@ public class Test_Api_2_Ers_Gthd extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -82,11 +82,11 @@ public class Test_Api_2_Ers_Gthd extends UiccTestModel
// Test case 4
response = test.unrecognizedEnvelope();
- result = response.checkSw("910B");
+ addResult(response.checkSw("910B"));
response = test.fetch("0B");
- result &= response.checkData("D0098103 01020082 028182");
+ addResult(response.checkData("D0098103 01020082 028182"));
response = test.terminalResponse("81030102 00020282 81030100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
/*********************************************************************/
@@ -95,8 +95,8 @@ public class Test_Api_2_Ers_Gthd extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
- + "04CCCCCC CC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "04CCCCCC CC"));
/*********************************************************************/
/*********************************************************************/
@@ -111,6 +111,6 @@ public class Test_Api_2_Ers_Gthd extends UiccTestModel
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_apda/Test_Api_2_Pah_Apda.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_apda/Test_Api_2_Pah_Apda.java
index 9ae8683823a4bf17bcf9b342ecd56cbb9859a4e8..14844f57d7ce43ebf914e6c869ed1fa5faf41d17 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_apda/Test_Api_2_Pah_Apda.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_apda/Test_Api_2_Pah_Apda.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Pah_Apda extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -81,8 +81,8 @@ public class Test_Api_2_Pah_Apda extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
- + "0CCCCCCC CCCCCCCC CCCCCCCC CC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "0CCCCCCC CCCCCCCC CCCCCCCC CC"));
/*********************************************************************/
/*********************************************************************/
@@ -96,6 +96,6 @@ public class Test_Api_2_Pah_Apda extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlb_bss/Test_Api_2_Pah_Aptlb_Bss.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlb_bss/Test_Api_2_Pah_Aptlb_Bss.java
index 4f1b1de2c3d38bc55f56d04c75ef70a92e72ecab..753c92489af0fa75e30a7799856f1662af3beb80 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlb_bss/Test_Api_2_Pah_Aptlb_Bss.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlb_bss/Test_Api_2_Pah_Aptlb_Bss.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Pah_Aptlb_Bss extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -81,8 +81,8 @@ public class Test_Api_2_Pah_Aptlb_Bss extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
- + "0ECCCCCC CCCCCCCC CCCCCCCC CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "0ECCCCCC CCCCCCCC CCCCCCCC CCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -96,6 +96,6 @@ public class Test_Api_2_Pah_Aptlb_Bss extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlb_bss_bss/Test_Api_2_Pah_Aptlb_Bss_Bss.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlb_bss_bss/Test_Api_2_Pah_Aptlb_Bss_Bss.java
index 3babbbeeeeb835e86a0dfc241b80138f0c764cf1..b56cc68992c78cf6e47e735bf0a9b850d0618942 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlb_bss_bss/Test_Api_2_Pah_Aptlb_Bss_Bss.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlb_bss_bss/Test_Api_2_Pah_Aptlb_Bss_Bss.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Pah_Aptlb_Bss_Bss extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -81,9 +81,9 @@ public class Test_Api_2_Pah_Aptlb_Bss_Bss extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
+ addResult(response.checkData("10" + APPLET_AID_1
+ "14CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"
- + "CCCCCCCC CC");
+ + "CCCCCCCC CC"));
/*********************************************************************/
/*********************************************************************/
@@ -97,6 +97,6 @@ public class Test_Api_2_Pah_Aptlb_Bss_Bss extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbb/Test_Api_2_Pah_Aptlbb.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbb/Test_Api_2_Pah_Aptlbb.java
index e60c3344598b6cc72fd8a94fddaf3b2b8690df2a..f61bf002c7b40e1073676ad88998db3e3e70deaf 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbb/Test_Api_2_Pah_Aptlbb.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbb/Test_Api_2_Pah_Aptlbb.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Pah_Aptlbb extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -81,8 +81,8 @@ public class Test_Api_2_Pah_Aptlbb extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
- + "05CCCCCC CCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "05CCCCCC CCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -96,6 +96,6 @@ public class Test_Api_2_Pah_Aptlbb extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbb_bss/Test_Api_2_Pah_Aptlbb_Bss.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbb_bss/Test_Api_2_Pah_Aptlbb_Bss.java
index 65d5c9aa9984368c49a4c6ea4341839136130bf6..881cc4b53f7da7e43bfaae83e416186c851b1782 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbb_bss/Test_Api_2_Pah_Aptlbb_Bss.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbb_bss/Test_Api_2_Pah_Aptlbb_Bss.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Pah_Aptlbb_Bss extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -81,8 +81,8 @@ public class Test_Api_2_Pah_Aptlbb_Bss extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
- + "0ECCCCCC CCCCCCCC CCCCCCCC CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "0ECCCCCC CCCCCCCC CCCCCCCC CCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -96,6 +96,6 @@ public class Test_Api_2_Pah_Aptlbb_Bss extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbbb/Test_Api_2_Pah_Aptlbbb.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbbb/Test_Api_2_Pah_Aptlbbb.java
index 220cce7a2d2cb73460e5a541d09dbb37c1804005..dc8d52b334b818167a3beb6328f86c3d701fb82f 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbbb/Test_Api_2_Pah_Aptlbbb.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbbb/Test_Api_2_Pah_Aptlbbb.java
@@ -34,7 +34,7 @@ public class Test_Api_2_Pah_Aptlbbb extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -80,8 +80,8 @@ public class Test_Api_2_Pah_Aptlbbb extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
- + "05CCCCCC CCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "05CCCCCC CCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -95,6 +95,6 @@ public class Test_Api_2_Pah_Aptlbbb extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbbs/Test_Api_2_Pah_Aptlbbs.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbbs/Test_Api_2_Pah_Aptlbbs.java
index 20b8af437e80a25d2c02d65747db83485b8d2b61..2465fdcfd97ed15a662ad9700124401bdb850f27 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbbs/Test_Api_2_Pah_Aptlbbs.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbbs/Test_Api_2_Pah_Aptlbbs.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Pah_Aptlbbs extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -81,8 +81,8 @@ public class Test_Api_2_Pah_Aptlbbs extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
- + "05CCCCCC CCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "05CCCCCC CCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -96,6 +96,6 @@ public class Test_Api_2_Pah_Aptlbbs extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbs/Test_Api_2_Pah_Aptlbs.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbs/Test_Api_2_Pah_Aptlbs.java
index 9af043c98ef76a67268ac5723814d0079ad573a3..2a55535c7de0e5069f664e013fea829fbbf38b05 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbs/Test_Api_2_Pah_Aptlbs.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbs/Test_Api_2_Pah_Aptlbs.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Pah_Aptlbs extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -81,8 +81,8 @@ public class Test_Api_2_Pah_Aptlbs extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
- + "05CCCCCC CCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "05CCCCCC CCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -96,6 +96,6 @@ public class Test_Api_2_Pah_Aptlbs extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbss/Test_Api_2_Pah_Aptlbss.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbss/Test_Api_2_Pah_Aptlbss.java
index 8b68be06be72e3a439b085afa77cc463e520cefb..5adb429d75b00a13ab81b668032d7f16603cdf76 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbss/Test_Api_2_Pah_Aptlbss.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbss/Test_Api_2_Pah_Aptlbss.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Pah_Aptlbss extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -81,8 +81,8 @@ public class Test_Api_2_Pah_Aptlbss extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
- + "05CCCCCC CCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "05CCCCCC CCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -96,6 +96,6 @@ public class Test_Api_2_Pah_Aptlbss extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_cler/Test_Api_2_Pah_Cler.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_cler/Test_Api_2_Pah_Cler.java
index ad551dde852ffe4c67e712fe8b4184d7093f1951..cfff48aeb8fa770bc6e9492e3c5f7a60bed07db1 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_cler/Test_Api_2_Pah_Cler.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_cler/Test_Api_2_Pah_Cler.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Pah_Cler extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -81,8 +81,8 @@ public class Test_Api_2_Pah_Cler extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
- + "02CCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "02CCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -96,6 +96,6 @@ public class Test_Api_2_Pah_Cler extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_copy/Test_Api_2_Pah_Copy.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_copy/Test_Api_2_Pah_Copy.java
index ed47085a18237d9f85f432bd6eb4e62880a501cd..abad17dcef9da340516f61adbe1d03c420becddf 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_copy/Test_Api_2_Pah_Copy.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_copy/Test_Api_2_Pah_Copy.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Pah_Copy extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -81,8 +81,8 @@ public class Test_Api_2_Pah_Copy extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
- + "0DCCCCCC CCCCCCCC CCCCCCCC CCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "0DCCCCCC CCCCCCCC CCCCCCCC CCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -96,6 +96,6 @@ public class Test_Api_2_Pah_Copy extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_cprv/Test_Api_2_Pah_Cprv.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_cprv/Test_Api_2_Pah_Cprv.java
index 90dd7aa194ead47f55b963cdeb80ead13a6eb12d..8feab155403327f4e2df41273721ee5ad972c8ca 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_cprv/Test_Api_2_Pah_Cprv.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_cprv/Test_Api_2_Pah_Cprv.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Pah_Cprv extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -81,9 +81,9 @@ public class Test_Api_2_Pah_Cprv extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
+ addResult(response.checkData("10" + APPLET_AID_1
+ "12CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"
- + "CCCCCC");
+ + "CCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -97,6 +97,6 @@ public class Test_Api_2_Pah_Cprv extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_cpyv/Test_Api_2_Pah_Cpyv.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_cpyv/Test_Api_2_Pah_Cpyv.java
index c04050de51ed96d4247ed822ea0d8865b5191819..07b7ecfa04c60df5e00dd69439f5a35fd5e4226a 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_cpyv/Test_Api_2_Pah_Cpyv.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_cpyv/Test_Api_2_Pah_Cpyv.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Pah_Cpyv extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -81,8 +81,8 @@ public class Test_Api_2_Pah_Cpyv extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
- + "0FCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "0FCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -96,6 +96,6 @@ public class Test_Api_2_Pah_Cpyv extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_facrb_bs/Test_Api_2_Pah_Facrb_Bs.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_facrb_bs/Test_Api_2_Pah_Facrb_Bs.java
index 78c157e39fbcf8b43f21569e05fa7d975ec1b723..cd0454fc9728f2f142015b0c213362013eb61881 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_facrb_bs/Test_Api_2_Pah_Facrb_Bs.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_facrb_bs/Test_Api_2_Pah_Facrb_Bs.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Pah_Facrb_Bs extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -81,9 +81,9 @@ public class Test_Api_2_Pah_Facrb_Bs extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
+ addResult(response.checkData("10" + APPLET_AID_1
+ "11CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"
- + "CCCC");
+ + "CCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -97,6 +97,6 @@ public class Test_Api_2_Pah_Facrb_Bs extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_facrbbs_bss/Test_Api_2_Pah_Facrbbs_Bss.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_facrbbs_bss/Test_Api_2_Pah_Facrbbs_Bss.java
index 082efc4e61e08a2383f2e2db71d7468b44c9be1d..35f145c66841ab7667744bb273206441b3d72a38 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_facrbbs_bss/Test_Api_2_Pah_Facrbbs_Bss.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_facrbbs_bss/Test_Api_2_Pah_Facrbbs_Bss.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Pah_Facrbbs_Bss extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -81,9 +81,9 @@ public class Test_Api_2_Pah_Facrbbs_Bss extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
+ addResult(response.checkData("10" + APPLET_AID_1
+ "19CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"
- + "CCCCCCCC CCCCCCCC CCCC");
+ + "CCCCCCCC CCCCCCCC CCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -97,6 +97,6 @@ public class Test_Api_2_Pah_Facrbbs_Bss extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_facyb_bs/Test_Api_2_Pah_Facyb_Bs.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_facyb_bs/Test_Api_2_Pah_Facyb_Bs.java
index eb9ad463f35d80bb6876c5247836512a062db59b..1ea73e28085bd3e152b5098a665146c51e8d6cf6 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_facyb_bs/Test_Api_2_Pah_Facyb_Bs.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_facyb_bs/Test_Api_2_Pah_Facyb_Bs.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Pah_Facyb_Bs extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -81,9 +81,9 @@ public class Test_Api_2_Pah_Facyb_Bs extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
+ addResult(response.checkData("10" + APPLET_AID_1
+ "10CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"
- + "CC");
+ + "CC"));
/*********************************************************************/
/*********************************************************************/
@@ -97,6 +97,6 @@ public class Test_Api_2_Pah_Facyb_Bs extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_facybbs_bss/Test_Api_2_Pah_Facybbs_Bss.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_facybbs_bss/Test_Api_2_Pah_Facybbs_Bss.java
index c690d6e8e32bca109578adfeb5f02e7f3c922ae6..360608243f95a20e465a03f484729fe66969f5f6 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_facybbs_bss/Test_Api_2_Pah_Facybbs_Bss.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_facybbs_bss/Test_Api_2_Pah_Facybbs_Bss.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Pah_Facybbs_Bss extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -81,9 +81,9 @@ public class Test_Api_2_Pah_Facybbs_Bss extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
+ addResult(response.checkData("10" + APPLET_AID_1
+ "18CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"
- + "CCCCCCCC CCCCCCCC CC");
+ + "CCCCCCCC CCCCCCCC CC"));
/*********************************************************************/
/*********************************************************************/
@@ -97,6 +97,6 @@ public class Test_Api_2_Pah_Facybbs_Bss extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_find/Test_Api_2_Pah_Find.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_find/Test_Api_2_Pah_Find.java
index 0faa42e8562be298af3533338e868600c7fca252..c7ecb2cac73392e65f13522090dbb6b4ca3eceee 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_find/Test_Api_2_Pah_Find.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_find/Test_Api_2_Pah_Find.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Pah_Find extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -81,8 +81,8 @@ public class Test_Api_2_Pah_Find extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
- + "0DCCCCCC CCCCCCCC CCCCCCCC CCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "0DCCCCCC CCCCCCCC CCCCCCCC CCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -96,6 +96,6 @@ public class Test_Api_2_Pah_Find extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_gcap/Test_Api_2_Pah_Gcap.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_gcap/Test_Api_2_Pah_Gcap.java
index 68bd2edee34674010398561f53f63a362d6d821a..a86a5069e570404cb0c95a7d7d4bdfe79672d5de 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_gcap/Test_Api_2_Pah_Gcap.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_gcap/Test_Api_2_Pah_Gcap.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Pah_Gcap extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -81,8 +81,8 @@ public class Test_Api_2_Pah_Gcap extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
- + "04CCCCCC CC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "04CCCCCC CC"));
/*********************************************************************/
/*********************************************************************/
@@ -96,6 +96,6 @@ public class Test_Api_2_Pah_Gcap extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_glen/Test_Api_2_Pah_glen.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_glen/Test_Api_2_Pah_glen.java
index 60013d292f2dc0bd36b5bc5e7d7bd750622f4f68..bcbccd2f8af904ed3079d14d148a55bab82d3bca 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_glen/Test_Api_2_Pah_glen.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_glen/Test_Api_2_Pah_glen.java
@@ -36,7 +36,7 @@ public class Test_Api_2_Pah_glen extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -77,7 +77,7 @@ public class Test_Api_2_Pah_glen extends UiccTestModel
{
// Send Unrecognized Envelope
response = test.unrecognizedEnvelope();
- result = response.checkSw("90 00");
+ addResult(response.checkSw("90 00"));
}
/*********************************************************************/
/*********************************************************************/
@@ -86,8 +86,8 @@ public class Test_Api_2_Pah_glen extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
- + "05CCCCCC CCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "05CCCCCC CCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -101,6 +101,6 @@ public class Test_Api_2_Pah_glen extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_gvby/Test_Api_2_Pah_Gvby.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_gvby/Test_Api_2_Pah_Gvby.java
index 5b12f7bf1da8544da40e0eda7d98e4a8561aa585..5f806c85be1c5cba9cde4a7689483df894c37505 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_gvby/Test_Api_2_Pah_Gvby.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_gvby/Test_Api_2_Pah_Gvby.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Pah_Gvby extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -81,8 +81,8 @@ public class Test_Api_2_Pah_Gvby extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
- + "08CCCCCC CCCCCCCC CC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "08CCCCCC CCCCCCCC CC"));
/*********************************************************************/
/*********************************************************************/
@@ -96,6 +96,6 @@ public class Test_Api_2_Pah_Gvby extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_gvle/Test_Api_2_Pah_Gvle.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_gvle/Test_Api_2_Pah_Gvle.java
index 7efba8c1cce373cf5a7693798166664f1d3471ff..67ece3664309fbe40857c48552e7b0a3a2c86fc4 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_gvle/Test_Api_2_Pah_Gvle.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_gvle/Test_Api_2_Pah_Gvle.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Pah_Gvle extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -81,8 +81,8 @@ public class Test_Api_2_Pah_Gvle extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
- + "06CCCCCC CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "06CCCCCC CCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -96,6 +96,6 @@ public class Test_Api_2_Pah_Gvle extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_gvsh/Test_Api_2_Pah_Gvsh.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_gvsh/Test_Api_2_Pah_Gvsh.java
index 45e5c847772d2599b03528d39674493992af67bb..0b4ea26f9688f37ceb08f87001e112f3f5fb4fdd 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_gvsh/Test_Api_2_Pah_Gvsh.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_gvsh/Test_Api_2_Pah_Gvsh.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Pah_Gvsh extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -81,8 +81,8 @@ public class Test_Api_2_Pah_Gvsh extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
- + "08CCCCCC CCCCCCCC CC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "08CCCCCC CCCCCCCC CC"));
/*********************************************************************/
/*********************************************************************/
@@ -96,6 +96,6 @@ public class Test_Api_2_Pah_Gvsh extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_icch/Test_Api_2_Pah_Icch.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_icch/Test_Api_2_Pah_Icch.java
index 82b8f2ba15c385c817258a7c3480a38e740c188c..654e179051fb1561ea4033f0c683deafffcbabd1 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_icch/Test_Api_2_Pah_Icch.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_icch/Test_Api_2_Pah_Icch.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Pah_Icch extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -73,105 +73,105 @@ public class Test_Api_2_Pah_Icch extends UiccTestModel
/*********************************************************************/
response = test.unrecognizedEnvelope();
- result = response.checkSw("911A");
+ addResult(response.checkSw("911A"));
// Fetch the Open Channel proactive command
response = test.fetch("1A");
- result &= response.checkData("D0188103 01400182 02818206 05815566"
- + "77883502 03003902 000A");
+ addResult(response.checkData("D0188103 01400182 02818206 05815566"
+ + "77883502 03003902 000A"));
// Successful terminal response
test.terminalResponse("81030140 01820282 81830100 38028100"
+ "35020300 3902000A");
// Send an EVENT_DOWNLOAD_CHANNEL_STATUS Envelope
response = test.envelopeEventDownloadChannelStatus("38028100");
- result &= response.checkSw("910B");
+ addResult(response.checkSw("910B"));
// Fetch the close channel proactive command
response = test.fetch("0B");
- result &= response.checkData("D0098103 01410082 028121");
+ addResult(response.checkData("D0098103 01410082 028121"));
// Successful terminal response
response = test.terminalResponse("81030141 00820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// Send an EVENT_DOWNLOAD_CHANNEL_STATUS Envelope
response = test.envelopeEventDownloadChannelStatus("38028100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
/** Testcase 2 */
/*********************************************************************/
response = test.unrecognizedEnvelope();
- result &= response.checkSw("911A");
+ addResult(response.checkSw("911A"));
// Fetch the open channel proactive command
response = test.fetch("1A");
- result &= response.checkData("D0188103 01400182 02818206 05815566"
- + "77883502 03003902 000A");
+ addResult(response.checkData("D0188103 01400182 02818206 05815566"
+ + "77883502 03003902 000A"));
// Successful terminal response
test.terminalResponse("81030140 01820282 81830100 38028100"
+ "35020300 3902000A");
// Send an EVENT_DOWNLOAD_CHANNEL_STATUS Envelope
response = test.envelopeEventDownloadChannelStatus("38028100");
- result &= response.checkSw("910B");
+ addResult(response.checkSw("910B"));
// Fetch the close channel proactive command
response = test.fetch("0B");
- result &= response.checkData("D0098103 01410082 028121");
+ addResult(response.checkData("D0098103 01410082 028121"));
// Successful terminal response
response = test.terminalResponse("81030141 00820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// Send an EVENT_DOWNLOAD_CHANNEL_STATUS Envelope
response = test.envelopeEventDownloadChannelStatus("38028100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
/** Testcase 3 */
/*********************************************************************/
response = test.unrecognizedEnvelope();
- result &= response.checkSw("911A");
+ addResult(response.checkSw("911A"));
// Fetch the open channel proactive command
response = test.fetch("1A");
- result &= response.checkData("D0188103 01400182 02818206 05815566"
- + "77883502 03003902 000A");
+ addResult(response.checkData("D0188103 01400182 02818206 05815566"
+ + "77883502 03003902 000A"));
// Successful terminal response
test.terminalResponse("81030140 01820282 81830100 38028100"
+ "35020300 3902000A");
// Send an EVENT_DOWNLOAD_CHANNEL_STATUS Envelope
response = test.envelopeEventDownloadChannelStatus("38028100");
- result &= response.checkSw("910B");
+ addResult(response.checkSw("910B"));
// Fetch the close channel proactive command
response = test.fetch("0B");
- result &= response.checkData("D0098103 01410082 028121");
+ addResult(response.checkData("D0098103 01410082 028121"));
// Successful terminal response
response = test.terminalResponse("81030141 00820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
/** Testcase 4 */
/*********************************************************************/
response = test.unrecognizedEnvelope();
- result &= response.checkSw("911A");
+ addResult(response.checkSw("911A"));
// Fetch the open channel proactive command
response = test.fetch("1A");
- result &= response.checkData("D0188103 01400182 02818206 05815566"
- + "77883502 03003902 000A");
+ addResult(response.checkData("D0188103 01400182 02818206 05815566"
+ + "77883502 03003902 000A"));
// Successful terminal response
test.terminalResponse("81030140 01820282 81830100 38028100"
+ "35020300 3902000A");
// Send an EVENT_DOWNLOAD_CHANNEL_STATUS Envelope
response = test.envelopeEventDownloadChannelStatus("38028100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
/*********************************************************************/
@@ -180,8 +180,8 @@ public class Test_Api_2_Pah_Icch extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
- + "04CCCCCC CC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "04CCCCCC CC"));
/*********************************************************************/
/*********************************************************************/
@@ -195,6 +195,6 @@ public class Test_Api_2_Pah_Icch extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_indt/Test_Api_2_Pah_Indt.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_indt/Test_Api_2_Pah_Indt.java
index 4147a7ab4f4b8b2bda4e8b3e77255b512f05cafa..29f233ec6280dff7f244feadbe6115e1a989d55a 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_indt/Test_Api_2_Pah_Indt.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_indt/Test_Api_2_Pah_Indt.java
@@ -37,7 +37,7 @@ public class Test_Api_2_Pah_Indt extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -75,92 +75,92 @@ public class Test_Api_2_Pah_Indt extends UiccTestModel
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
response = test.unrecognizedEnvelope();
- result = response.checkSw("9113");
+ addResult(response.checkSw("9113"));
response = test.fetch("13");
- result &= response.checkData("D0118103 01210082 0281028D 06045465"
- + "787441");
+ addResult(response.checkData("D0118103 01210082 0281028D 06045465"
+ + "787441"));
response = test.terminalResponse("81030121 00020282 81030100");
- result &= response.checkSw("9113");
+ addResult(response.checkSw("9113"));
/*********************************************************************/
/** Testcase 9 */
/*********************************************************************/
response = test.fetch("13");
- result &= response.checkData("D0118103 01210082 0281028D 06045465"
- + "787442");
+ addResult(response.checkData("D0118103 01210082 0281028D 06045465"
+ + "787442"));
response = test.terminalResponse("81030121 00020282 81030100");
- result &= response.checkSw("9113");
+ addResult(response.checkSw("9113"));
/*********************************************************************/
/** Testcase 10 */
/*********************************************************************/
response = test.fetch("13");
- result &= response.checkData("D0118103 01210082 0281028D 06045465"
- + "787443");
+ addResult(response.checkData("D0118103 01210082 0281028D 06045465"
+ + "787443"));
response = test.terminalResponse("81030121 00020282 81030100");
- result &= response.checkSw("9113");
+ addResult(response.checkSw("9113"));
/*********************************************************************/
/** Testcase 11 */
/*********************************************************************/
response = test.fetch("13");
- result &= response.checkData("D0118103 01210082 0281028D 06045465"
- + "787444");
+ addResult(response.checkData("D0118103 01210082 0281028D 06045465"
+ + "787444"));
response = test.terminalResponse("81030121 00020282 81030100");
- result &= response.checkSw("9113");
+ addResult(response.checkSw("9113"));
/*********************************************************************/
/** Testcase 12 */
/*********************************************************************/
response = test.fetch("13");
- result &= response.checkData("D0118103 01218182 0281028D 06045465"
- + "787445");
+ addResult(response.checkData("D0118103 01218182 0281028D 06045465"
+ + "787445"));
response = test.terminalResponse("81030121 81020282 81030100");
- result &= response.checkSw("9113");
+ addResult(response.checkSw("9113"));
/*********************************************************************/
/** Testcase 13 */
/*********************************************************************/
response = test.fetch("13");
- result &= response.checkData("D0118103 01210082 0281028D 06005465"
- + "787446");
+ addResult(response.checkData("D0118103 01210082 0281028D 06005465"
+ + "787446"));
response = test.terminalResponse("81030121 00020282 81030100");
- result &= response.checkSw("9113");
+ addResult(response.checkSw("9113"));
/*********************************************************************/
/** Testcase 14 */
/*********************************************************************/
response = test.fetch("13");
- result &= response.checkData("D0118103 01210082 0281028D 06085465"
- + "787447");
+ addResult(response.checkData("D0118103 01210082 0281028D 06085465"
+ + "787447"));
response = test.terminalResponse("81030121 00020282 81030100");
- result &= response.checkSw("9118");
+ addResult(response.checkSw("9118"));
/*********************************************************************/
/** Testcase 15 */
/*********************************************************************/
response = test.fetch("18");
- result &= response.checkData("D0168103 01210082 0281028D 0B045465"
- + "78744854 65787448");
+ addResult(response.checkData("D0168103 01210082 0281028D 0B045465"
+ + "78744854 65787448"));
response = test.terminalResponse("81030121 00020282 81030100");
- result &= response.checkSw("910D");
+ addResult(response.checkSw("910D"));
/*********************************************************************/
/** Testcase 16 */
/*********************************************************************/
response = test.fetch("0D");
- result &= response.checkData("D00B8103 01210082 0281028D 00");
+ addResult(response.checkData("D00B8103 01210082 0281028D 00"));
response = test.terminalResponse("81030121 00020282 81030100");
- result &= response.checkSw("918D");
+ addResult(response.checkSw("918D"));
/*********************************************************************/
/** Testcase 17,18 */
/*********************************************************************/
response = test.fetch("8D");
- result &= response.checkData("D0818A81 03012100 82028102 8D7F0455"
+ addResult(response.checkData("D0818A81 03012100 82028102 8D7F0455"
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
@@ -168,16 +168,16 @@ public class Test_Api_2_Pah_Indt extends UiccTestModel
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
- + "55555555 55555555 55555555 55");
+ + "55555555 55555555 55555555 55"));
response = test.terminalResponse("81030121 00020282 81030100");
- result &= response.checkSw("918F");
+ addResult(response.checkSw("918F"));
/*********************************************************************/
/** Testcase 19 */
/*********************************************************************/
response = test.fetch("8F");
- result &= response.checkData("D0818C81 03012100 82028102 8D818004"
+ addResult(response.checkData("D0818C81 03012100 82028102 8D818004"
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
@@ -185,16 +185,16 @@ public class Test_Api_2_Pah_Indt extends UiccTestModel
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
- + "55555555 55555555 55555555 555555");
+ + "55555555 55555555 55555555 555555"));
response = test.terminalResponse("81030121 00020282 81030100");
- result &= response.checkSw("9100");
+ addResult(response.checkSw("9100"));
/*********************************************************************/
/** Testcase 20,21,22 */
/*********************************************************************/
response = test.fetch("00");
- result &= response.checkData("D081FD81 03012100 82028102 8D81F104"
+ addResult(response.checkData("D081FD81 03012100 82028102 8D81F104"
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
@@ -209,10 +209,10 @@ public class Test_Api_2_Pah_Indt extends UiccTestModel
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
- + "55555555 55555555 55555555 55555555");
+ + "55555555 55555555 55555555 55555555"));
response = test.terminalResponse("81030121 00020282 81030100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
/*********************************************************************/
@@ -221,9 +221,9 @@ public class Test_Api_2_Pah_Indt extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
+ addResult(response.checkData("10" + APPLET_AID_1
+ "16CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"
- + "CCCCCCCC CCCCCC");
+ + "CCCCCCCC CCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -237,6 +237,6 @@ public class Test_Api_2_Pah_Indt extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_ingk/Test_Api_2_Pah_Ingk.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_ingk/Test_Api_2_Pah_Ingk.java
index 64d9aaf653867afc7cbea6ca6fc55e3df4ef6470..27a825379456acb2063dc44af85f6f7734b336a7 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_ingk/Test_Api_2_Pah_Ingk.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_ingk/Test_Api_2_Pah_Ingk.java
@@ -37,7 +37,7 @@ public class Test_Api_2_Pah_Ingk extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -75,92 +75,92 @@ public class Test_Api_2_Pah_Ingk extends UiccTestModel
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
response = test.unrecognizedEnvelope();
- result = response.checkSw("9113");
+ addResult(response.checkSw("9113"));
response = test.fetch("13");
- result &= response.checkData("D0118103 01220082 0281828D 06045465"
- + "787441");
+ addResult(response.checkData("D0118103 01220082 0281828D 06045465"
+ + "787441"));
response = test.terminalResponse("81030122 00020282 81030100");
- result &= response.checkSw("9113");
+ addResult(response.checkSw("9113"));
/*********************************************************************/
/** Testcase 9 */
/*********************************************************************/
response = test.fetch("13");
- result &= response.checkData("D0118103 01220082 0281828D 06045465"
- + "787442");
+ addResult(response.checkData("D0118103 01220082 0281828D 06045465"
+ + "787442"));
response = test.terminalResponse("81030122 00020282 81030100");
- result &= response.checkSw("9113");
+ addResult(response.checkSw("9113"));
/*********************************************************************/
/** Testcase 10 */
/*********************************************************************/
response = test.fetch("13");
- result &= response.checkData("D0118103 01220082 0281828D 06045465"
- + "787443");
+ addResult(response.checkData("D0118103 01220082 0281828D 06045465"
+ + "787443"));
response = test.terminalResponse("81030122 00020282 81030100");
- result &= response.checkSw("9113");
+ addResult(response.checkSw("9113"));
/*********************************************************************/
/** Testcase 11 */
/*********************************************************************/
response = test.fetch("13");
- result &= response.checkData("D0118103 01220082 0281828D 06045465"
- + "787444");
+ addResult(response.checkData("D0118103 01220082 0281828D 06045465"
+ + "787444"));
response = test.terminalResponse("81030122 00020282 81030100");
- result &= response.checkSw("9113");
+ addResult(response.checkSw("9113"));
/*********************************************************************/
/** Testcase 12 */
/*********************************************************************/
response = test.fetch("13");
- result &= response.checkData("D0118103 01228182 0281828D 06045465"
- + "787445");
+ addResult(response.checkData("D0118103 01228182 0281828D 06045465"
+ + "787445"));
response = test.terminalResponse("81030122 81020282 81030100");
- result &= response.checkSw("9113");
+ addResult(response.checkSw("9113"));
/*********************************************************************/
/** Testcase 13 */
/*********************************************************************/
response = test.fetch("13");
- result &= response.checkData("D0118103 01220082 0281828D 06005465"
- + "787446");
+ addResult(response.checkData("D0118103 01220082 0281828D 06005465"
+ + "787446"));
response = test.terminalResponse("81030122 00020282 81030100");
- result &= response.checkSw("9113");
+ addResult(response.checkSw("9113"));
/*********************************************************************/
/** Testcase 14 */
/*********************************************************************/
response = test.fetch("13");
- result &= response.checkData("D0118103 01220082 0281828D 06085465"
- + "787447");
+ addResult(response.checkData("D0118103 01220082 0281828D 06085465"
+ + "787447"));
response = test.terminalResponse("81030122 00020282 81030100");
- result &= response.checkSw("9118");
+ addResult(response.checkSw("9118"));
/*********************************************************************/
/** Testcase 15 */
/*********************************************************************/
response = test.fetch("18");
- result &= response.checkData("D0168103 01220082 0281828D 0B045465"
- + "78744854 65787448");
+ addResult(response.checkData("D0168103 01220082 0281828D 0B045465"
+ + "78744854 65787448"));
response = test.terminalResponse("81030122 00020282 81030100");
- result &= response.checkSw("910D");
+ addResult(response.checkSw("910D"));
/*********************************************************************/
/** Testcase 16 */
/*********************************************************************/
response = test.fetch("0D");
- result &= response.checkData("D00B8103 01220082 0281828D 00");
+ addResult(response.checkData("D00B8103 01220082 0281828D 00"));
response = test.terminalResponse("81030122 00020282 81030100");
- result &= response.checkSw("918D");
+ addResult(response.checkSw("918D"));
/*********************************************************************/
/** Testcase 17,18 */
/*********************************************************************/
response = test.fetch("8D");
- result &= response.checkData("D0818A81 03012200 82028182 8D7F0455"
+ addResult(response.checkData("D0818A81 03012200 82028182 8D7F0455"
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
@@ -168,16 +168,16 @@ public class Test_Api_2_Pah_Ingk extends UiccTestModel
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
- + "55555555 55555555 55555555 55");
+ + "55555555 55555555 55555555 55"));
response = test.terminalResponse("81030122 00020282 81030100");
- result &= response.checkSw("918F");
+ addResult(response.checkSw("918F"));
/*********************************************************************/
/** Testcase 19 */
/*********************************************************************/
response = test.fetch("8F");
- result &= response.checkData("D0818C81 03012200 82028182 8D818004"
+ addResult(response.checkData("D0818C81 03012200 82028182 8D818004"
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
@@ -185,16 +185,16 @@ public class Test_Api_2_Pah_Ingk extends UiccTestModel
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
- + "55555555 55555555 55555555 555555");
+ + "55555555 55555555 55555555 555555"));
response = test.terminalResponse("81030122 00020282 81030100");
- result &= response.checkSw("9100");
+ addResult(response.checkSw("9100"));
/*********************************************************************/
/** Testcase 20,21,22 */
/*********************************************************************/
response = test.fetch("00");
- result &= response.checkData("D081FD81 03012200 82028182 8D81F104"
+ addResult(response.checkData("D081FD81 03012200 82028182 8D81F104"
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
@@ -209,10 +209,10 @@ public class Test_Api_2_Pah_Ingk extends UiccTestModel
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
- + "55555555 55555555 55555555 55555555");
+ + "55555555 55555555 55555555 55555555"));
response = test.terminalResponse("81030122 00020282 81030100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
/*********************************************************************/
@@ -221,9 +221,9 @@ public class Test_Api_2_Pah_Ingk extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
+ addResult(response.checkData("10" + APPLET_AID_1
+ "16CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"
- + "CCCCCCCC CCCCCC");
+ + "CCCCCCCC CCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -237,6 +237,6 @@ public class Test_Api_2_Pah_Ingk extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_ingp/Test_Api_2_Pah_Ingp.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_ingp/Test_Api_2_Pah_Ingp.java
index 9941c6f4d164aab47b936112edc36cc8607c9ae2..d8363c8d4ca97ddd5a364a147d6f3dea84353b70 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_ingp/Test_Api_2_Pah_Ingp.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_ingp/Test_Api_2_Pah_Ingp.java
@@ -37,7 +37,7 @@ public class Test_Api_2_Pah_Ingp extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -75,93 +75,93 @@ public class Test_Api_2_Pah_Ingp extends UiccTestModel
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
response = test.unrecognizedEnvelope();
- result = response.checkSw("9117");
+ addResult(response.checkSw("9117"));
response = test.fetch("17");
- result &= response.checkData("D0158103 01230082 0281828D 06045465"
- + "78744191 0200FF");
+ addResult(response.checkData("D0158103 01230082 0281828D 06045465"
+ + "78744191 0200FF"));
response = test.terminalResponse("81030123 00020282 81030100 0D020441");
- result &= response.checkSw("9117");
+ addResult(response.checkSw("9117"));
/*********************************************************************/
/** Testcase 9 */
/*********************************************************************/
response = test.fetch("17");
- result &= response.checkData("D0158103 01230082 0281828D 06045465"
- + "78744291 0210FF");
+ addResult(response.checkData("D0158103 01230082 0281828D 06045465"
+ + "78744291 0210FF"));
response = test.terminalResponse("81030123 00020282 81030100 0D020441");
- result &= response.checkSw("9117");
+ addResult(response.checkSw("9117"));
/*********************************************************************/
/** Testcase 10 */
/*********************************************************************/
response = test.fetch("17");
- result &= response.checkData("D0158103 01230082 0281828D 06045465"
- + "78744391 02FFFF");
+ addResult(response.checkData("D0158103 01230082 0281828D 06045465"
+ + "78744391 02FFFF"));
response = test.terminalResponse("81030123 00020282 81030100 0D020441");
- result &= response.checkSw("9117");
+ addResult(response.checkSw("9117"));
/*********************************************************************/
/** Testcase 11 */
/*********************************************************************/
response = test.fetch("17");
- result &= response.checkData("D0158103 01230082 0281828D 06045465"
- + "78744491 020000");
+ addResult(response.checkData("D0158103 01230082 0281828D 06045465"
+ + "78744491 020000"));
response = test.terminalResponse("81030123 00020282 81030100 0D020441");
- result &= response.checkSw("9117");
+ addResult(response.checkSw("9117"));
/*********************************************************************/
/** Testcase 12 */
/*********************************************************************/
response = test.fetch("17");
- result &= response.checkData("D0158103 01238182 0281828D 06045465"
- + "78744591 020010");
+ addResult(response.checkData("D0158103 01238182 0281828D 06045465"
+ + "78744591 020010"));
response = test.terminalResponse("81030123 81020282 81030100 0D020441");
- result &= response.checkSw("9117");
+ addResult(response.checkSw("9117"));
/*********************************************************************/
/** Testcase 13 */
/*********************************************************************/
response = test.fetch("17");
- result &= response.checkData("D0158103 01230082 0281828D 06005465"
- + "78744691 021010");
+ addResult(response.checkData("D0158103 01230082 0281828D 06005465"
+ + "78744691 021010"));
response = test.terminalResponse("81030123 00020282 81030100 0D020441");
- result &= response.checkSw("9117");
+ addResult(response.checkSw("9117"));
/*********************************************************************/
/** Testcase 14 */
/*********************************************************************/
response = test.fetch("17");
- result &= response.checkData("D0158103 01230082 0281828D 06085465"
- + "78744791 0200FF");
+ addResult(response.checkData("D0158103 01230082 0281828D 06085465"
+ + "78744791 0200FF"));
response = test.terminalResponse("81030123 00020282 81030100 0D020441");
- result &= response.checkSw("911C");
+ addResult(response.checkSw("911C"));
/*********************************************************************/
/** Testcase 15 */
/*********************************************************************/
response = test.fetch("1C");
- result &= response.checkData("D01A8103 01230082 0281828D 0B045465"
- + "78744854 65787448 91020010");
+ addResult(response.checkData("D01A8103 01230082 0281828D 0B045465"
+ + "78744854 65787448 91020010"));
response = test.terminalResponse("81030123 00020282 81030100 0D020441");
- result &= response.checkSw("9111");
+ addResult(response.checkSw("9111"));
/*********************************************************************/
/** Testcase 16 */
/*********************************************************************/
response = test.fetch("11");
- result &= response.checkData("D00F8103 01230082 0281828D 00910200"
- + "10");
+ addResult(response.checkData("D00F8103 01230082 0281828D 00910200"
+ + "10"));
response = test.terminalResponse("81030123 00020282 81030100 0D020441");
- result &= response.checkSw("9191");
+ addResult(response.checkSw("9191"));
/*********************************************************************/
/** Testcase 17,18 */
/*********************************************************************/
response = test.fetch("91");
- result &= response.checkData("D0818E81 03012300 82028182 8D7F0455"
+ addResult(response.checkData("D0818E81 03012300 82028182 8D7F0455"
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
@@ -170,16 +170,16 @@ public class Test_Api_2_Pah_Ingp extends UiccTestModel
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55910200"
- + "10");
+ + "10"));
response = test.terminalResponse("81030123 00020282 81030100 0D020441");
- result &= response.checkSw("9193");
+ addResult(response.checkSw("9193"));
/*********************************************************************/
/** Testcase 19 */
/*********************************************************************/
response = test.fetch("93");
- result &= response.checkData("D0819081 03012300 82028182 8D818004"
+ addResult(response.checkData("D0819081 03012300 82028182 8D818004"
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
@@ -188,16 +188,16 @@ public class Test_Api_2_Pah_Ingp extends UiccTestModel
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555591"
- + "020010");
+ + "020010"));
response = test.terminalResponse("81030123 00020282 81030100 0D020441");
- result &= response.checkSw("9100");
+ addResult(response.checkSw("9100"));
/*********************************************************************/
/** Testcase 20,21,22 */
/*********************************************************************/
response = test.fetch("00");
- result &= response.checkData("D081FD81 03012300 82028182 8D81ED04"
+ addResult(response.checkData("D081FD81 03012300 82028182 8D81ED04"
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
@@ -212,10 +212,10 @@ public class Test_Api_2_Pah_Ingp extends UiccTestModel
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
- + "55555555 55555555 55555555 91020010");
+ + "55555555 55555555 55555555 91020010"));
response = test.terminalResponse("81030123 00020282 81030100 0D020441");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
/*********************************************************************/
@@ -224,9 +224,9 @@ public class Test_Api_2_Pah_Ingp extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
+ addResult(response.checkData("10" + APPLET_AID_1
+ "16CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"
- + "CCCCCCCC CCCCCC");
+ + "CCCCCCCC CCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -240,6 +240,6 @@ public class Test_Api_2_Pah_Ingp extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_init/Test_Api_2_Pah_Init.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_init/Test_Api_2_Pah_Init.java
index e71816f6411075910e9c8a123e54a1ed7955c71b..701b8bda150b64961494df4ea3f26718e4f8d696 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_init/Test_Api_2_Pah_Init.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_init/Test_Api_2_Pah_Init.java
@@ -46,7 +46,7 @@ public class Test_Api_2_Pah_Init extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -92,8 +92,8 @@ public class Test_Api_2_Pah_Init extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
- + "04CCCCCC CC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "04CCCCCC CC"));
/*********************************************************************/
/*********************************************************************/
@@ -107,6 +107,6 @@ public class Test_Api_2_Pah_Init extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_inmt/Test_Api_2_Pah_Inmt.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_inmt/Test_Api_2_Pah_Inmt.java
index 35fc93d6f25df53f02a81487153e6074b20ab5bc..9bc10a6d3050805e43c8d4ff90e4579f585ae312 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_inmt/Test_Api_2_Pah_Inmt.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_inmt/Test_Api_2_Pah_Inmt.java
@@ -37,7 +37,7 @@ public class Test_Api_2_Pah_Inmt extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -77,10 +77,10 @@ public class Test_Api_2_Pah_Inmt extends UiccTestModel
test.unrecognizedEnvelope();
// Fetch the initMoreTime proactive command
response = test.fetch("0B");
- result = response.checkData("D0098103 01020082 028182");
+ addResult(response.checkData("D0098103 01020082 028182"));
response = test.terminalResponse("81030102 00020282 81030100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
/*********************************************************************/
@@ -89,8 +89,8 @@ public class Test_Api_2_Pah_Inmt extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
- + "02CCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "02CCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -104,6 +104,6 @@ public class Test_Api_2_Pah_Inmt extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_send/Test_Api_2_Pah_Send.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_send/Test_Api_2_Pah_Send.java
index 602d07271ae2a4030bbb59742f01020da46b9c47..626721cc0b57df67015b928e0a6186ef1164d3d9 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_send/Test_Api_2_Pah_Send.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_send/Test_Api_2_Pah_Send.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Pah_Send extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -73,50 +73,50 @@ public class Test_Api_2_Pah_Send extends UiccTestModel
/*********************************************************************/
response = test.unrecognizedEnvelope();
- result = response.checkSw("9112");
+ addResult(response.checkSw("9112"));
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
response = test.terminalResponse("81030121 00020282 81030100");
- result &= response.checkSw("9112");
+ addResult(response.checkSw("9112"));
/*********************************************************************/
/** Testcase 3,4 */
/*********************************************************************/
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
response = test.terminalResponse("81030121 00020282 81030101");
- result &= response.checkSw("9112");
+ addResult(response.checkSw("9112"));
/*********************************************************************/
/** Testcase 5,6 */
/*********************************************************************/
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
response = test.terminalResponse("81030121 00020282 81030201 55");
- result &= response.checkSw("9112");
+ addResult(response.checkSw("9112"));
/*********************************************************************/
/** Testcase 7,8 */
/*********************************************************************/
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
response = test.terminalResponse("81030121 00020282 81030402 654321");
- result &= response.checkSw("9181");
+ addResult(response.checkSw("9181"));
/*********************************************************************/
/** Testcase 9 */
/*********************************************************************/
response = test.fetch("81");
- result &= response.checkData("D07F8103 01210082 0281028D 74045555"
+ addResult(response.checkData("D07F8103 01210082 0281028D 74045555"
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
@@ -124,16 +124,16 @@ public class Test_Api_2_Pah_Send extends UiccTestModel
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
- + "55");
+ + "55"));
response = test.terminalResponse("81030121 00020282 81030100");
- result &= response.checkSw("9183");
+ addResult(response.checkSw("9183"));
/*********************************************************************/
/** Testcase 10 */
/*********************************************************************/
response = test.fetch("83");
- result &= response.checkData("D0818081 03012100 82028102 8D750455"
+ addResult(response.checkData("D0818081 03012100 82028102 8D750455"
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
@@ -141,16 +141,16 @@ public class Test_Api_2_Pah_Send extends UiccTestModel
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
- + "555555");
+ + "555555"));
response = test.terminalResponse("81030121 00020282 81030100");
- result &= response.checkSw("9100");
+ addResult(response.checkSw("9100"));
/*********************************************************************/
/** Testcase 11 */
/*********************************************************************/
response = test.fetch("00");
- result &= response.checkData("D081FD81 03012100 82028102 8D81F104"
+ addResult(response.checkData("D081FD81 03012100 82028102 8D81F104"
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
@@ -165,61 +165,61 @@ public class Test_Api_2_Pah_Send extends UiccTestModel
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
- + "55555555 55555555 55555555 55555555");
+ + "55555555 55555555 55555555 55555555"));
response = test.terminalResponse("81030121 00020282 81030100");
- result &= response.checkSw("9112");
+ addResult(response.checkSw("9112"));
/*********************************************************************/
/** Testcase 12 */
/*********************************************************************/
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
response = test.terminalResponse("81030121 00020282 81030100");
- result &= response.checkSw("9112");
+ addResult(response.checkSw("9112"));
/*********************************************************************/
/** Testcase 13 */
/*********************************************************************/
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
response = test.terminalResponse("81030121 00020282 81030100");
- result &= response.checkSw("9112");
+ addResult(response.checkSw("9112"));
/*********************************************************************/
/** Testcase 14 */
/*********************************************************************/
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
response = test.terminalResponse("81030121 00020282 81030202 12030303"
+ "3456");
- result &= response.checkSw("9112");
+ addResult(response.checkSw("9112"));
/*********************************************************************/
/** Testcase 15 */
/*********************************************************************/
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
response = test.terminalResponse("81030121 00020282 81");
- result &= response.checkSw("9112");
+ addResult(response.checkSw("9112"));
/*********************************************************************/
/** Testcase 16 */
/*********************************************************************/
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
response = test.terminalResponse("81030121 00020282 810300");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
/*********************************************************************/
@@ -228,9 +228,9 @@ public class Test_Api_2_Pah_Send extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
+ addResult(response.checkData("10" + APPLET_AID_1
+ "10CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"
- + "CC");
+ + "CC"));
/*********************************************************************/
/*********************************************************************/
@@ -244,6 +244,6 @@ public class Test_Api_2_Pah_Send extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_phs_gthd/Test_Api_2_Phs_Gthd.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_phs_gthd/Test_Api_2_Phs_Gthd.java
index 475c4c90cfc7176dddfd80660b2dbb571b973d31..857926162cb3cd7267721611016481d2e58a5dc5 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_phs_gthd/Test_Api_2_Phs_Gthd.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_phs_gthd/Test_Api_2_Phs_Gthd.java
@@ -37,7 +37,7 @@ public class Test_Api_2_Phs_Gthd extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -87,8 +87,8 @@ public class Test_Api_2_Phs_Gthd extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
- + "03CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "03CCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -103,6 +103,6 @@ public class Test_Api_2_Phs_Gthd extends UiccTestModel
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cchd/Test_Api_2_Prh_Cchd.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cchd/Test_Api_2_Prh_Cchd.java
index f4c680c5ab8b2d43ee612adef2ec51ed4a87ef6a..eec34f6116b77ed9744bcbfa56b36e87573f900e 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cchd/Test_Api_2_Prh_Cchd.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cchd/Test_Api_2_Prh_Cchd.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Prh_Cchd extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -73,16 +73,16 @@ public class Test_Api_2_Prh_Cchd extends UiccTestModel
/*********************************************************************/
response = test.unrecognizedEnvelope();
- result = response.checkSw("911A");
+ addResult(response.checkSw("911A"));
// Fetch the open channel proactive command
response = test.fetch("1A");
- result &= response.checkData("D0188103 01400182 02818206 05815566"
- + "77883502 03003902 000A");
+ addResult(response.checkData("D0188103 01400182 02818206 05815566"
+ + "77883502 03003902 000A"));
// Successful Terminal Response with Channel Id 1
response = test.terminalResponse("81030140 01820282 81830100 38028100"
+ "35020300 3902000A");
- result &= response.checkSw("910E");
+ addResult(response.checkSw("910E"));
/*********************************************************************/
/** Testcase 2 */
@@ -90,11 +90,11 @@ public class Test_Api_2_Prh_Cchd extends UiccTestModel
// Fetch the received data proactive command
response = test.fetch("0E");
- result &= response.checkData("D00C8103 01420182 02812137 0102");
+ addResult(response.checkData("D00C8103 01420182 02812137 0102"));
// Terminal Response with not empty Channel Data TLV is issued ('AA')
response = test.terminalResponse("81030142 01820282 81830100 36024142"
+ "370102");
- result &= response.checkSw("910E");
+ addResult(response.checkSw("910E"));
/*********************************************************************/
/** Testcase 3 to 8 */
@@ -102,11 +102,11 @@ public class Test_Api_2_Prh_Cchd extends UiccTestModel
// Fetch the received data proactive command
response = test.fetch("0E");
- result &= response.checkData("D00C8103 01420182 02812137 0106");
- // Terminal Response with 6 bytes avalaible (‘Hello1’)
+ addResult(response.checkData("D00C8103 01420182 02812137 0106"));
+ // Terminal Response with 6 bytes avalaible (�Hello1�)
response = test.terminalResponse("81030142 01820282 81830100 36064865"
+ "6C6C6F31 370106");
- result &= response.checkSw("910E");
+ addResult(response.checkSw("910E"));
/*********************************************************************/
/** Testcase 9 */
@@ -114,10 +114,10 @@ public class Test_Api_2_Prh_Cchd extends UiccTestModel
// Fetch the received data proactive command
response = test.fetch("0E");
- result &= response.checkData("D00C8103 01420182 02812137 0106");
+ addResult(response.checkData("D00C8103 01420182 02812137 0106"));
// Terminal Response without ChannelData TLV element
response = test.terminalResponse("81030142 01820282 81830100 370106");
- result &= response.checkSw("910E");
+ addResult(response.checkSw("910E"));
/*********************************************************************/
/** Testcase 10 to 16 */
@@ -125,11 +125,11 @@ public class Test_Api_2_Prh_Cchd extends UiccTestModel
// Fetch the received data proactive command
response = test.fetch("0E");
- result &= response.checkData("D00C8103 01420182 02812137 0106");
- // Terminal Response with 6 bytes avalaible (‘Hello2’)
+ addResult(response.checkData("D00C8103 01420182 02812137 0106"));
+ // Terminal Response with 6 bytes avalaible (�Hello2�)
response = test.terminalResponse("81030142 01820282 81830100 36064865"
+ "6C6C6F32 370106");
- result &= response.checkSw("910E");
+ addResult(response.checkSw("910E"));
/*********************************************************************/
/** Testcase 17 & 18 */
@@ -137,11 +137,11 @@ public class Test_Api_2_Prh_Cchd extends UiccTestModel
// Fetch the received data proactive command
response = test.fetch("0E");
- result &= response.checkData("D00C8103 01420182 02812137 010C");
- // Terminal Response with 12 bytes avalaible (‘Hello3’ & 'Hello4')
+ addResult(response.checkData("D00C8103 01420182 02812137 010C"));
+ // Terminal Response with 12 bytes avalaible (�Hello3� & 'Hello4')
response = test.terminalResponse("81030142 01820282 81830100 36064865"
+ "6C6C6F33 36064865 6C6C6F34 37010C");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
/*********************************************************************/
@@ -150,9 +150,9 @@ public class Test_Api_2_Prh_Cchd extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
+ addResult(response.checkData("10" + APPLET_AID_1
+ "12CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"
- + "CCCCCC");
+ + "CCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -166,6 +166,6 @@ public class Test_Api_2_Prh_Cchd extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_copy/Test_Api_2_Prh_Copy.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_copy/Test_Api_2_Prh_Copy.java
index 4fc6046d97ec88dcc871bba7922a06272ebcee02..8a51c96e021347cf53fe70d3dd97df2e56b00451 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_copy/Test_Api_2_Prh_Copy.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_copy/Test_Api_2_Prh_Copy.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Prh_Copy extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -73,16 +73,16 @@ public class Test_Api_2_Prh_Copy extends UiccTestModel
/*********************************************************************/
response = test.unrecognizedEnvelope();
- result = response.checkSw("9112");
+ addResult(response.checkSw("9112"));
// Fetch the proactive command
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
// Terminal response with no additional information
response = test.terminalResponse("81030121 00020282 81030100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
/*********************************************************************/
@@ -91,8 +91,8 @@ public class Test_Api_2_Prh_Copy extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
- + "0DCCCCCC CCCCCCCC CCCCCCCC CCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "0DCCCCCC CCCCCCCC CCCCCCCC CCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -106,6 +106,6 @@ public class Test_Api_2_Prh_Copy extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cpai/Test_Api_2_Prh_Cpai.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cpai/Test_Api_2_Prh_Cpai.java
index 2ca0e89971f82ee16cb6c33faf5ebc7defd963db..32002a34fec91a338fb5303315085b9bb397ffa7 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cpai/Test_Api_2_Prh_Cpai.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cpai/Test_Api_2_Prh_Cpai.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Prh_Cpai extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -73,16 +73,16 @@ public class Test_Api_2_Prh_Cpai extends UiccTestModel
/*********************************************************************/
response = test.unrecognizedEnvelope();
- result = response.checkSw("9112");
+ addResult(response.checkSw("9112"));
// Fetch the proactive command
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
// Terminal response with 11 additional bytes
response = test.terminalResponse("81030121 00020282 81030C01 01234567"
+ "89ABCDEF 012345");
- result &= response.checkSw("9112");
+ addResult(response.checkSw("9112"));
/*********************************************************************/
/** Testcase 7 to 9 */
@@ -90,13 +90,13 @@ public class Test_Api_2_Prh_Cpai extends UiccTestModel
// Fetch the proactive command
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
// Terminal response with 5 additional bytes
response = test.terminalResponse("81030121 00020282 81030601 01234567"
+ "89");
- result &= response.checkSw("9112");
+ addResult(response.checkSw("9112"));
/*********************************************************************/
/** Testcase 10 & 11 */
@@ -104,13 +104,13 @@ public class Test_Api_2_Prh_Cpai extends UiccTestModel
// Fetch the proactive command
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
// Terminal response with 6 additional bytes
response = test.terminalResponse("81030121 00020282 81030701 ABCDEFFE"
+ "DCBA");
- result &= response.checkSw("9112");
+ addResult(response.checkSw("9112"));
/*********************************************************************/
/** Testcase 12 & 13 */
@@ -118,13 +118,13 @@ public class Test_Api_2_Prh_Cpai extends UiccTestModel
// Fetch the proactive command
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
// Terminal response with 7 additional bytes
response = test.terminalResponse("81030121 00020282 81030801 FEDCBA98"
+ "765432");
- result &= response.checkSw("9112");
+ addResult(response.checkSw("9112"));
/*********************************************************************/
/** Testcase 14 & 15 */
@@ -132,13 +132,13 @@ public class Test_Api_2_Prh_Cpai extends UiccTestModel
// Fetch the proactive command
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
// Terminal response with 8 additional bytes
response = test.terminalResponse("81030121 00020282 81030901 00112233"
+ "44556677");
- result &= response.checkSw("9112");
+ addResult(response.checkSw("9112"));
/*********************************************************************/
/** Testcase 16 to 18 */
@@ -146,8 +146,8 @@ public class Test_Api_2_Prh_Cpai extends UiccTestModel
// Fetch the proactive command
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
// Terminal response with F2 additional bytes
response = test.terminalResponse("81030121 00020282 810381F3 01000102"
@@ -166,7 +166,7 @@ public class Test_Api_2_Prh_Cpai extends UiccTestModel
+ "C3C4C5C6 C7C8C9CA CBCCCDCE CFD0D1D2"
+ "D3D4D5D6 D7D8D9DA DBDCDDDE DFE0E1E2"
+ "E3E4E5E6 E7E8E9EA EBECEDEE EFF0F1");
- result &= response.checkSw("9112");
+ addResult(response.checkSw("9112"));
/*********************************************************************/
/** Testcase 19 */
@@ -174,13 +174,13 @@ public class Test_Api_2_Prh_Cpai extends UiccTestModel
// Fetch the proactive command
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
// Terminal response with 5 additional bytes
response = test.terminalResponse("81030121 00020282 81030601 00112233"
+ "44");
- result &= response.checkSw("9112");
+ addResult(response.checkSw("9112"));
/*********************************************************************/
/** Testcase 20 */
@@ -188,13 +188,13 @@ public class Test_Api_2_Prh_Cpai extends UiccTestModel
// Fetch the proactive command
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
// Terminal response with 5 additional bytes
response = test.terminalResponse("81030121 00020282 81030601 00112233"
+ "44");
- result &= response.checkSw("9112");
+ addResult(response.checkSw("9112"));
/*********************************************************************/
/** Testcase 21 to 23 */
@@ -202,13 +202,13 @@ public class Test_Api_2_Prh_Cpai extends UiccTestModel
// Fetch the proactive command
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
// Terminal response with 2 results TLV
response = test.terminalResponse("81030121 00020282 81030601 01234567"
+ "89030100");
- result &= response.checkSw("9112");
+ addResult(response.checkSw("9112"));
/*********************************************************************/
/** Testcase 24 */
@@ -216,12 +216,12 @@ public class Test_Api_2_Prh_Cpai extends UiccTestModel
// Fetch the proactive command
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
// Terminal response with no result TLV
response = test.terminalResponse("81030121 00020282 81");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
/*********************************************************************/
@@ -230,9 +230,9 @@ public class Test_Api_2_Prh_Cpai extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
+ addResult(response.checkData("10" + APPLET_AID_1
+ "18CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"
- + "CCCCCCCC CCCCCCCC CC");
+ + "CCCCCCCC CCCCCCCC CC"));
/*********************************************************************/
/*********************************************************************/
@@ -246,6 +246,6 @@ public class Test_Api_2_Prh_Cpai extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cprv/Test_Api_2_Prh_Cprv.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cprv/Test_Api_2_Prh_Cprv.java
index f50529d55f7362c60611c6de3567ee3adf1eafe6..e7c5d08b1ec817bed589a040a1b74c450201fb04 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cprv/Test_Api_2_Prh_Cprv.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cprv/Test_Api_2_Prh_Cprv.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Prh_Cprv extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -73,17 +73,17 @@ public class Test_Api_2_Prh_Cprv extends UiccTestModel
/*********************************************************************/
response = test.unrecognizedEnvelope();
- result = response.checkSw("9116");
+ addResult(response.checkSw("9116"));
// Fetch the GET INPUT proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response (Text string length = 5)
response = test.terminalResponse("81030123 00020282 81030100 0D060401"
+ "02030405");
- result &= response.checkSw("9116");
+ addResult(response.checkSw("9116"));
/*********************************************************************/
/** Testcase 11 to 17 */
@@ -91,13 +91,13 @@ public class Test_Api_2_Prh_Cprv extends UiccTestModel
// Fetch the GET INPUT proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response (Text string length = 5)
response = test.terminalResponse("81030123 00020282 81030100 0D110400"
+ "01020304 05060708 090A0B0C 0D0E0F ");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
/*********************************************************************/
@@ -106,9 +106,9 @@ public class Test_Api_2_Prh_Cprv extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
+ addResult(response.checkData("10" + APPLET_AID_1
+ "11CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"
- + "CCCC");
+ + "CCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -122,6 +122,6 @@ public class Test_Api_2_Prh_Cprv extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cpts/Test_Api_2_Prh_Cpts.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cpts/Test_Api_2_Prh_Cpts.java
index 2b8e331f5ce01bfb5e4978e1d1eecee4f8598d4e..a59371b5cb3f605407734cd604a2bc922b46a99a 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cpts/Test_Api_2_Prh_Cpts.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cpts/Test_Api_2_Prh_Cpts.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Prh_Cpts extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -73,15 +73,15 @@ public class Test_Api_2_Prh_Cpts extends UiccTestModel
/*********************************************************************/
response = test.unrecognizedEnvelope();
- result = response.checkSw("9116");
+ addResult(response.checkSw("9116"));
// Fetch the proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
response = test.terminalResponse("81030123 00020282 81030100 0D020441");
- result &= response.checkSw("9116");
+ addResult(response.checkSw("9116"));
/*********************************************************************/
/** Testcase 2 & 3 */
@@ -89,12 +89,12 @@ public class Test_Api_2_Prh_Cpts extends UiccTestModel
// Fetch the proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
response = test.terminalResponse("81030123 00020282 81030100 0D040441"
+ "4243");
- result &= response.checkSw("9112");
+ addResult(response.checkSw("9112"));
/*********************************************************************/
/** Testcase 4 */
@@ -102,11 +102,11 @@ public class Test_Api_2_Prh_Cpts extends UiccTestModel
// Fetch the display text proactive command
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
response = test.terminalResponse("81030121 00020282 81030100");
- result &= response.checkSw("9116");
+ addResult(response.checkSw("9116"));
/*********************************************************************/
/** Testcase 5 & 6 */
@@ -114,11 +114,11 @@ public class Test_Api_2_Prh_Cpts extends UiccTestModel
// Fetch the proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
response = test.terminalResponse("81030123 00020282 81030100 0D00");
- result &= response.checkSw("9116");
+ addResult(response.checkSw("9116"));
/*********************************************************************/
/** Testcase 7 & 8 */
@@ -126,11 +126,11 @@ public class Test_Api_2_Prh_Cpts extends UiccTestModel
// Fetch the proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response with Text String Length = 01h
response = test.terminalResponse("81030123 00020282 81030100 0D020041");
- result &= response.checkSw("9116");
+ addResult(response.checkSw("9116"));
/*********************************************************************/
/** Testcase 9 to 11 */
@@ -138,12 +138,12 @@ public class Test_Api_2_Prh_Cpts extends UiccTestModel
// Fetch the proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response with Text String Length = 02h
response = test.terminalResponse("81030123 00020282 81030100 0D030042"
+ "43");
- result &= response.checkSw("9116");
+ addResult(response.checkSw("9116"));
/*********************************************************************/
/** Testcase 12 to 14 */
@@ -151,8 +151,8 @@ public class Test_Api_2_Prh_Cpts extends UiccTestModel
// Fetch the proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response with Text String Length = 7Eh
response = test.terminalResponse("81030123 00020282 81030100 0D7F0401"
+ "02030405 06070809 0A0B0C0D 0E0F1011"
@@ -163,7 +163,7 @@ public class Test_Api_2_Prh_Cpts extends UiccTestModel
+ "52535455 56575859 5A5B5C5D 5E5F6061"
+ "62636465 66676869 6A6B6C6D 6E6F7071"
+ "72737475 76777879 7A7B7C7D 7E");
- result &= response.checkSw("9116");
+ addResult(response.checkSw("9116"));
/*********************************************************************/
/** Testcase 15 to 16 */
@@ -171,8 +171,8 @@ public class Test_Api_2_Prh_Cpts extends UiccTestModel
// Fetch the proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response with Text String Length = 7Fh
response = test.terminalResponse("81030123 00020282 81030100 0D818004"
+ "01020304 05060708 090A0B0C 0D0E0F10"
@@ -183,7 +183,7 @@ public class Test_Api_2_Prh_Cpts extends UiccTestModel
+ "51525354 55565758 595A5B5C 5D5E5F60"
+ "61626364 65666768 696A6B6C 6D6E6F70"
+ "71727374 75767778 797A7B7C 7D7E7F");
- result &= response.checkSw("9116");
+ addResult(response.checkSw("9116"));
/*********************************************************************/
/** Testcase 17 to 18 */
@@ -191,8 +191,8 @@ public class Test_Api_2_Prh_Cpts extends UiccTestModel
// Fetch the proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response with Text String Length = EFh
response = test.terminalResponse("81030123 00020282 81030100 0D81F004"
+ "01020304 05060708 090A0B0C 0D0E0F10"
@@ -210,7 +210,7 @@ public class Test_Api_2_Prh_Cpts extends UiccTestModel
+ "C1C2C3C4 C5C6C7C8 C9CACBCC CDCECFD0"
+ "D1D2D3D4 D5D6D7D8 D9DADBDC DDDEDFE0"
+ "E1E2E3E4 E5E6E7E8 E9EAEBEC EDEEEF");
- result &= response.checkSw("9116");
+ addResult(response.checkSw("9116"));
/*********************************************************************/
/** Testcase 19 to 21 */
@@ -218,12 +218,12 @@ public class Test_Api_2_Prh_Cpts extends UiccTestModel
// Fetch the proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response with 2 Text String TLV
response = test.terminalResponse("81030123 00020282 81030100 0D030042"
+ "430D0204 44");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
/*********************************************************************/
@@ -232,9 +232,9 @@ public class Test_Api_2_Prh_Cpts extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
+ addResult(response.checkData("10" + APPLET_AID_1
+ "15CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"
- + "CCCCCCCC CCCC");
+ + "CCCCCCCC CCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -248,6 +248,6 @@ public class Test_Api_2_Prh_Cpts extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cpyv/Api_2_Prh_Cpyv_1.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cpyv/Api_2_Prh_Cpyv_1.java
index f61be099bce19a6e957c35491e13c16c803dcded..749ef702b2d612c2374cf71272d9172c8e3ae673 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cpyv/Api_2_Prh_Cpyv_1.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cpyv/Api_2_Prh_Cpyv_1.java
@@ -32,9 +32,10 @@ public class Api_2_Prh_Cpyv_1 extends TestToolkitApplet
private byte[] TEXT = {(byte)'T',(byte)'e',(byte)'x',(byte)'t'} ;
private byte[] dstBuffer5 = new byte[5] ;
- private byte[] dstBuffer13 = new byte[13] ;
- private byte[] dstBuffer12 = new byte[12] ;
+ private byte[] dstBuffer15 = new byte[15] ;
+ private byte[] dstBuffer17 = new byte[17] ;
private byte[] dstBuffer20 = new byte[20] ;
+
private byte[] compareBuffer = new byte[20] ;
public final byte DCS_8_BIT_DATA = (byte)0x04;
@@ -60,12 +61,11 @@ public class Api_2_Prh_Cpyv_1 extends TestToolkitApplet
thisApplet.init();
// Register on UNRECOGNIZED ENVELOPE
- thisApplet.obReg.setEvent(EVENT_UNRECOGNIZED_ENVELOPE);
+ thisApplet.obReg.setEvent(EVENT_UNRECOGNIZED_ENVELOPE);
}
public void processToolkit(short event)
{
-
// Get the system instance of the ProactiveHandler class
ProactiveHandler proHdlr = ProactiveHandlerSystem.getTheHandler() ;
@@ -82,25 +82,30 @@ public class Api_2_Prh_Cpyv_1 extends TestToolkitApplet
testCaseNb = (byte) 1 ;
bRes = false ;
- try {
-
- // Build and send a proactive command
- proHdlr.initDisplayText((byte)0, DCS_8_BIT_DATA, TEXT, (short)0, (short)TEXT.length) ;
- proHdlr.send() ;
-
+ try
+ {
+ proHdlr.initGetInput( (byte)1, DCS_8_BIT_DATA, TEXT, (short)0, (short)TEXT.length, (short)0, (short)5 );
+ proHdlr.send();
+
// Get the response
- proRespHdlr = ProactiveResponseHandlerSystem.getTheHandler() ;
+ proRespHdlr = ProactiveResponseHandlerSystem.getTheHandler() ;
+ proRespHdlr.findTLV( ToolkitConstants.TAG_TEXT_STRING, (byte)1 );
// Null as dstBuffer
- try {
+ try
+ {
dstOffset = (short)0 ;
dstLength = (short)1 ;
- proRespHdlr.copy(null, dstOffset, dstLength) ;
- } catch (NullPointerException e) {
+ proRespHdlr.copyValue( (short)0, null, dstOffset, dstLength) ;
+ }
+ catch (NullPointerException e)
+ {
bRes = true ;
}
+
}
- catch (Exception e) {
+ catch (Exception e)
+ {
bRes = false ;
}
reportTestOutcome(testCaseNb, bRes) ;
@@ -111,17 +116,21 @@ public class Api_2_Prh_Cpyv_1 extends TestToolkitApplet
testCaseNb = (byte) 2 ;
bRes = false ;
- try {
-
- try {
+ try
+ {
+ try
+ {
dstOffset = (short)6 ;
dstLength = (short)0 ;
- proRespHdlr.copy(dstBuffer5, dstOffset, dstLength) ;
- } catch (ArrayIndexOutOfBoundsException e) {
+ proRespHdlr.copyValue( (short)0, dstBuffer5, dstOffset, dstLength) ;
+ }
+ catch (ArrayIndexOutOfBoundsException e)
+ {
bRes = true ;
}
}
- catch (Exception e) {
+ catch (Exception e)
+ {
bRes = false ;
}
reportTestOutcome(testCaseNb, bRes) ;
@@ -132,17 +141,21 @@ public class Api_2_Prh_Cpyv_1 extends TestToolkitApplet
testCaseNb = (byte) 3 ;
bRes = false ;
- try {
-
- try {
+ try
+ {
+ try
+ {
dstOffset = (short)-1 ;
dstLength = (short)1 ;
- proRespHdlr.copy(dstBuffer5, dstOffset, dstLength) ;
- } catch (ArrayIndexOutOfBoundsException e) {
+ proRespHdlr.copyValue( (short)0, dstBuffer5, dstOffset, dstLength) ;
+ }
+ catch (ArrayIndexOutOfBoundsException e)
+ {
bRes = true ;
}
}
- catch (Exception e) {
+ catch (Exception e)
+ {
bRes = false ;
}
reportTestOutcome(testCaseNb, bRes) ;
@@ -153,17 +166,21 @@ public class Api_2_Prh_Cpyv_1 extends TestToolkitApplet
testCaseNb = (byte) 4 ;
bRes = false ;
- try {
-
- try {
+ try
+ {
+ try
+ {
dstOffset = (short)0 ;
dstLength = (short)6 ;
- proRespHdlr.copy(dstBuffer5, dstOffset, dstLength) ;
- } catch (ArrayIndexOutOfBoundsException e) {
+ proRespHdlr.copyValue( (short)0, dstBuffer5, dstOffset, dstLength) ;
+ }
+ catch (ArrayIndexOutOfBoundsException e)
+ {
bRes = true ;
}
}
- catch (Exception e) {
+ catch (Exception e)
+ {
bRes = false ;
}
reportTestOutcome(testCaseNb, bRes) ;
@@ -174,13 +191,16 @@ public class Api_2_Prh_Cpyv_1 extends TestToolkitApplet
testCaseNb = (byte) 5 ;
bRes = false ;
- try {
-
- try {
+ try
+ {
+ try
+ {
dstOffset = (short)3 ;
dstLength = (short)3 ;
- proRespHdlr.copy(dstBuffer5, dstOffset, dstLength) ;
- } catch (ArrayIndexOutOfBoundsException e) {
+ proRespHdlr.copyValue( (short)0, dstBuffer5, dstOffset, dstLength ) ;
+ }
+ catch (ArrayIndexOutOfBoundsException e)
+ {
bRes = true ;
}
}
@@ -200,19 +220,22 @@ public class Api_2_Prh_Cpyv_1 extends TestToolkitApplet
try {
dstOffset = (short)0 ;
dstLength = (short)-1 ;
- proRespHdlr.copy(dstBuffer5, dstOffset, dstLength) ;
- } catch (ArrayIndexOutOfBoundsException e) {
+ proRespHdlr.copyValue( (short)0, dstBuffer5, dstOffset, dstLength) ;
+ }
+ catch (ArrayIndexOutOfBoundsException e)
+ {
bRes = true ;
}
}
- catch (Exception e) {
+ catch (Exception e)
+ {
bRes = false ;
}
reportTestOutcome(testCaseNb, bRes) ;
- // --------------------------------------------
- // Test Case 7 : dstLength > length of the simple TLV list
+ // --------------------------------------------
+ // Test Case 7 : valueOffset > Text String Length
testCaseNb = (byte) 7 ;
bRes = false ;
@@ -220,9 +243,11 @@ public class Api_2_Prh_Cpyv_1 extends TestToolkitApplet
try {
dstOffset = (short)0 ;
- dstLength = (short)13 ;
- proRespHdlr.copy(dstBuffer13, dstOffset, dstLength) ;
- } catch (ToolkitException e) {
+ dstLength = (short)0 ;
+ proRespHdlr.copyValue( (short)7, dstBuffer15, dstOffset, dstLength) ;
+ }
+ catch (ToolkitException e)
+ {
bRes = (e.getReason() == ToolkitException.OUT_OF_TLV_BOUNDARIES) ;
}
}
@@ -230,149 +255,205 @@ public class Api_2_Prh_Cpyv_1 extends TestToolkitApplet
bRes = false ;
}
reportTestOutcome(testCaseNb, bRes) ;
-
- // --------------------------------------------
- // Test Case 8 : Successful call, whole buffer
+ // --------------------------------------------
+ // Test Case 8 : valueOffset < 0
testCaseNb = (byte) 8 ;
bRes = false ;
- try {
-
- dstOffset = (short)0 ;
- dstLength = (short)12 ;
- result = proRespHdlr.copy(dstBuffer12, dstOffset, dstLength) ;
-
- bRes = (result == (short)(dstOffset + dstLength)) ;
+ try
+ {
+ try
+ {
+ dstOffset = (short)0 ;
+ dstLength = (short)1 ;
+ proRespHdlr.copyValue( (short)-1, dstBuffer15, dstOffset, dstLength) ;
+ }
+ catch (ToolkitException e)
+ {
+ bRes = (e.getReason() == ToolkitException.OUT_OF_TLV_BOUNDARIES) ;
+ }
}
- catch (Exception e) {
+ catch (Exception e)
+ {
bRes = false ;
}
reportTestOutcome(testCaseNb, bRes) ;
-
- // --------------------------------------------
- // Test Case 9 : Compare the buffer
+ // --------------------------------------------
+ // Test Case 9 : dstLength > Text String length
testCaseNb = (byte) 9 ;
bRes = false ;
- try {
- // Initialise the buffer
- compareBuffer[0] = (byte)0x81 ; compareBuffer[1] = (byte)0x03 ;
- compareBuffer[2] = (byte)0x01 ; compareBuffer[3] = (byte)0x21 ; compareBuffer[4] = (byte)0x00 ;
- compareBuffer[5] = (byte)0x02 ; compareBuffer[6] = (byte)0x02 ;
- compareBuffer[7] = (byte)0x82 ; compareBuffer[8] = (byte)0x81 ;
- compareBuffer[9] = (byte)0x03 ; compareBuffer[10] = (byte)0x01 ; compareBuffer[11] = (byte)0x00 ;
-
- // Compare buffers
- result = Util.arrayCompare(compareBuffer, (short)0,
- dstBuffer12, (short)0, (short)12) ;
-
- bRes = (result == (short)0) ;
- }
- catch (Exception e) {
+ try
+ {
+ try
+ {
+ dstOffset = (short)0 ;
+ dstLength = (short)7 ;
+ proRespHdlr.copyValue( (short)0, dstBuffer15, dstOffset, dstLength) ;
+ }
+ catch (ToolkitException e)
+ {
+ bRes = (e.getReason() == ToolkitException.OUT_OF_TLV_BOUNDARIES) ;
+ }
+ }
+ catch (Exception e)
+ {
bRes = false ;
}
reportTestOutcome(testCaseNb, bRes) ;
-
- // --------------------------------------------
- // Test Case 10 : Successful call, part of a buffer
+ // --------------------------------------------
+ // Test Case 10 : ValueOffset + dstLength > Text String length
testCaseNb = (byte) 10 ;
bRes = false ;
- // Initialise buffers
- for (short i=0; i<(short)20; i++) {
- dstBuffer20[i] = (byte)i ;
- compareBuffer[i] = (byte)i ;
+ try
+ {
+ try
+ {
+ dstOffset = (short)0 ;
+ dstLength = (short)5 ;
+ proRespHdlr.copyValue( (short)2, dstBuffer15, dstOffset, dstLength) ;
+ }
+ catch (ToolkitException e)
+ {
+ bRes = (e.getReason() == ToolkitException.OUT_OF_TLV_BOUNDARIES) ;
+ }
+ }
+ catch (Exception e)
+ {
+ bRes = false ;
}
+ reportTestOutcome(testCaseNb, bRes) ;
- try {
-
- dstOffset = (short)3 ;
- dstLength = (short)12 ;
- result = proRespHdlr.copy(dstBuffer20, dstOffset, dstLength) ;
+ // --------------------------------------------
+ // Test Case 11 : TLV is not selected
+ testCaseNb = (byte) 11 ;
+ bRes = false ;
+
+ try
+ {
+ proHdlr.initGetInput( (byte)1, DCS_8_BIT_DATA, TEXT, (short)0, (short)TEXT.length, (short)0, (short)16 );
+ proHdlr.send();
+
+ // Get the response
+ proRespHdlr = ProactiveResponseHandlerSystem.getTheHandler() ;
+
+ // Null as dstBuffer
+ try
+ {
+ dstOffset = (short)0 ;
+ dstLength = (short)17 ;
+ proRespHdlr.copyValue( (short)0, dstBuffer17, dstOffset, dstLength) ;
+ }
+ catch (ToolkitException e)
+ {
+ bRes = ( e.getReason() == ToolkitException.UNAVAILABLE_ELEMENT );
+ }
- bRes = (result == (short)(dstOffset + dstLength)) ;
}
- catch (Exception e) {
+ catch (Exception e)
+ {
bRes = false ;
}
reportTestOutcome(testCaseNb, bRes) ;
-
- // --------------------------------------------
- // Test Case 11 : Compare the buffer
- testCaseNb = (byte) 11 ;
+ // --------------------------------------------
+ // Test Case 12 : Succesfull call
+ testCaseNb = (byte) 12 ;
+ bRes = true ;
+
+ try
+ {
+ proRespHdlr.findTLV( ToolkitConstants.TAG_TEXT_STRING, (byte)1 );
+ dstOffset = (short)0 ;
+ dstLength = (short)17 ;
+ proRespHdlr.copyValue( (short)0, dstBuffer17, dstOffset, dstLength) ;
+
+ }
+ catch (Exception e)
+ {
+ bRes = false ;
+ }
+ reportTestOutcome(testCaseNb, bRes) ;
+
+ // --------------------------------------------
+ // Test Case 13 : Compare the buffer
+ testCaseNb = (byte) 13 ;
bRes = false ;
- try {
+ try
+ {
// Initialise the buffer
- compareBuffer[3] = (byte)0x81 ; compareBuffer[4] = (byte)0x03 ;
- compareBuffer[5] = (byte)0x01 ; compareBuffer[6] = (byte)0x21 ; compareBuffer[7] = (byte)0x00 ;
- compareBuffer[8] = (byte)0x02 ; compareBuffer[9] = (byte)0x02 ;
- compareBuffer[10] = (byte)0x82 ; compareBuffer[11] = (byte)0x81 ;
- compareBuffer[12] = (byte)0x03 ; compareBuffer[13] = (byte)0x01 ; compareBuffer[14] = (byte)0x00 ;
-
+ compareBuffer[0] = (byte)0x04 ;
+ for ( short i = (short)1; i < (short)17; i++ )
+ compareBuffer[i] = (byte)( i - 1 );
+
// Compare buffers
result = Util.arrayCompare(compareBuffer, (short)0,
- dstBuffer20, (short)0, (short)20) ;
+ dstBuffer17, (short)0, (short)17) ;
bRes = (result == (short)0) ;
}
- catch (Exception e) {
+ catch (Exception e)
+ {
bRes = false ;
}
reportTestOutcome(testCaseNb, bRes) ;
-
-
- // --------------------------------------------
- // Test Case 12 : Successful call, part of a buffer
- testCaseNb = (byte)12 ;
- bRes = false ;
-
- // Initialise buffers
- for (short i=0; i<(short)20; i++) {
- dstBuffer20[i] = (byte)i ;
- compareBuffer[i] = (byte)i ;
- }
- try {
-
- dstOffset = (short)3 ;
- dstLength = (short)9 ;
- result = proRespHdlr.copy(dstBuffer20, dstOffset, dstLength) ;
+ // --------------------------------------------
+ // Test Case 14 : Succesfull call
+ testCaseNb = (byte) 14 ;
+ bRes = true ;
+
+ try
+ {
+ for ( short i = (short)0; i < (short)20; i++ )
+ dstBuffer20[i] = (byte)0x55;
+
+ dstOffset = (short)3 ;
+ dstLength = (short)12 ;
+ proRespHdlr.copyValue( (short)2, dstBuffer20, dstOffset, dstLength) ;
- bRes = (result == (short)(dstOffset + dstLength)) ;
}
- catch (Exception e) {
+ catch (Exception e)
+ {
bRes = false ;
}
reportTestOutcome(testCaseNb, bRes) ;
-
- // --------------------------------------------
- // Test Case 13 : Compare the buffer
- testCaseNb = (byte) 13 ;
+
+ // --------------------------------------------
+ // Test Case 15 : Compare the buffer
+ testCaseNb = (byte) 15 ;
bRes = false ;
- try {
- // Initialise the buffer
- compareBuffer[3] = (byte)0x81 ; compareBuffer[4] = (byte)0x03 ;
- compareBuffer[5] = (byte)0x01 ; compareBuffer[6] = (byte)0x21 ; compareBuffer[7] = (byte)0x00 ;
- compareBuffer[8] = (byte)0x02 ; compareBuffer[9] = (byte)0x02 ;
- compareBuffer[10] = (byte)0x82 ; compareBuffer[11] = (byte)0x81 ;
-
+ //55 55 55 01 02
+ //03 04 05 06 07
+ //08 09 0A 0B 0C
+ //55 55 55 55 55
+
+ try
+ {
+ // Initialise the buffer
+ for ( short i = (short)0; i < (short)20; i++ )
+ compareBuffer[i] = (byte)0x55;
+
+ for ( short i = (short)3; i < (short)15; i++ )
+ compareBuffer[i] = (byte)( i - 2 );
+
// Compare buffers
result = Util.arrayCompare(compareBuffer, (short)0,
dstBuffer20, (short)0, (short)20) ;
bRes = (result == (short)0) ;
}
- catch (Exception e) {
+ catch (Exception e)
+ {
bRes = false ;
}
reportTestOutcome(testCaseNb, bRes) ;
-
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cpyv/Test_Api_2_Prh_Cpyv.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cpyv/Test_Api_2_Prh_Cpyv.java
index 635caa31091f9f30f3530d02ea1f4399bdd4a0d8..5651fc214eb6617677a466ab2c522ccdbf261ea8 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cpyv/Test_Api_2_Prh_Cpyv.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cpyv/Test_Api_2_Prh_Cpyv.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Prh_Cpyv extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -73,16 +73,25 @@ public class Test_Api_2_Prh_Cpyv extends UiccTestModel
/*********************************************************************/
response = test.unrecognizedEnvelope();
- result = response.checkSw("9112");
+ addResult(response.checkSw("9116"));
- // Fetch the DISPLAY TEXT proactive command
- response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
-
- // Terminal response (No additional information)
- response = test.terminalResponse("81030121 00020282 81030100");
- result &= response.checkSw("9000");
+ // Fetch the GET INPUT proactive command
+ response = test.fetch("16");
+ addResult(response.checkData("D0148103 01230182 0281828D 05045465"
+ + "78749102 0005"));
+
+ response = test.terminalResponse("81030123 00020282 81030100 0D060401"
+ + "02030405");
+ addResult(response.checkSw("9116"));
+
+ // Fetch the GET INPUT proactive command
+ response = test.fetch("16");
+ addResult(response.checkData("D0148103 01230182 0281828D 05045465"
+ + "78749102 0010"));
+
+ response = test.terminalResponse("81030123 00020282 81030100 0D110400"
+ + "02030405060708090A0B0C0D0E0F");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
/*********************************************************************/
@@ -91,8 +100,8 @@ public class Test_Api_2_Prh_Cpyv extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
- + "0DCCCCCC CCCCCCCC CCCCCCCC CCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "0FCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -106,6 +115,6 @@ public class Test_Api_2_Prh_Cpyv extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_facrb_bs/Test_Api_2_Prh_Facrb_Bs.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_facrb_bs/Test_Api_2_Prh_Facrb_Bs.java
index eb66e18cacde27d9ca54779bd3ea2d4b9a732e12..ec615b25d4430f090c2bb7cdcdaf59c8ed87cfe3 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_facrb_bs/Test_Api_2_Prh_Facrb_Bs.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_facrb_bs/Test_Api_2_Prh_Facrb_Bs.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Prh_Facrb_Bs extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -73,17 +73,17 @@ public class Test_Api_2_Prh_Facrb_Bs extends UiccTestModel
/*********************************************************************/
response = test.unrecognizedEnvelope();
- result = response.checkSw("9116");
+ addResult(response.checkSw("9116"));
// Fetch the GET INPUT proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response (Text string length = 15)
response = test.terminalResponse("81030123 00020282 81030100 0D100401"
+ "02030405 06070809 0A0B0C0D 0E0F");
- result &= response.checkSw("9116");
+ addResult(response.checkSw("9116"));
/*********************************************************************/
/** Testcase 6 to 11 */
@@ -91,13 +91,13 @@ public class Test_Api_2_Prh_Facrb_Bs extends UiccTestModel
// Fetch the GET INPUT proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response (Text string length = 16)
response = test.terminalResponse("81030123 00020282 81030100 0D110400"
+ "01020304 05060708 090A0B0C 0D0E0F");
- result &= response.checkSw("9116");
+ addResult(response.checkSw("9116"));
/*********************************************************************/
/** Testcase 12 to 14 */
@@ -105,14 +105,14 @@ public class Test_Api_2_Prh_Facrb_Bs extends UiccTestModel
// Fetch the GET INPUT proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response (2 Text string TLV)
response = test.terminalResponse("81030123 00020282 81030100 0D110400"
+ "01020304 05060708 090A0B0C 0D0E0F0D"
+ "06001122 334455");
- result &= response.checkSw("9116");
+ addResult(response.checkSw("9116"));
/*********************************************************************/
/** Testcase 15 */
@@ -120,13 +120,13 @@ public class Test_Api_2_Prh_Facrb_Bs extends UiccTestModel
// Fetch the GET INPUT proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response (Text String Length = 16)
response = test.terminalResponse("81030123 00020282 81030100 0D110400"
+ "01020304 05060708 090A0B0C 0D0E0F");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
/*********************************************************************/
@@ -135,8 +135,8 @@ public class Test_Api_2_Prh_Facrb_Bs extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
- + "0FCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "0FCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -150,6 +150,6 @@ public class Test_Api_2_Prh_Facrb_Bs extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_facrbbs_bss/Test_Api_2_Prh_Facrbbs_Bss.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_facrbbs_bss/Test_Api_2_Prh_Facrbbs_Bss.java
index d84261662effc9ae08cd448378db6e24d858d8cd..fed311f11a310ed95fb4f50cf1485f0dfc201071 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_facrbbs_bss/Test_Api_2_Prh_Facrbbs_Bss.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_facrbbs_bss/Test_Api_2_Prh_Facrbbs_Bss.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Prh_Facrbbs_Bss extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -72,17 +72,17 @@ public class Test_Api_2_Prh_Facrbbs_Bss extends UiccTestModel
/*********************************************************************/
response = test.unrecognizedEnvelope();
- result = response.checkSw("9116");
+ addResult(response.checkSw("9116"));
// Fetch the GET INPUT proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response (Text string length = 15)
response = test.terminalResponse("81030123 00020282 81030100 0D100401"
+ "02030405 06070809 0A0B0C0D 0E0F");
- result &= response.checkSw("9116");
+ addResult(response.checkSw("9116"));
/*********************************************************************/
/** Testcase 7 to 11 */
@@ -90,13 +90,13 @@ public class Test_Api_2_Prh_Facrbbs_Bss extends UiccTestModel
// Fetch the GET INPUT proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response (Text string length = 5)
response = test.terminalResponse("81030123 00020282 81030100 0D060401"
+ "02030405");
- result &= response.checkSw("9116");
+ addResult(response.checkSw("9116"));
/*********************************************************************/
/** Testcase 12 to 19 */
@@ -104,13 +104,13 @@ public class Test_Api_2_Prh_Facrbbs_Bss extends UiccTestModel
// Fetch the GET INPUT proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response (Text String Length = 16)
response = test.terminalResponse("81030123 00020282 81030100 0D110400"
+ "01020304 05060708 090A0B0C 0D0E0F");
- result &= response.checkSw("9116");
+ addResult(response.checkSw("9116"));
/*********************************************************************/
/** Testcase 20 to 22 */
@@ -118,14 +118,14 @@ public class Test_Api_2_Prh_Facrbbs_Bss extends UiccTestModel
// Fetch the GET INPUT proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response (2 Text String TLV)
response = test.terminalResponse("81030123 00020282 81030100 0D110400"
+ "01020304 05060708 090A0B0C 0D0E0F0D"
+ "06001122 334455");
- result &= response.checkSw("9116");
+ addResult(response.checkSw("9116"));
/*********************************************************************/
/** Testcase 23 */
@@ -133,13 +133,13 @@ public class Test_Api_2_Prh_Facrbbs_Bss extends UiccTestModel
// Fetch the GET INPUT proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response (Text String Length = 16)
response = test.terminalResponse("81030123 00020282 81030100 0D110400"
+ "01020304 05060708 090A0B0C 0D0E0F");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
/*********************************************************************/
@@ -148,9 +148,9 @@ public class Test_Api_2_Prh_Facrbbs_Bss extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
+ addResult(response.checkData("10" + APPLET_AID_1
+ "17CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"
- + "CCCCCCCC CCCCCCCC");
+ + "CCCCCCCC CCCCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -164,6 +164,6 @@ public class Test_Api_2_Prh_Facrbbs_Bss extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_facyb_bs/Test_Api_2_Prh_Facyb_Bs.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_facyb_bs/Test_Api_2_Prh_Facyb_Bs.java
index 80eee2c472d225d023c3c0094dbee56cf949fd5e..e0c4ba1ac173e9530cda21a2876d0f5a27679911 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_facyb_bs/Test_Api_2_Prh_Facyb_Bs.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_facyb_bs/Test_Api_2_Prh_Facyb_Bs.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Prh_Facyb_Bs extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -73,17 +73,17 @@ public class Test_Api_2_Prh_Facyb_Bs extends UiccTestModel
/*********************************************************************/
response = test.unrecognizedEnvelope();
- result = response.checkSw("9116");
+ addResult(response.checkSw("9116"));
// Fetch the GET INPUT proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response (Text string length = 15)
response = test.terminalResponse("81030123 00020282 81030100 0D100401"
+ "02030405 06070809 0A0B0C0D 0E0F");
- result &= response.checkSw("9116");
+ addResult(response.checkSw("9116"));
/*********************************************************************/
/** Testcase 6 to 10 */
@@ -91,13 +91,13 @@ public class Test_Api_2_Prh_Facyb_Bs extends UiccTestModel
// Fetch the GET INPUT proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response (Text string length = 16)
response = test.terminalResponse("81030123 00020282 81030100 0D110400"
+ "01020304 05060708 090A0B0C 0D0E0F");
- result &= response.checkSw("9116");
+ addResult(response.checkSw("9116"));
/*********************************************************************/
/** Testcase 11 to 12 */
@@ -105,14 +105,14 @@ public class Test_Api_2_Prh_Facyb_Bs extends UiccTestModel
// Fetch the GET INPUT proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response (2 Text String TLV)
response = test.terminalResponse("81030123 00020282 81030100 0D110400"
+ "01020304 05060708 090A0B0C 0D0E0F0D"
+ "020441");
- result &= response.checkSw("9116");
+ addResult(response.checkSw("9116"));
/*********************************************************************/
/** Testcase 13 to 14 */
@@ -120,13 +120,13 @@ public class Test_Api_2_Prh_Facyb_Bs extends UiccTestModel
// Fetch the GET INPUT proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response (Text string length = 16)
response = test.terminalResponse("81030123 00020282 81030100 0D110400"
+ "01020304 05060708 090A0B0C 0D0E0F");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
/*********************************************************************/
@@ -135,8 +135,8 @@ public class Test_Api_2_Prh_Facyb_Bs extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
- + "0ECCCCCC CCCCCCCC CCCCCCCC CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "0ECCCCCC CCCCCCCC CCCCCCCC CCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -150,6 +150,6 @@ public class Test_Api_2_Prh_Facyb_Bs extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_facybbs_bss/Test_Api_2_Prh_Facybbs_Bss.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_facybbs_bss/Test_Api_2_Prh_Facybbs_Bss.java
index f90dc99f3a8e1ae0c3491cda046bcc55913e6abc..bf7269898bef389ab05521e2031b472a53d1963e 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_facybbs_bss/Test_Api_2_Prh_Facybbs_Bss.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_facybbs_bss/Test_Api_2_Prh_Facybbs_Bss.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Prh_Facybbs_Bss extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -73,17 +73,17 @@ public class Test_Api_2_Prh_Facybbs_Bss extends UiccTestModel
/*********************************************************************/
response = test.unrecognizedEnvelope();
- result = response.checkSw("9116");
+ addResult(response.checkSw("9116"));
// Fetch the GET INPUT proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response (Text string length = 15)
response = test.terminalResponse("81030123 00020282 81030100 0D100401"
+ "02030405 06070809 0A0B0C0D 0E0F");
- result &= response.checkSw("9116");
+ addResult(response.checkSw("9116"));
/*********************************************************************/
/** Testcase 7 to 10 */
@@ -91,13 +91,13 @@ public class Test_Api_2_Prh_Facybbs_Bss extends UiccTestModel
// Fetch the GET INPUT proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response (Text string length = 5)
response = test.terminalResponse("81030123 00020282 81030100 0D060401"
+ "02030405");
- result &= response.checkSw("9116");
+ addResult(response.checkSw("9116"));
/*********************************************************************/
/** Testcase 11 to 15 */
@@ -105,13 +105,13 @@ public class Test_Api_2_Prh_Facybbs_Bss extends UiccTestModel
// Fetch the GET INPUT proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response (Text String Length = 16)
response = test.terminalResponse("81030123 00020282 81030100 0D110400"
+ "01020304 05060708 090A0B0C 0D0E0F");
- result &= response.checkSw("9116");
+ addResult(response.checkSw("9116"));
/*********************************************************************/
/** Testcase 16 to 19 */
@@ -119,14 +119,14 @@ public class Test_Api_2_Prh_Facybbs_Bss extends UiccTestModel
// Fetch the GET INPUT proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response (2 Text string TLV)
response = test.terminalResponse("81030123 00020282 81030100 0D110400"
+ "01020304 05060708 090A0B0C 0D0E0F0D"
+ "06001122 334455");
- result &= response.checkSw("9116");
+ addResult(response.checkSw("9116"));
/*********************************************************************/
/** Testcase 20 to 22 */
@@ -134,13 +134,13 @@ public class Test_Api_2_Prh_Facybbs_Bss extends UiccTestModel
// Fetch the GET INPUT proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response (Text String Length = 16)
response = test.terminalResponse("81030123 00020282 81030100 0D110400"
+ "01020304 05060708 090A0B0C 0D0E0F");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
/*********************************************************************/
@@ -149,9 +149,9 @@ public class Test_Api_2_Prh_Facybbs_Bss extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
+ addResult(response.checkData("10" + APPLET_AID_1
+ "16CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"
- + "CCCCCCCC CCCCCC");
+ + "CCCCCCCC CCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -165,6 +165,6 @@ public class Test_Api_2_Prh_Facybbs_Bss extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_find/Test_Api_2_Prh_Find.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_find/Test_Api_2_Prh_Find.java
index 143991fe22eb9a20be379b5bbd1d885a2d848725..cbef0c25a9e4ea741960b5d8342bdeb3b9ceb5aa 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_find/Test_Api_2_Prh_Find.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_find/Test_Api_2_Prh_Find.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Prh_Find extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -73,16 +73,16 @@ public class Test_Api_2_Prh_Find extends UiccTestModel
/*********************************************************************/
response = test.unrecognizedEnvelope();
- result = response.checkSw("9112");
+ addResult(response.checkSw("9112"));
// Fetch the proactive command
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
// Terminal response with 2 result TLV
response = test.terminalResponse("81030121 00820282 81030100 03020112");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
/*********************************************************************/
@@ -91,8 +91,8 @@ public class Test_Api_2_Prh_Find extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
- + "0FCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "0FCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -106,6 +106,6 @@ public class Test_Api_2_Prh_Find extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gcap/Test_Api_2_Prh_Gcap.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gcap/Test_Api_2_Prh_Gcap.java
index af1ac35b6cd0eade90d39c9b2bfe4021b27cf20a..92f43b700462c3844705ecd97e4e04a42d689176 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gcap/Test_Api_2_Prh_Gcap.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gcap/Test_Api_2_Prh_Gcap.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Prh_Gcap extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -73,14 +73,14 @@ public class Test_Api_2_Prh_Gcap extends UiccTestModel
/*********************************************************************/
response = test.unrecognizedEnvelope();
- result = response.checkSw("9112");
+ addResult(response.checkSw("9112"));
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
response = test.terminalResponse("81030121 00020282 81030100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
/*********************************************************************/
@@ -89,8 +89,8 @@ public class Test_Api_2_Prh_Gcap extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
- + "03CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "03CCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -104,6 +104,6 @@ public class Test_Api_2_Prh_Gcap extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gcid/Test_Api_2_Prh_Gcid.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gcid/Test_Api_2_Prh_Gcid.java
index b2d3740fce74a750f398b6ea13ab6ffa70fecf5c..ac059972dfadc1533ca514670c833b336e7f41f9 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gcid/Test_Api_2_Prh_Gcid.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gcid/Test_Api_2_Prh_Gcid.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Prh_Gcid extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -73,15 +73,15 @@ public class Test_Api_2_Prh_Gcid extends UiccTestModel
/*********************************************************************/
response = test.unrecognizedEnvelope();
- result = response.checkSw("9112");
+ addResult(response.checkSw("9112"));
// Fetch Display Text
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
response = test.terminalResponse("81030121 00020282 81030100");
- result &= response.checkSw("911C");
+ addResult(response.checkSw("911C"));
/*********************************************************************/
/** Testcase 2 */
@@ -89,13 +89,13 @@ public class Test_Api_2_Prh_Gcid extends UiccTestModel
// Open channel proactive command
response = test.fetch("1C");
- result &= response.checkData("D01A8103 01400182 02818206 05911122"
- + "33443504 01000000 39020080");
+ addResult(response.checkData("D01A8103 01400182 02818206 05911122"
+ + "33443504 01000000 39020080"));
// Terminal response with channel status TLV length set to 00
response = test.terminalResponse("81030140 01820282 81030220 00380035"
+ "04010000 00390200 80");
- result &= response.checkSw("911C");
+ addResult(response.checkSw("911C"));
/*********************************************************************/
/** Testcase 3 */
@@ -103,21 +103,21 @@ public class Test_Api_2_Prh_Gcid extends UiccTestModel
// Open channel proactive command
response = test.fetch("1C");
- result &= response.checkData("D01A8103 01400182 02818206 05911122"
- + "33443504 01000000 39020080");
+ addResult(response.checkData("D01A8103 01400182 02818206 05911122"
+ + "33443504 01000000 39020080"));
// Terminal response OK on channel 01
response = test.terminalResponse("81030140 01820282 81030100 38028100"
+ "35040100 00003902 0080");
- result &= response.checkSw("910B");
+ addResult(response.checkSw("910B"));
// Close channel proactive command
response = test.fetch("0B");
- result &= response.checkData("D0098103 01410082 028121");
+ addResult(response.checkData("D0098103 01410082 028121"));
// Terminal response OK
response = test.terminalResponse("81030141 00820282 81030100");
- result &= response.checkSw("911C");
+ addResult(response.checkSw("911C"));
/*********************************************************************/
/** Testcase 4 */
@@ -125,21 +125,21 @@ public class Test_Api_2_Prh_Gcid extends UiccTestModel
// Open channel proactive command
response = test.fetch("1C");
- result &= response.checkData("D01A8103 01400182 02818206 05911122"
- + "33443504 01000000 39020080");
+ addResult(response.checkData("D01A8103 01400182 02818206 05911122"
+ + "33443504 01000000 39020080"));
// Terminal response with 2 Channel Id TLV
response = test.terminalResponse("81030140 01820282 81030100 38028100"
+ "38028200 35040100 00003902 0080");
- result &= response.checkSw("910B");
+ addResult(response.checkSw("910B"));
// Close channel proactive command
response = test.fetch("0B");
- result &= response.checkData("D0098103 01410082 028121");
+ addResult(response.checkData("D0098103 01410082 028121"));
// Terminal response OK
response = test.terminalResponse("81030141 00820282 81030100");
- result &= response.checkSw("911C");
+ addResult(response.checkSw("911C"));
/*********************************************************************/
/** Testcase 5 */
@@ -147,13 +147,13 @@ public class Test_Api_2_Prh_Gcid extends UiccTestModel
// Open channel proactive command
response = test.fetch("1C");
- result &= response.checkData("D01A8103 01400182 02818206 05911122"
- + "33443504 01000000 39020080");
+ addResult(response.checkData("D01A8103 01400182 02818206 05911122"
+ + "33443504 01000000 39020080"));
// Terminal response
response = test.terminalResponse("81030140 01820282 81030100 38020305"
+ "35040100 00003902 0080");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
/*********************************************************************/
@@ -162,8 +162,8 @@ public class Test_Api_2_Prh_Gcid extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
- + "05CCCCCC CCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "05CCCCCC CCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -177,6 +177,6 @@ public class Test_Api_2_Prh_Gcid extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gcst/Test_Api_2_Prh_Gcst.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gcst/Test_Api_2_Prh_Gcst.java
index e3c285e299ff078493f6acea5d2cb3f94dce2fe2..710b56f25b0194c41cb8b6c8c429015ee61f23ac 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gcst/Test_Api_2_Prh_Gcst.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gcst/Test_Api_2_Prh_Gcst.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Prh_Gcst extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -73,16 +73,16 @@ public class Test_Api_2_Prh_Gcst extends UiccTestModel
/*********************************************************************/
response = test.unrecognizedEnvelope();
- result = response.checkSw("9112");
+ addResult(response.checkSw("9112"));
// Fetch the DISPLAY TEXT proactive command
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
// Terminal response with no CHANNEL STATUS TLV
response = test.terminalResponse("81030121 00020282 81030100");
- result &= response.checkSw("911C");
+ addResult(response.checkSw("911C"));
/*********************************************************************/
/** Testcase 2 */
@@ -90,21 +90,21 @@ public class Test_Api_2_Prh_Gcst extends UiccTestModel
// Fetch the OPEN CHANNEL proactive command
response = test.fetch("1C");
- result &= response.checkData("D01A8103 01400182 02818206 05911122"
- + "33443504 01000000 39020080");
+ addResult(response.checkData("D01A8103 01400182 02818206 05911122"
+ + "33443504 01000000 39020080"));
// Successful terminal response with channel status value set to 0x8100
response = test.terminalResponse("81030140 01820282 81830100 38028100"
+ "35020300 3902000A");
- result &= response.checkSw("910B");
+ addResult(response.checkSw("910B"));
// Fetch the CLOSE CHANNEL proactive command
response = test.fetch("0B");
- result &= response.checkData("D0098103 01410082 028121");
+ addResult(response.checkData("D0098103 01410082 028121"));
// Successful terminal response
response = test.terminalResponse("81030141 00820282 81830100");
- result &= response.checkSw("911C");
+ addResult(response.checkSw("911C"));
/*********************************************************************/
/** Testcase 3 */
@@ -112,13 +112,13 @@ public class Test_Api_2_Prh_Gcst extends UiccTestModel
// Fetch the OPEN CHANNEL proactive command
response = test.fetch("1C");
- result &= response.checkData("D01A8103 01400182 02818206 05911122"
- + "33443504 01000000 39020080");
+ addResult(response.checkData("D01A8103 01400182 02818206 05911122"
+ + "33443504 01000000 39020080"));
// Unsuccessful terminal response with channel status TLV length set to 0
response = test.terminalResponse("81030140 01820282 81830130 38003502"
+ "03003902 000A");
- result &= response.checkSw("911C");
+ addResult(response.checkSw("911C"));
/*********************************************************************/
/** Testcase 4 */
@@ -126,13 +126,13 @@ public class Test_Api_2_Prh_Gcst extends UiccTestModel
// Fetch the OPEN CHANNEL proactive command
response = test.fetch("1C");
- result &= response.checkData("D01A8103 01400182 02818206 05911122"
- + "33443504 01000000 39020080");
+ addResult(response.checkData("D01A8103 01400182 02818206 05911122"
+ + "33443504 01000000 39020080"));
// Unsuccessful terminal response with channel status TLV length set to 1
response = test.terminalResponse("81030140 01820282 81830130 38018135"
+ "02030039 02000A");
- result &= response.checkSw("911C");
+ addResult(response.checkSw("911C"));
/*********************************************************************/
/** Testcase 5 */
@@ -140,13 +140,13 @@ public class Test_Api_2_Prh_Gcst extends UiccTestModel
// Fetch the OPEN CHANNEL proactive command
response = test.fetch("1C");
- result &= response.checkData("D01A8103 01400182 02818206 05911122"
- + "33443504 01000000 39020080");
+ addResult(response.checkData("D01A8103 01400182 02818206 05911122"
+ + "33443504 01000000 39020080"));
// Successful terminal response with channel status TLV value set to 0x8100
response = test.terminalResponse("81030140 01820282 81830100 38028100"
+ "35020300 3902000A");
- result &= response.checkSw("910B");
+ addResult(response.checkSw("910B"));
/*********************************************************************/
/** Testcase 6 */
@@ -154,12 +154,12 @@ public class Test_Api_2_Prh_Gcst extends UiccTestModel
// Fetch the GET CHANNEL STATUS proactive command
response = test.fetch("0B");
- result &= response.checkData("D0098103 01440082 028182");
+ addResult(response.checkData("D0098103 01440082 028182"));
// Successful terminal response with 2 channel status TLVs
response = test.terminalResponse("81030144 01820282 81830100 38028100"
+ "38028101 35020300 3902000A");
- result &= response.checkSw("910B");
+ addResult(response.checkSw("910B"));
/*********************************************************************/
/** Testcase 7 */
@@ -167,20 +167,20 @@ public class Test_Api_2_Prh_Gcst extends UiccTestModel
// Fetch the GET CHANNEL STATUS proactive command
response = test.fetch("0B");
- result &= response.checkData("D0098103 01440082 028182");
+ addResult(response.checkData("D0098103 01440082 028182"));
// Successful terminal response with 2 channel status TLVs
response = test.terminalResponse("81030144 01820282 81830100 38028200"
+ "38028100 35020300 3902000A");
- result &= response.checkSw("910B");
+ addResult(response.checkSw("910B"));
// Fetch the CLOSE CHANNEL proactive command
response = test.fetch("0B");
- result &= response.checkData("D0098103 01410082 028121");
+ addResult(response.checkData("D0098103 01410082 028121"));
// Successful terminal response
response = test.terminalResponse("81030141 00820282 81830100");
- result &= response.checkSw("911C");
+ addResult(response.checkSw("911C"));
/*********************************************************************/
/** Testcase 8 */
@@ -188,21 +188,21 @@ public class Test_Api_2_Prh_Gcst extends UiccTestModel
// Fetch the OPEN CHANNEL proactive command
response = test.fetch("1C");
- result &= response.checkData("D01A8103 01400182 02818206 05911122"
- + "33443504 01000000 39020080");
+ addResult(response.checkData("D01A8103 01400182 02818206 05911122"
+ + "33443504 01000000 39020080"));
// Successful terminal response with 1 channel status TLVs
response = test.terminalResponse("81030140 01820282 81830100 38028304"
+ "35020300 3902000A");
- result &= response.checkSw("910B");
+ addResult(response.checkSw("910B"));
// Fetch the CLOSE CHANNEL proactive command
response = test.fetch("0B");
- result &= response.checkData("D0098103 01410082 028123");
+ addResult(response.checkData("D0098103 01410082 028123"));
// Successful terminal response
response = test.terminalResponse("81030141 00820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
/*********************************************************************/
@@ -211,8 +211,8 @@ public class Test_Api_2_Prh_Gcst extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
- + "08CCCCCC CCCCCCCC CC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "08CCCCCC CCCCCCCC CC"));
/*********************************************************************/
/*********************************************************************/
@@ -226,6 +226,6 @@ public class Test_Api_2_Prh_Gcst extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_glen/Test_Api_2_Prh_Glen.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_glen/Test_Api_2_Prh_Glen.java
index 1dcc940f0fc111f09336f029bd06883014d452ce..511cb718a629da59aa2cbcdf411bc18c9f66c56a 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_glen/Test_Api_2_Prh_Glen.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_glen/Test_Api_2_Prh_Glen.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Prh_Glen extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -73,16 +73,16 @@ public class Test_Api_2_Prh_Glen extends UiccTestModel
/*********************************************************************/
response = test.unrecognizedEnvelope();
- result = response.checkSw("9112");
+ addResult(response.checkSw("9112"));
// Fetch the DISPLAY TEXT proactive command
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
// Terminal response with no additional information
response = test.terminalResponse("81030121 00020282 81030100");
- result &= response.checkSw("9112");
+ addResult(response.checkSw("9112"));
/*********************************************************************/
/** Testcase 2 */
@@ -90,8 +90,8 @@ public class Test_Api_2_Prh_Glen extends UiccTestModel
// Fetch the GET INPUT proactive command
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
// Terminal response (F2h additional bytes)
response = test.terminalResponse("81030121 00020282 810381F3 01000102"
@@ -110,7 +110,7 @@ public class Test_Api_2_Prh_Glen extends UiccTestModel
+ "C3C4C5C6 C7C8C9CA CBCCCDCE CFD0D1D2"
+ "D3D4D5D6 D7D8D9DA DBDCDDDE DFE0E1E2"
+ "E3E4E5E6 E7E8E9EA EBECEDEE EFF0F1");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
/*********************************************************************/
@@ -119,8 +119,8 @@ public class Test_Api_2_Prh_Glen extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
- + "02CCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "02CCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -134,6 +134,6 @@ public class Test_Api_2_Prh_Glen extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gtcs/Test_Api_2_Prh_Gtcs.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gtcs/Test_Api_2_Prh_Gtcs.java
index 26c3961300988d8f26fa87f0f1d26cf947222e3a..212afc739d4e237162c156f6473057f0f7e47230 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gtcs/Test_Api_2_Prh_Gtcs.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gtcs/Test_Api_2_Prh_Gtcs.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Prh_Gtcs extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -73,16 +73,16 @@ public class Test_Api_2_Prh_Gtcs extends UiccTestModel
/*********************************************************************/
response = test.unrecognizedEnvelope();
- result = response.checkSw("9112");
+ addResult(response.checkSw("9112"));
// Fetch the proactive command
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
// Terminal response with no additional information
response = test.terminalResponse("81030121 00020282 81030100");
- result &= response.checkSw("9116");
+ addResult(response.checkSw("9116"));
/*********************************************************************/
/** Testcase 2 */
@@ -90,12 +90,12 @@ public class Test_Api_2_Prh_Gtcs extends UiccTestModel
// Fetch the GET INPUT proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response (Text string TLV is null)
response = test.terminalResponse("81030123 00020282 81030100 0D00");
- result &= response.checkSw("9116");
+ addResult(response.checkSw("9116"));
/*********************************************************************/
/** Testcase 3 & 4 */
@@ -103,12 +103,12 @@ public class Test_Api_2_Prh_Gtcs extends UiccTestModel
// Fetch the GET INPUT proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response (Text string length = 01h)
response = test.terminalResponse("81030123 00020282 81030100 0D020441");
- result &= response.checkSw("9116");
+ addResult(response.checkSw("9116"));
/*********************************************************************/
/** Testcase 5 & 6 */
@@ -116,13 +116,13 @@ public class Test_Api_2_Prh_Gtcs extends UiccTestModel
// Fetch the GET INPUT proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response (Text string length = 02h)
response = test.terminalResponse("81030123 00020282 81030100 0D030042"
+ "42");
- result &= response.checkSw("9116");
+ addResult(response.checkSw("9116"));
/*********************************************************************/
/** Testcase 7 & 8 */
@@ -130,8 +130,8 @@ public class Test_Api_2_Prh_Gtcs extends UiccTestModel
// Fetch the GET INPUT proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response (Text string length = 7Eh)
response = test.terminalResponse("81030123 00020282 81030100 0D7F0801"
@@ -143,7 +143,7 @@ public class Test_Api_2_Prh_Gtcs extends UiccTestModel
+ "52535455 56575859 5A5B5C5D 5E5F6061"
+ "62636465 66676869 6A6B6C6D 6E6F7071"
+ "72737475 76777879 7A7B7C7D 7E");
- result &= response.checkSw("9116");
+ addResult(response.checkSw("9116"));
/*********************************************************************/
/** Testcase 9 & 10 */
@@ -151,8 +151,8 @@ public class Test_Api_2_Prh_Gtcs extends UiccTestModel
// Fetch the GET INPUT proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response (Text string length = 7Fh)
response = test.terminalResponse("81030123 00020282 81030100 0D818004"
@@ -164,7 +164,7 @@ public class Test_Api_2_Prh_Gtcs extends UiccTestModel
+ "51525354 55565758 595A5B5C 5D5E5F60"
+ "61626364 65666768 696A6B6C 6D6E6F70"
+ "71727374 75767778 797A7B7C 7D7E7F");
- result &= response.checkSw("9116");
+ addResult(response.checkSw("9116"));
/*********************************************************************/
/** Testcase 11 & 12 */
@@ -172,8 +172,8 @@ public class Test_Api_2_Prh_Gtcs extends UiccTestModel
// Fetch the GET INPUT proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response (Text string length = EFh)
response = test.terminalResponse("81030123 00020282 81030100 0D81F008"
@@ -192,7 +192,7 @@ public class Test_Api_2_Prh_Gtcs extends UiccTestModel
+ "C1C2C3C4 C5C6C7C8 C9CACBCC CDCECFD0"
+ "D1D2D3D4 D5D6D7D8 D9DADBDC DDDEDFE0"
+ "E1E2E3E4 E5E6E7E8 E9EAEBEC EDEEEF");
- result &= response.checkSw("9116");
+ addResult(response.checkSw("9116"));
/*********************************************************************/
/** Testcase 13 & 14 */
@@ -200,13 +200,13 @@ public class Test_Api_2_Prh_Gtcs extends UiccTestModel
// Fetch the GET INPUT proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response (2 Text string TLVs)
response = test.terminalResponse("81030123 00020282 81030100 0D020441"
+ "0D030842 43");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
/*********************************************************************/
@@ -215,8 +215,8 @@ public class Test_Api_2_Prh_Gtcs extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
- + "0ECCCCCC CCCCCCCC CCCCCCCC CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "0ECCCCCC CCCCCCCC CCCCCCCC CCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -230,6 +230,6 @@ public class Test_Api_2_Prh_Gtcs extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gtgr/Test_Api_2_Prh_Gtgr.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gtgr/Test_Api_2_Prh_Gtgr.java
index 1b4399b43bbb6734f8b5c91f69b3ecdcb5e5b962..6f63e9f3c09a5774b61522c5b27c4cc34b7a6755 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gtgr/Test_Api_2_Prh_Gtgr.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gtgr/Test_Api_2_Prh_Gtgr.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Prh_Gtgr extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -73,16 +73,16 @@ public class Test_Api_2_Prh_Gtgr extends UiccTestModel
/*********************************************************************/
response = test.unrecognizedEnvelope();
- result = response.checkSw("9112");
+ addResult(response.checkSw("9112"));
// Fetch the proactive command
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
// Terminal response
response = test.terminalResponse("81030121 00020282 81030100");
- result &= response.checkSw("9112");
+ addResult(response.checkSw("9112"));
/*********************************************************************/
@@ -91,12 +91,12 @@ public class Test_Api_2_Prh_Gtgr extends UiccTestModel
// Fetch the proactive command
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
// Terminal response
response = test.terminalResponse("81030121 00020282 81030101");
- result &= response.checkSw("9112");
+ addResult(response.checkSw("9112"));
/*********************************************************************/
/** Testcase 5 & 6 */
@@ -104,12 +104,12 @@ public class Test_Api_2_Prh_Gtgr extends UiccTestModel
// Fetch the proactive command
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
// Terminal response
response = test.terminalResponse("81030121 00020282 81030201 55");
- result &= response.checkSw("9112");
+ addResult(response.checkSw("9112"));
/*********************************************************************/
/** Testcase 7 & 8 */
@@ -117,12 +117,12 @@ public class Test_Api_2_Prh_Gtgr extends UiccTestModel
// Fetch the proactive command
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
// Terminal response
response = test.terminalResponse("81030121 00020282 81030402 654321");
- result &= response.checkSw("9112");
+ addResult(response.checkSw("9112"));
/*********************************************************************/
/** Testcase 9 & 10 */
@@ -130,8 +130,8 @@ public class Test_Api_2_Prh_Gtgr extends UiccTestModel
// Fetch the proactive command
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
// Terminal response with 7Fh additional information
response = test.terminalResponse("81030121 00020282 81038180 02555555"
@@ -143,7 +143,7 @@ public class Test_Api_2_Prh_Gtgr extends UiccTestModel
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555");
- result &= response.checkSw("9112");
+ addResult(response.checkSw("9112"));
/*********************************************************************/
/** Testcase 11 & 12 */
@@ -151,13 +151,13 @@ public class Test_Api_2_Prh_Gtgr extends UiccTestModel
// Fetch the proactive command
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
// Terminal response with 2 result TLVs
response = test.terminalResponse("81030121 00020282 81030202 12030303"
+ "3456");
- result &= response.checkSw("9112");
+ addResult(response.checkSw("9112"));
/*********************************************************************/
/** Testcase 13 */
@@ -165,12 +165,12 @@ public class Test_Api_2_Prh_Gtgr extends UiccTestModel
// Fetch the proactive command
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
// Terminal response with no result TLV
response = test.terminalResponse("81030121 00020282 81");
- result &= response.checkSw("9112");
+ addResult(response.checkSw("9112"));
/*********************************************************************/
/** Testcase 13 */
@@ -178,12 +178,12 @@ public class Test_Api_2_Prh_Gtgr extends UiccTestModel
// Fetch the proactive command
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
// Terminal response with no general result
response = test.terminalResponse("81030121 00020282 810300");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
/*********************************************************************/
@@ -192,8 +192,8 @@ public class Test_Api_2_Prh_Gtgr extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
- + "0ECCCCCC CCCCCCCC CCCCCCCC CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "0ECCCCCC CCCCCCCC CCCCCCCC CCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -207,6 +207,6 @@ public class Test_Api_2_Prh_Gtgr extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gtii/Test_Api_2_Prh_Gtii.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gtii/Test_Api_2_Prh_Gtii.java
index 0c04bcd29f49d1cac682bd0910e85e0db61fd4d0..395d40c3752b97ec1bf82a9c9016a502485d9895 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gtii/Test_Api_2_Prh_Gtii.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gtii/Test_Api_2_Prh_Gtii.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Prh_Gtii extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -73,16 +73,16 @@ public class Test_Api_2_Prh_Gtii extends UiccTestModel
/*********************************************************************/
response = test.unrecognizedEnvelope();
- result = response.checkSw("9112");
+ addResult(response.checkSw("9112"));
// Fetch the proactive command
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
// Terminal response with no additional information
response = test.terminalResponse("81030121 00020282 81030100");
- result &= response.checkSw("911B");
+ addResult(response.checkSw("911B"));
/*********************************************************************/
@@ -91,12 +91,12 @@ public class Test_Api_2_Prh_Gtii extends UiccTestModel
// Fetch the proactive command
response = test.fetch("1B");
- result &= response.checkData("D0198103 01240082 0281828F 06014974"
- + "656D318F 06024974 656D32");
+ addResult(response.checkData("D0198103 01240082 0281828F 06014974"
+ + "656D318F 06024974 656D32"));
// Terminal response (SELECT ITEM)
response = test.terminalResponse("81030124 00020282 81030100 100101");
- result &= response.checkSw("9123");
+ addResult(response.checkSw("9123"));
/*********************************************************************/
/** Testcase 4 & 5 */
@@ -104,13 +104,13 @@ public class Test_Api_2_Prh_Gtii extends UiccTestModel
// Fetch the proactive command
response = test.fetch("23");
- result &= response.checkData("D0218103 01240082 0281828F 06034974"
+ addResult(response.checkData("D0218103 01240082 0281828F 06034974"
+ "656D338F 06054974 656D358F 06074974"
- + "656D37");
+ + "656D37"));
// Terminal response (SELECT ITEM)
response = test.terminalResponse("81030124 00020282 81030100 100105");
- result &= response.checkSw("9123");
+ addResult(response.checkSw("9123"));
/*********************************************************************/
/** Testcase 6 & 7 */
@@ -118,13 +118,13 @@ public class Test_Api_2_Prh_Gtii extends UiccTestModel
// Fetch the proactive command
response = test.fetch("23");
- result &= response.checkData("D0218103 01240082 0281828F 06FD4974"
+ addResult(response.checkData("D0218103 01240082 0281828F 06FD4974"
+ "656D448F 06FE4974 656D458F 06FF4974"
- + "656D46");
+ + "656D46"));
// Terminal response (SELECT ITEM)
response = test.terminalResponse("81030124 00020282 81030100 1001FF");
- result &= response.checkSw("9123");
+ addResult(response.checkSw("9123"));
/*********************************************************************/
/** Testcase 8 & 9 */
@@ -132,14 +132,14 @@ public class Test_Api_2_Prh_Gtii extends UiccTestModel
// Fetch the proactive command
response = test.fetch("23");
- result &= response.checkData("D0218103 01240082 0281828F 06FD4974"
+ addResult(response.checkData("D0218103 01240082 0281828F 06FD4974"
+ "656D448F 06FE4974 656D458F 06FF4974"
- + "656D46");
+ + "656D46"));
// Terminal response (SELECT ITEM)
response = test.terminalResponse("81030124 00020282 81030100 1001FF10"
+ "01FE");
- result &= response.checkSw("9112");
+ addResult(response.checkSw("9112"));
/*********************************************************************/
/** Testcase 10 */
@@ -147,12 +147,12 @@ public class Test_Api_2_Prh_Gtii extends UiccTestModel
// Fetch the proactive command
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
// Terminal response with no item identifier
response = test.terminalResponse("81030121 00020282 81030100 1000");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
/*********************************************************************/
@@ -161,8 +161,8 @@ public class Test_Api_2_Prh_Gtii extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
- + "0ACCCCCC CCCCCCCC CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "0ACCCCCC CCCCCCCC CCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -176,6 +176,6 @@ public class Test_Api_2_Prh_Gtii extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gtil/Test_Api_2_Prh_Gtil.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gtil/Test_Api_2_Prh_Gtil.java
index bd7a78560d677cc4fc5a7eea35c6197e73d6bd9e..03701d75239837249bafd29ef10297ce2cc13c4f 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gtil/Test_Api_2_Prh_Gtil.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gtil/Test_Api_2_Prh_Gtil.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Prh_Gtil extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -73,16 +73,16 @@ public class Test_Api_2_Prh_Gtil extends UiccTestModel
/*********************************************************************/
response = test.unrecognizedEnvelope();
- result = response.checkSw("9112");
+ addResult(response.checkSw("9112"));
// Fetch the proactive command
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
// Terminal response with no additional information
response = test.terminalResponse("81030121 00020282 81030100");
- result &= response.checkSw("9112");
+ addResult(response.checkSw("9112"));
/*********************************************************************/
@@ -91,12 +91,12 @@ public class Test_Api_2_Prh_Gtil extends UiccTestModel
// Fetch the proactive command
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
// Terminal response with 1 additional byte
response = test.terminalResponse("81030121 00020282 81030202 55");
- result &= response.checkSw("9112");
+ addResult(response.checkSw("9112"));
/*********************************************************************/
/** Testcase 5 & 6 */
@@ -104,8 +104,8 @@ public class Test_Api_2_Prh_Gtil extends UiccTestModel
// Fetch the proactive command
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
// Terminal response with 7Eh additional bytes
response = test.terminalResponse("81030121 00020282 81037F02 55555555"
@@ -117,7 +117,7 @@ public class Test_Api_2_Prh_Gtil extends UiccTestModel
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 5555");
- result &= response.checkSw("9112");
+ addResult(response.checkSw("9112"));
/*********************************************************************/
/** Testcase 7 & 8 */
@@ -125,8 +125,8 @@ public class Test_Api_2_Prh_Gtil extends UiccTestModel
// Fetch the proactive command
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
// Terminal response with 7Fh additional bytes
response = test.terminalResponse("81030121 00020282 81038180 02555555"
@@ -138,7 +138,7 @@ public class Test_Api_2_Prh_Gtil extends UiccTestModel
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555");
- result &= response.checkSw("9112");
+ addResult(response.checkSw("9112"));
/*********************************************************************/
/** Testcase 9 & 10 */
@@ -146,8 +146,8 @@ public class Test_Api_2_Prh_Gtil extends UiccTestModel
// Fetch the proactive command
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
// Terminal response with 80h additional bytes
response = test.terminalResponse("81030121 00020282 81038181 02555555"
@@ -159,7 +159,7 @@ public class Test_Api_2_Prh_Gtil extends UiccTestModel
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55");
- result &= response.checkSw("9112");
+ addResult(response.checkSw("9112"));
/*********************************************************************/
/** Testcase 11 & 12 */
@@ -167,8 +167,8 @@ public class Test_Api_2_Prh_Gtil extends UiccTestModel
// Fetch the proactive command
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
// Terminal response with F2h additional bytes
response = test.terminalResponse("81030121 00020282 810381F3 02555555"
@@ -187,7 +187,7 @@ public class Test_Api_2_Prh_Gtil extends UiccTestModel
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 55555555"
+ "55555555 55555555 55555555 555555");
- result &= response.checkSw("9112");
+ addResult(response.checkSw("9112"));
/*********************************************************************/
/** Testcase 13 & 14 */
@@ -195,13 +195,13 @@ public class Test_Api_2_Prh_Gtil extends UiccTestModel
// Fetch the proactive command
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
// Terminal response with 2 result TLVs
response = test.terminalResponse("81030121 00020282 81030302 01230301"
+ "00");
- result &= response.checkSw("9112");
+ addResult(response.checkSw("9112"));
/*********************************************************************/
/** Testcase 15 */
@@ -209,12 +209,12 @@ public class Test_Api_2_Prh_Gtil extends UiccTestModel
// Fetch the proactive command
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
// Terminal response with no result TLV
response = test.terminalResponse("81030121 00020282 81");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
/*********************************************************************/
@@ -223,8 +223,8 @@ public class Test_Api_2_Prh_Gtil extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
- + "0FCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "0FCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -238,6 +238,6 @@ public class Test_Api_2_Prh_Gtil extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gttl/Test_Api_2_Prh_Gttl.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gttl/Test_Api_2_Prh_Gttl.java
index 5ed5ea22a7844a6fbb4623c72cc22da3e22f02f5..544eed48f10154b9dbdd8387bf95bc12b0e64359 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gttl/Test_Api_2_Prh_Gttl.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gttl/Test_Api_2_Prh_Gttl.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Prh_Gttl extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -73,16 +73,16 @@ public class Test_Api_2_Prh_Gttl extends UiccTestModel
/*********************************************************************/
response = test.unrecognizedEnvelope();
- result = response.checkSw("9112");
+ addResult(response.checkSw("9112"));
// Fetch the proactive command
response = test.fetch("12");
- result &= response.checkData("D0108103 01210082 0281028D 05045465"
- + "7874");
+ addResult(response.checkData("D0108103 01210082 0281028D 05045465"
+ + "7874"));
// Terminal response with no additional information
response = test.terminalResponse("81030121 00020282 81030100");
- result &= response.checkSw("9116");
+ addResult(response.checkSw("9116"));
/*********************************************************************/
/** Testcase 2 & 3 */
@@ -90,12 +90,12 @@ public class Test_Api_2_Prh_Gttl extends UiccTestModel
// Fetch the GET INPUT proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response (Text string TLV is null)
response = test.terminalResponse("81030123 00020282 81030100 0D00");
- result &= response.checkSw("9116");
+ addResult(response.checkSw("9116"));
/*********************************************************************/
/** Testcase 4 & 5 */
@@ -103,12 +103,12 @@ public class Test_Api_2_Prh_Gttl extends UiccTestModel
// Fetch the GET INPUT proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response (Text string length = 01h)
response = test.terminalResponse("81030123 00020282 81030100 0D020441");
- result &= response.checkSw("9116");
+ addResult(response.checkSw("9116"));
/*********************************************************************/
/** Testcase 6 & 7 */
@@ -116,13 +116,13 @@ public class Test_Api_2_Prh_Gttl extends UiccTestModel
// Fetch the GET INPUT proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response (Text string length = 02h)
response = test.terminalResponse("81030123 00020282 81030100 0D030042"
+ "42");
- result &= response.checkSw("9116");
+ addResult(response.checkSw("9116"));
/*********************************************************************/
/** Testcase 8 & 9 */
@@ -130,8 +130,8 @@ public class Test_Api_2_Prh_Gttl extends UiccTestModel
// Fetch the GET INPUT proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response (Text string length = 7Eh)
response = test.terminalResponse("81030123 00020282 81030100 0D7F0801"
@@ -143,7 +143,7 @@ public class Test_Api_2_Prh_Gttl extends UiccTestModel
+ "52535455 56575859 5A5B5C5D 5E5F6061"
+ "62636465 66676869 6A6B6C6D 6E6F7071"
+ "72737475 76777879 7A7B7C7D 7E");
- result &= response.checkSw("9116");
+ addResult(response.checkSw("9116"));
/*********************************************************************/
/** Testcase 10 & 11 */
@@ -151,8 +151,8 @@ public class Test_Api_2_Prh_Gttl extends UiccTestModel
// Fetch the GET INPUT proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response (Text string length = 7Fh)
response = test.terminalResponse("81030123 00020282 81030100 0D818004"
@@ -164,7 +164,7 @@ public class Test_Api_2_Prh_Gttl extends UiccTestModel
+ "51525354 55565758 595A5B5C 5D5E5F60"
+ "61626364 65666768 696A6B6C 6D6E6F70"
+ "71727374 75767778 797A7B7C 7D7E7F");
- result &= response.checkSw("9116");
+ addResult(response.checkSw("9116"));
/*********************************************************************/
/** Testcase 12 & 14 */
@@ -172,8 +172,8 @@ public class Test_Api_2_Prh_Gttl extends UiccTestModel
// Fetch the GET INPUT proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response (Text string length = EFh)
response = test.terminalResponse("81030123 00020282 81030100 0D81F004"
@@ -192,7 +192,7 @@ public class Test_Api_2_Prh_Gttl extends UiccTestModel
+ "C1C2C3C4 C5C6C7C8 C9CACBCC CDCECFD0"
+ "D1D2D3D4 D5D6D7D8 D9DADBDC DDDEDFE0"
+ "E1E2E3E4 E5E6E7E8 E9EAEBEC EDEEEF");
- result &= response.checkSw("9116");
+ addResult(response.checkSw("9116"));
/*********************************************************************/
/** Testcase 14 & 15 */
@@ -200,13 +200,13 @@ public class Test_Api_2_Prh_Gttl extends UiccTestModel
// Fetch the GET INPUT proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response (2 Text string TLVs)
response = test.terminalResponse("81030123 00020282 81030100 0D020441"
+ "0D030842 43");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
/*********************************************************************/
@@ -215,8 +215,8 @@ public class Test_Api_2_Prh_Gttl extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
- + "0FCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "0FCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -230,6 +230,6 @@ public class Test_Api_2_Prh_Gttl extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gvby/Test_Api_2_Prh_Gvby.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gvby/Test_Api_2_Prh_Gvby.java
index 5b5a50acfaad626e336d181daf630859d8e71eb2..95d5162f6bb06a3bcdd92798c8e9f857195b5a95 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gvby/Test_Api_2_Prh_Gvby.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gvby/Test_Api_2_Prh_Gvby.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Prh_Gvby extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -73,12 +73,12 @@ public class Test_Api_2_Prh_Gvby extends UiccTestModel
/*********************************************************************/
response = test.unrecognizedEnvelope();
- result = response.checkSw("9116");
+ addResult(response.checkSw("9116"));
// Fetch the GET INPUT proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response (Text String Length = 7Eh)
response = test.terminalResponse("81030123 00020282 81030100 0D7F0801"
@@ -90,7 +90,7 @@ public class Test_Api_2_Prh_Gvby extends UiccTestModel
+ "52535455 56575859 5A5B5C5D 5E5F6061"
+ "62636465 66676869 6A6B6C6D 6E6F7071"
+ "72737475 76777879 7A7B7C7D 7E");
- result &= response.checkSw("9116");
+ addResult(response.checkSw("9116"));
/*********************************************************************/
/** Testcase 6 to 8 */
@@ -98,8 +98,8 @@ public class Test_Api_2_Prh_Gvby extends UiccTestModel
// Fetch the GET INPUT proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response (Text String Length = EFh)
response = test.terminalResponse("81030123 00020282 81030100 0D81F004"
@@ -118,7 +118,7 @@ public class Test_Api_2_Prh_Gvby extends UiccTestModel
+ "C1C2C3C4 C5C6C7C8 C9CACBCC CDCECFD0"
+ "D1D2D3D4 D5D6D7D8 D9DADBDC DDDEDFE0"
+ "E1E2E3E4 E5E6E7E8 E9EAEBEC EDEEEF");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
/*********************************************************************/
@@ -127,8 +127,8 @@ public class Test_Api_2_Prh_Gvby extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
- + "08CCCCCC CCCCCCCC CC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "08CCCCCC CCCCCCCC CC"));
/*********************************************************************/
/*********************************************************************/
@@ -142,6 +142,6 @@ public class Test_Api_2_Prh_Gvby extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gvle/Test_Api_2_Prh_Gvle.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gvle/Test_Api_2_Prh_Gvle.java
index 8a5af7104cdef223e17985df2c571c3d610fe65c..37c9da80629956709376443b4091dab11ffa0c34 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gvle/Test_Api_2_Prh_Gvle.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gvle/Test_Api_2_Prh_Gvle.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Prh_Gvle extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -73,16 +73,16 @@ public class Test_Api_2_Prh_Gvle extends UiccTestModel
/*********************************************************************/
response = test.unrecognizedEnvelope();
- result = response.checkSw("9116");
+ addResult(response.checkSw("9116"));
// Fetch the GET INPUT proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response (Null Text String)
response = test.terminalResponse("81030123 00020282 81030100 0D00");
- result &= response.checkSw("9116");
+ addResult(response.checkSw("9116"));
/*********************************************************************/
/** Testcase 3 */
@@ -90,12 +90,12 @@ public class Test_Api_2_Prh_Gvle extends UiccTestModel
// Fetch the GET INPUT proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response (Text String Length = 01h)
response = test.terminalResponse("81030123 00020282 81030100 0D020441");
- result &= response.checkSw("9116");
+ addResult(response.checkSw("9116"));
/*********************************************************************/
/** Testcase 4 */
@@ -103,8 +103,8 @@ public class Test_Api_2_Prh_Gvle extends UiccTestModel
// Fetch the GET INPUT proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response (Text String Length = 7Eh)
response = test.terminalResponse("81030123 00020282 81030100 0D7F0801"
@@ -116,7 +116,7 @@ public class Test_Api_2_Prh_Gvle extends UiccTestModel
+ "52535455 56575859 5A5B5C5D 5E5F6061"
+ "62636465 66676869 6A6B6C6D 6E6F7071"
+ "72737475 76777879 7A7B7C7D 7E");
- result &= response.checkSw("9116");
+ addResult(response.checkSw("9116"));
/*********************************************************************/
/** Testcase 5 */
@@ -124,8 +124,8 @@ public class Test_Api_2_Prh_Gvle extends UiccTestModel
// Fetch the GET INPUT proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response (Text String Length = 7Fh)
response = test.terminalResponse("81030123 00020282 81030100 0D818004"
@@ -137,7 +137,7 @@ public class Test_Api_2_Prh_Gvle extends UiccTestModel
+ "51525354 55565758 595A5B5C 5D5E5F60"
+ "61626364 65666768 696A6B6C 6D6E6F70"
+ "71727374 75767778 797A7B7C 7D7E7F");
- result &= response.checkSw("9116");
+ addResult(response.checkSw("9116"));
/*********************************************************************/
/** Testcase 6 */
@@ -145,8 +145,8 @@ public class Test_Api_2_Prh_Gvle extends UiccTestModel
// Fetch the GET INPUT proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal response (Text String Length = EFh)
response = test.terminalResponse("81030123 00020282 81030100 0D81F004"
@@ -165,7 +165,7 @@ public class Test_Api_2_Prh_Gvle extends UiccTestModel
+ "C1C2C3C4 C5C6C7C8 C9CACBCC CDCECFD0"
+ "D1D2D3D4 D5D6D7D8 D9DADBDC DDDEDFE0"
+ "E1E2E3E4 E5E6E7E8 E9EAEBEC EDEEEF");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
/*********************************************************************/
@@ -174,8 +174,8 @@ public class Test_Api_2_Prh_Gvle extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
- + "06CCCCCC CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "06CCCCCC CCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -189,6 +189,6 @@ public class Test_Api_2_Prh_Gvle extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gvsh/Test_Api_2_Prh_Gvsh.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gvsh/Test_Api_2_Prh_Gvsh.java
index 4a4572be332ae77008ded265f8d7700ede475b7c..c90515b9580e7098a2f44fbc850f7b9d50e1d1bd 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gvsh/Test_Api_2_Prh_Gvsh.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gvsh/Test_Api_2_Prh_Gvsh.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Prh_Gvsh extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -73,12 +73,12 @@ public class Test_Api_2_Prh_Gvsh extends UiccTestModel
/*********************************************************************/
response = test.unrecognizedEnvelope();
- result = response.checkSw("9116");
+ addResult(response.checkSw("9116"));
// Fetch the GET INPUT proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal Response (Text String length = 7Eh)
response = test.terminalResponse("81030123 00020282 81030100 0D7F0401"
+ "02030405 06070809 0A0B0C0D 0E0F1011"
@@ -89,7 +89,7 @@ public class Test_Api_2_Prh_Gvsh extends UiccTestModel
+ "52535455 56575859 5A5B5C5D 5E5F6061"
+ "62636465 66676869 6A6B6C6D 6E6F7071"
+ "72737475 76777879 7A7B7C7D 7E");
- result &= response.checkSw("9116");
+ addResult(response.checkSw("9116"));
/*********************************************************************/
/** Testcase 6 to 8 */
@@ -97,8 +97,8 @@ public class Test_Api_2_Prh_Gvsh extends UiccTestModel
// Fetch the GET INPUT proactive command
response = test.fetch("16");
- result &= response.checkData("D0148103 01230082 0281828D 05045465"
- + "78749102 00FF");
+ addResult(response.checkData("D0148103 01230082 0281828D 05045465"
+ + "78749102 00FF"));
// Terminal Response (Text String length = EFh)
response = test.terminalResponse("81030123 00020282 81030100 0D81F004"
+ "01020304 05060708 090A0B0C 0D0E0F10"
@@ -116,7 +116,7 @@ public class Test_Api_2_Prh_Gvsh extends UiccTestModel
+ "C1C2C3C4 C5C6C7C8 C9CACBCC CDCECFD0"
+ "D1D2D3D4 D5D6D7D8 D9DADBDC DDDEDFE0"
+ "E1E2E3E4 E5E6E7E8 E9EAEBEC EDEEEF");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
/*********************************************************************/
@@ -125,8 +125,8 @@ public class Test_Api_2_Prh_Gvsh extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1
- + "08CCCCCC CCCCCCCC CC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "08CCCCCC CCCCCCCC CC"));
/*********************************************************************/
/*********************************************************************/
@@ -140,6 +140,6 @@ public class Test_Api_2_Prh_Gvsh extends UiccTestModel
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prs_gthd/Test_Api_2_Prs_Gthd.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prs_gthd/Test_Api_2_Prs_Gthd.java
index 96de14d1d364904122b8302c9dbcffab74ae5d63..2175e05fbe327b65dcb76a4c28d68e9e6f801d41 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prs_gthd/Test_Api_2_Prs_Gthd.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prs_gthd/Test_Api_2_Prs_Gthd.java
@@ -37,7 +37,7 @@ public class Test_Api_2_Prs_Gthd extends UiccTestModel
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -87,8 +87,8 @@ public class Test_Api_2_Prs_Gthd extends UiccTestModel
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1
- + "03CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1
+ + "03CCCCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -103,6 +103,6 @@ public class Test_Api_2_Prs_Gthd extends UiccTestModel
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_chec_bss/Test_Api_2_Tep_Chec_Bss.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_chec_bss/Test_Api_2_Tep_Chec_Bss.java
index 971f2f49bc0357be7bd8275bbf6435b622c575be..8a63d816f622a6708adfcf24111e6e4ffc4b2bb2 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_chec_bss/Test_Api_2_Tep_Chec_Bss.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_chec_bss/Test_Api_2_Tep_Chec_Bss.java
@@ -30,7 +30,7 @@ public class Test_Api_2_Tep_Chec_Bss extends UiccTestModel {
public boolean run() {
- boolean result = false;
+ initialiseResults();
// start test
test.reset();
@@ -61,11 +61,11 @@ public class Test_Api_2_Tep_Chec_Bss extends UiccTestModel {
test.terminalProfileSession("A977FFF1 FFFFFFFF FFFFFFFF FFFFFFFF");
response = test.unrecognizedEnvelope();
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "0BCCCCCC CCCCCCCC CCCCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "0BCCCCCC CCCCCCCC CCCCCCCC"));
// delete applet and package
test.reset();
@@ -73,7 +73,7 @@ public class Test_Api_2_Tep_Chec_Bss extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_checb/Test_Api_2_Tep_Checb.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_checb/Test_Api_2_Tep_Checb.java
index 655b854f40c9a06f19627dc9d1b6fdc70a76a719..8eb3b175607802aa77f49c4eb6038df04eb11305 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_checb/Test_Api_2_Tep_Checb.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_checb/Test_Api_2_Tep_Checb.java
@@ -30,7 +30,7 @@ public class Test_Api_2_Tep_Checb extends UiccTestModel {
public boolean run() {
- boolean result = false;
+ initialiseResults();
// start test
test.reset();
@@ -61,11 +61,11 @@ public class Test_Api_2_Tep_Checb extends UiccTestModel {
test.terminalProfileSession("010160");
response = test.unrecognizedEnvelope();
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "05CCCCCC CCCC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "05CCCCCC CCCC"));
// delete applet and package
test.reset();
@@ -73,7 +73,7 @@ public class Test_Api_2_Tep_Checb extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_checs/Test_Api_2_Tep_Checs.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_checs/Test_Api_2_Tep_Checs.java
index 0c39a325c430cda5e66340887acf83b1f65d0315..9b896707c6473a0aa95037438098b17a76ba33da 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_checs/Test_Api_2_Tep_Checs.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_checs/Test_Api_2_Tep_Checs.java
@@ -30,7 +30,7 @@ public class Test_Api_2_Tep_Checs extends UiccTestModel {
public boolean run() {
- boolean result = false;
+ initialiseResults();
// start test
test.reset();
@@ -60,11 +60,11 @@ public class Test_Api_2_Tep_Checs extends UiccTestModel {
test.terminalProfileSession("010160");
response = test.unrecognizedEnvelope();
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "05CCCCCC CCCC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "05CCCCCC CCCC"));
// delete applet and package
test.reset();
@@ -72,7 +72,7 @@ public class Test_Api_2_Tep_Checs extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_copy/Api_2_Tep_Copy_1.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_copy/Api_2_Tep_Copy_1.java
index 0ccf79ff4d026ed26073bc08779c41cbba22a9b7..f60075c5d4cabddd179d88d2166c22a6b8885c68 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_copy/Api_2_Tep_Copy_1.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_copy/Api_2_Tep_Copy_1.java
@@ -269,22 +269,6 @@ public class Api_2_Tep_Copy_1 extends TestToolkitApplet {
}
reportTestOutcome(testCaseNb, bRes);
- /** Test Case 12: startOffset < 0 */
- testCaseNb = (byte)12;
- bRes = false;
- try {
- Util.arrayFillNonAtomic(dstBuffer, (short)0, (short)dstBuffer.length, (byte)0);
- TerminalProfile.copy((short)-1, dstBuffer, (short)0, (short)6);
- }
- catch (ToolkitException e) {
- if (isBufferEmpty(dstBuffer))
- if (e.getReason() == ToolkitException.BAD_INPUT_PARAMETER)
- bRes = true;
- }
- catch (Exception e) {
- bRes = false;
- }
- reportTestOutcome(testCaseNb, bRes);
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_copy/Test_Api_2_Tep_Copy.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_copy/Test_Api_2_Tep_Copy.java
index 47919720ddae127563c02a85c0978920ad4aa962..8193a0769a715b8c76a96d4bb2ecd7a447c28b36 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_copy/Test_Api_2_Tep_Copy.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_copy/Test_Api_2_Tep_Copy.java
@@ -30,7 +30,7 @@ public class Test_Api_2_Tep_Copy extends UiccTestModel {
public boolean run() {
- boolean result = false;
+ initialiseResults();
// start test
test.reset();
@@ -55,16 +55,16 @@ public class Test_Api_2_Tep_Copy extends UiccTestModel {
// test case 1: send a status command to trigger the applet without terminal profile
test.status("00","00","04");
- // test case 2 to 12
+ // test cases 2 to 11
test.reset();
test.terminalProfileSession("A901D2F0 01020000 00000000 008DFF");
response = test.unrecognizedEnvelope();
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "0CCCCCCC CCCCCCCC CCCCCCCC CC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "0BCCCCCC CCCCCCCC CCCCCCCC"));
// delete applet and package
test.reset();
@@ -72,7 +72,7 @@ public class Test_Api_2_Tep_Copy extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_gval/Test_Api_2_Tep_Gval.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_gval/Test_Api_2_Tep_Gval.java
index dea080f977274094f004af9676e50283d170de35..0d41570cb8f934e8f5dfe41486b39121689d08ed 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_gval/Test_Api_2_Tep_Gval.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_gval/Test_Api_2_Tep_Gval.java
@@ -30,7 +30,7 @@ public class Test_Api_2_Tep_Gval extends UiccTestModel {
public boolean run() {
- boolean result = false;
+ initialiseResults();
// start test
test.reset();
@@ -61,11 +61,11 @@ public class Test_Api_2_Tep_Gval extends UiccTestModel {
test.terminalProfileSession("A901D2F0 00000000 00000000 008DFF");
response = test.unrecognizedEnvelope();
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "09CCCCCC CCCCCCCC CCCC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "09CCCCCC CCCCCCCC CCCC"));
// delete applet and package
test.reset();
@@ -73,7 +73,7 @@ public class Test_Api_2_Tep_Gval extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tke_coor/Test_Api_2_Tke_Coor.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tke_coor/Test_Api_2_Tke_Coor.java
index ed43297a6dad21adcc3c8152058c62b688793cb9..c2c036dd76b7e960675f2f21bb1b9e6a2613aef8 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tke_coor/Test_Api_2_Tke_Coor.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tke_coor/Test_Api_2_Tke_Coor.java
@@ -25,7 +25,7 @@ public class Test_Api_2_Tke_Coor extends UiccTestModel {
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -57,7 +57,7 @@ public class Test_Api_2_Tke_Coor extends UiccTestModel {
// Trigger Applet
response = test.envelopeMenuSelection("100101", "");
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -67,7 +67,7 @@ public class Test_Api_2_Tke_Coor extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "01" + "CC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "01" + "CC"));
/*********************************************************************/
/*********************************************************************/
@@ -81,6 +81,6 @@ public class Test_Api_2_Tke_Coor extends UiccTestModel {
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tke_thit/Test_Api_2_Tke_Thit.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tke_thit/Test_Api_2_Tke_Thit.java
index 496d235c01ffc22153aa01a216e81400ff9dfed2..7cc345cbfa3c01484760cce996c5999ddbeac49a 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tke_thit/Test_Api_2_Tke_Thit.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tke_thit/Test_Api_2_Tke_Thit.java
@@ -25,7 +25,7 @@ public class Test_Api_2_Tke_Thit extends UiccTestModel {
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -57,7 +57,7 @@ public class Test_Api_2_Tke_Thit extends UiccTestModel {
// Trigger Applet
response = test.envelopeMenuSelection("100101", "");
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -67,7 +67,7 @@ public class Test_Api_2_Tke_Thit extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "06" + "CCCCCCCC CCCC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "06" + "CCCCCCCC CCCC"));
/*********************************************************************/
/*********************************************************************/
@@ -81,6 +81,6 @@ public class Test_Api_2_Tke_Thit extends UiccTestModel {
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_asid/Test_Api_2_Tkr_Asid.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_asid/Test_Api_2_Tkr_Asid.java
index 6ca3fad24e982dd543be584b806bd62ec9db15a5..e7f8fd96c1a69cfee196db4c654422b429be0647 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_asid/Test_Api_2_Tkr_Asid.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_asid/Test_Api_2_Tkr_Asid.java
@@ -35,7 +35,7 @@ public class Test_Api_2_Tkr_Asid extends UiccTestModel {
public boolean run() {
- boolean result = true;
+ initialiseResults();
// start test
test.reset();
@@ -91,59 +91,59 @@ public class Test_Api_2_Tkr_Asid extends UiccTestModel {
char serviceID;
String check, data;
- result &= response.checkSw("9110");
+ addResult(response.checkSw("9110"));
response = test.fetch("10");
// check that we received a ADD SERVICE command
data = response.getData();
serviceID = data.charAt(data.lastIndexOf("4103000") + 7);
check = "D00E8103 01470082 02818241 03000X00".replace('X', serviceID);
- result &= response.checkData(check);
+ addResult(response.checkData(check));
response = test.terminalResponse("81030147 00820282 81830100");
}
// test case 2: trigger applet1 with EVENT_EVENT_DOWNLOAD_LOCAL_CONNECTION event
response = test.envelopeEventDownloadLocalConnection("41030000 00");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
response = test.envelopeEventDownloadLocalConnection("41030002 00");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
response = test.envelopeEventDownloadLocalConnection("41030006 00");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
response = test.envelopeEventDownloadLocalConnection("41030003 00");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
response = test.envelopeEventDownloadLocalConnection("41030007 00");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
response = test.envelopeEventDownloadLocalConnection("41030005 00");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
response = test.envelopeEventDownloadLocalConnection("41030001 00");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
response = test.envelopeEventDownloadLocalConnection("41030004 00");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test case 3: trigger applet1, applet2 then applet1
response = test.envelopeMenuSelection("100101","");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
response = test.envelopeMenuSelection("100102","");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
response = test.envelopeMenuSelection("100101","");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test case 4: trigger applet3 then applet2
response = test.envelopeMenuSelection("100103","");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
response = test.envelopeMenuSelection("100102","");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "0BCCCCCC CCCCCCCC CCCCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "0BCCCCCC CCCCCCCC CCCCCCCC"));
response = test.selectApplication(APPLET_AID_2);
- result &= response.checkData("10" + APPLET_AID_2 + "02CCCC");
+ addResult(response.checkData("10" + APPLET_AID_2 + "02CCCC"));
response = test.selectApplication(APPLET_AID_3);
- result &= response.checkData("10" + APPLET_AID_3 + "01CC");
+ addResult(response.checkData("10" + APPLET_AID_3 + "01CC"));
// delete applet and package
test.reset();
@@ -153,7 +153,7 @@ public class Test_Api_2_Tkr_Asid extends UiccTestModel {
test.deleteApplet(APPLET_AID_3);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_atim/Test_Api_2_Tkr_Atim.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_atim/Test_Api_2_Tkr_Atim.java
index 9eb4f32d411bf893937670f7bf7a1cea9f1f5863..f58c3fad8727731b1902c6df558c15637a49ea16 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_atim/Test_Api_2_Tkr_Atim.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_atim/Test_Api_2_Tkr_Atim.java
@@ -34,7 +34,7 @@ public class Test_Api_2_Tkr_Atim extends UiccTestModel {
public boolean run() {
- boolean result = false;
+ initialiseResults();
// start test
test.reset();
@@ -88,43 +88,43 @@ public class Test_Api_2_Tkr_Atim extends UiccTestModel {
// test case 1 to 3: trigger applet1
response = test.envelopeMenuSelection("100101","");
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// all timers expire
response = test.envelopeTimerExpiration("240108");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
response = test.envelopeTimerExpiration("240107");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
response = test.envelopeTimerExpiration("240106");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
response = test.envelopeTimerExpiration("240105");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
response = test.envelopeTimerExpiration("240104");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
response = test.envelopeTimerExpiration("240103");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
response = test.envelopeTimerExpiration("240102");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
response = test.envelopeTimerExpiration("240101");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test case 4: trigger applet2
response = test.envelopeMenuSelection("100102","");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test case 5: trigger applet3
response = test.envelopeMenuSelection("100103","");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "03CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "03CCCCCC"));
response = test.selectApplication(APPLET_AID_2);
- result &= response.checkData("10" + APPLET_AID_2 + "01CC");
+ addResult(response.checkData("10" + APPLET_AID_2 + "01CC"));
response = test.selectApplication(APPLET_AID_3);
- result &= response.checkData("10" + APPLET_AID_3 + "01CC");
+ addResult(response.checkData("10" + APPLET_AID_3 + "01CC"));
// delete applet and package
test.reset();
@@ -134,7 +134,7 @@ public class Test_Api_2_Tkr_Atim extends UiccTestModel {
test.deleteApplet(APPLET_AID_3);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_cevt/Test_Api_2_Tkr_Cevt.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_cevt/Test_Api_2_Tkr_Cevt.java
index b647eea8e32f8a514a866116f7b3d46af3446207..205afec2bf8a4708966dde5722ae533d6a5b118f 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_cevt/Test_Api_2_Tkr_Cevt.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_cevt/Test_Api_2_Tkr_Cevt.java
@@ -30,7 +30,7 @@ public class Test_Api_2_Tkr_Cevt extends UiccTestModel {
public boolean run() {
- boolean result = false;
+ initialiseResults();
// start test
test.reset();
@@ -59,15 +59,15 @@ public class Test_Api_2_Tkr_Cevt extends UiccTestModel {
// test case 1 to 3: trigger applet1
response = test.unrecognizedEnvelope();
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test case 4: trigger applet1
response = test.envelopeEventDownloadUserActivity();
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "04CCCCCC CC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "04CCCCCC CC"));
// delete applet and package
test.reset();
@@ -75,7 +75,7 @@ public class Test_Api_2_Tkr_Cevt extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_cmet/Test_Api_2_Tkr_Cmet.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_cmet/Test_Api_2_Tkr_Cmet.java
index 54308f28176b9e746a41c188c0ba23e23e02a017..11f4f7102f8d072f0a8bd14fee1a9d641ba96b9e 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_cmet/Test_Api_2_Tkr_Cmet.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_cmet/Test_Api_2_Tkr_Cmet.java
@@ -30,7 +30,7 @@ public class Test_Api_2_Tkr_Cmet extends UiccTestModel {
public boolean run() {
- boolean result = true;
+ initialiseResults();
// start test
test.reset();
@@ -56,102 +56,102 @@ public class Test_Api_2_Tkr_Cmet extends UiccTestModel {
// test case 1
response = test.unrecognizedEnvelope();
- result &= response.checkSw("912D");
+ addResult(response.checkSw("912D"));
response = test.fetch("2D");
- result &= response.checkData("D02B8103 01250082 02818285 09554943" +
+ addResult(response.checkData("D02B8103 01250082 02818285 09554943" +
"43205445 53548F06 01496E69 74318F0D" +
- "02557365 416C6C42 75666665 72");
+ "02557365 416C6C42 75666665 72"));
response = test.terminalResponse("81030125 00820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test case 2
response = test.unrecognizedEnvelope();
- result &= response.checkSw("9134");
+ addResult(response.checkSw("9134"));
response = test.fetch("34");
- result &= response.checkData("D0328103 01250082 02818285 09554943" +
+ addResult(response.checkData("D0328103 01250082 02818285 09554943" +
"43205445 53548F0D 01506172 744F6642" +
"75666665 728F0D02 55736541 6C6C4275" +
- "66666572");
+ "66666572"));
response = test.terminalResponse("81030125 00820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test case 3
response = test.unrecognizedEnvelope();
- result &= response.checkSw("911C");
+ addResult(response.checkSw("911C"));
response = test.fetch("1C");
- result &= response.checkData("D01A8103 01250082 02818285 09554943" +
- "43205445 53548F01 018F0102");
+ addResult(response.checkData("D01A8103 01250082 02818285 09554943" +
+ "43205445 53548F01 018F0102"));
response = test.terminalResponse("81030125 00820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test case 4
response = test.unrecognizedEnvelope();
- result &= response.checkSw("912F");
+ addResult(response.checkSw("912F"));
response = test.fetch("2F");
- result &= response.checkData("D02D8103 01258082 02818285 09554943" +
+ addResult(response.checkData("D02D8103 01258082 02818285 09554943" +
"43205445 53548F01 018F1002 4E657874" +
- "41637469 6F6E496E 64696318 020010");
+ "41637469 6F6E496E 64696318 020010"));
response = test.terminalResponse("81030125 80820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test case 5
response = test.envelopeMenuSelection("900102", "9500");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test case 6
response = test.unrecognizedEnvelope();
- result &= response.checkSw("913C");
+ addResult(response.checkSw("913C"));
response = test.fetch("3C");
- result &= response.checkData("D03A8103 01258082 02818285 09554943" +
+ addResult(response.checkData("D03A8103 01258082 02818285 09554943" +
"43205445 53548F0E 0148656C 70537570" +
"706F7274 65648F10 024E6578 74416374" +
- "696F6E49 6E646963 18020010");
+ "696F6E49 6E646963 18020010"));
response = test.terminalResponse("81030125 80820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test case 7
response = test.envelopeMenuSelection("900101", "9500");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test case 8
response = test.unrecognizedEnvelope();
- result &= response.checkSw("913B");
+ addResult(response.checkSw("913B"));
response = test.fetch("3B");
- result &= response.checkData("D0398103 01250082 02818285 09554943" +
+ addResult(response.checkData("D0398103 01250082 02818285 09554943" +
"43205445 53548F0E 0149636F 6E517561" +
"6C696669 65728F0E 0249636F 6E517561" +
- "6C696669 65721F03 010102");
+ "6C696669 65721F03 010102"));
response = test.terminalResponse("81030125 00820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test case 9
response = test.unrecognizedEnvelope();
- result &= response.checkSw("9134");
+ addResult(response.checkSw("9134"));
response = test.fetch("34");
- result &= response.checkData("D0328103 01250082 02818285 09554943" +
+ addResult(response.checkData("D0328103 01250082 02818285 09554943" +
"43205445 53548F0C 01456E61 626C6545" +
"6E747279 8F0E0249 636F6E51 75616C69" +
- "66696572");
+ "66696572"));
response = test.terminalResponse("81030125 00820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test case 10..19
response = test.unrecognizedEnvelope();
- result &= response.checkSw("912B");
+ addResult(response.checkSw("912B"));
// test case 20
response = test.fetch("2B");
- result &= response.checkData("D0298103 01250082 02818285 09554943" +
+ addResult(response.checkData("D0298103 01250082 02818285 09554943" +
"43205445 53548F0C 01456E61 626C6545" +
- "6E747279 8F050249 6E6974");
+ "6E747279 8F050249 6E6974"));
response = test.terminalResponse("81030125 00820282 81830100");
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 +
+ addResult(response.checkData("10" + APPLET_AID_1 +
"14CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
- "CCCCCCCC CC");
+ "CCCCCCCC CC"));
// delete applet and package
test.reset();
@@ -159,6 +159,6 @@ public class Test_Api_2_Tkr_Cmet extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_dmet/Test_Api_2_Tkr_Dmet.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_dmet/Test_Api_2_Tkr_Dmet.java
index 5b30c0b19ba3179b1c517534c4031ee6320d4431..b1c8a6813795f12d9eba35e1ae60054658e62cc7 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_dmet/Test_Api_2_Tkr_Dmet.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_dmet/Test_Api_2_Tkr_Dmet.java
@@ -30,7 +30,7 @@ public class Test_Api_2_Tkr_Dmet extends UiccTestModel {
public boolean run() {
- boolean result = false;
+ initialiseResults();
// start test
test.reset();
@@ -53,52 +53,52 @@ public class Test_Api_2_Tkr_Dmet extends UiccTestModel {
// test script
test.reset();
response = test.terminalProfile("09010020");
- result = response.checkSw("9124");
+ addResult(response.checkSw("9124"));
response = test.fetch("24");
- result &= response.checkData("D0228103 01250082 02818285 09554943" +
+ addResult(response.checkData("D0228103 01250082 02818285 09554943" +
"43205445 53548F05 01496E69 748F0502" +
- "496E6974");
+ "496E6974"));
response = test.terminalResponse("81030125 00820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test case 1
response = test.unrecognizedEnvelope();
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test case 2
response = test.unrecognizedEnvelope();
- result &= response.checkSw("911D");
+ addResult(response.checkSw("911D"));
response = test.fetch("1D");
- result &= response.checkData("D01B8103 01250082 02818285 09554943" +
- "43205445 53548F05 02496E69 74");
+ addResult(response.checkData("D01B8103 01250082 02818285 09554943" +
+ "43205445 53548F05 02496E69 74"));
response = test.terminalResponse("81030125 00820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test case 3
response = test.unrecognizedEnvelope();
- result &= response.checkSw("911D");
+ addResult(response.checkSw("911D"));
response = test.fetch("1D");
- result &= response.checkData("D01B8103 01258082 02818285 09554943" +
- "43205445 53548F05 02496E69 74");
+ addResult(response.checkData("D01B8103 01258082 02818285 09554943" +
+ "43205445 53548F05 02496E69 74"));
response = test.terminalResponse("81030125 80820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test case 4
response = test.unrecognizedEnvelope();
- result &= response.checkSw("9118");
+ addResult(response.checkSw("9118"));
response = test.fetch("18");
- result &= response.checkData("D0168103 01250082 02818285 09554943" +
- "43205445 53548F00");
+ addResult(response.checkData("D0168103 01250082 02818285 09554943" +
+ "43205445 53548F00"));
response = test.terminalResponse("81030125 00820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test case 5
response = test.unrecognizedEnvelope();
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "05CCCCCC CCCC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "05CCCCCC CCCC"));
// delete applet and package
test.reset();
@@ -106,7 +106,7 @@ public class Test_Api_2_Tkr_Dmet extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_drfes_bss_bsb/Test_Api_2_Tkr_Drfes_Bss_Bsb.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_drfes_bss_bsb/Test_Api_2_Tkr_Drfes_Bss_Bsb.java
index c2536b74c9ecb0900cd5478cfaaf2db7a3835c11..ff2a061f141d6fb8dace4cd314afa1cd8be1eb74 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_drfes_bss_bsb/Test_Api_2_Tkr_Drfes_Bss_Bsb.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_drfes_bss_bsb/Test_Api_2_Tkr_Drfes_Bss_Bsb.java
@@ -43,7 +43,7 @@ public class Test_Api_2_Tkr_Drfes_Bss_Bsb extends UiccTestModel {
public boolean run() {
- boolean result = true;
+ initialiseResults();
// start test
test.reset();
@@ -81,19 +81,19 @@ public class Test_Api_2_Tkr_Drfes_Bss_Bsb extends UiccTestModel {
test.unrecognizedEnvelope();
// update binary EF_TARU and check that applet is correctly triggered
- result &= modifyEFandCheck(MF, EF_TARU, true);
- result &= modifyEFandCheck(MF, EF_CARU, true);
- result &= modifyEFandCheck(MF, EF_LARU, true);
+ modifyEFandCheck(MF, EF_TARU, true);
+ modifyEFandCheck(MF, EF_CARU, true);
+ modifyEFandCheck(MF, EF_LARU, true);
test.unrecognizedEnvelope();
- result &= modifyEFandCheck(MF, EF_TARU, false);
- result &= modifyEFandCheck(MF, EF_CARU, false);
- result &= modifyEFandCheck(MF, EF_LARU, true);
+ modifyEFandCheck(MF, EF_TARU, false);
+ modifyEFandCheck(MF, EF_CARU, false);
+ modifyEFandCheck(MF, EF_LARU, true);
test.unrecognizedEnvelope();
- result &= modifyEFandCheck(MF, EF_LARU, false);
+ modifyEFandCheck(MF, EF_LARU, false);
test.unrecognizedEnvelope();
@@ -104,11 +104,11 @@ public class Test_Api_2_Tkr_Drfes_Bss_Bsb extends UiccTestModel {
test.unrecognizedEnvelope();
- result &= modifyEFandCheck(MF, EF_TARU, true);
+ modifyEFandCheck(MF, EF_TARU, true);
test.unrecognizedEnvelope();
- result &= modifyEFandCheck(MF, EF_TARU, true);
+ modifyEFandCheck(MF, EF_TARU, true);
/** Testcase 3 *****************************************
@@ -117,12 +117,12 @@ public class Test_Api_2_Tkr_Drfes_Bss_Bsb extends UiccTestModel {
test.unrecognizedEnvelope();
- result &= modifyEFandCheck(MF, EF_TARU, true);
+ modifyEFandCheck(MF, EF_TARU, true);
test.unrecognizedEnvelope();
- result &= modifyEFandCheck(MF, EF_TARU, true);
- result &= modifyEFandCheck(MF, EF_LARU, true);
+ modifyEFandCheck(MF, EF_TARU, true);
+ modifyEFandCheck(MF, EF_LARU, true);
/** Testcase 4 *****************************************
@@ -131,19 +131,19 @@ public class Test_Api_2_Tkr_Drfes_Bss_Bsb extends UiccTestModel {
test.unrecognizedEnvelope();
- result &= modifyEFandCheck(ADF, EF_TARU, true);
- result &= modifyEFandCheck(ADF, EF_CARU, true);
- result &= modifyEFandCheck(ADF, EF_LARU, true);
+ modifyEFandCheck(ADF, EF_TARU, true);
+ modifyEFandCheck(ADF, EF_CARU, true);
+ modifyEFandCheck(ADF, EF_LARU, true);
test.unrecognizedEnvelope();
- result &= modifyEFandCheck(ADF, EF_TARU, false);
- result &= modifyEFandCheck(ADF, EF_CARU, false);
- result &= modifyEFandCheck(ADF, EF_LARU, true);
+ modifyEFandCheck(ADF, EF_TARU, false);
+ modifyEFandCheck(ADF, EF_CARU, false);
+ modifyEFandCheck(ADF, EF_LARU, true);
test.unrecognizedEnvelope();
- result &= modifyEFandCheck(ADF, EF_LARU, false);
+ modifyEFandCheck(ADF, EF_LARU, false);
test.unrecognizedEnvelope();
@@ -154,11 +154,11 @@ public class Test_Api_2_Tkr_Drfes_Bss_Bsb extends UiccTestModel {
test.unrecognizedEnvelope();
- result &= modifyEFandCheck(ADF, EF_TARU, true);
+ modifyEFandCheck(ADF, EF_TARU, true);
test.unrecognizedEnvelope();
- result &= modifyEFandCheck(ADF, EF_TARU, true);
+ modifyEFandCheck(ADF, EF_TARU, true);
/** Testcase 6 *****************************************
@@ -167,12 +167,12 @@ public class Test_Api_2_Tkr_Drfes_Bss_Bsb extends UiccTestModel {
test.unrecognizedEnvelope();
- result &= modifyEFandCheck(ADF, EF_TARU, true);
+ modifyEFandCheck(ADF, EF_TARU, true);
test.unrecognizedEnvelope();
- result &= modifyEFandCheck(ADF, EF_TARU, true);
- result &= modifyEFandCheck(ADF, EF_LARU, true);
+ modifyEFandCheck(ADF, EF_TARU, true);
+ modifyEFandCheck(ADF, EF_LARU, true);
/** Testcase 7 - 20 **********************************
@@ -226,9 +226,9 @@ public class Test_Api_2_Tkr_Drfes_Bss_Bsb extends UiccTestModel {
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 +
+ addResult(response.checkData("10" + APPLET_AID_1 +
"16CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
- "CCCCCCCC CCCCCC");
+ "CCCCCCCC CCCCCC"));
// delete applet and package
test.reset();
@@ -236,19 +236,18 @@ public class Test_Api_2_Tkr_Drfes_Bss_Bsb extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
/**
* Check the File List which caused the latest EXTERNAL_FILE_UDPATE
* and compare it whith the File List given in parameter.
- * If the applet has not been triggered it will return "000100"
*/
- private boolean appletTriggered(String data) {
+ private void appletTriggered(String data) {
response = test.envelopeCallControlByNAA();
- return response.checkData(data);
+ addResult(response.checkData(data));
}
@@ -257,7 +256,7 @@ public class Test_Api_2_Tkr_Drfes_Bss_Bsb extends UiccTestModel {
* if the test applet is triggered with an EXTERNAL_FILE_UDPATE event.
*/
- private boolean modifyEFandCheck(String mfadf, String fid, boolean shouldTrigger) {
+ private void modifyEFandCheck(String mfadf, String fid, boolean shouldTrigger) {
// select correct file
if (mfadf == ADF) test.selectApplication(AID_ADF_1);
@@ -281,8 +280,7 @@ public class Test_Api_2_Tkr_Drfes_Bss_Bsb extends UiccTestModel {
else if (fid == EF_LARU) checkString += (DF_TEST + EF_LARU);
else if (fid == EF_TAA) checkString += (DF_TEST + DF_SUB_TEST + EF_TAA);
- // return the result of the triggering
- return appletTriggered(checkString);
+ appletTriggered(checkString);
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_drfeso/Test_Api_2_Tkr_Drfeso.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_drfeso/Test_Api_2_Tkr_Drfeso.java
index 3271485ab9f1eff4ae372b4cb0e92aed6c4521d5..7d0d5ee9cdd906ee1cd00f93b5aa66d9aa0f7123 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_drfeso/Test_Api_2_Tkr_Drfeso.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_drfeso/Test_Api_2_Tkr_Drfeso.java
@@ -41,7 +41,7 @@ public class Test_Api_2_Tkr_Drfeso extends UiccTestModel {
public boolean run() {
- boolean result = true;
+ initialiseResults();
// start test
test.reset();
@@ -79,21 +79,21 @@ public class Test_Api_2_Tkr_Drfeso extends UiccTestModel {
test.unrecognizedEnvelope();
// update binary EF_TARU and check that applet is correctly triggered
- result &= modifyEFandCheck(MF, EF_TARU, true);
- result &= modifyEFandCheck(MF, EF_CARU, true);
- result &= modifyEFandCheck(MF, EF_LARU, true);
+ modifyEFandCheck(MF, EF_TARU, true);
+ modifyEFandCheck(MF, EF_CARU, true);
+ modifyEFandCheck(MF, EF_LARU, true);
test.unrecognizedEnvelope();
- result &= modifyEFandCheck(MF, EF_TARU, false);
+ modifyEFandCheck(MF, EF_TARU, false);
test.unrecognizedEnvelope();
- result &= modifyEFandCheck(MF, EF_CARU, false);
+ modifyEFandCheck(MF, EF_CARU, false);
test.unrecognizedEnvelope();
- result &= modifyEFandCheck(MF, EF_LARU, false);
+ modifyEFandCheck(MF, EF_LARU, false);
test.unrecognizedEnvelope();
@@ -104,11 +104,11 @@ public class Test_Api_2_Tkr_Drfeso extends UiccTestModel {
test.unrecognizedEnvelope();
- result &= modifyEFandCheck(MF, EF_TARU, true);
+ modifyEFandCheck(MF, EF_TARU, true);
test.unrecognizedEnvelope();
- result &= modifyEFandCheck(MF, EF_TARU, true);
+ modifyEFandCheck(MF, EF_TARU, true);
/** Testcase 3 *****************************************
@@ -117,12 +117,12 @@ public class Test_Api_2_Tkr_Drfeso extends UiccTestModel {
test.unrecognizedEnvelope();
- result &= modifyEFandCheck(MF, EF_TARU, true);
+ modifyEFandCheck(MF, EF_TARU, true);
test.unrecognizedEnvelope();
- result &= modifyEFandCheck(MF, EF_TARU, true);
- result &= modifyEFandCheck(MF, EF_LARU, true);
+ modifyEFandCheck(MF, EF_TARU, true);
+ modifyEFandCheck(MF, EF_LARU, true);
/** Testcase 4 *****************************************
@@ -131,21 +131,21 @@ public class Test_Api_2_Tkr_Drfeso extends UiccTestModel {
test.unrecognizedEnvelope();
- result &= modifyEFandCheck(ADF, EF_TARU, true);
- result &= modifyEFandCheck(ADF, EF_CARU, true);
- result &= modifyEFandCheck(ADF, EF_LARU, true);
+ modifyEFandCheck(ADF, EF_TARU, true);
+ modifyEFandCheck(ADF, EF_CARU, true);
+ modifyEFandCheck(ADF, EF_LARU, true);
test.unrecognizedEnvelope();
- result &= modifyEFandCheck(ADF, EF_TARU, false);
+ modifyEFandCheck(ADF, EF_TARU, false);
test.unrecognizedEnvelope();
- result &= modifyEFandCheck(ADF, EF_CARU, false);
+ modifyEFandCheck(ADF, EF_CARU, false);
test.unrecognizedEnvelope();
- result &= modifyEFandCheck(ADF, EF_LARU, false);
+ modifyEFandCheck(ADF, EF_LARU, false);
/** Testcase 5 *****************************************
@@ -154,11 +154,11 @@ public class Test_Api_2_Tkr_Drfeso extends UiccTestModel {
test.unrecognizedEnvelope();
- result &= modifyEFandCheck(ADF, EF_TARU, true);
+ modifyEFandCheck(ADF, EF_TARU, true);
test.unrecognizedEnvelope();
- result &= modifyEFandCheck(ADF, EF_TARU, true);
+ modifyEFandCheck(ADF, EF_TARU, true);
/** Testcase 6 *****************************************
@@ -167,12 +167,12 @@ public class Test_Api_2_Tkr_Drfeso extends UiccTestModel {
test.unrecognizedEnvelope();
- result &= modifyEFandCheck(ADF, EF_TARU, true);
+ modifyEFandCheck(ADF, EF_TARU, true);
test.unrecognizedEnvelope();
- result &= modifyEFandCheck(ADF, EF_TARU, true);
- result &= modifyEFandCheck(ADF, EF_LARU, true);
+ modifyEFandCheck(ADF, EF_TARU, true);
+ modifyEFandCheck(ADF, EF_LARU, true);
@@ -213,8 +213,8 @@ public class Test_Api_2_Tkr_Drfeso extends UiccTestModel {
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 +
- "0CCCCCCC CCCCCCCC CCCCCCCC CC");
+ addResult(response.checkData("10" + APPLET_AID_1 +
+ "0CCCCCCC CCCCCCCC CCCCCCCC CC"));
// delete applet and package
test.reset();
@@ -222,19 +222,18 @@ public class Test_Api_2_Tkr_Drfeso extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
/**
* Check the File List which caused the latest EXTERNAL_FILE_UDPATE
* and compare it whith the File List given in parameter.
- * If the applet has not been triggered it will return "000100"
*/
- private boolean appletTriggered(String data) {
+ private void appletTriggered(String data) {
response = test.envelopeCallControlByNAA();
- return response.checkData(data);
+ addResult(response.checkData(data));
}
@@ -243,7 +242,7 @@ public class Test_Api_2_Tkr_Drfeso extends UiccTestModel {
* if the test applet is triggered with an EXTERNAL_FILE_UDPATE event.
*/
- private boolean modifyEFandCheck(String mfadf, String fid, boolean shouldTrigger) {
+ private void modifyEFandCheck(String mfadf, String fid, boolean shouldTrigger) {
// select correct file
if (mfadf == ADF) test.selectApplication(AID_ADF_1);
@@ -266,8 +265,7 @@ public class Test_Api_2_Tkr_Drfeso extends UiccTestModel {
else if (fid == EF_CARU) checkString += (DF_TEST + EF_CARU);
else if (fid == EF_LARU) checkString += (DF_TEST + EF_LARU);
- // return the result of the triggering
- return appletTriggered(checkString);
+ appletTriggered(checkString);
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_emet/Test_Api_2_Tkr_Emet.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_emet/Test_Api_2_Tkr_Emet.java
index fe6662e08e5bdf445aee63047e27d8f5ce7b6366..ff2acd70a809e6d7c4a6667e28b77323df34bddf 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_emet/Test_Api_2_Tkr_Emet.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_emet/Test_Api_2_Tkr_Emet.java
@@ -30,7 +30,7 @@ public class Test_Api_2_Tkr_Emet extends UiccTestModel {
public boolean run() {
- boolean result = false;
+ initialiseResults();
// start test
test.reset();
@@ -53,59 +53,59 @@ public class Test_Api_2_Tkr_Emet extends UiccTestModel {
// test script
test.reset();
response = test.terminalProfile("09010020");
- result = response.checkSw("9124");
+ addResult(response.checkSw("9124"));
response = test.fetch("24");
- result &= response.checkData("D0228103 01250082 02818285 09554943" +
+ addResult(response.checkData("D0228103 01250082 02818285 09554943" +
"43205445 53548F05 01496E69 748F0502" +
- "496E6974");
+ "496E6974"));
response = test.terminalResponse("81030125 00820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test case 1
response = test.unrecognizedEnvelope();
- result &= response.checkSw("911D");
+ addResult(response.checkSw("911D"));
response = test.fetch("1D");
- result &= response.checkData("D01B8103 01250082 02818285 09554943" +
- "43205445 53548F05 02496E69 74");
+ addResult(response.checkData("D01B8103 01250082 02818285 09554943" +
+ "43205445 53548F05 02496E69 74"));
response = test.terminalResponse("81030125 00820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test case 2
response = test.unrecognizedEnvelope();
- result &= response.checkSw("9124");
+ addResult(response.checkSw("9124"));
response = test.fetch("24");
- result &= response.checkData("D0228103 01250082 02818285 09554943" +
+ addResult(response.checkData("D0228103 01250082 02818285 09554943" +
"43205445 53548F05 01496E69 748F0502" +
- "496E6974");
+ "496E6974"));
response = test.terminalResponse("81030125 00820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test case 3
response = test.unrecognizedEnvelope();
- result &= response.checkSw("911D");
+ addResult(response.checkSw("911D"));
response = test.fetch("1D");
- result &= response.checkData("D01B8103 01250082 02818285 09554943" +
- "43205445 53548F05 01496E69 74");
+ addResult(response.checkData("D01B8103 01250082 02818285 09554943" +
+ "43205445 53548F05 01496E69 74"));
response = test.terminalResponse("81030125 00820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test case 4
response = test.unrecognizedEnvelope();
- result &= response.checkSw("9124");
+ addResult(response.checkSw("9124"));
response = test.fetch("24");
- result &= response.checkData("D0228103 01258082 02818285 09554943" +
+ addResult(response.checkData("D0228103 01258082 02818285 09554943" +
"43205445 53548F05 01496E69 748F0502" +
- "496E6974");
+ "496E6974"));
response = test.terminalResponse("81030125 80820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test case 5
response = test.unrecognizedEnvelope();
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "05CCCCCC CCCC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "05CCCCCC CCCC"));
// delete applet and package
test.reset();
@@ -113,7 +113,7 @@ public class Test_Api_2_Tkr_Emet extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_gpol/Test_Api_2_Tkr_Gpol.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_gpol/Test_Api_2_Tkr_Gpol.java
index 5166137bd69ac52a7708a8ec86e3f5808e465c2f..c51d3427b4457c0e6f07b0a76c90bf146125cbe1 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_gpol/Test_Api_2_Tkr_Gpol.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_gpol/Test_Api_2_Tkr_Gpol.java
@@ -26,7 +26,7 @@ public class Test_Api_2_Tkr_Gpol extends UiccTestModel {
}
public boolean run() {
- boolean result = true;
+ initialiseResults();
// start test
test.reset();
@@ -58,12 +58,12 @@ public class Test_Api_2_Tkr_Gpol extends UiccTestModel {
* Requesting max duration.
*/
response = test.unrecognizedEnvelope();
- result &= response.checkSw("910F");
+ addResult(response.checkSw("910F"));
response = test.fetch("0F");
test.terminalResponse("81030103 00820282 81830100 840200FF");
test.reset();
response = test.terminalProfile("09017020");
- result &= response.checkSw("910F");
+ addResult(response.checkSw("910F"));
response = test.fetch("0F");
test.terminalResponse("81030103 00820282 81830100 840200FF");
test.unrecognizedEnvelope();
@@ -72,12 +72,12 @@ public class Test_Api_2_Tkr_Gpol extends UiccTestModel {
* Requesting system duration.
*/
response = test.unrecognizedEnvelope();
- result &= response.checkSw("910F");
+ addResult(response.checkSw("910F"));
response = test.fetch("0F");
test.terminalResponse("81030103 00820282 81830100 8402011E");
test.reset();
response = test.terminalProfile("09017020");
- result &= response.checkSw("910F");
+ addResult(response.checkSw("910F"));
response = test.fetch("0F");
test.terminalResponse("81030103 00820282 81830100 84020175");
test.unrecognizedEnvelope();
@@ -86,17 +86,17 @@ public class Test_Api_2_Tkr_Gpol extends UiccTestModel {
* Requesting no Duration.
*/
response = test.unrecognizedEnvelope();
- result &= response.checkSw("910B");
+ addResult(response.checkSw("910B"));
response = test.fetch("0B");
test.terminalResponse("81030104 00820282 81830100");
test.reset();
response = test.terminalProfile("09017020");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
test.unrecognizedEnvelope();
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "04CCCCCC CC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "04CCCCCC CC"));
// delete applet and package
test.reset();
@@ -104,6 +104,6 @@ public class Test_Api_2_Tkr_Gpol extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_ievs/Test_Api_2_Tkr_Ievs.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_ievs/Test_Api_2_Tkr_Ievs.java
index b5a6846a4762b10bea57df7e686625f8bab92484..d49a58ae9596c103fec26c546c233edb06c410da 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_ievs/Test_Api_2_Tkr_Ievs.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_ievs/Test_Api_2_Tkr_Ievs.java
@@ -32,7 +32,7 @@ public class Test_Api_2_Tkr_Ievs extends UiccTestModel {
public boolean run() {
- boolean result = true;
+ initialiseResults();
// start test
test.reset();
@@ -76,10 +76,10 @@ public class Test_Api_2_Tkr_Ievs extends UiccTestModel {
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "09CCCCCC CCCCCCCC CCCC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "09CCCCCC CCCCCCCC CCCC"));
response = test.selectApplication(APPLET_AID_2);
- result &= response.checkData("10" + APPLET_AID_2 + "01CC");
+ addResult(response.checkData("10" + APPLET_AID_2 + "01CC"));
// delete applet and package
test.reset();
@@ -88,6 +88,6 @@ public class Test_Api_2_Tkr_Ievs extends UiccTestModel {
test.deleteApplet(APPLET_AID_2);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_imet/Test_Api_2_Tkr_Imet.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_imet/Test_Api_2_Tkr_Imet.java
index e8e96aa0d267dc60e55184a740d97edb8929d0a3..26ab6b08ed1d05e85255bd24e4cfb7a2c8745a1e 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_imet/Test_Api_2_Tkr_Imet.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_imet/Test_Api_2_Tkr_Imet.java
@@ -30,7 +30,7 @@ public class Test_Api_2_Tkr_Imet extends UiccTestModel {
public boolean run() {
- boolean result = false;
+ initialiseResults();
// start test
test.reset();
@@ -56,55 +56,55 @@ public class Test_Api_2_Tkr_Imet extends UiccTestModel {
// test Case 16
response = test.fetch("76");
- result = response.checkData("D0748103 01258082 02818285 09554943" +
+ addResult(response.checkData("D0748103 01258082 02818285 09554943" +
"43205445 53548F0F 01544F4F 4C4B4954" +
"20544553 5420318F 0F02544F 4F4C4B49" +
"54205445 53542032 8F0F0354 4F4F4C4B" +
"49542054 45535420 338F0F04 544F4F4C" +
"4B495420 54455354 20348F0F 05544F4F" +
"4C4B4954 20544553 5420358F 01061806" +
- "00000000 2400");
- result &= response.checkSw("9000");
+ "00000000 2400"));
+ addResult(response.checkSw("9000"));
response = test.terminalResponse("81030125 80820282 81830100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
test.unrecognizedEnvelope();
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test case 17
response = test.envelopeMenuSelection("900101", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test case 18
response = test.envelopeMenuSelection("900102", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test case 19
response = test.envelopeMenuSelection("900103", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test case 20
response = test.envelopeMenuSelection("900104", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test case 21
response = test.envelopeMenuSelection("900105", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test case 22
response = test.envelopeMenuSelection("900103", "9500");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test case 23
response = test.envelopeMenuSelection("900106", "");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 +
+ addResult(response.checkData("10" + APPLET_AID_1 +
"17CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
- "CCCCCCCC CCCCCCCC");
+ "CCCCCCCC CCCCCCCC"));
// delete applet and package
test.reset();
@@ -112,7 +112,7 @@ public class Test_Api_2_Tkr_Imet extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rgfes_bss_bsb/Test_Api_2_Tkr_Rgfes_Bss_Bsb.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rgfes_bss_bsb/Test_Api_2_Tkr_Rgfes_Bss_Bsb.java
index fda43952a2b8c3e1630f5c8d3e98a9b4d5bf0606..67d99199d091023cb8c4691d71060f8d28019d90 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rgfes_bss_bsb/Test_Api_2_Tkr_Rgfes_Bss_Bsb.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rgfes_bss_bsb/Test_Api_2_Tkr_Rgfes_Bss_Bsb.java
@@ -52,7 +52,7 @@ public class Test_Api_2_Tkr_Rgfes_Bss_Bsb extends UiccTestModel {
public boolean run() {
- boolean result = true;
+ initialiseResults();
// start test
test.reset();
@@ -91,15 +91,15 @@ public class Test_Api_2_Tkr_Rgfes_Bss_Bsb extends UiccTestModel {
for (int i=0; i < 2; i ++) {
test.unrecognizedEnvelope();
- result &= modifyEFandCheck(MF, EF_TARU, true);
- result &= modifyEFandCheck(MF, EF_CARU, true);
+ modifyEFandCheck(MF, EF_TARU, true);
+ modifyEFandCheck(MF, EF_CARU, true);
if (i == 0)
- result &= modifyEFandCheck(MF, EF_LARU, false);
+ modifyEFandCheck(MF, EF_LARU, false);
else
- result &= modifyEFandCheck(MF, EF_LARU, true);
+ modifyEFandCheck(MF, EF_LARU, true);
- result &= modifyEFandCheck(MF, EF_TAA, false);
+ modifyEFandCheck(MF, EF_TAA, false);
test.unrecognizedEnvelope();
}
@@ -114,15 +114,15 @@ public class Test_Api_2_Tkr_Rgfes_Bss_Bsb extends UiccTestModel {
for (int i=0; i < 2; i ++) {
test.unrecognizedEnvelope();
- result &= modifyEFandCheck(ADF, EF_TARU, true);
- result &= modifyEFandCheck(ADF, EF_CARU, true);
+ modifyEFandCheck(ADF, EF_TARU, true);
+ modifyEFandCheck(ADF, EF_CARU, true);
if (i == 0)
- result &= modifyEFandCheck(ADF, EF_LARU, false);
+ modifyEFandCheck(ADF, EF_LARU, false);
else
- result &= modifyEFandCheck(ADF, EF_LARU, true);
+ modifyEFandCheck(ADF, EF_LARU, true);
- result &= modifyEFandCheck(ADF, EF_TAA, false);
+ modifyEFandCheck(ADF, EF_TAA, false);
test.unrecognizedEnvelope();
}
@@ -157,14 +157,14 @@ public class Test_Api_2_Tkr_Rgfes_Bss_Bsb extends UiccTestModel {
test.unrecognizedEnvelope();
- result &= modifyEFandCheck(MF, EF_TARU, true);
+ modifyEFandCheck(MF, EF_TARU, true);
// delete EF_TARU
test.deleteFile(EF_TARU);
// create EF_TARU
test.createFile(fcp_EF_TARU);
- result &= modifyEFandCheck(MF, EF_TARU, true);
+ modifyEFandCheck(MF, EF_TARU, true);
test.unrecognizedEnvelope();
@@ -176,7 +176,7 @@ public class Test_Api_2_Tkr_Rgfes_Bss_Bsb extends UiccTestModel {
test.unrecognizedEnvelope();
- result &= modifyEFandCheck(MF, EF_TAA, true);
+ modifyEFandCheck(MF, EF_TAA, true);
// delete DF_SUB_TEST
test.selectFile(MF);
@@ -190,7 +190,7 @@ public class Test_Api_2_Tkr_Rgfes_Bss_Bsb extends UiccTestModel {
test.selectFile(DF_SUB_TEST);
test.createFile(fcp_EF_TAA);
- result &= modifyEFandCheck(MF, EF_TAA, true);
+ modifyEFandCheck(MF, EF_TAA, true);
test.unrecognizedEnvelope();
@@ -210,7 +210,7 @@ public class Test_Api_2_Tkr_Rgfes_Bss_Bsb extends UiccTestModel {
// update binary EF_TNEW
test.selectFile(EF_TNEW);
test.updateBinary("0000", "FFFFFF");
- result &= appletTriggered("01" + MF + DF_TEST + DF_SUB_TEST + EF_TNEW);
+ appletTriggered("01" + MF + DF_TEST + DF_SUB_TEST + EF_TNEW);
test.unrecognizedEnvelope();
@@ -236,7 +236,7 @@ public class Test_Api_2_Tkr_Rgfes_Bss_Bsb extends UiccTestModel {
test.selectFile(DF_NEW);
test.selectFile(EF_TNEW);
test.updateBinary("0000", "FFFFFF");
- result &= appletTriggered("01" + MF + DF_TEST + DF_NEW + EF_TNEW);
+ appletTriggered("01" + MF + DF_TEST + DF_NEW + EF_TNEW);
test.unrecognizedEnvelope();
@@ -289,9 +289,9 @@ public class Test_Api_2_Tkr_Rgfes_Bss_Bsb extends UiccTestModel {
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 +
+ addResult(response.checkData("10" + APPLET_AID_1 +
"18CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
- "CCCCCCCC CCCCCCCC CC");
+ "CCCCCCCC CCCCCCCC CC"));
// delete applet and package
test.reset();
@@ -299,19 +299,18 @@ public class Test_Api_2_Tkr_Rgfes_Bss_Bsb extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
/**
* Check the File List which caused the latest EXTERNAL_FILE_UDPATE
* and compare it whith the File List given in parameter.
- * If the applet has not been triggered it will return "000100"
*/
- private boolean appletTriggered(String data) {
+ private void appletTriggered(String data) {
response = test.envelopeCallControlByNAA();
- return response.checkData(data);
+ addResult(response.checkData(data));
}
@@ -320,7 +319,7 @@ public class Test_Api_2_Tkr_Rgfes_Bss_Bsb extends UiccTestModel {
* if the test applet is triggered with an EXTERNAL_FILE_UDPATE event.
*/
- private boolean modifyEFandCheck(String mfadf, String fid, boolean shouldTrigger) {
+ private void modifyEFandCheck(String mfadf, String fid, boolean shouldTrigger) {
// select correct file
if (mfadf == ADF) test.selectApplication(AID_ADF_1);
@@ -344,8 +343,7 @@ public class Test_Api_2_Tkr_Rgfes_Bss_Bsb extends UiccTestModel {
else if (fid == EF_LARU) checkString += (DF_TEST + EF_LARU);
else if (fid == EF_TAA) checkString += (DF_TEST + DF_SUB_TEST + EF_TAA);
- // return the result of the triggering
- return appletTriggered(checkString);
+ appletTriggered(checkString);
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rgfeso/Test_Api_2_Tkr_Rgfeso.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rgfeso/Test_Api_2_Tkr_Rgfeso.java
index 27d793412b710a47b115e7654ac48dc69208fbc4..2483c6fcc83ca5f33de966e2578a3790660ca19c 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rgfeso/Test_Api_2_Tkr_Rgfeso.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rgfeso/Test_Api_2_Tkr_Rgfeso.java
@@ -46,7 +46,7 @@ public class Test_Api_2_Tkr_Rgfeso extends UiccTestModel {
public boolean run() {
- boolean result = true;
+ initialiseResults();
// start test
test.reset();
@@ -84,14 +84,14 @@ public class Test_Api_2_Tkr_Rgfeso extends UiccTestModel {
test.unrecognizedEnvelope();
// update binary EF_TARU and check that applet is correctly triggered
- result &= modifyEFandCheck(MF, EF_TARU, true);
+ modifyEFandCheck(MF, EF_TARU, true);
test.unrecognizedEnvelope();
- result &= modifyEFandCheck(MF, EF_TARU, true);
- result &= modifyEFandCheck(MF, EF_CARU, true);
- result &= modifyEFandCheck(MF, EF_LARU, false);
- result &= modifyEFandCheck(MF, EF_TAA, false);
+ modifyEFandCheck(MF, EF_TARU, true);
+ modifyEFandCheck(MF, EF_CARU, true);
+ modifyEFandCheck(MF, EF_LARU, false);
+ modifyEFandCheck(MF, EF_TAA, false);
test.unrecognizedEnvelope();
@@ -102,10 +102,10 @@ public class Test_Api_2_Tkr_Rgfeso extends UiccTestModel {
test.unrecognizedEnvelope();
- result &= modifyEFandCheck(MF, EF_TARU, true);
- result &= modifyEFandCheck(MF, EF_CARU, true);
- result &= modifyEFandCheck(MF, EF_LARU, true);
- result &= modifyEFandCheck(MF, EF_TAA, false);
+ modifyEFandCheck(MF, EF_TARU, true);
+ modifyEFandCheck(MF, EF_CARU, true);
+ modifyEFandCheck(MF, EF_LARU, true);
+ modifyEFandCheck(MF, EF_TAA, false);
test.unrecognizedEnvelope();
@@ -116,14 +116,14 @@ public class Test_Api_2_Tkr_Rgfeso extends UiccTestModel {
test.unrecognizedEnvelope();
- result &= modifyEFandCheck(ADF, EF_TARU, true);
+ modifyEFandCheck(ADF, EF_TARU, true);
test.unrecognizedEnvelope();
- result &= modifyEFandCheck(ADF, EF_TARU, true);
- result &= modifyEFandCheck(ADF, EF_CARU, true);
- result &= modifyEFandCheck(ADF, EF_LARU, false);
- result &= modifyEFandCheck(ADF, EF_TAA, false);
+ modifyEFandCheck(ADF, EF_TARU, true);
+ modifyEFandCheck(ADF, EF_CARU, true);
+ modifyEFandCheck(ADF, EF_LARU, false);
+ modifyEFandCheck(ADF, EF_TAA, false);
test.unrecognizedEnvelope();
@@ -133,10 +133,10 @@ public class Test_Api_2_Tkr_Rgfeso extends UiccTestModel {
test.unrecognizedEnvelope();
- result &= modifyEFandCheck(ADF, EF_TARU, true);
- result &= modifyEFandCheck(ADF, EF_CARU, true);
- result &= modifyEFandCheck(ADF, EF_LARU, true);
- result &= modifyEFandCheck(ADF, EF_TAA, false);
+ modifyEFandCheck(ADF, EF_TARU, true);
+ modifyEFandCheck(ADF, EF_CARU, true);
+ modifyEFandCheck(ADF, EF_LARU, true);
+ modifyEFandCheck(ADF, EF_TAA, false);
test.unrecognizedEnvelope();
@@ -158,14 +158,14 @@ public class Test_Api_2_Tkr_Rgfeso extends UiccTestModel {
test.unrecognizedEnvelope();
- result &= modifyEFandCheck(ADF, EF_TARU, true);
+ modifyEFandCheck(ADF, EF_TARU, true);
// delete EF_TARU
test.deleteFile(EF_TARU);
// create EF_TARU
test.createFile(fcp_EF_TARU);
- result &= modifyEFandCheck(ADF, EF_TARU, true);
+ modifyEFandCheck(ADF, EF_TARU, true);
test.unrecognizedEnvelope();
@@ -176,7 +176,7 @@ public class Test_Api_2_Tkr_Rgfeso extends UiccTestModel {
test.unrecognizedEnvelope();
- result &= modifyEFandCheck(ADF, EF_TAA, true);
+ modifyEFandCheck(ADF, EF_TAA, true);
// delete DF_SUB_TEST
test.selectFile(ADF);
@@ -190,7 +190,7 @@ public class Test_Api_2_Tkr_Rgfeso extends UiccTestModel {
// create EF_TAA
test.createFile(fcp_EF_TAA);
- result &= modifyEFandCheck(ADF, EF_TAA, true);
+ modifyEFandCheck(ADF, EF_TAA, true);
test.unrecognizedEnvelope();
@@ -241,8 +241,8 @@ public class Test_Api_2_Tkr_Rgfeso extends UiccTestModel {
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 +
- "0CCCCCCC CCCCCCCC CCCCCCCC CC");
+ addResult(response.checkData("10" + APPLET_AID_1 +
+ "0CCCCCCC CCCCCCCC CCCCCCCC CC"));
// delete applet and package
test.reset();
@@ -250,19 +250,18 @@ public class Test_Api_2_Tkr_Rgfeso extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
/**
* Check the File List which caused the latest EXTERNAL_FILE_UDPATE
* and compare it whith the File List given in parameter.
- * If the applet has not been triggered it will return "000100"
*/
- private boolean appletTriggered(String data) {
+ private void appletTriggered(String data) {
response = test.envelopeCallControlByNAA();
- return response.checkData(data);
+ addResult(response.checkData(data));
}
/**
@@ -270,7 +269,7 @@ public class Test_Api_2_Tkr_Rgfeso extends UiccTestModel {
* if the test applet is triggered with an EXTERNAL_FILE_UDPATE event.
*/
- private boolean modifyEFandCheck(String mfadf, String fid, boolean shouldTrigger) {
+ private void modifyEFandCheck(String mfadf, String fid, boolean shouldTrigger) {
// select correct file
if (mfadf == ADF) test.selectApplication(AID_ADF_1);
@@ -294,8 +293,7 @@ public class Test_Api_2_Tkr_Rgfeso extends UiccTestModel {
else if (fid == EF_LARU) checkString += (DF_TEST + EF_LARU);
else if (fid == EF_TAA) checkString += (DF_TEST + DF_SUB_TEST + EF_TAA);
- // return the result of the triggering
- return appletTriggered(checkString);
+ appletTriggered(checkString);
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rpol/Test_Api_2_Tkr_Rpol.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rpol/Test_Api_2_Tkr_Rpol.java
index 5269606fe3233c58ad6828c93e3417f7c2972dd9..0929711bd66f8aad48652875dae719300a54642f 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rpol/Test_Api_2_Tkr_Rpol.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rpol/Test_Api_2_Tkr_Rpol.java
@@ -30,7 +30,7 @@ public class Test_Api_2_Tkr_Rpol extends UiccTestModel {
public boolean run() {
- boolean result = false;
+ initialiseResults();
// start test
test.reset();
@@ -60,7 +60,7 @@ public class Test_Api_2_Tkr_Rpol extends UiccTestModel {
test.reset();
test.terminalProfileSession("0001");
response = test.status("00", "00", "01");
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test case 3
test.unrecognizedEnvelope();
@@ -69,7 +69,7 @@ public class Test_Api_2_Tkr_Rpol extends UiccTestModel {
test.reset();
test.terminalProfileSession("0001");
response = test.status("00", "00", "01");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test case 5, 6
test.unrecognizedEnvelope();
@@ -78,11 +78,11 @@ public class Test_Api_2_Tkr_Rpol extends UiccTestModel {
test.reset();
test.terminalProfileSession("0001");
response = test.status("00", "00", "01");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "07CCCCCC CCCCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "07CCCCCC CCCCCCCC"));
// delete applet and package
test.reset();
@@ -90,7 +90,7 @@ public class Test_Api_2_Tkr_Rpol extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rsid/Test_Api_2_Tkr_Rsid.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rsid/Test_Api_2_Tkr_Rsid.java
index 43b1719accc3c83748050b4bcd62f9b7cfef2264..6de551d4607b355a980627c88109cdece8d0bf39 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rsid/Test_Api_2_Tkr_Rsid.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rsid/Test_Api_2_Tkr_Rsid.java
@@ -32,7 +32,7 @@ public class Test_Api_2_Tkr_Rsid extends UiccTestModel {
public boolean run() {
- boolean result = false;
+ initialiseResults();
// start test
test.reset();
@@ -70,33 +70,33 @@ public class Test_Api_2_Tkr_Rsid extends UiccTestModel {
// test case 1 to 5: trigger Applet1 with EVENT_MENU_SELECTION (item = '01')
response = test.envelopeMenuSelection("900101","");
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test case 5: trigger Applet2 with EVENT_MENU_SELECTION (item = '02')
response = test.envelopeMenuSelection("900102","");
- result &= response.checkSw("9110");
+ addResult(response.checkSw("9110"));
response = test.fetch("10");
response = test.terminalResponse("81030147 00820282 81830100");
// test case 6: trigger Applet1 with EVENT_MENU_SELECTION (item = '01')
response = test.envelopeMenuSelection("900101","");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test case 7: trigger Applet1 with EVENT_EVENT_DOWNLOAD_LOCAL_CONNECTION
response = test.envelopeEventDownloadLocalConnection("4103000100");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test case 8: trigger Applet1 with EVENT_MENU_SELECTION (item = '01')
response = test.envelopeMenuSelection("900101","");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "08CCCCCC CCCCCCCC CC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "08CCCCCC CCCCCCCC CC"));
response = test.selectApplication(APPLET_AID_2);
- result &= response.checkData("10" + APPLET_AID_2 + "02CCCC");
+ addResult(response.checkData("10" + APPLET_AID_2 + "02CCCC"));
// delete applet and package
test.reset();
@@ -105,7 +105,7 @@ public class Test_Api_2_Tkr_Rsid extends UiccTestModel {
test.deleteApplet(APPLET_AID_2);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rtim/Test_Api_2_Tkr_Rtim.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rtim/Test_Api_2_Tkr_Rtim.java
index d455037046cb65abd6ee0f128d51335fce2a6555..e2138b1ce528059ca0dae15f3f6622ecc9087889 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rtim/Test_Api_2_Tkr_Rtim.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rtim/Test_Api_2_Tkr_Rtim.java
@@ -30,7 +30,7 @@ public class Test_Api_2_Tkr_Rtim extends UiccTestModel {
public boolean run() {
- boolean result = false;
+ initialiseResults();
// start test
test.reset();
@@ -55,36 +55,36 @@ public class Test_Api_2_Tkr_Rtim extends UiccTestModel {
// test case 1 to 6
response = test.unrecognizedEnvelope();
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test case 7
response = test.envelopeTimerExpiration("240101");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
response = test.envelopeTimerExpiration("240102");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
response = test.envelopeTimerExpiration("240103");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
response = test.envelopeTimerExpiration("240104");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
response = test.envelopeTimerExpiration("240105");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
response = test.envelopeTimerExpiration("240106");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
response = test.envelopeTimerExpiration("240107");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
response = test.envelopeTimerExpiration("240108");
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "07CCCCCC CCCCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "07CCCCCC CCCCCCCC"));
// delete applet and package
test.reset();
@@ -92,6 +92,6 @@ public class Test_Api_2_Tkr_Rtim extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_sevl/Test_Api_2_Tkr_Sevl.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_sevl/Test_Api_2_Tkr_Sevl.java
index 3d837bf01f29a7b37646f44fd6b99d7c1c2eb4b0..e024c318937ab86a95b0d9d21779acc145a5209c 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_sevl/Test_Api_2_Tkr_Sevl.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_sevl/Test_Api_2_Tkr_Sevl.java
@@ -32,7 +32,7 @@ public class Test_Api_2_Tkr_Sevl extends UiccTestModel {
public boolean run() {
- boolean result = false;
+ initialiseResults();
// start test
test.reset();
@@ -70,27 +70,27 @@ public class Test_Api_2_Tkr_Sevl extends UiccTestModel {
// test case 1 to 18: trigger Applet1
response = test.envelopeMenuSelection("900101", "");
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test case 19: trigger Applet1 with EVENT_CALL_CONTROL_BY_NAA
test.reset();
test.terminalProfileSession("09010020 03");
response = test.envelopeCallControlByNAA();
- result &= response.checkSw("9000");
+ addResult(response.checkSw("9000"));
// test case 20 to 22: trigger Applet2
response = test.envelopeMenuSelection("900102", "");
- result &= response.checkSw("910E");
+ addResult(response.checkSw("910E"));
response = test.fetch("0E");
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 +
+ addResult(response.checkData("10" + APPLET_AID_1 +
"13CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC" +
- "CCCCCCCC");
+ "CCCCCCCC"));
response = test.selectApplication(APPLET_AID_2);
- result &= response.checkData("10" + APPLET_AID_2 + "03CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_2 + "03CCCCCC"));
// delete applet and package
test.reset();
@@ -99,6 +99,6 @@ public class Test_Api_2_Tkr_Sevl extends UiccTestModel {
test.deleteApplet(APPLET_AID_2);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_sevt/Test_Api_2_Tkr_Sevt.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_sevt/Test_Api_2_Tkr_Sevt.java
index ace6b29f95e8f5a23fcbe3696a7814714b53e572..38ac00c63f5793f29d8a776670d7ccf2745d8a4f 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_sevt/Test_Api_2_Tkr_Sevt.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_sevt/Test_Api_2_Tkr_Sevt.java
@@ -36,7 +36,7 @@ public class Test_Api_2_Tkr_Sevt extends UiccTestModel {
public boolean run() {
- boolean result = true;
+ initialiseResults();
// start test
test.reset();
@@ -118,16 +118,16 @@ public class Test_Api_2_Tkr_Sevt extends UiccTestModel {
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "0BCCCCCC CCCCCCCC CCCCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "0BCCCCCC CCCCCCCC CCCCCCCC"));
response = test.selectApplication(APPLET_AID_2);
- result &= response.checkData("10" + APPLET_AID_2 + "01CC");
+ addResult(response.checkData("10" + APPLET_AID_2 + "01CC"));
response = test.selectApplication(APPLET_AID_3);
- result &= response.checkData("10" + APPLET_AID_3 + "01CC");
+ addResult(response.checkData("10" + APPLET_AID_3 + "01CC"));
response = test.selectApplication(APPLET_AID_4);
- result &= response.checkData("10" + APPLET_AID_4 + "03CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_4 + "03CCCCCC"));
// delete applet and package
test.reset();
@@ -138,7 +138,7 @@ public class Test_Api_2_Tkr_Sevt extends UiccTestModel {
test.deleteApplet(APPLET_AID_4);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_smta/Test_Api_2_Tkr_Smta.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_smta/Test_Api_2_Tkr_Smta.java
index 3e54dd07647546024c7feec914e9969816764cce..c23f47958bb0ece5f8e77a23db30adcbfa0680ae 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_smta/Test_Api_2_Tkr_Smta.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_smta/Test_Api_2_Tkr_Smta.java
@@ -32,7 +32,7 @@ public class Test_Api_2_Tkr_Smta extends UiccTestModel {
public boolean run() {
- boolean result = false;
+ initialiseResults();
// start test
test.reset();
@@ -57,33 +57,33 @@ public class Test_Api_2_Tkr_Smta extends UiccTestModel {
response = test.terminalProfile("09010020 00000000 00000000 00000008" +
"00000000 00000000 0000003F 7F");
- result = response.checkSw("913E");
+ addResult(response.checkSw("913E"));
response = test.fetch("3E");
test.terminalResponse("81030125 00820282 81830100");
// testcase 1
response = test.unrecognizedEnvelope();
- result &= response.checkSw("9150");
+ addResult(response.checkSw("9150"));
response = test.fetch("50");
- result &= response.checkData("D04E8103 01250082 02818285 09554943" +
+ addResult(response.checkData("D04E8103 01250082 02818285 09554943" +
"43205445 53548F08 01417070 6C657431" +
response.getData().substring(64,66)+ "08024170 706C6574 31"+ //item2
- response.getData().substring(84,86)+ "08034170 706C6574 31"+ //item3
- response.getData().substring(104,106)+"08044170 706C6574 31"+ //item4
- response.getData().substring(124,126)+"10000003 90000C11 02000003 9000000390");//text attribute
+ response.getData().substring(84,86)+ "08034170 706C6574 31"+ //item3
+ response.getData().substring(104,106)+"08044170 706C6574 31"+ //item4
+ response.getData().substring(124,126)+"10000003 90000C11 02000003 9000000390"));//text attribute
test.terminalResponse("81030125 00820282 81830100");
// testcase 2
response = test.unrecognizedEnvelope();
- result &= response.checkSw("9150");
+ addResult(response.checkSw("9150"));
response = test.fetch("50");
- result &= response.checkData("D04E8103 01250082 02818285 09554943" +
+ addResult(response.checkData("D04E8103 01250082 02818285 09554943" +
"43205445 53548F08 01417070 6C657431" +
- response.getData().substring(64,66)+ "08024170 706C6574 31"+ //item2
- response.getData().substring(84,86)+ "08034170 706C6574 31"+ //item3
- response.getData().substring(104,106)+"08044170 706C6574 31"+ //item4
- response.getData().substring(124,126)+"10000003 90000C11 02000003 90000C1003");//text attribute
+ response.getData().substring(64,66)+ "08024170 706C6574 31"+ //item2
+ response.getData().substring(84,86)+ "08034170 706C6574 31"+ //item3
+ response.getData().substring(104,106)+"08044170 706C6574 31"+ //item4
+ response.getData().substring(124,126)+"10000003 90000C11 02000003 90000C1003"));//text attribute
test.terminalResponse("81030125 00820282 81830100");
@@ -93,8 +93,8 @@ public class Test_Api_2_Tkr_Smta extends UiccTestModel {
// check results
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 +
- "09CCCCCC CCCCCCCC CCCC");
+ addResult(response.checkData("10" + APPLET_AID_1 +
+ "09CCCCCC CCCCCCCC CCCC"));
// delete applet and package
test.reset();
@@ -102,7 +102,7 @@ public class Test_Api_2_Tkr_Smta extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_trs_gety/Test_Api_2_Trs_Gety.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_trs_gety/Test_Api_2_Trs_Gety.java
index e8ee45c5aabdd5e0be4b2c0e1f4d0faae2839c23..13581af5bb6742c2e6631bf5804ebcd90d8c2d41 100644
--- a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_trs_gety/Test_Api_2_Trs_Gety.java
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_trs_gety/Test_Api_2_Trs_Gety.java
@@ -30,7 +30,7 @@ public class Test_Api_2_Trs_Gety extends UiccTestModel {
public boolean run() {
- boolean result = false;
+ initialiseResults();
// start test
test.reset();
@@ -60,7 +60,7 @@ public class Test_Api_2_Trs_Gety extends UiccTestModel {
// check results
response = test.selectApplication(APPLET_AID_1);
- result = response.checkData("10" + APPLET_AID_1 + "03CCCCCC");
+ addResult(response.checkData("10" + APPLET_AID_1 + "03CCCCCC"));
// delete applet and package
test.reset();
@@ -68,7 +68,7 @@ public class Test_Api_2_Trs_Gety extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deletePackage(CAP_FILE_PATH);
- return result;
+ return getOverallResult();
}
}