diff --git a/source/Annex_D_UiccInterfaces/org/etsi/scp/wg3/uicc/jcapi/userclass/UiccAPITestCardService.java b/source/Annex_D_UiccInterfaces/org/etsi/scp/wg3/uicc/jcapi/userclass/UiccAPITestCardService.java
index fa16fcb3469fd17a88fb9ad77433d67336af0c60..cc152c20fe81eb1708ad382c007289f14d0b041b 100644
--- a/source/Annex_D_UiccInterfaces/org/etsi/scp/wg3/uicc/jcapi/userclass/UiccAPITestCardService.java
+++ b/source/Annex_D_UiccInterfaces/org/etsi/scp/wg3/uicc/jcapi/userclass/UiccAPITestCardService.java
@@ -7,9 +7,9 @@
package org.etsi.scp.wg3.uicc.jcapi.userclass;
+import org.etsi.scp.wg3.uicc.jcapi.userinterface.*;
-
-public class UiccAPITestCardService {
+public class UiccAPITestCardService implements UiccCardManagementService,UiccAdministrativeCommandsService,UiccApplicationManagementService,UiccToolkitService {
public static UiccAPITestCardService TestReference = null;
@@ -26,4 +26,399 @@ public class UiccAPITestCardService {
}
}
+ @Override
+ public String reset() {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse selectFile(String FileId) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse selectFile(String LogicalChannel, String FileId) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse selectForActivation(String DFname) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse selectForActivation(String LogicalChannel, String DFname) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse selectForTermination(String DFname) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse selectForTermination(String LogicalChannel, String DFname) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse activate(String FileId) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse activate(String LogicalChannel, String FileId) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse deactivate(String FileId) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse deactivate(String LogicalChannel, String FileId) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse manageChannel(String OperationCode, String ChannelNb) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse manageChannel(String LogicalChannel, String OperationCode, String ChannelNb) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse status(String AppStatus, String ReturnedData, String DataLength) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse status(String LogicalChannel, String AppStatus, String ReturnedData, String DataLength) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse readBinary(String sfiOffset, String length) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse readBinary(String logicalChannel, String sfiOffset, String length) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse readRecord(String recordNb, String mode, String length) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse readRecord(String logicalChannel, String recordNb, String mode, String length) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse updateBinary(String sfiOffset, String data) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse updateBinary(String logicalChannel, String sfiOffset, String data) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse updateRecord(String recordNb, String mode, String data) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse updateRecord(String logicalChannel, String recordNb, String mode, String data) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse increase(String incValue) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse increase(String logicalChannel, String incValue) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse verifyPIN(String keyRef, String PINValue) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse verifyPIN(String logicalChannel, String keyRef, String PINValue) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse changePIN(String keyRef, String OldPINValue, String NewPINValue) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse changePIN(String logicalChannel, String keyRef, String OldPINValue, String NewPINValue) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse enablePIN(String keyRef, String PINValue) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse enablePIN(String logicalChannel, String keyRef, String PINValue) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse disablePIN(String keyRef, String PINValue) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse disablePIN(String logicalChannel, String keyRef, String PINValue) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse unblockPIN(String keyRef, String unblockPINValue, String PINValue) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse unblockPIN(String logicalChannel, String keyRef, String unblockPINValue, String PINValue) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse sendApdu(String apduCommand) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse createFile(String fcpValue) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse createFile(String logicalChannel, String fcpValue) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse deleteFile(String fileId) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse deleteFile(String logicalChannel, String fileId) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse resizeFile(String fileId, String size) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse resizeFile(String logicalChannel, String fileId, String size) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse loadPackage(String capFilePath) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse installApplet(String capFilePath, String classAID, String appAID, String uiccSystemSpecificParameters) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse installInstallApplet(String capFilePath, String classAID, String appAID, String uiccSystemSpecificParameters) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse makeSelectableApplet(String appAID) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse selectApplication(String AID) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse selectApplication(String LogicalChannel, String AID) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse lockApplication(String appletAid) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse unlockApplication(String appletAid) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse deleteApplet(String AID) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse deletePackage(String capFilePath) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse deletePackageAndAllRelatedApplications(String capFilePath) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse terminalProfileSession(String tpStr) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse terminalProfile(String tpStr) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse fetch(String expDataLength) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse terminalResponse(String cmd) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse envelopeMenuSelection(String itemIdTLV, String HelpRequestTLV) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse envelopeCallControlByNAA() {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse envelopeTimerExpiration(String TimerIdTLV) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse unrecognizedEnvelope() {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse envelopeEventDownloadMTCall() {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse envelopeEventDownloadCallConnected() {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse envelopeEventDownloadCallDisconnected() {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse envelopeEventDownloadLocationStatus() {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse envelopeEventDownloadUserActivity() {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse envelopeEventDownloadIdleScreenAvailable() {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse envelopeEventDownloadCardReaderStatus() {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse envelopeEventDownloadLanguageSelection() {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse envelopeEventDownloadBrowserTermination() {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse envelopeEventDownloadDataAvailable(String ChannelStatusTLV) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse envelopeEventDownloadChannelStatus(String ChannelStatusTLV) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse envelopeEventDownloadAccessTechnologyChange() {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse envelopeEventDownloadDisplayParametersChanged() {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse envelopeEventDownloadLocalConnection(String ServiceRecordTLV) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse envelopeEventDownloadNetworkSearchModeChange() {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse envelopeEventDownloadBrowsingStatus() {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse envelopeEventDownloadFramesInformationChanged() {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public APDUResponse envelopeEventDownloadHCIConnectivity() {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
}
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 6c72e75f0d31faf4d00d9e257ce606c66241414f..32ef4a469cb3ebe041b13b6ecfff85400856b3f8 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
@@ -6,39 +6,7 @@
package org.etsi.scp.wg3.uicc.jcapi.userclass;
-public abstract class UiccTestModel {
+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/UiccToolkitService.java b/source/Annex_D_UiccInterfaces/org/etsi/scp/wg3/uicc/jcapi/userinterface/UiccToolkitService.java
index d0d411e4bc11b7b3a0b8021e64c61b1e9228c014..949b16745b17853e17028a8298e4168f3aeec96d 100644
--- a/source/Annex_D_UiccInterfaces/org/etsi/scp/wg3/uicc/jcapi/userinterface/UiccToolkitService.java
+++ b/source/Annex_D_UiccInterfaces/org/etsi/scp/wg3/uicc/jcapi/userinterface/UiccToolkitService.java
@@ -1,6 +1,6 @@
/**
* @author SCP WG3, ETSI
- * @version 0.10
+ * @version 0.10.1
* UiccToolkitService defines Toolkit methods, among them ETSI TS 102 223 specification
*/
package org.etsi.scp.wg3.uicc.jcapi.userinterface;
@@ -197,7 +197,7 @@ public interface UiccToolkitService {
* perform an Envelope Event Download Network Search Change Mode
* @return APDUResponse Object
* Send the following string :
- * "D6 0A 99 01 0E 82 02 83 81 E5 01 00"
+ * "D6 0A 99 01 0E 82 02 82 81 E5 01 00"
*/
public APDUResponse envelopeEventDownloadNetworkSearchModeChange();
@@ -205,8 +205,23 @@ public interface UiccToolkitService {
* perform an Envelope Event Download Browsing Status
* @return APDUResponse Object
* Send the following string :
- * "D6 0A 99 01 0F 82 02 83 81 E4 01 00"
+ * "D6 0A 99 01 0F 82 02 82 81 E4 01 00"
*/
- public APDUResponse envelopeEventDownloadBrowsingStatus();
-
+ public APDUResponse envelopeEventDownloadBrowsingStatus();
+
+ /**
+ * perform an Envelope Event Download Frames Inforamation Changed
+ * @return APDUResponse Object
+ * Send the following string :
+ * "D6 0C 99 01 10 82 02 83 81 E7 03 01 02 03"
+ */
+ public APDUResponse envelopeEventDownloadFramesInformationChanged();
+
+ /**
+ * perform an Envelope Event Download HCI Connectivity
+ * @return APDUResponse Object
+ * Send the following string :
+ * "D6 07 99 01 13 82 02 82 81"
+ */
+ public APDUResponse envelopeEventDownloadHCIConnectivity();
}
diff --git a/source/Annex_D_UiccTestUtil/uicc/test/util/TestToolkitApplet.opt b/source/Annex_D_UiccTestUtil/uicc/test/util/TestToolkitApplet.opt
index 5bf6ad854f2e74f57c30aaeca593fb431736233c..7dea0d45c6e99af9f4760f0d56f3c5af8a21174f 100644
--- a/source/Annex_D_UiccTestUtil/uicc/test/util/TestToolkitApplet.opt
+++ b/source/Annex_D_UiccTestUtil/uicc/test/util/TestToolkitApplet.opt
@@ -1,3 +1,2 @@
--exportpath ..\..\Export;.\
-out EXP CAP JCA
uicc.test.util 0xA0:0x00:0x00:0x00:0x09:0x00:0x05:0xFF:0xFF:0xFF:0xFF:0x89:0xF0:0x00:0x00:0x00 1.0
\ No newline at end of file
diff --git a/source/Annex_D_UiccTestUtil/uicc/test/util/UICCTestConstants.java b/source/Annex_D_UiccTestUtil/uicc/test/util/UICCTestConstants.java
index 488fa44c9d38a73203bace59d5a6a6f98847bf1f..c132adc15b933d120355628af7cc460b91a6ae07 100644
--- a/source/Annex_D_UiccTestUtil/uicc/test/util/UICCTestConstants.java
+++ b/source/Annex_D_UiccTestUtil/uicc/test/util/UICCTestConstants.java
@@ -106,6 +106,10 @@ public class UICCTestConstants {
public final static short FID_ADF = (short)0x7FFF;
+ public final static short FID_EF_NOSH2 = (short)0x6FC6;
+ public final static short FID_EF_LTERM = (short)0x6FC7;
+ public final static short FID_EF_CTERM = (short)0x6FC8;
+
public final byte[] AID_ADF1 = {(byte)0xA0, (byte)0x00, (byte)0x00, (byte)0x00,
(byte)0x09, (byte)0x00, (byte)0x05, (byte)0xFF,
(byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0x89,
diff --git a/source/Annex_D_UiccTestUtil/uicc/test/util/javacard/util.cap b/source/Annex_D_UiccTestUtil/uicc/test/util/javacard/util.cap
index 15588c1eef6005a13e8bbb40e395670dcfc07066..9a58746a034e4d11749e0b1e6b987fa2ea06f1c1 100644
Binary files a/source/Annex_D_UiccTestUtil/uicc/test/util/javacard/util.cap and b/source/Annex_D_UiccTestUtil/uicc/test/util/javacard/util.cap differ
diff --git a/source/Annex_D_UiccTestUtil/uicc/test/util/javacard/util.exp b/source/Annex_D_UiccTestUtil/uicc/test/util/javacard/util.exp
index f12edda18bfd00e4def8db7b4e1b197af3418dde..37f7466b3832306dda86fe6f7e9f177fd1fe8c63 100644
Binary files a/source/Annex_D_UiccTestUtil/uicc/test/util/javacard/util.exp and b/source/Annex_D_UiccTestUtil/uicc/test/util/javacard/util.exp differ
diff --git a/source/Annex_D_UiccTestUtil/uicc/test/util/javacard/util.jca b/source/Annex_D_UiccTestUtil/uicc/test/util/javacard/util.jca
index a3061682cc6e31e4975f939ad2eb45cc7cffb7ff..83d6e09731153b1b886269f04907d7241b8d03fe 100644
--- a/source/Annex_D_UiccTestUtil/uicc/test/util/javacard/util.jca
+++ b/source/Annex_D_UiccTestUtil/uicc/test/util/javacard/util.jca
@@ -1,13 +1,13 @@
// converted by version 1.3
-// on Wed Sep 27 10:19:00 CEST 2006
+// on Fri May 21 21:05:31 CEST 2021
.package uicc/test/util {
.aid 0xA0:0x0:0x0:0x0:0x9:0x0:0x5:0xFF:0xFF:0xFF:0xFF:0x89:0xF0:0x0:0x0:0x0;
.version 1.0;
.imports {
- 0xA0:0x0:0x0:0x0:0x62:0x1:0x1 1.2; //javacard/framework
- 0xA0:0x0:0x0:0x0:0x9:0x0:0x5:0xFF:0xFF:0xFF:0xFF:0x89:0x12:0x0:0x0:0x0 1.0; //uicc/toolkit
+ 0xA0:0x0:0x0:0x0:0x62:0x1:0x1 1.3; //javacard/framework
+ 0xA0:0x0:0x0:0x0:0x9:0x0:0x5:0xFF:0xFF:0xFF:0xFF:0x89:0x12:0x0:0x0:0x0 1.4; //uicc/toolkit
0xA0:0x0:0x0:0x0:0x62:0x0:0x1 1.0; //java/lang
}
@@ -31,17 +31,17 @@
.descriptor Ljavacard/framework/AID; 0.6;
// 8
- virtualMethodRef 0.6.3([BS)B; // javacard/framework/AID.getBytes([BS)B
+ virtualMethodRef 0.6.3([BS)B; // getBytes([BS)B
// 9
staticMethodRef 0.16.3([BSSB)S; // javacard/framework/Util.arrayFillNonAtomic([BSSB)S
// 10
- virtualMethodRef 0.3.3()Z; // javacard/framework/Applet.selectingApplet()Z
+ virtualMethodRef 0.3.3()Z; // selectingApplet()Z
// 11
- virtualMethodRef 0.10.7()S; // javacard/framework/APDU.setOutgoing()S
+ virtualMethodRef 0.10.7()S; // setOutgoing()S
// 12
- virtualMethodRef 0.10.9(S)V; // javacard/framework/APDU.setOutgoingLength(S)V
+ virtualMethodRef 0.10.9(S)V; // setOutgoingLength(S)V
// 13
- virtualMethodRef 0.10.5([BSS)V; // javacard/framework/APDU.sendBytesLong([BSS)V
+ virtualMethodRef 0.10.5([BSS)V; // sendBytesLong([BSS)V
// 14
staticMethodRef 0.7.1(S)V; // javacard/framework/ISOException.throwIt(S)V
// 15
@@ -129,7 +129,7 @@
invokestatic 7; // javacard/framework/JCSystem.getAID()Ljavacard/framework/AID;
getfield_a_this 0; // reference uicc/test/util/TestToolkitApplet.baTestAppletId
sconst_1;
- invokevirtual 8; // javacard/framework/AID.getBytes([BS)B
+ invokevirtual 8; // getBytes([BS)B
bastore;
getfield_a_this 1; // reference uicc/test/util/TestToolkitApplet.baTestsResults
sconst_0;
@@ -188,10 +188,10 @@
.descriptor Ljavacard/framework/APDU; 0.10;
L0: aload_0;
- invokevirtual 10; // javacard/framework/Applet.selectingApplet()Z
+ invokevirtual 10; // selectingApplet()Z
ifeq L2;
L1: aload_1;
- invokevirtual 11; // javacard/framework/APDU.setOutgoing()S
+ invokevirtual 11; // setOutgoing()S
pop;
aload_1;
getfield_a_this 0; // reference uicc/test/util/TestToolkitApplet.baTestAppletId
@@ -203,7 +203,7 @@
sadd;
sconst_2;
sadd;
- invokevirtual 12; // javacard/framework/APDU.setOutgoingLength(S)V
+ invokevirtual 12; // setOutgoingLength(S)V
aload_1;
getfield_a_this 0; // reference uicc/test/util/TestToolkitApplet.baTestAppletId
sconst_0;
@@ -212,7 +212,7 @@
baload;
sconst_1;
sadd;
- invokevirtual 13; // javacard/framework/APDU.sendBytesLong([BSS)V
+ invokevirtual 13; // sendBytesLong([BSS)V
aload_1;
getfield_a_this 1; // reference uicc/test/util/TestToolkitApplet.baTestsResults
sconst_0;
@@ -221,7 +221,7 @@
baload;
sconst_1;
sadd;
- invokevirtual 13; // javacard/framework/APDU.sendBytesLong([BSS)V
+ invokevirtual 13; // sendBytesLong([BSS)V
goto L3;
L2: sspush 27904;
invokestatic 14; // javacard/framework/ISOException.throwIt(S)V
@@ -307,6 +307,9 @@
public static final short FID_EF_ARR_ADF = 28422; // S
public static final short FID_EF_UICC = 12260; // S
public static final short FID_ADF = 32767; // S
+ public static final short FID_EF_NOSH2 = 28614; // S
+ public static final short FID_EF_LTERM = 28615; // S
+ public static final short FID_EF_CTERM = 28616; // S
}
.publicMethodTable 1 {
diff --git a/source/Annex_D_UiccTestUtil/uicc/test/util/javacard/util_exp.tex b/source/Annex_D_UiccTestUtil/uicc/test/util/javacard/util_exp.tex
new file mode 100644
index 0000000000000000000000000000000000000000..3c00e8a2e5e97f344f52f9ecc249fe30a3fb0d79
--- /dev/null
+++ b/source/Annex_D_UiccTestUtil/uicc/test/util/javacard/util_exp.tex
@@ -0,0 +1,2026 @@
+export file { // uicc/test/util
+ magic 00FACADE // in hex
+ minor_version 1
+ major_version 2
+ constant_pool_count 186
+ constant_pool {
+ Constant_Utf8_info {
+ tag 1
+ length 5
+ bytes obReg
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 30
+ bytes Luicc/toolkit/ToolkitRegistry;
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 6
+ bytes
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 3
+ bytes ()V
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 6
+ bytes equals
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 21
+ bytes (Ljava/lang/Object;)Z
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 8
+ bytes register
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 7
+ bytes ([BSB)V
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 15
+ bytes selectingApplet
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 3
+ bytes ()Z
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 8
+ bytes deselect
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 27
+ bytes getShareableInterfaceObject
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 57
+ bytes (Ljavacard/framework/AID;B)Ljavacard/framework/Shareable;
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 6
+ bytes select
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 7
+ bytes process
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 28
+ bytes (Ljavacard/framework/APDU;)V
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 4
+ bytes init
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 17
+ bytes reportTestOutcome
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 5
+ bytes (BZ)V
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 14
+ bytes processToolkit
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 4
+ bytes (S)V
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 32
+ bytes uicc/test/util/TestToolkitApplet
+ }
+ Constant_Classref_info {
+ tag 7
+ name_index 21 // uicc/test/util/TestToolkitApplet
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 16
+ bytes java/lang/Object
+ }
+ Constant_Classref_info {
+ tag 7
+ name_index 23 // java/lang/Object
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 25
+ bytes javacard/framework/Applet
+ }
+ Constant_Classref_info {
+ tag 7
+ name_index 25 // javacard/framework/Applet
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 28
+ bytes javacard/framework/Shareable
+ }
+ Constant_Classref_info {
+ tag 7
+ name_index 27 // javacard/framework/Shareable
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 29
+ bytes uicc/toolkit/ToolkitInterface
+ }
+ Constant_Classref_info {
+ tag 7
+ name_index 29 // uicc/toolkit/ToolkitInterface
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 29
+ bytes uicc/toolkit/ToolkitConstants
+ }
+ Constant_Classref_info {
+ tag 7
+ name_index 31 // uicc/toolkit/ToolkitConstants
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 8
+ bytes AID_ADF1
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 2
+ bytes [B
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 8
+ bytes AID_ADF2
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 6
+ bytes FID_MF
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 1
+ bytes S
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 13
+ bytes ConstantValue
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 16128
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 11
+ bytes FID_EF_RFU0
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28457
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 11
+ bytes FID_EF_RFU1
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28458
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 11
+ bytes FID_EF_RFU2
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28459
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 11
+ bytes FID_DF_RFU1
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 24321
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 11
+ bytes FID_DF_RFU2
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 24322
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 11
+ bytes FID_DF_RFU3
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 24323
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 11
+ bytes FID_DF_TEST
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 32586
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 15
+ bytes FID_DF_SUB_TEST
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 24336
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 11
+ bytes FID_DF_ADF2
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 32587
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 10
+ bytes FID_EF_TNR
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28417
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 10
+ bytes FID_EF_TNU
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28418
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 11
+ bytes FID_EF_TARU
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28419
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 10
+ bytes FID_EF_CNR
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28420
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 10
+ bytes FID_EF_CNU
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28421
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 11
+ bytes FID_EF_CNIC
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28444
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 11
+ bytes FID_EF_CNDE
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28423
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 11
+ bytes FID_EF_CNAC
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28424
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 11
+ bytes FID_EF_CARU
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28425
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 10
+ bytes FID_EF_LNR
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28426
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 10
+ bytes FID_EF_LNU
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28427
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 11
+ bytes FID_EF_LARU
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28428
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 11
+ bytes FID_EF_CINA
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28429
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 11
+ bytes FID_EF_TRAC
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28430
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 11
+ bytes FID_EF_TDAC
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28431
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 11
+ bytes FID_EF_CIAC
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28432
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 11
+ bytes FID_EF_CIAA
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28433
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 11
+ bytes FID_EF_CNRA
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28434
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 11
+ bytes FID_EF_CUAC
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28435
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 11
+ bytes FID_EF_TAAC
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28436
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 11
+ bytes FID_EF_LADA
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28437
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 11
+ bytes FID_EF_TAAA
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28438
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 11
+ bytes FID_EF_LRUA
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28439
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 11
+ bytes FID_EF_LUPC
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28440
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 11
+ bytes FID_EF_NOSH
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28441
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 11
+ bytes FID_EF_LSEA
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28442
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 11
+ bytes FID_EF_CSEA
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28443
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 11
+ bytes FID_EF_TERM
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28464
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 11
+ bytes FID_DF_TERM
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 24368
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 10
+ bytes FID_EF_TAA
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 20240
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 12
+ bytes FID_EF_LARR1
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28577
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 12
+ bytes FID_EF_LARR2
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28578
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 12
+ bytes FID_EF_LARR3
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28579
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 12
+ bytes FID_EF_LARR4
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28580
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 12
+ bytes FID_EF_LARR5
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28581
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 12
+ bytes FID_EF_TARR1
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28593
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 12
+ bytes FID_EF_TARR2
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28594
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 12
+ bytes FID_EF_TARR3
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28595
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 12
+ bytes FID_EF_TARR4
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28596
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 12
+ bytes FID_EF_TARR5
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28597
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 12
+ bytes FID_EF_CARR1
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28609
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 12
+ bytes FID_EF_CARR2
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28610
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 12
+ bytes FID_EF_CARR3
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28611
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 12
+ bytes FID_EF_CARR4
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28612
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 12
+ bytes FID_EF_CARR5
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28613
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 11
+ bytes FID_DF_ARR1
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 24337
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 12
+ bytes FID_EF_TAR1T
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 20241
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 11
+ bytes FID_DF_ARR2
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 24338
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 12
+ bytes FID_EF_TAR2T
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 20242
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 11
+ bytes FID_DF_ARR3
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 24339
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 12
+ bytes FID_EF_TAR3T
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 20243
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 11
+ bytes FID_DF_ARR4
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 24340
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 12
+ bytes FID_EF_TAR4T
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 20244
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 11
+ bytes FID_DF_ARR5
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 24341
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 12
+ bytes FID_EF_TAR5T
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 20245
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 13
+ bytes FID_EF_ARR_MF
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 12038
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 14
+ bytes FID_EF_ARR_ADF
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28422
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 11
+ bytes FID_EF_UICC
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 12260
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 7
+ bytes FID_ADF
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 32767
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 12
+ bytes FID_EF_NOSH2
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28614
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 12
+ bytes FID_EF_LTERM
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28615
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 12
+ bytes FID_EF_CTERM
+ }
+ Constant_Integer_info {
+ tag 3
+ bytes 28616
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 32
+ bytes uicc/test/util/UICCTestConstants
+ }
+ Constant_Classref_info {
+ tag 7
+ name_index 182 // uicc/test/util/UICCTestConstants
+ }
+ Constant_Utf8_info {
+ tag 1
+ length 14
+ bytes uicc/test/util
+ }
+ CONSTANT_Package_info {
+ tag 13
+ flags 1
+ name_index 184 // uicc/test/util
+ minor_version 0
+ major_version 1
+ aid_length 16
+ aid 0xA0:0x0:0x0:0x0:0x9:0x0:0x5:0xFF:0xFF:0xFF:0xFF:0x89:0xF0:0x0:0x0:0x0
+ }
+ }
+ this_package 185
+ export_class_count 2
+ export_classes {
+ class_info { // uicc/test/util/TestToolkitApplet
+ token 0
+ access_flags public abstract shareable
+ name_index 22 // uicc/test/util/TestToolkitApplet
+ export_supers_count 2
+ supers {
+ constant_pool_index 24 // java/lang/Object
+ constant_pool_index 26 // javacard/framework/Applet
+ }
+ export_interfaces_count 3
+ interfaces {
+ constant_pool_index 28 // javacard/framework/Shareable
+ constant_pool_index 30 // uicc/toolkit/ToolkitInterface
+ constant_pool_index 32 // uicc/toolkit/ToolkitConstants
+ }
+ export_fields_count 1
+ fields {
+ field_info {
+ token 0
+ access_flags protected
+ name_index 0 // obReg
+ Descriptor_Index 1 // Luicc/toolkit/ToolkitRegistry;
+ attributes_count 0
+ attributes {
+ }
+ }
+ }
+ export_methods_count 12
+ methods {
+ method_info {
+ token 0
+ access_flags public
+ name_index 2 //
+ Descriptor_Index 3 // ()V
+ }
+ method_info {
+ token 0
+ access_flags public
+ name_index 4 // equals
+ Descriptor_Index 5 // (Ljava/lang/Object;)Z
+ }
+ method_info {
+ token 1
+ access_flags protected final
+ name_index 6 // register
+ Descriptor_Index 3 // ()V
+ }
+ method_info {
+ token 2
+ access_flags protected final
+ name_index 6 // register
+ Descriptor_Index 7 // ([BSB)V
+ }
+ method_info {
+ token 3
+ access_flags protected final
+ name_index 8 // selectingApplet
+ Descriptor_Index 9 // ()Z
+ }
+ method_info {
+ token 4
+ access_flags public
+ name_index 10 // deselect
+ Descriptor_Index 3 // ()V
+ }
+ method_info {
+ token 5
+ access_flags public
+ name_index 11 // getShareableInterfaceObject
+ Descriptor_Index 12 // (Ljavacard/framework/AID;B)Ljavacard/framework/Shareable;
+ }
+ method_info {
+ token 6
+ access_flags public
+ name_index 13 // select
+ Descriptor_Index 9 // ()Z
+ }
+ method_info {
+ token 7
+ access_flags public
+ name_index 14 // process
+ Descriptor_Index 15 // (Ljavacard/framework/APDU;)V
+ }
+ method_info {
+ token 8
+ access_flags public
+ name_index 16 // init
+ Descriptor_Index 3 // ()V
+ }
+ method_info {
+ token 9
+ access_flags protected
+ name_index 17 // reportTestOutcome
+ Descriptor_Index 18 // (BZ)V
+ }
+ method_info {
+ token 10
+ access_flags public abstract
+ name_index 19 // processToolkit
+ Descriptor_Index 20 // (S)V
+ }
+ }
+ }
+ class_info { // uicc/test/util/UICCTestConstants
+ token 1
+ access_flags public
+ name_index 183 // uicc/test/util/UICCTestConstants
+ export_supers_count 1
+ supers {
+ constant_pool_index 24 // java/lang/Object
+ }
+ export_interfaces_count 0
+ interfaces {
+ }
+ export_fields_count 74
+ fields {
+ field_info {
+ token 0
+ access_flags public final
+ name_index 33 // AID_ADF1
+ Descriptor_Index 34 // [B
+ attributes_count 0
+ attributes {
+ }
+ }
+ field_info {
+ token 1
+ access_flags public final
+ name_index 35 // AID_ADF2
+ Descriptor_Index 34 // [B
+ attributes_count 0
+ attributes {
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 36 // FID_MF
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 39 // value = 16128
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 40 // FID_EF_RFU0
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 41 // value = 28457
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 42 // FID_EF_RFU1
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 43 // value = 28458
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 44 // FID_EF_RFU2
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 45 // value = 28459
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 46 // FID_DF_RFU1
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 47 // value = 24321
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 48 // FID_DF_RFU2
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 49 // value = 24322
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 50 // FID_DF_RFU3
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 51 // value = 24323
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 52 // FID_DF_TEST
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 53 // value = 32586
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 54 // FID_DF_SUB_TEST
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 55 // value = 24336
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 56 // FID_DF_ADF2
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 57 // value = 32587
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 58 // FID_EF_TNR
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 59 // value = 28417
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 60 // FID_EF_TNU
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 61 // value = 28418
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 62 // FID_EF_TARU
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 63 // value = 28419
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 64 // FID_EF_CNR
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 65 // value = 28420
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 66 // FID_EF_CNU
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 67 // value = 28421
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 68 // FID_EF_CNIC
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 69 // value = 28444
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 70 // FID_EF_CNDE
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 71 // value = 28423
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 72 // FID_EF_CNAC
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 73 // value = 28424
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 74 // FID_EF_CARU
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 75 // value = 28425
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 76 // FID_EF_LNR
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 77 // value = 28426
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 78 // FID_EF_LNU
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 79 // value = 28427
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 80 // FID_EF_LARU
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 81 // value = 28428
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 82 // FID_EF_CINA
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 83 // value = 28429
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 84 // FID_EF_TRAC
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 85 // value = 28430
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 86 // FID_EF_TDAC
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 87 // value = 28431
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 88 // FID_EF_CIAC
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 89 // value = 28432
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 90 // FID_EF_CIAA
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 91 // value = 28433
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 92 // FID_EF_CNRA
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 93 // value = 28434
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 94 // FID_EF_CUAC
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 95 // value = 28435
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 96 // FID_EF_TAAC
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 97 // value = 28436
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 98 // FID_EF_LADA
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 99 // value = 28437
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 100 // FID_EF_TAAA
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 101 // value = 28438
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 102 // FID_EF_LRUA
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 103 // value = 28439
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 104 // FID_EF_LUPC
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 105 // value = 28440
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 106 // FID_EF_NOSH
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 107 // value = 28441
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 108 // FID_EF_LSEA
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 109 // value = 28442
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 110 // FID_EF_CSEA
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 111 // value = 28443
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 112 // FID_EF_TERM
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 113 // value = 28464
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 114 // FID_DF_TERM
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 115 // value = 24368
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 116 // FID_EF_TAA
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 117 // value = 20240
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 118 // FID_EF_LARR1
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 119 // value = 28577
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 120 // FID_EF_LARR2
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 121 // value = 28578
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 122 // FID_EF_LARR3
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 123 // value = 28579
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 124 // FID_EF_LARR4
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 125 // value = 28580
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 126 // FID_EF_LARR5
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 127 // value = 28581
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 128 // FID_EF_TARR1
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 129 // value = 28593
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 130 // FID_EF_TARR2
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 131 // value = 28594
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 132 // FID_EF_TARR3
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 133 // value = 28595
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 134 // FID_EF_TARR4
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 135 // value = 28596
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 136 // FID_EF_TARR5
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 137 // value = 28597
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 138 // FID_EF_CARR1
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 139 // value = 28609
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 140 // FID_EF_CARR2
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 141 // value = 28610
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 142 // FID_EF_CARR3
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 143 // value = 28611
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 144 // FID_EF_CARR4
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 145 // value = 28612
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 146 // FID_EF_CARR5
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 147 // value = 28613
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 148 // FID_DF_ARR1
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 149 // value = 24337
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 150 // FID_EF_TAR1T
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 151 // value = 20241
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 152 // FID_DF_ARR2
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 153 // value = 24338
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 154 // FID_EF_TAR2T
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 155 // value = 20242
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 156 // FID_DF_ARR3
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 157 // value = 24339
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 158 // FID_EF_TAR3T
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 159 // value = 20243
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 160 // FID_DF_ARR4
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 161 // value = 24340
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 162 // FID_EF_TAR4T
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 163 // value = 20244
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 164 // FID_DF_ARR5
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 165 // value = 24341
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 166 // FID_EF_TAR5T
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 167 // value = 20245
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 168 // FID_EF_ARR_MF
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 169 // value = 12038
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 170 // FID_EF_ARR_ADF
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 171 // value = 28422
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 172 // FID_EF_UICC
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 173 // value = 12260
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 174 // FID_ADF
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 175 // value = 32767
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 176 // FID_EF_NOSH2
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 177 // value = 28614
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 178 // FID_EF_LTERM
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 179 // value = 28615
+ }
+ }
+ }
+ field_info {
+ token 255
+ access_flags public static final
+ name_index 180 // FID_EF_CTERM
+ Descriptor_Index 37 // S
+ attributes_count 1
+ attributes {
+ ConstantValue_attribute {
+ attribute_name_index 38 // ConstantValue
+ attribute_length 2
+ constantvalue_index 181 // value = 28616
+ }
+ }
+ }
+ }
+ export_methods_count 2
+ methods {
+ method_info {
+ token 0
+ access_flags public
+ name_index 2 //
+ Descriptor_Index 3 // ()V
+ }
+ method_info {
+ token 0
+ access_flags public
+ name_index 4 // equals
+ Descriptor_Index 5 // (Ljava/lang/Object;)Z
+ }
+ }
+ }
+ }
+}
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_cont/javacard/api_1_cont.cap b/source/Annex_E_SourceCode/uicc/test/access/api_1_cont/javacard/api_1_cont.cap
index df2149848761b2463405f6892c61e7baf9da905b..6d9502f4b03fc6c7d2084bcdf1b7f68216dde43c 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/access/api_1_cont/javacard/api_1_cont.cap and b/source/Annex_E_SourceCode/uicc/test/access/api_1_cont/javacard/api_1_cont.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_cont/javacard/api_1_cont.exp b/source/Annex_E_SourceCode/uicc/test/access/api_1_cont/javacard/api_1_cont.exp
new file mode 100644
index 0000000000000000000000000000000000000000..829909f2aeeeaa0233627592ee10b049b78f3b2b
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/access/api_1_cont/javacard/api_1_cont.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_actf/javacard/api_1_fvw_actf.cap b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_actf/javacard/api_1_fvw_actf.cap
index c65c6914ef45b249589c039b76a549edb3f2f26f..8b7f83a80478cbae810da7e9f4958421fdb046a7 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_actf/javacard/api_1_fvw_actf.cap and b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_actf/javacard/api_1_fvw_actf.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_actf/javacard/api_1_fvw_actf.exp b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_actf/javacard/api_1_fvw_actf.exp
new file mode 100644
index 0000000000000000000000000000000000000000..cec1977c58021fec0947e7a1f1c429583f5391f9
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_actf/javacard/api_1_fvw_actf.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_dacf/javacard/api_1_fvw_dacf.cap b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_dacf/javacard/api_1_fvw_dacf.cap
index f3fa8750fae68e4a98ee481c127948fb49a091d4..efe87618d4d62e24d8387a24509e95324c7a3aa9 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_dacf/javacard/api_1_fvw_dacf.cap and b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_dacf/javacard/api_1_fvw_dacf.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_dacf/javacard/api_1_fvw_dacf.exp b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_dacf/javacard/api_1_fvw_dacf.exp
new file mode 100644
index 0000000000000000000000000000000000000000..fab28d6d8860b25a2728e3fbc1dc21b127a49d9c
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_dacf/javacard/api_1_fvw_dacf.exp differ
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 7e6d175868ae4b986be732ab42e14a10d7736f16..7eb3ed328a49f5a8d9a96d6ff79c4fb6314cf3f6 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
@@ -528,39 +528,10 @@ public class Api_1_Fvw_Incr_1 extends TestToolkitApplet implements UICCConstants
reportTestOutcome(testCaseNb, bRes);
// -----------------------------------------------------------------
- // Test Case 15 : Record not found
+ // Test Case 15 : Void
+ // Note: this means that baTestsResults will contain '00' for this test case, indicating Void in this case
//
- 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
// -----------------------------------------------------------------
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 9e4f687cc3782e4d683d90cd4ed7a403857ba68a..c52b0535e288e78fe139845320e3832279fecb10 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
@@ -25,7 +25,7 @@ public class Test_Api_1_Fvw_Incr extends UiccTestModel {
public boolean run() {
APDUResponse data = null;
- boolean result = false;
+ initialiseResults();
// test script
test.reset();
@@ -71,7 +71,7 @@ public class Test_Api_1_Fvw_Incr extends UiccTestModel {
// Trigger Applet
response = test.envelopeMenuSelection("100101", "");
- result = response.checkSw("9000");
+ addResult(response.checkSw("9000"));
/*********************************************************************/
@@ -81,8 +81,9 @@ public class Test_Api_1_Fvw_Incr extends UiccTestModel {
/*********************************************************************/
response = test.selectApplication(APPLET_AID_1);
- result &= response.checkData("10" + APPLET_AID_1 + "10" +
- "CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC");
+ // Note: as test case 15 is Void, we expect '00' for the result
+ addResult(response.checkData("10" + APPLET_AID_1 + "10" +
+ "CCCCCCCC CCCCCCCC CCCCCCCC CCCC00CC"));
/*********************************************************************/
/*********************************************************************/
@@ -96,6 +97,6 @@ public class Test_Api_1_Fvw_Incr 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/javacard/api_1_fvw_incr.cap b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_incr/javacard/api_1_fvw_incr.cap
index 059938114a750cd20092b1f6da0bf8695001c433..8366acf68a87c519518d32f0fcdc06dcad2b6d7f 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_incr/javacard/api_1_fvw_incr.cap and b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_incr/javacard/api_1_fvw_incr.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_incr/javacard/api_1_fvw_incr.exp b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_incr/javacard/api_1_fvw_incr.exp
new file mode 100644
index 0000000000000000000000000000000000000000..d92e9f612c11cd1f704e211e52ad6dca1f1a182d
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_incr/javacard/api_1_fvw_incr.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_redb/javacard/api_1_fvw_redb.cap b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_redb/javacard/api_1_fvw_redb.cap
index bb80e1c3aff135deb1a6e05a2a285b844e968fe1..8e1081b4030461a299a66e33bdae60f1c1bcb874 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_redb/javacard/api_1_fvw_redb.cap and b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_redb/javacard/api_1_fvw_redb.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_redb/javacard/api_1_fvw_redb.exp b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_redb/javacard/api_1_fvw_redb.exp
new file mode 100644
index 0000000000000000000000000000000000000000..6846c53bf8d6e1ff08f26701a815fcf762630708
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_redb/javacard/api_1_fvw_redb.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_redr/javacard/api_1_fvw_redr.cap b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_redr/javacard/api_1_fvw_redr.cap
index d0ba5bfd99479878a9abc09d0c8fa871c4256475..dbc2b834bf902478d179013d8954e4ea26a6189a 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_redr/javacard/api_1_fvw_redr.cap and b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_redr/javacard/api_1_fvw_redr.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_redr/javacard/api_1_fvw_redr.exp b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_redr/javacard/api_1_fvw_redr.exp
new file mode 100644
index 0000000000000000000000000000000000000000..b55b667ba450fa9cf8b27ba2ee9b6807ada3916e
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_redr/javacard/api_1_fvw_redr.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_sear/javacard/api_1_fvw_sear.cap b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_sear/javacard/api_1_fvw_sear.cap
index 75ee8846ac34aed4458e63faa1b7258d5bb4bcb4..ef922b06b7431a5a2d54b42846492c8f584beac2 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_sear/javacard/api_1_fvw_sear.cap and b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_sear/javacard/api_1_fvw_sear.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_sear/javacard/api_1_fvw_sear.exp b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_sear/javacard/api_1_fvw_sear.exp
new file mode 100644
index 0000000000000000000000000000000000000000..433af25e40aacdc77a95ed9baba41420775c1577
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_sear/javacard/api_1_fvw_sear.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_slctb/javacard/api_1_fvw_slctb.cap b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_slctb/javacard/api_1_fvw_slctb.cap
index cb2e9973c43cf92ae6647261880f9014c85daaba..2f59313fa7d7063732437119643b9dc4b5a9c179 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_slctb/javacard/api_1_fvw_slctb.cap and b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_slctb/javacard/api_1_fvw_slctb.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_slctb/javacard/api_1_fvw_slctb.exp b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_slctb/javacard/api_1_fvw_slctb.exp
new file mode 100644
index 0000000000000000000000000000000000000000..7b092c588250699d6f1e3ce47b6b44b3cfb6092c
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_slctb/javacard/api_1_fvw_slctb.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_slctb_bss/javacard/api_1_fvw_slctb_bss.cap b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_slctb_bss/javacard/api_1_fvw_slctb_bss.cap
index c1da56e12e3e5b4567a86483fc52d45e8d3059ac..b5c96d9105b866333fc4ed09f4e31c5c560af723 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_slctb_bss/javacard/api_1_fvw_slctb_bss.cap and b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_slctb_bss/javacard/api_1_fvw_slctb_bss.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_slctb_bss/javacard/api_1_fvw_slctb_bss.exp b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_slctb_bss/javacard/api_1_fvw_slctb_bss.exp
new file mode 100644
index 0000000000000000000000000000000000000000..86104896c7281e0785b1d429b1027465cdaf66f1
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_slctb_bss/javacard/api_1_fvw_slctb_bss.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_slcts/javacard/api_1_fvw_slcts.cap b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_slcts/javacard/api_1_fvw_slcts.cap
index b4be3e6968cdc444ee37888b0761ef002070143c..2465ee22f297ccfc897e78634a8f37f445e73ec3 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_slcts/javacard/api_1_fvw_slcts.cap and b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_slcts/javacard/api_1_fvw_slcts.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_slcts/javacard/api_1_fvw_slcts.exp b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_slcts/javacard/api_1_fvw_slcts.exp
new file mode 100644
index 0000000000000000000000000000000000000000..4dad543e2634dc4c6b367be7eae2c93f336390e9
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_slcts/javacard/api_1_fvw_slcts.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_stat/javacard/api_1_fvw_stat.cap b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_stat/javacard/api_1_fvw_stat.cap
index efff8da701f35857918b4cff467934402109729c..b237d387ee30453b87dc376c0b1e1387c6b91c21 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_stat/javacard/api_1_fvw_stat.cap and b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_stat/javacard/api_1_fvw_stat.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_stat/javacard/api_1_fvw_stat.exp b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_stat/javacard/api_1_fvw_stat.exp
new file mode 100644
index 0000000000000000000000000000000000000000..4988d186f7fa1a6aafe02d30e30387274dd84ddd
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_stat/javacard/api_1_fvw_stat.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_updb/javacard/api_1_fvw_updb.cap b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_updb/javacard/api_1_fvw_updb.cap
index 35cd26670260922dca85a39a56336c8c98158d4c..dc60eccecf4179ab9ab8277623f2a552ce0026cf 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_updb/javacard/api_1_fvw_updb.cap and b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_updb/javacard/api_1_fvw_updb.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_updb/javacard/api_1_fvw_updb.exp b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_updb/javacard/api_1_fvw_updb.exp
new file mode 100644
index 0000000000000000000000000000000000000000..680683ca90d9b624f19b1e2b97ad5b734b669736
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_updb/javacard/api_1_fvw_updb.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_updr/javacard/api_1_fvw_updr.cap b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_updr/javacard/api_1_fvw_updr.cap
index 3764a0af33ee5410c1d24c6da1c2b3de134457ac..ad9aeeb6f808b1ff39f49d8c9a019eb49d71da1b 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_updr/javacard/api_1_fvw_updr.cap and b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_updr/javacard/api_1_fvw_updr.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_updr/javacard/api_1_fvw_updr.exp b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_updr/javacard/api_1_fvw_updr.exp
new file mode 100644
index 0000000000000000000000000000000000000000..f4c51b6c1f1fc7ba273064650c65ea19fc7e71c3
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/access/api_1_fvw_updr/javacard/api_1_fvw_updr.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_uex_coor/javacard/api_1_uex_coor.cap b/source/Annex_E_SourceCode/uicc/test/access/api_1_uex_coor/javacard/api_1_uex_coor.cap
index e211b13ffd7b62a6b134582ea3d239ea104cf2fc..86e1eaa0a384675aa5ca96b5ff852b7a830c5d5d 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/access/api_1_uex_coor/javacard/api_1_uex_coor.cap and b/source/Annex_E_SourceCode/uicc/test/access/api_1_uex_coor/javacard/api_1_uex_coor.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_uex_coor/javacard/api_1_uex_coor.exp b/source/Annex_E_SourceCode/uicc/test/access/api_1_uex_coor/javacard/api_1_uex_coor.exp
new file mode 100644
index 0000000000000000000000000000000000000000..c0229f8d83c2274bfa4da69af1a566dc14e14b52
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/access/api_1_uex_coor/javacard/api_1_uex_coor.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_uex_thit/javacard/api_1_uex_thit.cap b/source/Annex_E_SourceCode/uicc/test/access/api_1_uex_thit/javacard/api_1_uex_thit.cap
index 824e036462cde228ef8581661ce69ba62608cfcf..470f01d24f09dc460494ea24e33c90a86e75af25 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/access/api_1_uex_thit/javacard/api_1_uex_thit.cap and b/source/Annex_E_SourceCode/uicc/test/access/api_1_uex_thit/javacard/api_1_uex_thit.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_uex_thit/javacard/api_1_uex_thit.exp b/source/Annex_E_SourceCode/uicc/test/access/api_1_uex_thit/javacard/api_1_uex_thit.exp
new file mode 100644
index 0000000000000000000000000000000000000000..ec4ade71a1005b2f91968cf4ba4eea4458178cff
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/access/api_1_uex_thit/javacard/api_1_uex_thit.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_usy_getf_bsbb/javacard/api_1_usy_getf_bsbb.cap b/source/Annex_E_SourceCode/uicc/test/access/api_1_usy_getf_bsbb/javacard/api_1_usy_getf_bsbb.cap
index 6c4311bf101e6782a9cadfcaaa369bb0c2565a94..ff85dbf4323c857bd04a11b08f5f278f0aae7abe 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/access/api_1_usy_getf_bsbb/javacard/api_1_usy_getf_bsbb.cap and b/source/Annex_E_SourceCode/uicc/test/access/api_1_usy_getf_bsbb/javacard/api_1_usy_getf_bsbb.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_usy_getf_bsbb/javacard/api_1_usy_getf_bsbb.exp b/source/Annex_E_SourceCode/uicc/test/access/api_1_usy_getf_bsbb/javacard/api_1_usy_getf_bsbb.exp
new file mode 100644
index 0000000000000000000000000000000000000000..6b0efc5d0b68c7e9a66dcde3efe449efebfef121
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/access/api_1_usy_getf_bsbb/javacard/api_1_usy_getf_bsbb.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_usy_getfb/javacard/api_1_usy_getfb.cap b/source/Annex_E_SourceCode/uicc/test/access/api_1_usy_getfb/javacard/api_1_usy_getfb.cap
index cdfbfcf590d4b190e5d469243c5870018e0b2d3a..64a19f2793fd27bb755b94d49ac0596b13004bcd 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/access/api_1_usy_getfb/javacard/api_1_usy_getfb.cap and b/source/Annex_E_SourceCode/uicc/test/access/api_1_usy_getfb/javacard/api_1_usy_getfb.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_usy_getfb/javacard/api_1_usy_getfb.exp b/source/Annex_E_SourceCode/uicc/test/access/api_1_usy_getfb/javacard/api_1_usy_getfb.exp
new file mode 100644
index 0000000000000000000000000000000000000000..9b762c22c665afc995f3fa2700d48b62d622478a
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/access/api_1_usy_getfb/javacard/api_1_usy_getfb.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_usy_getfob/javacard/api_1_usy_getfob.cap b/source/Annex_E_SourceCode/uicc/test/access/api_1_usy_getfob/javacard/api_1_usy_getfob.cap
index 38cb7b89425fde2fee292ec1c5b022f3f95c6427..f9e0274a8f479df4179637dcca3ae766329f3fc1 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/access/api_1_usy_getfob/javacard/api_1_usy_getfob.cap and b/source/Annex_E_SourceCode/uicc/test/access/api_1_usy_getfob/javacard/api_1_usy_getfob.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/api_1_usy_getfob/javacard/api_1_usy_getfob.exp b/source/Annex_E_SourceCode/uicc/test/access/api_1_usy_getfob/javacard/api_1_usy_getfob.exp
new file mode 100644
index 0000000000000000000000000000000000000000..3d788b659a26597076d381bb33ed9f5035c91f74
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/access/api_1_usy_getfob/javacard/api_1_usy_getfob.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_aex_coor/javacard/api_4_aex_coor.cap b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_aex_coor/javacard/api_4_aex_coor.cap
index f919313342c9c3222752f157ba5b36f9aa658ffe..ad67613118bbd4c5bdfa82d2429bfb506a29427f 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_aex_coor/javacard/api_4_aex_coor.cap and b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_aex_coor/javacard/api_4_aex_coor.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_aex_coor/javacard/api_4_aex_coor.exp b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_aex_coor/javacard/api_4_aex_coor.exp
new file mode 100644
index 0000000000000000000000000000000000000000..488199bf77d981d2f52de07d52248e92adb70259
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_aex_coor/javacard/api_4_aex_coor.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_aex_thit/javacard/api_4_aex_thit.cap b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_aex_thit/javacard/api_4_aex_thit.cap
index 1c55a87c04c3c73e4aac8124e578465f268dcec4..13fdd2b73f969c8c70b5f812e500713a4ae34f5b 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_aex_thit/javacard/api_4_aex_thit.cap and b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_aex_thit/javacard/api_4_aex_thit.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_aex_thit/javacard/api_4_aex_thit.exp b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_aex_thit/javacard/api_4_aex_thit.exp
new file mode 100644
index 0000000000000000000000000000000000000000..283e02ee3dcaa8bc0370e92cc4728254776a99a1
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_aex_thit/javacard/api_4_aex_thit.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afb_gtaf_bsbb/javacard/api_4_afb_gtaf_bsbb.cap b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afb_gtaf_bsbb/javacard/api_4_afb_gtaf_bsbb.cap
index a79b11c2a2f452d9d90e6b7ccbad4448eef00c60..f3e6279a26d9cace940d63255d3ce52b47442dc7 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afb_gtaf_bsbb/javacard/api_4_afb_gtaf_bsbb.cap and b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afb_gtaf_bsbb/javacard/api_4_afb_gtaf_bsbb.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afb_gtaf_bsbb/javacard/api_4_afb_gtaf_bsbb.exp b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afb_gtaf_bsbb/javacard/api_4_afb_gtaf_bsbb.exp
new file mode 100644
index 0000000000000000000000000000000000000000..3ce11d156c7c424069f3eb63128cd7201aa4966f
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afb_gtaf_bsbb/javacard/api_4_afb_gtaf_bsbb.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afb_gtafb/javacard/api_4_afb_gtafb.cap b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afb_gtafb/javacard/api_4_afb_gtafb.cap
index 7bdb8cea0ecd89b1210f89cf0c7efb71336193e3..c0a14d590366e5f721986811d07545af43f59983 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afb_gtafb/javacard/api_4_afb_gtafb.cap and b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afb_gtafb/javacard/api_4_afb_gtafb.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afb_gtafb/javacard/api_4_afb_gtafb.exp b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afb_gtafb/javacard/api_4_afb_gtafb.exp
new file mode 100644
index 0000000000000000000000000000000000000000..2d918b7d1eebf2b2269317686b8b1b349c1f317e
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afb_gtafb/javacard/api_4_afb_gtafb.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afb_gtafob/javacard/api_4_afb_gtafob.cap b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afb_gtafob/javacard/api_4_afb_gtafob.cap
index 84b31489be04213142e41ccff28645d1d3d3b23a..9bb07025e7ba5e4562f50b6dda8b827b45d8f0f5 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afb_gtafob/javacard/api_4_afb_gtafob.cap and b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afb_gtafob/javacard/api_4_afb_gtafob.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afb_gtafob/javacard/api_4_afb_gtafob.exp b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afb_gtafob/javacard/api_4_afb_gtafob.exp
new file mode 100644
index 0000000000000000000000000000000000000000..febbfd4d06ae132521d31630b3ffb52053533951
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afb_gtafob/javacard/api_4_afb_gtafob.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_actf/javacard/api_4_afv_actf.cap b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_actf/javacard/api_4_afv_actf.cap
index 89b5c9908e86656c8f71ed59c6a40c399e9354a1..e55ee9c421c75d9ad872cd05826dc52c83377efc 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_actf/javacard/api_4_afv_actf.cap and b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_actf/javacard/api_4_afv_actf.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_actf/javacard/api_4_afv_actf.exp b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_actf/javacard/api_4_afv_actf.exp
new file mode 100644
index 0000000000000000000000000000000000000000..16cbed840950ca14f34c2f3202a4ce7fefdbd1fd
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_actf/javacard/api_4_afv_actf.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_crtf/javacard/api_4_afv_crtf.cap b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_crtf/javacard/api_4_afv_crtf.cap
index 8c06d07d8822d5ccc3299628959b5077b0c1bea0..390ec68428872a6adde548cade97aac35e761928 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_crtf/javacard/api_4_afv_crtf.cap and b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_crtf/javacard/api_4_afv_crtf.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_crtf/javacard/api_4_afv_crtf.exp b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_crtf/javacard/api_4_afv_crtf.exp
new file mode 100644
index 0000000000000000000000000000000000000000..d4aaddd527afaae454e0d2ec3f0ecedd9ae21eae
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_crtf/javacard/api_4_afv_crtf.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_dacf/javacard/api_4_afv_dacf.cap b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_dacf/javacard/api_4_afv_dacf.cap
index 0d0a17f24ef25a1d19b85eb330ab876e9471213b..79da926c816c1d106d8c84bca4a2ea59adfcebb2 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_dacf/javacard/api_4_afv_dacf.cap and b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_dacf/javacard/api_4_afv_dacf.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_dacf/javacard/api_4_afv_dacf.exp b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_dacf/javacard/api_4_afv_dacf.exp
new file mode 100644
index 0000000000000000000000000000000000000000..9a9e889633f89963d3ab728d7614545cbabb3147
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_dacf/javacard/api_4_afv_dacf.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_dltf/javacard/api_4_afv_dltf.cap b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_dltf/javacard/api_4_afv_dltf.cap
index b7d1f14e2296b77c9f8d6cd6fa98914b3ee09a21..103580b82a100752bc620cc98598991ae52f51e7 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_dltf/javacard/api_4_afv_dltf.cap and b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_dltf/javacard/api_4_afv_dltf.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_dltf/javacard/api_4_afv_dltf.exp b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_dltf/javacard/api_4_afv_dltf.exp
new file mode 100644
index 0000000000000000000000000000000000000000..d4997291e0bfa3c0e6b29022533b7bfa68ad06f8
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_dltf/javacard/api_4_afv_dltf.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_incr/javacard/api_4_afv_incr.cap b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_incr/javacard/api_4_afv_incr.cap
index 4aee2f6ebcabe8c992dbf712080daf14aaea16e3..0918a86a8e0ed3e414a3089f5ca7d8aef98d6ad0 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_incr/javacard/api_4_afv_incr.cap and b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_incr/javacard/api_4_afv_incr.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_incr/javacard/api_4_afv_incr.exp b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_incr/javacard/api_4_afv_incr.exp
new file mode 100644
index 0000000000000000000000000000000000000000..934fbfdc097adfb8cd4e0e3697c9bed5892e293b
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_incr/javacard/api_4_afv_incr.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_redb/javacard/api_4_afv_redb.cap b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_redb/javacard/api_4_afv_redb.cap
index 532ede7b1f486d9da33e2121b6f98a14ad18ea34..ec97811cf8a2003f9c43a7c8d3d04becf6c62241 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_redb/javacard/api_4_afv_redb.cap and b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_redb/javacard/api_4_afv_redb.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_redb/javacard/api_4_afv_redb.exp b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_redb/javacard/api_4_afv_redb.exp
new file mode 100644
index 0000000000000000000000000000000000000000..aabb29dfbfb7036b0cd4bc6fdad53a11d11eff73
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_redb/javacard/api_4_afv_redb.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_redr/javacard/api_4_afv_redr.cap b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_redr/javacard/api_4_afv_redr.cap
index d939e3640500759cd3bc94ee6b5b2cec5247a821..35064a9a40094d93aa6b58f6c6385709197f36d0 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_redr/javacard/api_4_afv_redr.cap and b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_redr/javacard/api_4_afv_redr.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_redr/javacard/api_4_afv_redr.exp b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_redr/javacard/api_4_afv_redr.exp
new file mode 100644
index 0000000000000000000000000000000000000000..2d4e58d6b7ab24a5657f77cb77ce94c5bbcdd36b
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_redr/javacard/api_4_afv_redr.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_rszf/javacard/api_4_afv_rszf.cap b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_rszf/javacard/api_4_afv_rszf.cap
index bede232369711cdd24d23875e8b4d8763bb37f0a..0020dcae106a1302a8a1b7963d133b82c71bac74 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_rszf/javacard/api_4_afv_rszf.cap and b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_rszf/javacard/api_4_afv_rszf.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_rszf/javacard/api_4_afv_rszf.exp b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_rszf/javacard/api_4_afv_rszf.exp
new file mode 100644
index 0000000000000000000000000000000000000000..15698dcb7eb62ee9428daa033bdfff5ee80eee1c
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_rszf/javacard/api_4_afv_rszf.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_sear/javacard/api_4_afv_sear.cap b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_sear/javacard/api_4_afv_sear.cap
index f6615667d18e87cd0bfec228e64b0791a8ee6ea2..8b9bd9d35a51f2b78c806284d11aa458e47f8583 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_sear/javacard/api_4_afv_sear.cap and b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_sear/javacard/api_4_afv_sear.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_sear/javacard/api_4_afv_sear.exp b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_sear/javacard/api_4_afv_sear.exp
new file mode 100644
index 0000000000000000000000000000000000000000..09c8bca40f5ae1b7d34a35ef1240733e34820d76
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_sear/javacard/api_4_afv_sear.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_slctb/javacard/api_4_afv_slctb.cap b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_slctb/javacard/api_4_afv_slctb.cap
index 1ea6f08c2f1701177dd45a65192d17ad441e90d8..50696c4e0194cd32e06afd3da23133b7bc532eed 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_slctb/javacard/api_4_afv_slctb.cap and b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_slctb/javacard/api_4_afv_slctb.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_slctb/javacard/api_4_afv_slctb.exp b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_slctb/javacard/api_4_afv_slctb.exp
new file mode 100644
index 0000000000000000000000000000000000000000..32807b76e9a1224a856443c135ed5e99fca315e1
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_slctb/javacard/api_4_afv_slctb.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_slctb_bss/javacard/api_4_afv_slctb_bss.cap b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_slctb_bss/javacard/api_4_afv_slctb_bss.cap
index 8690bcb81f0d07b567a768092d929caebf72dfbd..4682190752ec9fb5116aca6fe9f5b99ca80706e6 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_slctb_bss/javacard/api_4_afv_slctb_bss.cap and b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_slctb_bss/javacard/api_4_afv_slctb_bss.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_slctb_bss/javacard/api_4_afv_slctb_bss.exp b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_slctb_bss/javacard/api_4_afv_slctb_bss.exp
new file mode 100644
index 0000000000000000000000000000000000000000..7749381b1a8938e3c68a06dbb8e506e7a97cf134
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_slctb_bss/javacard/api_4_afv_slctb_bss.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_slcts/javacard/api_4_afv_slcts.cap b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_slcts/javacard/api_4_afv_slcts.cap
index 250ef4e5f3b6a38248af4c834ecee726d649d2f7..001c94c761c2d346c08aabafb39321af9b31eba8 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_slcts/javacard/api_4_afv_slcts.cap and b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_slcts/javacard/api_4_afv_slcts.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_slcts/javacard/api_4_afv_slcts.exp b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_slcts/javacard/api_4_afv_slcts.exp
new file mode 100644
index 0000000000000000000000000000000000000000..23c325eb78abca797cfbc7205ebafb369324daf5
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_slcts/javacard/api_4_afv_slcts.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_stat/javacard/api_4_afv_stat.cap b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_stat/javacard/api_4_afv_stat.cap
index 080600ff245061defdff0449c7af8cc3f23df26f..2dc9ad9175dd8dbe3af5ec522a1535db54ed9cc2 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_stat/javacard/api_4_afv_stat.cap and b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_stat/javacard/api_4_afv_stat.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_stat/javacard/api_4_afv_stat.exp b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_stat/javacard/api_4_afv_stat.exp
new file mode 100644
index 0000000000000000000000000000000000000000..213d5a035b4678a4bcf6862300528db59dbe9c61
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_stat/javacard/api_4_afv_stat.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_updb/javacard/api_4_afv_updb.cap b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_updb/javacard/api_4_afv_updb.cap
index 78ab33018f4029d6f80d5a6b2293361f4801b4f3..1787d22c9dcd8c32c04ec43a881cc7b1d936bade 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_updb/javacard/api_4_afv_updb.cap and b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_updb/javacard/api_4_afv_updb.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_updb/javacard/api_4_afv_updb.exp b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_updb/javacard/api_4_afv_updb.exp
new file mode 100644
index 0000000000000000000000000000000000000000..96eb06474360615b017c210f098a4c00089ba44b
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_updb/javacard/api_4_afv_updb.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_updr/javacard/api_4_afv_updr.cap b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_updr/javacard/api_4_afv_updr.cap
index e103dcae7b64078956e59e2d20b9ea9c352171b3..9e09508c70ec93da2034b49dca454952d16a7ae7 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_updr/javacard/api_4_afv_updr.cap and b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_updr/javacard/api_4_afv_updr.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_updr/javacard/api_4_afv_updr.exp b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_updr/javacard/api_4_afv_updr.exp
new file mode 100644
index 0000000000000000000000000000000000000000..cfba14d64b272cb5b91ce6b90403185da7c2635b
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/access/fileadministration/api_4_afv_updr/javacard/api_4_afv_updr.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_api_hepo/javacard/cre_api_hepo.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_api_hepo/javacard/cre_api_hepo.cap
index 494fe81b93f88f68a87f1eae69f474aeff2347ae..54cbc639c8d13651af7f0ab18711e65a730169e3 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_api_hepo/javacard/cre_api_hepo.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_api_hepo/javacard/cre_api_hepo.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_api_hepo/javacard/cre_api_hepo.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_api_hepo/javacard/cre_api_hepo.exp
new file mode 100644
index 0000000000000000000000000000000000000000..d358acb88b8726b17b253d639aea9f7a62c2703e
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_api_hepo/javacard/cre_api_hepo.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_api_tmid/javacard/cre_api_tmid.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_api_tmid/javacard/cre_api_tmid.cap
index ada13792e8f1c7a2d8ca6326340b63e22830af50..afbdfd93d39954c92f3ed21f97dafd2ea62320bb 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_api_tmid/javacard/cre_api_tmid.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_api_tmid/javacard/cre_api_tmid.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_api_tmid/javacard/cre_api_tmid.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_api_tmid/javacard/cre_api_tmid.exp
new file mode 100644
index 0000000000000000000000000000000000000000..81104cf5fe267862283e6c695d29a0651897a0ca
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_api_tmid/javacard/cre_api_tmid.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_api_tran/javacard/cre_api_tran.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_api_tran/javacard/cre_api_tran.cap
index 966cba62568cfbe48bbb0ea09fe7422224a14f03..e813087ac1240346403962e350399a49c3e2109f 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_api_tran/javacard/cre_api_tran.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_api_tran/javacard/cre_api_tran.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_api_tran/javacard/cre_api_tran.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_api_tran/javacard/cre_api_tran.exp
new file mode 100644
index 0000000000000000000000000000000000000000..cb4ed046d256438a4adc03b6b7409198a2264def
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_api_tran/javacard/cre_api_tran.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_eade/javacard/cre_apt_eade.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_eade/javacard/cre_apt_eade.cap
index 6cfd960125cfa0a2d2e6698702a240914fbfe30e..80320d0c910c30b0cb22da1bb06d9bcb353397ab 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_eade/javacard/cre_apt_eade.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_eade/javacard/cre_apt_eade.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_eade/javacard/cre_apt_eade.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_eade/javacard/cre_apt_eade.exp
new file mode 100644
index 0000000000000000000000000000000000000000..610dc7fa75eda5472ddd096047f5a7d23e9f137d
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_eade/javacard/cre_apt_eade.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_eccn/javacard/cre_apt_eccn.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_eccn/javacard/cre_apt_eccn.cap
index c6c3d16f2a1dd275973a8cde61b006c5c5f62be3..ff832de46b94c0f2602b184ad75f5b613695f115 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_eccn/javacard/cre_apt_eccn.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_eccn/javacard/cre_apt_eccn.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_eccn/javacard/cre_apt_eccn.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_eccn/javacard/cre_apt_eccn.exp
new file mode 100644
index 0000000000000000000000000000000000000000..990625952c2be40365498b247eb0773ca2da8fcb
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_eccn/javacard/cre_apt_eccn.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edat/javacard/cre_apt_edat.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edat/javacard/cre_apt_edat.cap
index e4d9a62c6467c48cc6e73f367ae95b4b57d95812..ec946e0c303ee65b497d9b554df03709242fbe66 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edat/javacard/cre_apt_edat.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edat/javacard/cre_apt_edat.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edat/javacard/cre_apt_edat.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edat/javacard/cre_apt_edat.exp
new file mode 100644
index 0000000000000000000000000000000000000000..8a485f2dc44b761914520e28a0cc0e7c01fb0c8b
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edat/javacard/cre_apt_edat.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edbs/javacard/cre_apt_edbs.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edbs/javacard/cre_apt_edbs.cap
index 4b1e1336c95d225b926b8fc19f8a222ad4b6c9b2..0fb2c45a5c48aacfdc43ef954f4d92f05378573b 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edbs/javacard/cre_apt_edbs.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edbs/javacard/cre_apt_edbs.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edbs/javacard/cre_apt_edbs.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edbs/javacard/cre_apt_edbs.exp
new file mode 100644
index 0000000000000000000000000000000000000000..18ede5b972ecf9ecffd31005336ce284e0a9f7de
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edbs/javacard/cre_apt_edbs.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edbt/javacard/cre_apt_edbt.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edbt/javacard/cre_apt_edbt.cap
index 8f7fe9b35707d3bf94d0ca8f20bf74cdbfce6b30..1ab3d7fffc335c9c77bbada339642dfe8d7b4c1c 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edbt/javacard/cre_apt_edbt.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edbt/javacard/cre_apt_edbt.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edbt/javacard/cre_apt_edbt.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edbt/javacard/cre_apt_edbt.exp
new file mode 100644
index 0000000000000000000000000000000000000000..8780a9fd42b6259f5691d17259565f261da68048
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edbt/javacard/cre_apt_edbt.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edcc/javacard/cre_apt_edcc.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edcc/javacard/cre_apt_edcc.cap
index 85eb3d96f20821ce1613453d31a3a6d0be46a4a7..596ac1fedc86ed88816a0a18301818a16e001e21 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edcc/javacard/cre_apt_edcc.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edcc/javacard/cre_apt_edcc.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edcc/javacard/cre_apt_edcc.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edcc/javacard/cre_apt_edcc.exp
new file mode 100644
index 0000000000000000000000000000000000000000..9f70828320271f432d9f9c03e33445aa47870551
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edcc/javacard/cre_apt_edcc.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edcd/javacard/cre_apt_edcd.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edcd/javacard/cre_apt_edcd.cap
index 34c406393ed5fc07438372ebea1acde63e3e52f1..5313fe6aebf3b383d8fae15aefea4ac0acec1b51 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edcd/javacard/cre_apt_edcd.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edcd/javacard/cre_apt_edcd.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edcd/javacard/cre_apt_edcd.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edcd/javacard/cre_apt_edcd.exp
new file mode 100644
index 0000000000000000000000000000000000000000..8208e37e2b1affaa6e54989a8a463b4f93e94f86
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edcd/javacard/cre_apt_edcd.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edcr/javacard/cre_apt_edcr.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edcr/javacard/cre_apt_edcr.cap
index 229e6af4e9f6e38da871284c7e3d07f29909e972..b27fd8fd4ae477027129c1ec69ee6275d60ac1e1 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edcr/javacard/cre_apt_edcr.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edcr/javacard/cre_apt_edcr.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edcr/javacard/cre_apt_edcr.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edcr/javacard/cre_apt_edcr.exp
new file mode 100644
index 0000000000000000000000000000000000000000..7cb38965856d479ce64568b1426177ca99bd63ad
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edcr/javacard/cre_apt_edcr.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edcs/javacard/cre_apt_edcs.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edcs/javacard/cre_apt_edcs.cap
index f51f87b9c293608a154942e094eb9c5dc07c21fb..562b392d46d9835434176587220802093e5eecf1 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edcs/javacard/cre_apt_edcs.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edcs/javacard/cre_apt_edcs.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edcs/javacard/cre_apt_edcs.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edcs/javacard/cre_apt_edcs.exp
new file mode 100644
index 0000000000000000000000000000000000000000..b8e862bc0921e392e5ed863d60fe421d7ad43c13
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edcs/javacard/cre_apt_edcs.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edda/javacard/cre_apt_edda.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edda/javacard/cre_apt_edda.cap
index fb16fcbe1fccd9c145655fd16c2ba9b92074c577..bebd963248decb233303fb1df4dfc8efdc69fc38 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edda/javacard/cre_apt_edda.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edda/javacard/cre_apt_edda.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edda/javacard/cre_apt_edda.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edda/javacard/cre_apt_edda.exp
new file mode 100644
index 0000000000000000000000000000000000000000..63d8be8c0bb6d0e0825ca00c43c65aa285ce4bd8
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edda/javacard/cre_apt_edda.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_eddp/javacard/cre_apt_eddp.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_eddp/javacard/cre_apt_eddp.cap
index 4c773b2678a60742af34adb5134d65b6e2ab9594..51b4e09fa476d71db8b750a07200ef7365f904f7 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_eddp/javacard/cre_apt_eddp.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_eddp/javacard/cre_apt_eddp.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_eddp/javacard/cre_apt_eddp.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_eddp/javacard/cre_apt_eddp.exp
new file mode 100644
index 0000000000000000000000000000000000000000..e48debfb6bc44fbddc420a4c896e89e52fedf3cd
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_eddp/javacard/cre_apt_eddp.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edis/javacard/cre_apt_edis.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edis/javacard/cre_apt_edis.cap
index d93d476def59867a2bf458071eb038621d181f5e..ac133b9c4799a4bb60c29e60d1ddb0ffe103e298 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edis/javacard/cre_apt_edis.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edis/javacard/cre_apt_edis.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edis/javacard/cre_apt_edis.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edis/javacard/cre_apt_edis.exp
new file mode 100644
index 0000000000000000000000000000000000000000..2a311ac7e03a15b2178bb632a4393aeb170c8e9c
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edis/javacard/cre_apt_edis.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edlc/javacard/cre_apt_edlc.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edlc/javacard/cre_apt_edlc.cap
index cc9dd4c5a74847742eecaa6bb3595429ba1cfb2d..60579fd8bef34ce9ff72475959402c65e246837c 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edlc/javacard/cre_apt_edlc.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edlc/javacard/cre_apt_edlc.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edlc/javacard/cre_apt_edlc.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edlc/javacard/cre_apt_edlc.exp
new file mode 100644
index 0000000000000000000000000000000000000000..7a5d381cae37c138ea9a055c81a35277e789d8e5
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edlc/javacard/cre_apt_edlc.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edlg/javacard/cre_apt_edlg.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edlg/javacard/cre_apt_edlg.cap
index f1488d37b65a878281886f1c6d0bfe210f848f99..f40040332b78d74251ea8c6fe1e5f332ca66b129 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edlg/javacard/cre_apt_edlg.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edlg/javacard/cre_apt_edlg.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edlg/javacard/cre_apt_edlg.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edlg/javacard/cre_apt_edlg.exp
new file mode 100644
index 0000000000000000000000000000000000000000..86799890260b0d163570cfd58383b4758ddedbd4
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edlg/javacard/cre_apt_edlg.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edls/javacard/cre_apt_edls.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edls/javacard/cre_apt_edls.cap
index 883309526dad84f377b943932984289301e81d96..76dbdfe76e481b067265be9a33338d9a791fb611 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edls/javacard/cre_apt_edls.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edls/javacard/cre_apt_edls.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edls/javacard/cre_apt_edls.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edls/javacard/cre_apt_edls.exp
new file mode 100644
index 0000000000000000000000000000000000000000..38cebeab04fefaf6bd270fc1960ce6616c388e08
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edls/javacard/cre_apt_edls.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edmc/javacard/cre_apt_edmc.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edmc/javacard/cre_apt_edmc.cap
index 298b61ce7049707462ac7bb0ab3a0dfec293d08e..4485ba887e66163d81fc849127215d0563dc5e45 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edmc/javacard/cre_apt_edmc.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edmc/javacard/cre_apt_edmc.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edmc/javacard/cre_apt_edmc.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edmc/javacard/cre_apt_edmc.exp
new file mode 100644
index 0000000000000000000000000000000000000000..9bda4a69053c2a557d8f1880d31e584c5f73619c
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edmc/javacard/cre_apt_edmc.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edns/javacard/cre_apt_edns.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edns/javacard/cre_apt_edns.cap
index a17a29a5b671778b73fdc56acf80f7e587f50929..738280666b9b1ccc53bcc85f7b6f93cfc4506084 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edns/javacard/cre_apt_edns.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edns/javacard/cre_apt_edns.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edns/javacard/cre_apt_edns.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edns/javacard/cre_apt_edns.exp
new file mode 100644
index 0000000000000000000000000000000000000000..2c3cf0e79d759bf7b1e8681701b8a76770825464
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edns/javacard/cre_apt_edns.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edua/javacard/cre_apt_edua.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edua/javacard/cre_apt_edua.cap
index c9339c949a01140f4a65ab3d379cde5b9bf8c4e2..0553d71f59246a3cf513e8e0790dd98303eab59a 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edua/javacard/cre_apt_edua.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edua/javacard/cre_apt_edua.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edua/javacard/cre_apt_edua.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edua/javacard/cre_apt_edua.exp
new file mode 100644
index 0000000000000000000000000000000000000000..bad0897fcb0070157f62f76499428c87dafe71d3
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_edua/javacard/cre_apt_edua.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_eefu/javacard/cre_apt_eefu.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_eefu/javacard/cre_apt_eefu.cap
index 9ea1e4a9591418970880e6507f05534cfe737e1a..bbfea18032e9c4dafb6805ee879146072c394bea 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_eefu/javacard/cre_apt_eefu.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_eefu/javacard/cre_apt_eefu.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_eefu/javacard/cre_apt_eefu.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_eefu/javacard/cre_apt_eefu.exp
new file mode 100644
index 0000000000000000000000000000000000000000..01837fb0f979c38f4ea039781f691704ea355d16
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_eefu/javacard/cre_apt_eefu.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_efca/javacard/cre_apt_efca.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_efca/javacard/cre_apt_efca.cap
index 0692cad74f2a19b86721636ccaf5a5e649a413c1..57f2cd28b14b2327e16a6b21cd7f0691064b1921 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_efca/javacard/cre_apt_efca.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_efca/javacard/cre_apt_efca.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_efca/javacard/cre_apt_efca.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_efca/javacard/cre_apt_efca.exp
new file mode 100644
index 0000000000000000000000000000000000000000..f06d4d80a918582ad4b5d414ddfeadc0ea3b2194
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_efca/javacard/cre_apt_efca.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_emse/javacard/cre_apt_emse.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_emse/javacard/cre_apt_emse.cap
index 3f0d71194dfc2899b3149a1db010604768cf9dc0..e55324bb8654f4674a482cae1698d232a740dd88 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_emse/javacard/cre_apt_emse.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_emse/javacard/cre_apt_emse.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_emse/javacard/cre_apt_emse.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_emse/javacard/cre_apt_emse.exp
new file mode 100644
index 0000000000000000000000000000000000000000..03ac5dd698915de3d3e7ba88c1cfc844fb764433
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_emse/javacard/cre_apt_emse.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_emsh/javacard/cre_apt_emsh.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_emsh/javacard/cre_apt_emsh.cap
index 49c2604f53f2a6966b43cadcc697dc9f3bd6d0a3..6b7ade64580dc3e26eb2acffd18578da41495194 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_emsh/javacard/cre_apt_emsh.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_emsh/javacard/cre_apt_emsh.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_emsh/javacard/cre_apt_emsh.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_emsh/javacard/cre_apt_emsh.exp
new file mode 100644
index 0000000000000000000000000000000000000000..1a84d770c8ce10de27ab64ee0ee2499f03431948
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_emsh/javacard/cre_apt_emsh.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_epdw/javacard/cre_apt_epdw.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_epdw/javacard/cre_apt_epdw.cap
index 502b1a5a530180a7c93e91d8b4be59b64b734dcd..69e2ed160b4d701ef3da2a94762cf12ecf4284ad 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_epdw/javacard/cre_apt_epdw.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_epdw/javacard/cre_apt_epdw.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_epdw/javacard/cre_apt_epdw.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_epdw/javacard/cre_apt_epdw.exp
new file mode 100644
index 0000000000000000000000000000000000000000..d32d473ccc4449be194f8c9f5a41f88389353df3
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_epdw/javacard/cre_apt_epdw.exp differ
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 b280bf46fe7f06d296500cf402cd1eadf22e729a..313e3c69d75759c13f5b9bfeb54eadf4b4b6b908 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
@@ -19,6 +19,7 @@ public class Test_Cre_Apt_Epha extends UiccTestModel {
static final String APPLET_AID_1 = "A0000000 090005FF FFFFFF89 50010102";
static final String APPLET_AID_2 = "A0000000 090005FF FFFFFF89 50020102";
+ static final String APPLET_AID_3 = "A0000000 090005FF FFFFFF89 50020103";
static final String Text1 = "54657874 31";
private UiccAPITestCardService test;
@@ -32,6 +33,11 @@ public class Test_Cre_Apt_Epha extends UiccTestModel {
initialiseResults();
+ /*********************************************************************/
+ /** Testcase 1, 2 */
+ /*********************************************************************/
+
+
// start test
test.reset();
test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
@@ -98,6 +104,71 @@ public class Test_Cre_Apt_Epha extends UiccTestModel {
test.deleteApplet(APPLET_AID_1);
test.deleteApplet(APPLET_AID_2);
test.deletePackage(CAP_FILE_PATH);
+
+ /*********************************************************************/
+ /** Testcase 3 */
+ /*********************************************************************/
+
+ // Install Applet1
+ test.installApplet(CAP_FILE_PATH, CLASS_AID_1, APPLET_AID_3,
+ "8008" + // TLV UICC Toolkit application specific parameters
+ "01" + // V Priority Level
+ "00" + // V Max. number of timers
+ "0A" + // V Maximum text length for a menu entry
+ "00" + // V Maximum number of menu entries
+ "00" + // V Maximum number of channels
+ "00" + // LV Minimum Security Level field
+ "00" + // LV TAR Value(s)
+ "00"); // V Maximum number of services
+
+ addResult(response.checkSw("9000"));
+
+ // Install Applet2
+ test.installApplet(CAP_FILE_PATH, CLASS_AID_1, APPLET_AID_3,
+ "8008" + // TLV UICC Toolkit application specific parameters
+ "01" + // V Priority Level
+ "00" + // V Max. number of timers
+ "0A" + // V Maximum text length for a menu entry
+ "00" + // V Maximum number of menu entries
+ "00" + // V Maximum number of channels
+ "00" + // LV Minimum Security Level field
+ "00" + // LV TAR Value(s)
+ "00"); // V Maximum number of services
+
+ addResult(response.checkSw("9000"));
+
+ // Card Initialisation
+ test.reset();
+ test.terminalProfileSession("09030020 21");
+
+ // Trigger the applets
+ response = test.envelopeEventProactiveHandlerAvailable();
+ addResult(response.checkSw("9000"));
+
+
+ /*********************************************************************/
+ /*********************************************************************/
+ /** Check Applets */
+ /*********************************************************************/
+ /*********************************************************************/
+
+ response = test.selectApplication(APPLET_AID_3);
+ addResult(response.checkData("10" + APPLET_AID_1 + "01" + "CC"));
+
+
+ /*********************************************************************/
+ /*********************************************************************/
+ /** Restore card */
+ /*********************************************************************/
+ /*********************************************************************/
+
+ test.reset();
+ test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
+ // delete applets and package
+ test.deleteApplet(APPLET_AID_3);
+ test.deletePackage(CAP_FILE_PATH);
+ addResult(response.checkSw("9000"));
+
return getOverallResult();
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_epha/javacard/cre_apt_epha.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_epha/javacard/cre_apt_epha.cap
index 6900517eb5689ebd6797f5651bfafdce5711bffc..3efa5054970be6c56ba8f1a950bac4c0582ce0ce 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_epha/javacard/cre_apt_epha.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_epha/javacard/cre_apt_epha.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_epha/javacard/cre_apt_epha.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_epha/javacard/cre_apt_epha.exp
new file mode 100644
index 0000000000000000000000000000000000000000..c512d5a6de4286c10f74859003e7f5a689cd54b2
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_epha/javacard/cre_apt_epha.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_estc/javacard/cre_apt_estc.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_estc/javacard/cre_apt_estc.cap
index 65a46910a22adb4b5d5705f24f8a715e85c73af0..ca00f75525a75de2770b6c7c84ef5007717c94c8 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_estc/javacard/cre_apt_estc.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_estc/javacard/cre_apt_estc.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_estc/javacard/cre_apt_estc.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_estc/javacard/cre_apt_estc.exp
new file mode 100644
index 0000000000000000000000000000000000000000..07a212c5b27b372ddb5eb94cd3c52bc2782dfa8c
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_estc/javacard/cre_apt_estc.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_etex/javacard/cre_apt_etex.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_etex/javacard/cre_apt_etex.cap
index 6b7abaf488bde8d16638a4b7f5cb8456da5d1a6a..eb45683d19142d392905e80e7f47b036d97d8948 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_etex/javacard/cre_apt_etex.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_etex/javacard/cre_apt_etex.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_etex/javacard/cre_apt_etex.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_etex/javacard/cre_apt_etex.exp
new file mode 100644
index 0000000000000000000000000000000000000000..55b60a47415995b88c6e9c95926177ff2215bfa3
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_etex/javacard/cre_apt_etex.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_euev/javacard/cre_apt_euev.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_euev/javacard/cre_apt_euev.cap
index 78537e5928abff6200d47411f70a97d92cdc44e5..5a557aa4ea95ad1abb7603ceea644ee58a09c4e7 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_euev/javacard/cre_apt_euev.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_euev/javacard/cre_apt_euev.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_euev/javacard/cre_apt_euev.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_euev/javacard/cre_apt_euev.exp
new file mode 100644
index 0000000000000000000000000000000000000000..86e7bb1baabaddea57ac55dfbd71752a85ba73b2
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_euev/javacard/cre_apt_euev.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_genb/javacard/cre_apt_genb.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_genb/javacard/cre_apt_genb.cap
index 89c50ab1703ac40a6577470bda0fb9f82e1e13af..434eb7753f0f892348cc8902e3540eda55e873d8 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_genb/javacard/cre_apt_genb.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_genb/javacard/cre_apt_genb.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_genb/javacard/cre_apt_genb.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_genb/javacard/cre_apt_genb.exp
new file mode 100644
index 0000000000000000000000000000000000000000..6309b1e1337d3eaa3a6ee183a51d741996e221ad
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_apt_genb/javacard/cre_apt_genb.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_erp_eccn/javacard/cre_erp_eccn.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_erp_eccn/javacard/cre_erp_eccn.cap
index f31288b0b041e044e70532b30aa41857a83fedf7..fafcb707076d9aa5517ca7bed8d940be1e84f362 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_erp_eccn/javacard/cre_erp_eccn.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_erp_eccn/javacard/cre_erp_eccn.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_erp_eccn/javacard/cre_erp_eccn.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_erp_eccn/javacard/cre_erp_eccn.exp
new file mode 100644
index 0000000000000000000000000000000000000000..e0e0eebc08d3c4477e36696550156a0d95dec24b
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_erp_eccn/javacard/cre_erp_eccn.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_erp_euen/javacard/cre_erp_euen.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_erp_euen/javacard/cre_erp_euen.cap
index d8417d7e93c8fd09a34219a27074e62e0bbd4ec0..d93ada2e3b67af332b03b44b71873d7da26d57e3 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_erp_euen/javacard/cre_erp_euen.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_erp_euen/javacard/cre_erp_euen.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_erp_euen/javacard/cre_erp_euen.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_erp_euen/javacard/cre_erp_euen.exp
new file mode 100644
index 0000000000000000000000000000000000000000..33a8eba82440e3ee4109fadd2301d2742f2990ea
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_erp_euen/javacard/cre_erp_euen.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_exh_genb/javacard/cre_exh_genb.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_exh_genb/javacard/cre_exh_genb.cap
index acd9797311fd399f0614e10b59fca7a32802025a..8ad110b188ad6c058614308a05ed7f3098de78e5 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_exh_genb/javacard/cre_exh_genb.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_exh_genb/javacard/cre_exh_genb.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_exh_genb/javacard/cre_exh_genb.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_exh_genb/javacard/cre_exh_genb.exp
new file mode 100644
index 0000000000000000000000000000000000000000..ddc61e438a64c6672752e29676cefba635b8b4e8
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_exh_genb/javacard/cre_exh_genb.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_exh_imtg/javacard/cre_exh_imtg.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_exh_imtg/javacard/cre_exh_imtg.cap
index 696a95fc89830341780610d68139d1e82b560b0d..66910c512d9c539f6aa26d3af18231ea28c40c1d 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_exh_imtg/javacard/cre_exh_imtg.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_exh_imtg/javacard/cre_exh_imtg.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_exh_imtg/javacard/cre_exh_imtg.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_exh_imtg/javacard/cre_exh_imtg.exp
new file mode 100644
index 0000000000000000000000000000000000000000..c8010a6d54be811c1b3fa29d1cc392127f029c84
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_exh_imtg/javacard/cre_exh_imtg.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_hin_enhd/javacard/cre_hin_enhd.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_hin_enhd/javacard/cre_hin_enhd.cap
index 04e4f8feb7b022dd63437341d97b2d82a9aa042c..a34bcf256a7c7188132408493fc8a6b83f6e3e52 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_hin_enhd/javacard/cre_hin_enhd.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_hin_enhd/javacard/cre_hin_enhd.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_hin_enhd/javacard/cre_hin_enhd.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_hin_enhd/javacard/cre_hin_enhd.exp
new file mode 100644
index 0000000000000000000000000000000000000000..40ce06f6e482b696a3bc9b89f96c5c8b4612eddc
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_hin_enhd/javacard/cre_hin_enhd.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_hin_erhd/javacard/cre_hin_erhd.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_hin_erhd/javacard/cre_hin_erhd.cap
index 33805fcc0cdf0575639a4048a8cd2318d69415ca..0d57d5b5a032e44ad82549ff71efdbf7015a62ce 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_hin_erhd/javacard/cre_hin_erhd.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_hin_erhd/javacard/cre_hin_erhd.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_hin_erhd/javacard/cre_hin_erhd.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_hin_erhd/javacard/cre_hin_erhd.exp
new file mode 100644
index 0000000000000000000000000000000000000000..5fb1bc85abb1f59505a01f2cb99387ccedfa2f88
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_hin_erhd/javacard/cre_hin_erhd.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_hin_pahd/javacard/cre_hin_pahd.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_hin_pahd/javacard/cre_hin_pahd.cap
index 076a2943339cd3904440b841c074e2b451e2cecd..1563bb46d7e58f6ac9e1f08fee40916483707d13 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_hin_pahd/javacard/cre_hin_pahd.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_hin_pahd/javacard/cre_hin_pahd.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_hin_pahd/javacard/cre_hin_pahd.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_hin_pahd/javacard/cre_hin_pahd.exp
new file mode 100644
index 0000000000000000000000000000000000000000..609f602430b467615e61482a7556fd965938002d
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_hin_pahd/javacard/cre_hin_pahd.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_hin_prhd/javacard/cre_hin_prhd.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_hin_prhd/javacard/cre_hin_prhd.cap
index 25240a19e468fa441103fc311b6e9bda14b18f16..51c3383c108267c753a5e3043a84b6fa6e25072a 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_hin_prhd/javacard/cre_hin_prhd.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_hin_prhd/javacard/cre_hin_prhd.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_hin_prhd/javacard/cre_hin_prhd.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_hin_prhd/javacard/cre_hin_prhd.exp
new file mode 100644
index 0000000000000000000000000000000000000000..5fd317584945911017676775d4d51740a85ddc70
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_hin_prhd/javacard/cre_hin_prhd.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_enhd/Cre_Mha_Enhd_1.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_enhd/Cre_Mha_Enhd_1.java
index 10e7a6884f5814eceed65c34f720ec100c693b27..32809e01d9e917f58c35586f79bd690714f15c8a 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_enhd/Cre_Mha_Enhd_1.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_enhd/Cre_Mha_Enhd_1.java
@@ -57,7 +57,9 @@ public class Cre_Mha_Enhd_1 extends TestToolkitApplet
EVENT_FIRST_COMMAND_AFTER_ATR,
EVENT_PROFILE_DOWNLOAD,
EVENT_EVENT_DOWNLOAD_NETWORK_SEARCH_MODE_CHANGE,
- EVENT_EVENT_BROWSING_STATUS};
+ EVENT_EVENT_BROWSING_STATUS,
+ EVENT_EVENT_DOWNLOAD_FRAMES_INFORMATION_CHANGED,
+ EVENT_EVENT_DOWNLOAD_HCI_CONNECTIVITY};
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_enhd/Cre_Mha_Enhd_2.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_enhd/Cre_Mha_Enhd_2.java
index ade5468bd05ca45566d2a23065c13dd596349ab7..04c38d79b2c120fab5c1788792449b135a672648 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_enhd/Cre_Mha_Enhd_2.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_enhd/Cre_Mha_Enhd_2.java
@@ -48,6 +48,8 @@ public class Cre_Mha_Enhd_2 extends TestToolkitApplet {
EVENT_EVENT_DOWNLOAD_NETWORK_SEARCH_MODE_CHANGE,
EVENT_EVENT_BROWSING_STATUS,
EVENT_PROFILE_DOWNLOAD,
+ EVENT_EVENT_DOWNLOAD_FRAMES_INFORMATION_CHANGED,
+ EVENT_EVENT_DOWNLOAD_HCI_CONNECTIVITY
};
/**
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 887972c388191dd39367a9687d35f92aa4a94192..04e92547ae143db9caa63f14187784c58b233994 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,7 +38,9 @@ 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;
+
/**
*
@@ -50,11 +52,9 @@ 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");
+ test.terminalProfileSession("0301");
// Install Applet
test.loadPackage(CAP_FILE_PATH);
@@ -94,85 +94,91 @@ public class Test_Cre_Mha_Enhd extends UiccTestModel {
response = test.terminalProfileSession("FFFFFFF FFEFF1FFF FF0000FF FF9FFFEF" +
"03FF000 0007FE300 01");
response = test.envelopeMenuSelection("900102","9500");
- addResult(response.checkSw("9000"));
+ testresult = response.checkSw("9000");
//TC 4
response = test.envelopeMenuSelection("900101","");
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 5
response = test.envelopeTimerExpiration("A40101");
//TC 6
response = test.envelopeCallControlByNAA();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 7
response = test.envelopeEventDownloadMTCall();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 8
response = test.envelopeEventDownloadCallConnected();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 9
response = test.envelopeEventDownloadCallDisconnected();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 10
response = test.envelopeEventDownloadLocationStatus();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 11
response = test.envelopeEventDownloadUserActivity();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 12
response = test.envelopeEventDownloadIdleScreenAvailable();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 13
response = test.envelopeEventDownloadCardReaderStatus();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 14
response = test.envelopeEventDownloadLanguageSelection();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 15
response = test.envelopeEventDownloadBrowserTermination();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 16
response = test.status("00","0C","00");
- addResult(response.checkSw("911A"));
+ testresult &= response.checkSw("911A");
//TC 17
response = test.fetch("1A");
response = test.terminalResponse("81030140 01820282 8183010038 0281003502 " +
"03003902 000A");
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
response = test.envelopeEventDownloadDataAvailable("B8028100");
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 18
response = test.envelopeEventDownloadChannelStatus("B8028100");
- addResult(response.checkSw("9000"));
+ testresult &= 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");
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 20
response = test.envelopeEventDownloadLocalConnection("C1040000FFFF");
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 21
response = test.envelopeEventDownloadAccessTechnologyChange();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 22
response = test.envelopeEventDownloadDisplayParametersChanged();
- addResult(response.checkSw("9000"));
+ testresult &= 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");
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 25
response = test.envelopeEventDownloadNetworkSearchModeChange();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 26
response = test.envelopeEventDownloadBrowsingStatus();
- addResult(response.checkSw("9000"));
- //TC 27
+ testresult &= response.checkSw("9000");
+ //TC 28
+ response = test.envelopeEventDownloadFramesInformationChanged();
+ testresult &= response.checkSw("9000");
+ //TC 29
+ response = test.envelopeEventDownloadHCIConnectivity();
+ testresult &= response.checkSw("9000");
+ //TC 27 + 2
test.reset();
response = test.terminalProfileSession("FFFFFFF FFEFF1FFF FF0000FF FF9FFFEF" +
"03FF000 0007FE300 01");
@@ -188,21 +194,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);
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//CHECK TEST RESULT
response = test.selectApplication(APPLET_AID_1);
- addResult(response.checkData("10" +APPLET_AID_1 +
- "1ACCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
- "CCCCCCCC CCCCCCCC CCCCCC"));
+ testresult &= response.checkData("10" +APPLET_AID_1 +
+ "1CCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
+ "CCCCCCCC CCCCCCCC CCCCCC");
response = test.selectApplication(APPLET_AID_2);
- addResult(response.checkData("10" +APPLET_AID_2 +
+ testresult &= response.checkData("10" +APPLET_AID_2 +
"13CCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
- "CCCCCC CCCC"));
+ "CCCCCC CCCC");
response = test.selectApplication(APPLET_AID_3);
- addResult(response.checkData("10" +APPLET_AID_3 + "01CC"));
+ testresult &= response.checkData("10" +APPLET_AID_3 + "01CC");
// delete applet and package
test.reset();
@@ -212,7 +218,7 @@ public class Test_Cre_Mha_Enhd extends UiccTestModel {
test.deleteApplet(APPLET_AID_3);
test.deletePackage(CAP_FILE_PATH);
- return getOverallResult();
+ return testresult;
}
/**
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_enhd/javacard/cre_mha_enhd.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_enhd/javacard/cre_mha_enhd.cap
index 852e78e4607e46b384747a41690edbc66a86fb64..80d0c8295ec5732dc1080c4715dfcbe1cfcd0e9d 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_enhd/javacard/cre_mha_enhd.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_enhd/javacard/cre_mha_enhd.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_enhd/javacard/cre_mha_enhd.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_enhd/javacard/cre_mha_enhd.exp
new file mode 100644
index 0000000000000000000000000000000000000000..6d65b0c535ea290dbcfa67065ff9f51e15eb24e1
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_enhd/javacard/cre_mha_enhd.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_erhd/Cre_Mha_Erhd_1.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_erhd/Cre_Mha_Erhd_1.java
index f484904f76c6942a3bc6cab980bf8ccb63171cd8..e4393fbc8e1ea1d094e9d666d0ae5515fcd6e2e5 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_erhd/Cre_Mha_Erhd_1.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_erhd/Cre_Mha_Erhd_1.java
@@ -60,6 +60,8 @@ public class Cre_Mha_Erhd_1 extends TestToolkitApplet {
EVENT_APPLICATION_DESELECT,
EVENT_EVENT_BROWSING_STATUS,
EVENT_EVENT_DOWNLOAD_NETWORK_SEARCH_MODE_CHANGE,
+ EVENT_EVENT_DOWNLOAD_FRAMES_INFORMATION_CHANGED,
+ EVENT_EVENT_DOWNLOAD_HCI_CONNECTIVITY
};
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 8bb0ae92909d032c584450308228856bdaeede1a..47330013f08342e41d1d82d80c35f4418b0c0520 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,6 +35,8 @@ 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;
/**
*
@@ -46,9 +48,7 @@ public class Test_Cre_Mha_Erhd extends UiccTestModel {
* Installs the applet, runs the tests and checks the test result.
*/
public boolean run(){
- initialiseResults();
-
- // test script
+ // test script
test.reset();
test.terminalProfileSession("16FF");
// Install Applet
@@ -91,109 +91,115 @@ public class Test_Cre_Mha_Erhd extends UiccTestModel {
"FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF " +
"FFFF");
response = test.envelopeMenuSelection("900102","9500");
- addResult(response.checkSw("9000"));
+ testresult = response.checkSw("9000");
//TC 4
response = test.envelopeMenuSelection("900101","");
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 5
response = test.envelopeTimerExpiration("A40101");
//TC 6
response = test.envelopeEventDownloadMTCall();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 7
response = test.envelopeEventDownloadCallConnected();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 8
response = test.envelopeEventDownloadCallDisconnected();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 9
response = test.envelopeEventDownloadLocationStatus();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 10
response = test.envelopeEventDownloadUserActivity();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 11
response = test.envelopeEventDownloadIdleScreenAvailable();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 12
response = test.envelopeEventDownloadCardReaderStatus();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 13
response = test.envelopeEventDownloadLanguageSelection();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 14
response = test.envelopeEventDownloadBrowserTermination();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 15
response = test.status("00","0C","00");
- addResult(response.checkSw("911A"));
+ testresult &= response.checkSw("911A");
//TC 16
response = test.fetch("1A");
response = test.terminalResponse("81030140 01820282 8183010038 0281003502 " +
"03003902 000A");
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
response = test.envelopeEventDownloadDataAvailable("B8028100");//channel id 1
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 17
response = test.envelopeEventDownloadChannelStatus("B8028100");
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 18
response = test.envelopeCallControlByNAA();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
response = test.envelopeCallControlByNAA();
- addResult(response.checkSw("9110"));
+ testresult &= response.checkSw("9110");
response = test.fetch("10");
- addResult(response.checkData("D00E8103 01218082 0281028D 03040000"));
+ testresult &= response.checkData("D00E8103 01218082 0281028D 03040000");
response = test.terminalResponse("81030110 00820282 81830100");
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 19
response = test.unrecognizedEnvelope();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
response = test.unrecognizedEnvelope();
- addResult(response.checkSw("9111"));
+ testresult &= response.checkSw("9111");
response = test.fetch("11");
- addResult(response.checkData("D00F8103 01218082 0281028D 0404010203"));
+ testresult &= response.checkData("D00F8103 01218082 0281028D 0404010203");
response = test.terminalResponse("81030110 00820282 81830100");
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 20
response = test.unrecognizedEnvelope();
- addResult(response.checkSw("9114"));
+ testresult &= response.checkSw("9114");
response = test.envelopeCallControlByNAA();
- addResult(response.checkSw("9114"));
+ testresult &= response.checkSw("9114");
response = test.fetch("14");
- addResult(response.checkData("D0128103 01218082 0281028D 07045445 58542031"));
+ testresult &= response.checkData("D0128103 01218082 0281028D 07045445 58542031");
response = test.terminalResponse("81030121 80820282 81030100");
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 21
response = test.unrecognizedEnvelope();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 22
response = test.envelopeEventDownloadAccessTechnologyChange();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 23
response = test.envelopeEventDownloadDisplayParametersChanged();
- addResult(response.checkSw("9110"));
+ testresult &= 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");
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 25
response = test.envelopeEventDownloadLocalConnection("C1040000FFFF");
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 26
response = test.selectApplication ("A0000000 090005FF FFFFFF89 E0000002");
response = test.sendApdu ("00A4044C 10A00000 00090005 FFFFFFFF 89E00000 02");
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 27
response = test.envelopeEventDownloadNetworkSearchModeChange();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 28
response = test.envelopeEventDownloadBrowsingStatus();
- addResult(response.checkSw("9000"));
- //TC 27
+ testresult &= response.checkSw("9000");
+ //TC 28
+ response = test.envelopeEventDownloadFramesInformationChanged();
+ testresult &= response.checkSw("9000");
+ //TC 29
+ response = test.envelopeEventDownloadHCIConnectivity();
+ testresult &= response.checkSw("9000");
+ //TC 27 + 2
test.reset();
response = test.terminalProfileSession("13");
@@ -217,16 +223,16 @@ public class Test_Cre_Mha_Erhd extends UiccTestModel {
//check results of the tests
//test.reset();
response = test.selectApplication(APPLET_AID_1);
- addResult(response.checkData("10" +APPLET_AID_1 +
- "1CCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
- "CCCCCCCC CCCCCCCC CCCCCCCC CC"));
+ testresult &= response.checkData("10" +APPLET_AID_1 +
+ "1ECCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
+ "CCCCCCCC CCCCCCCC CCCCCCCC CC");
response = test.selectApplication(APPLET_AID_2);
- addResult(response.checkData("10" +APPLET_AID_2 +
- "02CCCC"));
+ testresult &= response.checkData("10" +APPLET_AID_2 +
+ "02CCCC");
response = test.selectApplication(APPLET_AID_3);
- addResult(response.checkData("10" +APPLET_AID_3 + "01CC"));
+ testresult &= response.checkData("10" +APPLET_AID_3 + "01CC");
// delete applet and package
test.reset();
@@ -236,7 +242,7 @@ public class Test_Cre_Mha_Erhd extends UiccTestModel {
test.deleteApplet(APPLET_AID_3);
test.deletePackage(CAP_FILE_PATH);
- return getOverallResult();
+ return testresult;
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_erhd/javacard/cre_mha_erhd.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_erhd/javacard/cre_mha_erhd.cap
index 03e688201b1bf3686e39a47cd3f7893400bdb850..5d8a2f50abbcb3aa9c49d47fcab68e3e5914f2bb 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_erhd/javacard/cre_mha_erhd.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_erhd/javacard/cre_mha_erhd.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_erhd/javacard/cre_mha_erhd.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_erhd/javacard/cre_mha_erhd.exp
new file mode 100644
index 0000000000000000000000000000000000000000..2be15bcebfb4c798a34a0e82416c9efc37758a1f
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_erhd/javacard/cre_mha_erhd.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_pahd/Cre_Mha_Pahd_1.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_pahd/Cre_Mha_Pahd_1.java
index 194ea6679bb5d2ec5b283347786fa92c9acfa1d5..595fdae52a2291e55ecc80295938d1acecaca2e5 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_pahd/Cre_Mha_Pahd_1.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_pahd/Cre_Mha_Pahd_1.java
@@ -57,7 +57,9 @@ public class Cre_Mha_Pahd_1 extends TestToolkitApplet {
EVENT_EVENT_DOWNLOAD_DISPLAY_PARAMETER_CHANGED,
EVENT_EVENT_DOWNLOAD_NETWORK_SEARCH_MODE_CHANGE,
EVENT_EVENT_BROWSING_STATUS,
- EVENT_APPLICATION_DESELECT
+ EVENT_APPLICATION_DESELECT,
+ EVENT_EVENT_DOWNLOAD_FRAMES_INFORMATION_CHANGED,
+ EVENT_EVENT_DOWNLOAD_HCI_CONNECTIVITY
};
@@ -221,7 +223,7 @@ public class Cre_Mha_Pahd_1 extends TestToolkitApplet {
//- TC 3,4,5,6,7,9,10,11,12
// 13,14,15,17,18,19,20,22 <-handler available
// 24,25,26,27,28,29,31,32,33,34,35,36,37
- // 38,39,40,
+ // 38,39,40,48,49
default:
checkProactiveHandler();
break;
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_pahd/Cre_Mha_Pahd_2.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_pahd/Cre_Mha_Pahd_2.java
index 53451e7d8b7549b43cbb82a145ee3989c1a4fa1b..a61a620d933f910b206109b417c32f01820862d8 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_pahd/Cre_Mha_Pahd_2.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_pahd/Cre_Mha_Pahd_2.java
@@ -47,7 +47,9 @@ public class Cre_Mha_Pahd_2 extends TestToolkitApplet {
EVENT_EVENT_DOWNLOAD_DISPLAY_PARAMETER_CHANGED,
EVENT_EVENT_DOWNLOAD_NETWORK_SEARCH_MODE_CHANGE,
EVENT_EVENT_BROWSING_STATUS,
- EVENT_APPLICATION_DESELECT
+ EVENT_APPLICATION_DESELECT,
+ EVENT_EVENT_DOWNLOAD_FRAMES_INFORMATION_CHANGED,
+ EVENT_EVENT_DOWNLOAD_HCI_CONNECTIVITY
};
@@ -178,7 +180,7 @@ public class Cre_Mha_Pahd_2 extends TestToolkitApplet {
default:
//TC 7,8,9,10,11,12,13,14,15,16,16,20,21,23,29,
- //30,31,33,34,35,36,37,38,39,40,41,
+ //30,31,33,34,35,36,37,38,39,40,41,48,49
checkProactiveHandler();
break;
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_pahd/Cre_Mha_Pahd_3.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_pahd/Cre_Mha_Pahd_3.java
index 323b8a1db9ad4940c7aa2c6f2de23df10b5552a4..c906f311311601125cfbdd9d30aefea88c6b49ad 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_pahd/Cre_Mha_Pahd_3.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_pahd/Cre_Mha_Pahd_3.java
@@ -35,7 +35,7 @@ public class Cre_Mha_Pahd_3 extends TestToolkitApplet {
private Cre_Mha_Pahd_3 () {}
- private byte[] baTestsResults = new byte[128];
+ private byte[] baTestsResults = new byte[128];
private byte[] baTestAppletId = new byte[17];
/**
* Create an instance of the Applet, the Java Card runtime environment will call this static method first.
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 b0cefaa76aa78708d95af060716fd1d1c3433f45..945b5c401d91e7709b09d2995cc17fc013c10760 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,6 +39,8 @@ 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,
@@ -57,11 +59,9 @@ public class Test_Cre_Mha_Pahd extends UiccTestModel {
* Installs the applet, runs the tests and checks the test result.
*/
public boolean run(){
- initialiseResults();
-
- // test script
+ // test script
test.reset();
- test.terminalProfileSession("03010000 0102");
+ test.terminalProfileSession("0301");
// Install Applet
test.loadPackage(CAP_FILE_PATH);
@@ -94,68 +94,68 @@ public class Test_Cre_Mha_Pahd extends UiccTestModel {
//TC 1 - select MF
response = test.selectFile("3F00");
//TC 2 - send Terminal Profile except SET_EVENT_LIST,POLL_INTERVALL,SETUP_IDLE_MODE_TEXT,SET_UP_MENU
- response = test.terminalProfileSession("FFFFDFD FFEFF1FEF FF0000FF FF9FFFEF" +
- "03FF000 0007FE300 01");
+ response = test.terminalProfileSession("FFFFDFDF FEFF1FEF FF0000FF FF9FFFEF" +
+ "03FF0000 007FE300 01");
//TC 3 - initialization with all the facilities supported (without SETUP_EVENT_LIST
response = test.terminalProfileSession("FFFFFFFF FEFFFFFF FFFFFFFF FFFFFFFF " +
- "FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF " +
- "FFFF");
+ "FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF " +
+ "FFFF");
response = test.envelopeMenuSelection("900102","9500");
- addResult(response.checkSw("9000"));
+ testresult = response.checkSw("9000");
//TC 4
response = test.envelopeMenuSelection("900101","");
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 5
response = test.envelopeTimerExpiration("A40101");
//TC 6
response = test.envelopeCallControlByNAA();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 7
response = test.envelopeEventDownloadMTCall();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 8
response = test.envelopeEventDownloadCallConnected();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 9
response = test.envelopeEventDownloadCallDisconnected();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 10
response = test.envelopeEventDownloadLocationStatus();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 11
response = test.envelopeEventDownloadUserActivity();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 12
response = test.envelopeEventDownloadIdleScreenAvailable();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 13
response = test.envelopeEventDownloadCardReaderStatus();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 14
response = test.envelopeEventDownloadLanguageSelection();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 15
response = test.envelopeEventDownloadBrowserTermination();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 16
response = test.status("00","0C","00");
- addResult(response.checkSw("911A"));
+ testresult &= response.checkSw("911A");
//TC 17
response = test.fetch("1A");
response = test.terminalResponse("81030140 01820282 8183010038 0281003502 " +
"03003902 000A");
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
response = test.envelopeEventDownloadDataAvailable("B8028100");
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 18
response = test.envelopeEventDownloadChannelStatus("B8028100");
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 19
response = test.unrecognizedEnvelope();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 20
response = test.envelopeEventDownloadAccessTechnologyChange();
- addResult(response.checkSw("9000"));
+ testresult &= 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");
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 22
response = test.envelopeEventDownloadLocalConnection(servrectlv);
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 23
response = test.envelopeEventDownloadCallConnected();
//fetch display text
response = test.fetch("14");
response = test.terminalResponse("81030121 80820282 81030100");
- addResult(response.checkSw("9000"));
+ testresult &= 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) );
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 25
test.reset();
//no terminal profile is sent and proactive handler shall not be available.
@@ -215,24 +215,28 @@ public class Test_Cre_Mha_Pahd extends UiccTestModel {
response = test.envelopeEventDownloadAccessTechnologyChange();
//TC 41
response = test.envelopeEventDownloadDisplayParametersChanged();
+ //TC 49
+ response = test.envelopeEventDownloadFramesInformationChanged();
+ //TC 50
+ response = test.envelopeEventDownloadHCIConnectivity();
//TC 42
//The Proactive Handler is not available before the
//Terminal Profile
//TC 43
- response = test.envelopeEventDownloadNetworkSearchModeChange();
- //TC 44
- response = test.envelopeEventDownloadBrowsingStatus();
- //TC 45
- test.reset();
+ response = test.envelopeEventDownloadNetworkSearchModeChange();
+ //TC 44
+ response = test.envelopeEventDownloadBrowsingStatus();
+ //TC 45 + 2
+ test.reset();
//initialization with all the facilities supported (without SETUP_EVENT_LIST)
response = test.terminalProfileSession("FFFFFFFF FEFFFFFF FFFFFFFF FFFFFFFF " +
"FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF " +
"FFFF");
response = test.envelopeEventDownloadNetworkSearchModeChange();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 46
response = test.envelopeEventDownloadBrowsingStatus();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 47
test.reset();
// Install Applet
@@ -259,8 +263,8 @@ 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);
- addResult(response.checkData("10" +APPLET_AID_1 +
- "2DCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
+ testresult &= (response.checkData("10" +APPLET_AID_1 +
+ "2FCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
"CCCCCCCC CCCCCCCC CCCCCCCC CCCC") ||
response.checkData("10" +APPLET_AID_1 +
@@ -268,7 +272,7 @@ public class Test_Cre_Mha_Pahd extends UiccTestModel {
"CCCCCCCC CCCCCCCC CC") );
response = test.selectApplication(APPLET_AID_2);
- addResult(response.checkData("10" +APPLET_AID_2 +
+ testresult &= (response.checkData("10" +APPLET_AID_2 +
"22CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
"CCCCCC") ||
@@ -277,7 +281,7 @@ public class Test_Cre_Mha_Pahd extends UiccTestModel {
"CCCC") );
response = test.selectApplication(APPLET_AID_3);
- addResult(response.checkData("10" +APPLET_AID_3 + "01CC"));
+ testresult &= response.checkData("10" +APPLET_AID_3 + "01CC");
// delete applet and package
test.reset();
@@ -287,7 +291,7 @@ public class Test_Cre_Mha_Pahd extends UiccTestModel {
test.deleteApplet(APPLET_AID_3);
test.deletePackage(CAP_FILE_PATH);
- return getOverallResult();
+ return testresult;
}
/**
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_pahd/javacard/cre_mha_pahd.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_pahd/javacard/cre_mha_pahd.cap
index d5084ed561546e56794f10ca2261fe703d5d5955..23a2b563b17983a4f3092f64210b1755861a4cad 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_pahd/javacard/cre_mha_pahd.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_pahd/javacard/cre_mha_pahd.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_pahd/javacard/cre_mha_pahd.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_pahd/javacard/cre_mha_pahd.exp
new file mode 100644
index 0000000000000000000000000000000000000000..623848864691fb697c5994e81a39f300d7a1c828
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_pahd/javacard/cre_mha_pahd.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_prhd/Cre_Mha_Prhd_1.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_prhd/Cre_Mha_Prhd_1.java
index 35daf04c2515de2c1dccfd117812e1e2392371a2..45b9f9ef8153584bfb42fd39d8183dbfc57785ca 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_prhd/Cre_Mha_Prhd_1.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_prhd/Cre_Mha_Prhd_1.java
@@ -58,7 +58,9 @@ public class Cre_Mha_Prhd_1 extends TestToolkitApplet {
EVENT_EVENT_DOWNLOAD_DISPLAY_PARAMETER_CHANGED,
EVENT_EVENT_DOWNLOAD_NETWORK_SEARCH_MODE_CHANGE,
EVENT_EVENT_BROWSING_STATUS,
- EVENT_APPLICATION_DESELECT
+ EVENT_APPLICATION_DESELECT,
+ EVENT_EVENT_DOWNLOAD_FRAMES_INFORMATION_CHANGED,
+ EVENT_EVENT_DOWNLOAD_HCI_CONNECTIVITY
};
@@ -227,7 +229,7 @@ public class Cre_Mha_Prhd_1 extends TestToolkitApplet {
//- TC 3,4,5,6,7,9,10,11,12
// 13,14,15,17,18,19,20,22 <-handler available
// 24,25,26,27,28,29,31,32,33,34,35,36,37
- // 38,39,40,
+ // 38,39,40,48,49
default:
checkProactiveHandler();
break;
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_prhd/Cre_Mha_Prhd_2.java b/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_prhd/Cre_Mha_Prhd_2.java
index 48f7b6351c257a0268c23e1292fc2a0172a6e183..5bddc221e4aea03d395ef5dc7c84ea83732d4dee 100644
--- a/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_prhd/Cre_Mha_Prhd_2.java
+++ b/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_prhd/Cre_Mha_Prhd_2.java
@@ -47,7 +47,9 @@ public class Cre_Mha_Prhd_2 extends TestToolkitApplet {
EVENT_EVENT_DOWNLOAD_DISPLAY_PARAMETER_CHANGED,
EVENT_EVENT_DOWNLOAD_NETWORK_SEARCH_MODE_CHANGE,
EVENT_EVENT_BROWSING_STATUS,
- EVENT_APPLICATION_DESELECT
+ EVENT_APPLICATION_DESELECT,
+ EVENT_EVENT_DOWNLOAD_FRAMES_INFORMATION_CHANGED,
+ EVENT_EVENT_DOWNLOAD_HCI_CONNECTIVITY
};
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 4e68e0f7c5974ae4c06f2b84c22edbb2e9c44cd4..be5c4c59f2b2ad5173a564512fd4a904281be21a 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,6 +38,8 @@ 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;
/**
*
@@ -49,11 +51,10 @@ 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();
- test.terminalProfileSession("03010000 0102");
+ test.terminalProfileSession("0301");
// Install Applet
test.loadPackage(CAP_FILE_PATH);
@@ -93,61 +94,61 @@ public class Test_Cre_Mha_Prhd extends UiccTestModel {
"FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF " +
"FFFF");
response = test.envelopeMenuSelection("900102","9500");
- addResult(response.checkSw("9000"));
+ testresult = response.checkSw("9000");
//TC 4
response = test.envelopeMenuSelection("900101","");
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 5
response = test.envelopeTimerExpiration("A40101");
//TC 6
response = test.envelopeCallControlByNAA();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 7
response = test.envelopeEventDownloadMTCall();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 8
response = test.envelopeEventDownloadCallConnected();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 9
response = test.envelopeEventDownloadCallDisconnected();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 10
response = test.envelopeEventDownloadLocationStatus();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 11
response = test.envelopeEventDownloadUserActivity();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 12
response = test.envelopeEventDownloadIdleScreenAvailable();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 13
response = test.envelopeEventDownloadCardReaderStatus();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 14
response = test.envelopeEventDownloadLanguageSelection();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 15
response = test.envelopeEventDownloadBrowserTermination();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 16
response = test.status("00","0C","00");
- addResult(response.checkSw("911A"));
+ testresult &= response.checkSw("911A");
//TC 17
response = test.fetch("1A");
response = test.terminalResponse("81030140 01820282 8183010038 0281003502 " +
"03003902 000A");
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
response = test.envelopeEventDownloadDataAvailable("B8028100");
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 18
response = test.envelopeEventDownloadChannelStatus("B8028100");
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 19
response = test.unrecognizedEnvelope();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 20
response = test.envelopeEventDownloadAccessTechnologyChange();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 21
response = test.envelopeEventDownloadDisplayParametersChanged();
//fetch declare service
@@ -155,22 +156,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");
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 22
response = test.envelopeEventDownloadLocalConnection(servrectlv);
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 23
response = test.envelopeEventDownloadCallConnected();
//fetch display text
response = test.fetch("14");
response = test.terminalResponse("81030121 80820282 81030100");
- addResult(response.checkSw("9000"));
+ testresult &= 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 );
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 25
test.reset();
//no terminal profile is sent and proactive handler shall not be available.
@@ -207,6 +208,10 @@ public class Test_Cre_Mha_Prhd extends UiccTestModel {
response = test.envelopeEventDownloadAccessTechnologyChange();
//TC 41
response = test.envelopeEventDownloadDisplayParametersChanged();
+ //TC 48
+ response = test.envelopeEventDownloadFramesInformationChanged();
+ //TC 49
+ response = test.envelopeEventDownloadHCIConnectivity();
//TC 42
//The Proactive Handler is not available before the
//Terminal Profile
@@ -214,17 +219,17 @@ public class Test_Cre_Mha_Prhd extends UiccTestModel {
response = test.envelopeEventDownloadNetworkSearchModeChange();
//TC 44
response = test.envelopeEventDownloadBrowsingStatus();
- //TC 45
+ //TC 45 +2
test.reset();
//initialization with all the facilities supported (without SETUP_EVENT_LIST)
response = test.terminalProfileSession("FFFFFFFF FEFFFFFF FFFFFFFF FFFFFFFF " +
"FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF " +
"FFFF");
response = test.envelopeEventDownloadNetworkSearchModeChange();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 46
response = test.envelopeEventDownloadBrowsingStatus();
- addResult(response.checkSw("9000"));
+ testresult &= response.checkSw("9000");
//TC 47
test.reset();
// Install Applet
@@ -252,8 +257,8 @@ 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);
- addResult(response.checkData("10" +APPLET_AID_1 +
- "2DCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
+ testresult &= (response.checkData("10" +APPLET_AID_1 +
+ "2FCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
"CCCCCCCC CCCCCCCC CCCCCCCC CCCC"
) ||
@@ -264,7 +269,7 @@ public class Test_Cre_Mha_Prhd extends UiccTestModel {
response = test.selectApplication(APPLET_AID_2);
- addResult(response.checkData("10" +APPLET_AID_2 +
+ testresult &= response.checkData("10" +APPLET_AID_2 +
"22CCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
"CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC"+
"CCCCCC"
@@ -273,11 +278,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);
- addResult(response.checkData("10" +APPLET_AID_3 + "01CC"));
+ testresult &= response.checkData("10" +APPLET_AID_3 + "01CC");
// delete applet and package
test.reset();
@@ -287,7 +292,7 @@ public class Test_Cre_Mha_Prhd extends UiccTestModel {
test.deleteApplet(APPLET_AID_3);
test.deletePackage(CAP_FILE_PATH);
- return getOverallResult();
+ return testresult;
}
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_prhd/javacard/cre_mha_prhd.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_prhd/javacard/cre_mha_prhd.cap
index 79885c7eaae24cf6142529e21e25f28c418158e6..3a0654451681a513664db7af065aa75c94d0e155 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_prhd/javacard/cre_mha_prhd.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_prhd/javacard/cre_mha_prhd.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_prhd/javacard/cre_mha_prhd.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_prhd/javacard/cre_mha_prhd.exp
new file mode 100644
index 0000000000000000000000000000000000000000..a46a36d3844d8d446dab91ab72dc879eabe01dda
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_mha_prhd/javacard/cre_mha_prhd.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_pcs_igco/javacard/cre_pcs_igco.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_pcs_igco/javacard/cre_pcs_igco.cap
index d923b4f4904709d0600ca294b14df427a79925c6..c94b913bccf9d8fb505c92205411fbeb4b79249a 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_pcs_igco/javacard/cre_pcs_igco.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_pcs_igco/javacard/cre_pcs_igco.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_pcs_igco/javacard/cre_pcs_igco.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_pcs_igco/javacard/cre_pcs_igco.exp
new file mode 100644
index 0000000000000000000000000000000000000000..3f78bb9d8b13de85464826e8959ac04739f5ec00
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_pcs_igco/javacard/cre_pcs_igco.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_pcs_pcco/javacard/cre_pcs_pcco.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_pcs_pcco/javacard/cre_pcs_pcco.cap
index e1d3028b9152b96947a82b7fb87c681bdcb8485c..49c615c41a3d5632dbda970321c7272d2896ad67 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_pcs_pcco/javacard/cre_pcs_pcco.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_pcs_pcco/javacard/cre_pcs_pcco.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_pcs_pcco/javacard/cre_pcs_pcco.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_pcs_pcco/javacard/cre_pcs_pcco.exp
new file mode 100644
index 0000000000000000000000000000000000000000..2d7c7f7a0be787b538d8520373d3accdb0803a99
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_pcs_pcco/javacard/cre_pcs_pcco.exp differ
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 9786d073c803d14a24eeff6aba8ae1a4bdcaad74..b7cbf51537193b023a06b05724c0b3fa08afcd9c 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
@@ -659,6 +659,8 @@ public class Test_Cre_Pcs_Spco extends UiccTestModel {
//Lock Applet3 (testcase 14-14)
response = test.lockApplication(APPLET_AID_3);
+ // Send a status command to be sure to retrieve the correct status word in the RAPDU
+ response = test.status("00","0C","00");
// Fetch the SetUpMenu
response = test.fetch(response.getStatusWord().substring(2));
addResult(response.checkData("D01C8103 01250082 02818285 09554943" +
@@ -697,7 +699,7 @@ 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"));
+ "034D656E 7533D108 00000390 00000390"));
response = test.terminalResponse("81030125 00820282 81830100");
addResult(response.checkSw("9000"));
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_pcs_spco/javacard/cre_pcs_spco.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_pcs_spco/javacard/cre_pcs_spco.cap
index f062d768837bb7a1fe85ad39fc0c480117002f9f..d51040f3b845f21779d74db326929499e37093c7 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_pcs_spco/javacard/cre_pcs_spco.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_pcs_spco/javacard/cre_pcs_spco.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_pcs_spco/javacard/cre_pcs_spco.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_pcs_spco/javacard/cre_pcs_spco.exp
new file mode 100644
index 0000000000000000000000000000000000000000..1484845c9298f68cbb4961c355ed9a6536578ac5
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_pcs_spco/javacard/cre_pcs_spco.exp differ
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 8cd1ef11dbf364458e9b103a812908f7bd09d5ab..7c9b9e76980f5bb04ea0cef75000c646b7fca4be 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
@@ -54,10 +54,10 @@ public class Test_Cre_Reg_Evtr extends UiccTestModel {
"00" + // LV TAR Value(s)
"00"); // V Maximum number of services
- test.status("00", "0C", "00");
-
// test script
response = test.makeSelectableApplet(APPLET_AID_1);
+ // Send a status command to be sure to retrieve the correct status word in the RAPDU
+ test.status("00", "0C", "00");
addResult(response.checkSw("910F"));
response = test.fetch("0F");
addResult(response.checkData("D00D8103 01050082 02818299 020004") ||
@@ -68,7 +68,7 @@ public class Test_Cre_Reg_Evtr extends UiccTestModel {
response = test.envelopeEventDownloadUserActivity();
addResult(response.checkSw("910F"));
response = test.fetch("0F");
- addResult(response.checkData("D00D8103 01050082 02818299 020003")) ||
+ addResult(response.checkData("D00D8103 01050082 02818299 020003") ||
response.checkData("D00D8103 01050082 02818219 020003"));
test.terminalResponse("81030105 00820282 81830100");
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_reg_evtr/javacard/cre_reg_evtr.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_reg_evtr/javacard/cre_reg_evtr.cap
index 9963b3d9d33d85afa87e897fd032303d99b0f9b5..e7b6dc2e81c056a0090bb952f146aca894170a68 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_reg_evtr/javacard/cre_reg_evtr.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_reg_evtr/javacard/cre_reg_evtr.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_reg_evtr/javacard/cre_reg_evtr.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_reg_evtr/javacard/cre_reg_evtr.exp
new file mode 100644
index 0000000000000000000000000000000000000000..13a18814cd3ffc731fabbf710122f88edcd482a4
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_reg_evtr/javacard/cre_reg_evtr.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_acdo/javacard/cre_tin_acdo.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_acdo/javacard/cre_tin_acdo.cap
index 2a79ee8f10b4c8e8d711bd8dc00976be6e19b94b..1eeb0ef058cd5285f817ca4e968d20d1cfd60585 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_acdo/javacard/cre_tin_acdo.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_acdo/javacard/cre_tin_acdo.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_acdo/javacard/cre_tin_acdo.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_acdo/javacard/cre_tin_acdo.exp
new file mode 100644
index 0000000000000000000000000000000000000000..e25684cfa37ce584312cd9531a71ef41bafff202
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_acdo/javacard/cre_tin_acdo.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_chal/javacard/cre_tin_chal.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_chal/javacard/cre_tin_chal.cap
index 21debb381ae95d41c8f76de58bbc1d63289d2a1e..1e20acaa35273d0e35d5173b8a02ec96cbcf6e1a 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_chal/javacard/cre_tin_chal.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_chal/javacard/cre_tin_chal.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_chal/javacard/cre_tin_chal.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_chal/javacard/cre_tin_chal.exp
new file mode 100644
index 0000000000000000000000000000000000000000..89f44aaf0226b724f4ae2985abd701b371e1c69d
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_chal/javacard/cre_tin_chal.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_genb/javacard/cre_tin_genb.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_genb/javacard/cre_tin_genb.cap
index cf15131f0adfc87d68a4d3a06311870ac0c4e9a1..72807ec68c80a1fd1f9a98732b20f55a4fe96173 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_genb/javacard/cre_tin_genb.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_genb/javacard/cre_tin_genb.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_genb/javacard/cre_tin_genb.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_genb/javacard/cre_tin_genb.exp
new file mode 100644
index 0000000000000000000000000000000000000000..124ffcbddb2a463b7995c5a8cacef8825863ba2c
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_genb/javacard/cre_tin_genb.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_itid/javacard/cre_tin_itid.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_itid/javacard/cre_tin_itid.cap
index 9f44ec5034f9c17be6ac1af2f23d52443b44f107..b26f4b07e6834d8b3f4b02feffe18dac7f69398f 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_itid/javacard/cre_tin_itid.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_itid/javacard/cre_tin_itid.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_itid/javacard/cre_tin_itid.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_itid/javacard/cre_tin_itid.exp
new file mode 100644
index 0000000000000000000000000000000000000000..a920f80530686e4e2239d0fbaa90bc5cc60f35f0
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_itid/javacard/cre_tin_itid.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_itpo/javacard/cre_tin_itpo.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_itpo/javacard/cre_tin_itpo.cap
index 4151c7d9d51ff388aa6696adfb278eedce2495a1..bb89dbeb02f95eaa289a95ccb26d4e2b4142327e 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_itpo/javacard/cre_tin_itpo.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_itpo/javacard/cre_tin_itpo.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_itpo/javacard/cre_tin_itpo.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_itpo/javacard/cre_tin_itpo.exp
new file mode 100644
index 0000000000000000000000000000000000000000..55f1f273918221c009c8ad8435d6732031fdf203
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_itpo/javacard/cre_tin_itpo.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_mlme/javacard/cre_tin_mlme.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_mlme/javacard/cre_tin_mlme.cap
index 1ad045d37863562cfa8a7e2426bdfe75f052375b..6d3a82094f9367feb95c796938b088f49624a1d0 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_mlme/javacard/cre_tin_mlme.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_mlme/javacard/cre_tin_mlme.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_mlme/javacard/cre_tin_mlme.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_mlme/javacard/cre_tin_mlme.exp
new file mode 100644
index 0000000000000000000000000000000000000000..c6ed765ea10a8c65c7b1e590149f120c3c712d9d
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_mlme/javacard/cre_tin_mlme.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_nbme/javacard/cre_tin_nbme.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_nbme/javacard/cre_tin_nbme.cap
index 9794d09068150435b6bcbcc059a01e8478f9c4da..7eeb60edc8d6727ea649c0cca8cf997834852241 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_nbme/javacard/cre_tin_nbme.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_nbme/javacard/cre_tin_nbme.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_nbme/javacard/cre_tin_nbme.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_nbme/javacard/cre_tin_nbme.exp
new file mode 100644
index 0000000000000000000000000000000000000000..b225273d6d4b561478072d58ecc546be7527ad62
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_nbme/javacard/cre_tin_nbme.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_1/javacard/cre_tin_prlv_1.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_1/javacard/cre_tin_prlv_1.cap
index fc0363bfa6298b32774cf48deb31d65f9336455f..2e0809872e651bdd8f4a5f621ec8099ee419465e 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_1/javacard/cre_tin_prlv_1.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_1/javacard/cre_tin_prlv_1.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_1/javacard/cre_tin_prlv_1.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_1/javacard/cre_tin_prlv_1.exp
new file mode 100644
index 0000000000000000000000000000000000000000..1bd366cedb982041b61807281ef7f077c4d7066b
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_1/javacard/cre_tin_prlv_1.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_10/cre_tin_prlv_10a/javacard/cre_tin_prlv_10a.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_10/cre_tin_prlv_10a/javacard/cre_tin_prlv_10a.cap
index 703787f16de34e66be160807741cf6e79d05ccfc..80003610a5c6e138f4a707ce956d8c8cd0c0fca0 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_10/cre_tin_prlv_10a/javacard/cre_tin_prlv_10a.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_10/cre_tin_prlv_10a/javacard/cre_tin_prlv_10a.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_10/cre_tin_prlv_10a/javacard/cre_tin_prlv_10a.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_10/cre_tin_prlv_10a/javacard/cre_tin_prlv_10a.exp
new file mode 100644
index 0000000000000000000000000000000000000000..eeb8722f78b0e8cc99069a9f9c5262cfdbfa7f61
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_10/cre_tin_prlv_10a/javacard/cre_tin_prlv_10a.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_10/cre_tin_prlv_10b/javacard/cre_tin_prlv_10b.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_10/cre_tin_prlv_10b/javacard/cre_tin_prlv_10b.cap
index 6a81935b773f49bced55b26877b0ca7f66dfa70a..8173d0bd510e2a9d4c645cec0da92b0da190f90c 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_10/cre_tin_prlv_10b/javacard/cre_tin_prlv_10b.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_10/cre_tin_prlv_10b/javacard/cre_tin_prlv_10b.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_10/cre_tin_prlv_10b/javacard/cre_tin_prlv_10b.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_10/cre_tin_prlv_10b/javacard/cre_tin_prlv_10b.exp
new file mode 100644
index 0000000000000000000000000000000000000000..5ecc487c25c8d168d14554d6046282a1a2361459
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_10/cre_tin_prlv_10b/javacard/cre_tin_prlv_10b.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_10/javacard/cre_tin_prlv_10.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_10/javacard/cre_tin_prlv_10.cap
index 33c4c38411212c60606f6edbfa4c93588363f70f..7df89b5ea19a6614cc79decf1185df5b20fb11eb 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_10/javacard/cre_tin_prlv_10.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_10/javacard/cre_tin_prlv_10.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_10/javacard/cre_tin_prlv_10.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_10/javacard/cre_tin_prlv_10.exp
new file mode 100644
index 0000000000000000000000000000000000000000..ed35d7f00a65e0562c605289f42474aa0192f613
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_10/javacard/cre_tin_prlv_10.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_11/javacard/cre_tin_prlv_11.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_11/javacard/cre_tin_prlv_11.cap
index 90c593cea2f8ff1864324af9ecb02fdf1bac85a1..526b7c04aa87ba7091f17735faa3b98b9118d4db 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_11/javacard/cre_tin_prlv_11.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_11/javacard/cre_tin_prlv_11.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_11/javacard/cre_tin_prlv_11.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_11/javacard/cre_tin_prlv_11.exp
new file mode 100644
index 0000000000000000000000000000000000000000..e6c8459e6f330469be6e226da72da67e2b74afaf
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_11/javacard/cre_tin_prlv_11.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_12/javacard/cre_tin_prlv_12.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_12/javacard/cre_tin_prlv_12.cap
index ff1fb5bd5d203a67673d380f2670f565786bae45..177e7394f4df18c55a0e897a3161a7f0e7b0d4fc 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_12/javacard/cre_tin_prlv_12.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_12/javacard/cre_tin_prlv_12.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_12/javacard/cre_tin_prlv_12.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_12/javacard/cre_tin_prlv_12.exp
new file mode 100644
index 0000000000000000000000000000000000000000..af3e3e805658519f321f11e28100afc454e04d85
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_12/javacard/cre_tin_prlv_12.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_2/javacard/cre_tin_prlv_2.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_2/javacard/cre_tin_prlv_2.cap
index 4540320c910b662d28ea59b4cc92d393df483cb7..e356bab1d73bdca671c671396adad3a37792bcf6 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_2/javacard/cre_tin_prlv_2.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_2/javacard/cre_tin_prlv_2.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_2/javacard/cre_tin_prlv_2.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_2/javacard/cre_tin_prlv_2.exp
new file mode 100644
index 0000000000000000000000000000000000000000..6f6105d6d5776e7573d67732ba7ed8f23e0e0652
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_2/javacard/cre_tin_prlv_2.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_3/javacard/cre_tin_prlv_3.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_3/javacard/cre_tin_prlv_3.cap
index f6172247655ee6d6b6a820305f22c626245e2b9c..5a32786137b297895ff3e52c6da9a1f5a411d283 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_3/javacard/cre_tin_prlv_3.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_3/javacard/cre_tin_prlv_3.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_3/javacard/cre_tin_prlv_3.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_3/javacard/cre_tin_prlv_3.exp
new file mode 100644
index 0000000000000000000000000000000000000000..c506c4e2db0a774c3de1ce4204f5c9789e69b9ff
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_3/javacard/cre_tin_prlv_3.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_4/javacard/cre_tin_prlv_4.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_4/javacard/cre_tin_prlv_4.cap
index 4e5bc59a8680016974c72b855104f0816609e9d2..8139b7ad76d1ea15655a64527dd51da2419db6d3 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_4/javacard/cre_tin_prlv_4.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_4/javacard/cre_tin_prlv_4.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_4/javacard/cre_tin_prlv_4.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_4/javacard/cre_tin_prlv_4.exp
new file mode 100644
index 0000000000000000000000000000000000000000..15e98f9adc05fe4858cf0059954c3326bbbc3845
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_4/javacard/cre_tin_prlv_4.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_5/javacard/cre_tin_prlv_5.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_5/javacard/cre_tin_prlv_5.cap
index 684bb37d4cd8410bfb34e1049059e46ab11e0908..bb87183be264ef9827bd8215581b99074df91af2 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_5/javacard/cre_tin_prlv_5.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_5/javacard/cre_tin_prlv_5.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_5/javacard/cre_tin_prlv_5.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_5/javacard/cre_tin_prlv_5.exp
new file mode 100644
index 0000000000000000000000000000000000000000..5752653d66bb01ca202926491c2402955bd0cbd5
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_5/javacard/cre_tin_prlv_5.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_6/javacard/cre_tin_prlv_6.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_6/javacard/cre_tin_prlv_6.cap
index 0c828295eda0320cafa6e32a680534f201377b04..15e979e5e840b73f25ad024802254012ac3744ba 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_6/javacard/cre_tin_prlv_6.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_6/javacard/cre_tin_prlv_6.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_6/javacard/cre_tin_prlv_6.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_6/javacard/cre_tin_prlv_6.exp
new file mode 100644
index 0000000000000000000000000000000000000000..d95fdee7c4d392bbd9ecee9567be476ca7c5c060
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_6/javacard/cre_tin_prlv_6.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_7/javacard/cre_tin_prlv_7.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_7/javacard/cre_tin_prlv_7.cap
index 0d9274aa936964d24969b8c7ed253e5f750c3954..60ed1ca69c63d5e0d186792e942a8d85d20b4ae6 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_7/javacard/cre_tin_prlv_7.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_7/javacard/cre_tin_prlv_7.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_7/javacard/cre_tin_prlv_7.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_7/javacard/cre_tin_prlv_7.exp
new file mode 100644
index 0000000000000000000000000000000000000000..aba48399239ac809f1835dd7afc6d11c1a3ea26d
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_7/javacard/cre_tin_prlv_7.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_8/cre_tin_prlv_8a/javacard/cre_tin_prlv_8a.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_8/cre_tin_prlv_8a/javacard/cre_tin_prlv_8a.cap
index 80eb4bb57b36dfd157a129e11cabdc0181d44086..8f305ae87bab7e81d58050765a82d66f6f711262 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_8/cre_tin_prlv_8a/javacard/cre_tin_prlv_8a.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_8/cre_tin_prlv_8a/javacard/cre_tin_prlv_8a.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_8/cre_tin_prlv_8a/javacard/cre_tin_prlv_8a.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_8/cre_tin_prlv_8a/javacard/cre_tin_prlv_8a.exp
new file mode 100644
index 0000000000000000000000000000000000000000..4b877230ce0f3b34ee052479617f7b5cff0dcb85
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_8/cre_tin_prlv_8a/javacard/cre_tin_prlv_8a.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_8/cre_tin_prlv_8b/javacard/cre_tin_prlv_8b.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_8/cre_tin_prlv_8b/javacard/cre_tin_prlv_8b.cap
index be53f9d9ddd8e07b6c2099a17611d9f23f8da5ef..13c7399da7aab3db8ae786006d98a153bfee447c 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_8/cre_tin_prlv_8b/javacard/cre_tin_prlv_8b.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_8/cre_tin_prlv_8b/javacard/cre_tin_prlv_8b.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_8/cre_tin_prlv_8b/javacard/cre_tin_prlv_8b.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_8/cre_tin_prlv_8b/javacard/cre_tin_prlv_8b.exp
new file mode 100644
index 0000000000000000000000000000000000000000..1cb3a42128d63778c0535a8a3d5667297e0928d5
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_8/cre_tin_prlv_8b/javacard/cre_tin_prlv_8b.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_8/javacard/cre_tin_prlv_8.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_8/javacard/cre_tin_prlv_8.cap
index 06cebe6140fc1efcc385fb7264ef6a979fe899da..8100489f9812817b0b016bfe06303c22f160da90 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_8/javacard/cre_tin_prlv_8.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_8/javacard/cre_tin_prlv_8.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_8/javacard/cre_tin_prlv_8.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_8/javacard/cre_tin_prlv_8.exp
new file mode 100644
index 0000000000000000000000000000000000000000..b3a778af4cd7c86643fb15ddcfd6965e7ae99728
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_8/javacard/cre_tin_prlv_8.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_9/cre_tin_prlv_9a/javacard/cre_tin_prlv_9a.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_9/cre_tin_prlv_9a/javacard/cre_tin_prlv_9a.cap
index f240f1d14247bba2292d3ee512ec5737434069db..fe7742fda66654b76d7c401bafd02b36ea8a39c0 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_9/cre_tin_prlv_9a/javacard/cre_tin_prlv_9a.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_9/cre_tin_prlv_9a/javacard/cre_tin_prlv_9a.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_9/cre_tin_prlv_9a/javacard/cre_tin_prlv_9a.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_9/cre_tin_prlv_9a/javacard/cre_tin_prlv_9a.exp
new file mode 100644
index 0000000000000000000000000000000000000000..8d6604f08386c599e697adc84184e06b2fc0fa16
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_9/cre_tin_prlv_9a/javacard/cre_tin_prlv_9a.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_9/cre_tin_prlv_9b/javacard/cre_tin_prlv_9b.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_9/cre_tin_prlv_9b/javacard/cre_tin_prlv_9b.cap
index df704e2ebdf2bef561928b52f2f2c3e90ab04cfc..866c0eec5241583847eee61e61f4519412968c22 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_9/cre_tin_prlv_9b/javacard/cre_tin_prlv_9b.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_9/cre_tin_prlv_9b/javacard/cre_tin_prlv_9b.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_9/cre_tin_prlv_9b/javacard/cre_tin_prlv_9b.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_9/cre_tin_prlv_9b/javacard/cre_tin_prlv_9b.exp
new file mode 100644
index 0000000000000000000000000000000000000000..b3be5eb8ae3a63dac33788afbe91588da8dedc71
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_9/cre_tin_prlv_9b/javacard/cre_tin_prlv_9b.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_9/javacard/cre_tin_prlv_9.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_9/javacard/cre_tin_prlv_9.cap
index ba95fa11a441611eee1b7a69829662a23aec3233..1859bc8b838685764f5e450250f3572322b45551 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_9/javacard/cre_tin_prlv_9.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_9/javacard/cre_tin_prlv_9.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_9/javacard/cre_tin_prlv_9.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_9/javacard/cre_tin_prlv_9.exp
new file mode 100644
index 0000000000000000000000000000000000000000..812d9c8ff8d411468dd379ab23acaa6a0b0f5d1e
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_prlv_9/javacard/cre_tin_prlv_9.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_sval/javacard/cre_tin_sval.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_sval/javacard/cre_tin_sval.cap
index fb34a2d97ba128c0a0f7a1bdaf5c346c64117930..ed7305fc36c9eb3582071f0ddefe2b5dfca3ba2d 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_sval/javacard/cre_tin_sval.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_sval/javacard/cre_tin_sval.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_sval/javacard/cre_tin_sval.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_sval/javacard/cre_tin_sval.exp
new file mode 100644
index 0000000000000000000000000000000000000000..281cd25fb87b07b6f2a4a7c26ac20c8f512ca2d2
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_sval/javacard/cre_tin_sval.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_tarv/javacard/cre_tin_tarv.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_tarv/javacard/cre_tin_tarv.cap
index d0232f10447c9dc3c4410b1d48eebb3ac9300094..08cddbaf77a2905e4d7b01202793f19f32a67d31 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_tarv/javacard/cre_tin_tarv.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_tarv/javacard/cre_tin_tarv.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_tarv/javacard/cre_tin_tarv.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_tarv/javacard/cre_tin_tarv.exp
new file mode 100644
index 0000000000000000000000000000000000000000..130fa67924a8e9f4de67176ab1e500fa2ee7691b
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_tarv/javacard/cre_tin_tarv.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_tmal/javacard/cre_tin_tmal.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_tmal/javacard/cre_tin_tmal.cap
index f2890dc365f06b060cbe2544b60ee94847f9e449..5fd199dbce823016f314cbe6d787ea95cf71de39 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_tmal/javacard/cre_tin_tmal.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_tmal/javacard/cre_tin_tmal.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_tmal/javacard/cre_tin_tmal.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_tmal/javacard/cre_tin_tmal.exp
new file mode 100644
index 0000000000000000000000000000000000000000..2c2371b6614e80252d9cb7a7d7888c3820e5f989
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_tin_tmal/javacard/cre_tin_tmal.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_ufa_view/javacard/cre_ufa_view.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_ufa_view/javacard/cre_ufa_view.cap
index a8ee394e4ce9b0fbf64be063538e0e504702fa9e..c2c9e36608337e4022cf8956fc083f8d49a45e14 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_ufa_view/javacard/cre_ufa_view.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_ufa_view/javacard/cre_ufa_view.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_ufa_view/javacard/cre_ufa_view.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_ufa_view/javacard/cre_ufa_view.exp
new file mode 100644
index 0000000000000000000000000000000000000000..420f874a81c6f7e9498d5087567939b98a13e17c
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_ufa_view/javacard/cre_ufa_view.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_adel/cre_uta_adel_a/javacard/cre_uta_adel_a.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_adel/cre_uta_adel_a/javacard/cre_uta_adel_a.cap
index 12c512d977285f37d0b9c02bb4bd4ddeda1d74da..7039317f86d213855628678d34770b01b32fe90b 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_adel/cre_uta_adel_a/javacard/cre_uta_adel_a.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_adel/cre_uta_adel_a/javacard/cre_uta_adel_a.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_adel/cre_uta_adel_a/javacard/cre_uta_adel_a.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_adel/cre_uta_adel_a/javacard/cre_uta_adel_a.exp
new file mode 100644
index 0000000000000000000000000000000000000000..ca1b0e37c8233d9a309f78f708417cbefcdf0cca
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_adel/cre_uta_adel_a/javacard/cre_uta_adel_a.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_adel/cre_uta_adel_b/javacard/cre_uta_adel_b.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_adel/cre_uta_adel_b/javacard/cre_uta_adel_b.cap
index 251361f8c4bb2f35ef61ca28663763811a0b6271..df22da23991f713111724a37c9dd6fd2f1506780 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_adel/cre_uta_adel_b/javacard/cre_uta_adel_b.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_adel/cre_uta_adel_b/javacard/cre_uta_adel_b.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_adel/cre_uta_adel_b/javacard/cre_uta_adel_b.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_adel/cre_uta_adel_b/javacard/cre_uta_adel_b.exp
new file mode 100644
index 0000000000000000000000000000000000000000..fea09be1221f2548ace992eae89ae0b68ac7e5ba
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_adel/cre_uta_adel_b/javacard/cre_uta_adel_b.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_dafs/cre_uta_dafs_a/javacard/cre_uta_dafs_a.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_dafs/cre_uta_dafs_a/javacard/cre_uta_dafs_a.cap
index e174e8e8ef16251fcda9d3973e99145489dbd211..489a8dbb0b22f93d2b9f272f5e253bf017ba769f 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_dafs/cre_uta_dafs_a/javacard/cre_uta_dafs_a.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_dafs/cre_uta_dafs_a/javacard/cre_uta_dafs_a.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_dafs/cre_uta_dafs_a/javacard/cre_uta_dafs_a.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_dafs/cre_uta_dafs_a/javacard/cre_uta_dafs_a.exp
new file mode 100644
index 0000000000000000000000000000000000000000..be32a0729e724c964f1ee1d231682388af139299
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_dafs/cre_uta_dafs_a/javacard/cre_uta_dafs_a.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_dafs/cre_uta_dafs_b/javacard/cre_uta_dafs_b.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_dafs/cre_uta_dafs_b/javacard/cre_uta_dafs_b.cap
index 3083c339ab1a192642cef722b2b45076422160a8..135efd82b0124217a758ca4a2fe0ea19556c81de 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_dafs/cre_uta_dafs_b/javacard/cre_uta_dafs_b.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_dafs/cre_uta_dafs_b/javacard/cre_uta_dafs_b.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_dafs/cre_uta_dafs_b/javacard/cre_uta_dafs_b.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_dafs/cre_uta_dafs_b/javacard/cre_uta_dafs_b.exp
new file mode 100644
index 0000000000000000000000000000000000000000..aa69ba20ad597f13a58742b0420afc57b9200801
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_dafs/cre_uta_dafs_b/javacard/cre_uta_dafs_b.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_odel/javacard/cre_uta_odel.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_odel/javacard/cre_uta_odel.cap
index db97e5370a9f8458033f478c4116c304eea21119..cc00d11040c763bf11c8674faad65eeab57a90ee 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_odel/javacard/cre_uta_odel.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_odel/javacard/cre_uta_odel.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_odel/javacard/cre_uta_odel.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_odel/javacard/cre_uta_odel.exp
new file mode 100644
index 0000000000000000000000000000000000000000..4562767a6591bb4ba18483b1dc07943ca9a9dfaf
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_odel/javacard/cre_uta_odel.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_pdel/cre_uta_pdel_a/javacard/cre_uta_pdel_a.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_pdel/cre_uta_pdel_a/javacard/cre_uta_pdel_a.cap
index 3c0035dc7c23870d2082236f8243fd19431a853c..9dfdb22706ece2fea9cf2219c7253434db9491dc 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_pdel/cre_uta_pdel_a/javacard/cre_uta_pdel_a.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_pdel/cre_uta_pdel_a/javacard/cre_uta_pdel_a.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_pdel/cre_uta_pdel_a/javacard/cre_uta_pdel_a.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_pdel/cre_uta_pdel_a/javacard/cre_uta_pdel_a.exp
new file mode 100644
index 0000000000000000000000000000000000000000..a06b1f038ddb7c203213af7d2f604349a0691035
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_pdel/cre_uta_pdel_a/javacard/cre_uta_pdel_a.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_pdel/cre_uta_pdel_b/javacard/cre_uta_pdel_b.cap b/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_pdel/cre_uta_pdel_b/javacard/cre_uta_pdel_b.cap
index 248a6d0e9695a0246faa4e718fac8d284b39bed3..afc7c475d4e3c739059938dd5fef0af8c3699d30 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_pdel/cre_uta_pdel_b/javacard/cre_uta_pdel_b.cap and b/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_pdel/cre_uta_pdel_b/javacard/cre_uta_pdel_b.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_pdel/cre_uta_pdel_b/javacard/cre_uta_pdel_b.exp b/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_pdel/cre_uta_pdel_b/javacard/cre_uta_pdel_b.exp
new file mode 100644
index 0000000000000000000000000000000000000000..6bbabc5538107558161f014869aaf8d99820c141
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/catre/cre_uta_pdel/cre_uta_pdel_b/javacard/cre_uta_pdel_b.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/system/api_3_hbd_bthdbs/javacard/api_3_hbd_bthdbs.cap b/source/Annex_E_SourceCode/uicc/test/system/api_3_hbd_bthdbs/javacard/api_3_hbd_bthdbs.cap
index ef89d5a4beb6d6d1a06165dfa6cf48cd3e96dfb9..2a2e4ba73c3568ed240e683f4fc344ff1aa0e326 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/system/api_3_hbd_bthdbs/javacard/api_3_hbd_bthdbs.cap and b/source/Annex_E_SourceCode/uicc/test/system/api_3_hbd_bthdbs/javacard/api_3_hbd_bthdbs.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/system/api_3_hbd_bthdbs/javacard/api_3_hbd_bthdbs.exp b/source/Annex_E_SourceCode/uicc/test/system/api_3_hbd_bthdbs/javacard/api_3_hbd_bthdbs.exp
new file mode 100644
index 0000000000000000000000000000000000000000..c3a350e80bf82b29eb1e881f879b459fe339c46c
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/system/api_3_hbd_bthdbs/javacard/api_3_hbd_bthdbs.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/system/api_3_hbd_bthdbs_bss/javacard/api_3_hbd_bthdbs_bss.cap b/source/Annex_E_SourceCode/uicc/test/system/api_3_hbd_bthdbs_bss/javacard/api_3_hbd_bthdbs_bss.cap
index 777aba8ae7444616c125785574c99ef9e8c281ac..d47ef0c05868007b660ea459c90227c1649be4ac 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/system/api_3_hbd_bthdbs_bss/javacard/api_3_hbd_bthdbs_bss.cap and b/source/Annex_E_SourceCode/uicc/test/system/api_3_hbd_bthdbs_bss/javacard/api_3_hbd_bthdbs_bss.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/system/api_3_hbd_bthdbs_bss/javacard/api_3_hbd_bthdbs_bss.exp b/source/Annex_E_SourceCode/uicc/test/system/api_3_hbd_bthdbs_bss/javacard/api_3_hbd_bthdbs_bss.exp
new file mode 100644
index 0000000000000000000000000000000000000000..da9621980258e8b81be195883340fbaec6484522
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/system/api_3_hbd_bthdbs_bss/javacard/api_3_hbd_bthdbs_bss.exp differ
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 de4b2fc7bb4006c419ec0d10935126234da77bd3..5689eafa87efd670ddf96b9baee223fa4bb11ff6 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
@@ -56,16 +56,7 @@ public class Test_Api_3_Upf_Gvba extends UiccTestModel {
// install client package and applet for shareable test case
test.loadPackage(CAP_FILE_PATH2);
- test.installApplet(CAP_FILE_PATH2, CLASS_AID_2, APPLET_AID_2,
- "8008" + // TLV UICC Toolkit application specific parameters
- "01" + // V Priority Level
- "00" + // V Max. number of timers
- "0A" + // V Maximum text length for a menu entry
- "00" + // V Maximum number of menu entries
- "00" + // V Maximum number of channels
- "00" + // LV Minimum Security Level field
- "00" + // LV TAR Value(s)
- "00"); // V Maximum number of services
+ test.installApplet(CAP_FILE_PATH2, CLASS_AID_2, APPLET_AID_2, "");
// test script
test.reset();
diff --git a/source/Annex_E_SourceCode/uicc/test/system/api_3_upf_gvba/api_3_upf_gvba2/javacard/api_3_upf_gvba2.cap b/source/Annex_E_SourceCode/uicc/test/system/api_3_upf_gvba/api_3_upf_gvba2/javacard/api_3_upf_gvba2.cap
index 99c8c285139cd2a62dde0dbe383ba12de7776ff9..ab7f583bb062a91b9038606e9df35b9f111956f0 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/system/api_3_upf_gvba/api_3_upf_gvba2/javacard/api_3_upf_gvba2.cap and b/source/Annex_E_SourceCode/uicc/test/system/api_3_upf_gvba/api_3_upf_gvba2/javacard/api_3_upf_gvba2.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/system/api_3_upf_gvba/api_3_upf_gvba2/javacard/api_3_upf_gvba2.exp b/source/Annex_E_SourceCode/uicc/test/system/api_3_upf_gvba/api_3_upf_gvba2/javacard/api_3_upf_gvba2.exp
new file mode 100644
index 0000000000000000000000000000000000000000..9a8068034d352a4bec4a9f6c67e4507e4511e3e6
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/system/api_3_upf_gvba/api_3_upf_gvba2/javacard/api_3_upf_gvba2.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/system/api_3_upf_gvba/javacard/api_3_upf_gvba.cap b/source/Annex_E_SourceCode/uicc/test/system/api_3_upf_gvba/javacard/api_3_upf_gvba.cap
index ea3c4f4078cad784b185792f8b643d70fa931cc2..3827e3727a1df2c758db94f4abbd7e4bc0ae81b3 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/system/api_3_upf_gvba/javacard/api_3_upf_gvba.cap and b/source/Annex_E_SourceCode/uicc/test/system/api_3_upf_gvba/javacard/api_3_upf_gvba.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/system/api_3_upf_gvba/javacard/api_3_upf_gvba.exp b/source/Annex_E_SourceCode/uicc/test/system/api_3_upf_gvba/javacard/api_3_upf_gvba.exp
new file mode 100644
index 0000000000000000000000000000000000000000..39da2131a174f86bbb50f09dbb43b56ab1647bee
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/system/api_3_upf_gvba/javacard/api_3_upf_gvba.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_apda/javacard/api_2_bte_apda.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_apda/javacard/api_2_bte_apda.cap
index e51d6545441c83f5ecadffac9e22a290916649b0..1ccd41098e36637efd9cd80840d846602f4e2853 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_apda/javacard/api_2_bte_apda.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_apda/javacard/api_2_bte_apda.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_apda/javacard/api_2_bte_apda.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_apda/javacard/api_2_bte_apda.exp
new file mode 100644
index 0000000000000000000000000000000000000000..0c0916909ba95ac0c7bff1a1cb0f20e6c656287a
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_apda/javacard/api_2_bte_apda.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlb_bss/javacard/api_2_bte_aptlb_bss.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlb_bss/javacard/api_2_bte_aptlb_bss.cap
index 02f178c805da1f26ffeec698dfaf202e431ef873..00e31d6a53af3d15d68cb42a812fddfbdd46549e 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlb_bss/javacard/api_2_bte_aptlb_bss.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlb_bss/javacard/api_2_bte_aptlb_bss.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlb_bss/javacard/api_2_bte_aptlb_bss.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlb_bss/javacard/api_2_bte_aptlb_bss.exp
new file mode 100644
index 0000000000000000000000000000000000000000..479a83dc7fb5cf7221349a3f5f0c2159dd7b691a
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlb_bss/javacard/api_2_bte_aptlb_bss.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlb_bss_bss/javacard/api_2_bte_aptlb_bss_bss.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlb_bss_bss/javacard/api_2_bte_aptlb_bss_bss.cap
index 3f4aabf97623abc65dca4dab1cca26b6b1694e67..da3c80b985df57a71f3723b2afec3b7a787af42b 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlb_bss_bss/javacard/api_2_bte_aptlb_bss_bss.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlb_bss_bss/javacard/api_2_bte_aptlb_bss_bss.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlb_bss_bss/javacard/api_2_bte_aptlb_bss_bss.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlb_bss_bss/javacard/api_2_bte_aptlb_bss_bss.exp
new file mode 100644
index 0000000000000000000000000000000000000000..8fed13cc31853fb2c9f94f30214de9c192a4d406
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlb_bss_bss/javacard/api_2_bte_aptlb_bss_bss.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbb/javacard/api_2_bte_aptlbb.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbb/javacard/api_2_bte_aptlbb.cap
index 342b87ab0fc31473bfd3a738b1d7b193a096af32..4fc60daab3a8e2133229e0483a19817120b48892 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbb/javacard/api_2_bte_aptlbb.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbb/javacard/api_2_bte_aptlbb.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbb/javacard/api_2_bte_aptlbb.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbb/javacard/api_2_bte_aptlbb.exp
new file mode 100644
index 0000000000000000000000000000000000000000..1275b90ee3d9f0724f41195459cd12ee1dbdb3d1
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbb/javacard/api_2_bte_aptlbb.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbb_bss/javacard/api_2_bte_aptlbb_bss.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbb_bss/javacard/api_2_bte_aptlbb_bss.cap
index 2c1c4fdafb08df6eb428238b4271b91c78152844..1a377045fa9b4f5f06bb55248cfdae03776f6b45 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbb_bss/javacard/api_2_bte_aptlbb_bss.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbb_bss/javacard/api_2_bte_aptlbb_bss.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbb_bss/javacard/api_2_bte_aptlbb_bss.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbb_bss/javacard/api_2_bte_aptlbb_bss.exp
new file mode 100644
index 0000000000000000000000000000000000000000..789754765fe930441b9e78a8c0d24c53b8915e2c
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbb_bss/javacard/api_2_bte_aptlbb_bss.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbbb/javacard/api_2_bte_aptlbbb.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbbb/javacard/api_2_bte_aptlbbb.cap
index aa654989c6b1264f36b0fa3ebe725733c085fd77..33604ae2362726b463cef6b3dfd7d3b9147ccbc4 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbbb/javacard/api_2_bte_aptlbbb.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbbb/javacard/api_2_bte_aptlbbb.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbbb/javacard/api_2_bte_aptlbbb.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbbb/javacard/api_2_bte_aptlbbb.exp
new file mode 100644
index 0000000000000000000000000000000000000000..15d6dfccf5e6f6a48a394044fe4eaa2c5e0e1d5c
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbbb/javacard/api_2_bte_aptlbbb.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbbs/javacard/api_2_bte_aptlbbs.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbbs/javacard/api_2_bte_aptlbbs.cap
index 8db4280d9476fc34a78b4135d0bb8c2072f31cfe..ef912fd5309aecb25139f981fd648588db927623 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbbs/javacard/api_2_bte_aptlbbs.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbbs/javacard/api_2_bte_aptlbbs.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbbs/javacard/api_2_bte_aptlbbs.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbbs/javacard/api_2_bte_aptlbbs.exp
new file mode 100644
index 0000000000000000000000000000000000000000..c85281cc21bf7964ed8f59e4a74b3549e2570fde
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbbs/javacard/api_2_bte_aptlbbs.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbs/javacard/api_2_bte_aptlbs.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbs/javacard/api_2_bte_aptlbs.cap
index dee0b68f414aca216627936ab468eab7999b6821..5d027dc94f9c554d1a62ce6306aca99f913a0b02 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbs/javacard/api_2_bte_aptlbs.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbs/javacard/api_2_bte_aptlbs.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbs/javacard/api_2_bte_aptlbs.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbs/javacard/api_2_bte_aptlbs.exp
new file mode 100644
index 0000000000000000000000000000000000000000..08404ab3b1b89a3fb72b4f04dd59e319fcac2a32
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbs/javacard/api_2_bte_aptlbs.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbss/javacard/api_2_bte_aptlbss.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbss/javacard/api_2_bte_aptlbss.cap
index cf3d838a8b4c744bde557ee24fc9a57dfc9e7a96..3ba1c986fcffb0b955e18f764be8f9cf52e20858 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbss/javacard/api_2_bte_aptlbss.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbss/javacard/api_2_bte_aptlbss.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbss/javacard/api_2_bte_aptlbss.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbss/javacard/api_2_bte_aptlbss.exp
new file mode 100644
index 0000000000000000000000000000000000000000..fc61eb144b98f4533d3d2bba459622fec53dd01f
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_aptlbss/javacard/api_2_bte_aptlbss.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_cler/javacard/api_2_bte_cler.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_cler/javacard/api_2_bte_cler.cap
index 98faffa474615f35d0cd07908331a6c83692b9b9..b28488a506cb59b60153ca72f7fc00aa5a44f9ab 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_cler/javacard/api_2_bte_cler.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_cler/javacard/api_2_bte_cler.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_cler/javacard/api_2_bte_cler.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_cler/javacard/api_2_bte_cler.exp
new file mode 100644
index 0000000000000000000000000000000000000000..1f57b6b0d8324d0a48a37de96fbd815696058561
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_cler/javacard/api_2_bte_cler.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_copy/javacard/api_2_bte_copy.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_copy/javacard/api_2_bte_copy.cap
index 1df8c0d9d8ef1cee9d6510f3841926fa211bd7a6..5f5826c6d77bf968788a57859ab0998bb0431aa5 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_copy/javacard/api_2_bte_copy.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_copy/javacard/api_2_bte_copy.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_copy/javacard/api_2_bte_copy.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_copy/javacard/api_2_bte_copy.exp
new file mode 100644
index 0000000000000000000000000000000000000000..c12c3a69a4927041292e807524f1d08c44b5c6db
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_copy/javacard/api_2_bte_copy.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_cprv/javacard/api_2_bte_cprv.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_cprv/javacard/api_2_bte_cprv.cap
index e783f54188a1c22342d741b9e8ea335853268b17..ae2e53576d4da57ee35b58f54dc010db84faf5f2 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_cprv/javacard/api_2_bte_cprv.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_cprv/javacard/api_2_bte_cprv.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_cprv/javacard/api_2_bte_cprv.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_cprv/javacard/api_2_bte_cprv.exp
new file mode 100644
index 0000000000000000000000000000000000000000..13d0305db3d306fea2eb5f29e2a7305cacebb8c9
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_cprv/javacard/api_2_bte_cprv.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_cpyv/javacard/api_2_bte_cpyv.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_cpyv/javacard/api_2_bte_cpyv.cap
index 9ddde9414861613728df20a9e0a674f4286e8eec..97b12ea17936f92900b77076e24bdc3c84d13d2a 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_cpyv/javacard/api_2_bte_cpyv.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_cpyv/javacard/api_2_bte_cpyv.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_cpyv/javacard/api_2_bte_cpyv.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_cpyv/javacard/api_2_bte_cpyv.exp
new file mode 100644
index 0000000000000000000000000000000000000000..9ae4149f0380b4ecff98af13cd888c788fdc1b1d
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_cpyv/javacard/api_2_bte_cpyv.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facrb_bs/javacard/api_2_bte_facrb_bs.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facrb_bs/javacard/api_2_bte_facrb_bs.cap
index c697477af5c86349589ea48735535cb3e18e9747..94fd2df220a4cce77e510c010968418602454ae3 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facrb_bs/javacard/api_2_bte_facrb_bs.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facrb_bs/javacard/api_2_bte_facrb_bs.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facrb_bs/javacard/api_2_bte_facrb_bs.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facrb_bs/javacard/api_2_bte_facrb_bs.exp
new file mode 100644
index 0000000000000000000000000000000000000000..b9c93f6653ce3c95abfb95d26c8f1be9db63622c
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facrb_bs/javacard/api_2_bte_facrb_bs.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facrbbs_bss/javacard/api_2_bte_facrbbs_bss.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facrbbs_bss/javacard/api_2_bte_facrbbs_bss.cap
index 5aec8db3646f32565560e675edc5fc34f78de292..184c6ce5766b7ffa80870d1f7dcdeb8e413cdcac 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facrbbs_bss/javacard/api_2_bte_facrbbs_bss.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facrbbs_bss/javacard/api_2_bte_facrbbs_bss.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facrbbs_bss/javacard/api_2_bte_facrbbs_bss.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facrbbs_bss/javacard/api_2_bte_facrbbs_bss.exp
new file mode 100644
index 0000000000000000000000000000000000000000..643633e112f64d2a47b5b94fd66b5c165c5c5ccc
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facrbbs_bss/javacard/api_2_bte_facrbbs_bss.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facyb_bs/javacard/api_2_bte_facyb_bs.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facyb_bs/javacard/api_2_bte_facyb_bs.cap
index 0673369cc3b55decf4ff0aa06cccacc103024d3b..5cef6e2cda064b2e0c625ebf1240fc355296db2a 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facyb_bs/javacard/api_2_bte_facyb_bs.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facyb_bs/javacard/api_2_bte_facyb_bs.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facyb_bs/javacard/api_2_bte_facyb_bs.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facyb_bs/javacard/api_2_bte_facyb_bs.exp
new file mode 100644
index 0000000000000000000000000000000000000000..ba08804c4c235e0828227fa87e8b21f809385e18
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facyb_bs/javacard/api_2_bte_facyb_bs.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facybbs_bss/javacard/api_2_bte_facybbs_bss.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facybbs_bss/javacard/api_2_bte_facybbs_bss.cap
index 8423b7c9028f191b47b6d2e5023c82efc1f2491a..1397a168884bdc06cd23ceedcaca2bf829497738 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facybbs_bss/javacard/api_2_bte_facybbs_bss.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facybbs_bss/javacard/api_2_bte_facybbs_bss.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facybbs_bss/javacard/api_2_bte_facybbs_bss.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facybbs_bss/javacard/api_2_bte_facybbs_bss.exp
new file mode 100644
index 0000000000000000000000000000000000000000..757c5b869b49098225c176f4fbccd614921d3f81
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_facybbs_bss/javacard/api_2_bte_facybbs_bss.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_find/javacard/api_2_bte_find.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_find/javacard/api_2_bte_find.cap
index af3735f5764353973e04a949f1c4a7f5ecd0e9eb..7ffa7e203774cf8f4d19da522d21fcc0d8f240e3 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_find/javacard/api_2_bte_find.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_find/javacard/api_2_bte_find.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_find/javacard/api_2_bte_find.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_find/javacard/api_2_bte_find.exp
new file mode 100644
index 0000000000000000000000000000000000000000..e86bd0b01736690a815d5a26010256759c04d545
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_find/javacard/api_2_bte_find.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gcap/javacard/api_2_bte_gcap.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gcap/javacard/api_2_bte_gcap.cap
index d481981990da0cdc97028e38c1d04a9632792bf5..36d8638fe848b47f752d2ab03b94f9b71b2981e3 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gcap/javacard/api_2_bte_gcap.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gcap/javacard/api_2_bte_gcap.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gcap/javacard/api_2_bte_gcap.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gcap/javacard/api_2_bte_gcap.exp
new file mode 100644
index 0000000000000000000000000000000000000000..195f3c4f2231bce70ef70ee1e130464a60f9dba7
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gcap/javacard/api_2_bte_gcap.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_glen/javacard/api_2_bte_glen.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_glen/javacard/api_2_bte_glen.cap
index 3722a9599cadbe929ba32e96bd7816d2ce0c5d14..f1046472aba80d6ceb4716010d8394c6304519ca 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_glen/javacard/api_2_bte_glen.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_glen/javacard/api_2_bte_glen.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_glen/javacard/api_2_bte_glen.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_glen/javacard/api_2_bte_glen.exp
new file mode 100644
index 0000000000000000000000000000000000000000..b34e86ccbf495a06112cf74e58f659ba93d3a8ff
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_glen/javacard/api_2_bte_glen.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gtsz/javacard/api_2_bte_gtsz.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gtsz/javacard/api_2_bte_gtsz.cap
index c672f5ae2d42474820e216f5ab9b7413c43ed931..d4d25299dc3ac8f54c0006852d84a139316d1f83 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gtsz/javacard/api_2_bte_gtsz.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gtsz/javacard/api_2_bte_gtsz.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gtsz/javacard/api_2_bte_gtsz.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gtsz/javacard/api_2_bte_gtsz.exp
new file mode 100644
index 0000000000000000000000000000000000000000..54ef39ce7c80755bb94ea85341faa54893f2ea3b
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gtsz/javacard/api_2_bte_gtsz.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gvby/javacard/api_2_bte_gvby.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gvby/javacard/api_2_bte_gvby.cap
index e6f72d4dc7b33255f2dad2796115dc5fdc6d1c58..8a0dffaf30e39e898d7fe784c6ccbecd39f57c32 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gvby/javacard/api_2_bte_gvby.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gvby/javacard/api_2_bte_gvby.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gvby/javacard/api_2_bte_gvby.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gvby/javacard/api_2_bte_gvby.exp
new file mode 100644
index 0000000000000000000000000000000000000000..3d60426487567b5506d30c87d421c4303f52128f
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gvby/javacard/api_2_bte_gvby.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gvle/javacard/api_2_bte_gvle.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gvle/javacard/api_2_bte_gvle.cap
index 890b8adf94ae0f0a58b022fe392c7174a82f69ea..26c2577f404d38934dc84244d8b12f348906e92f 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gvle/javacard/api_2_bte_gvle.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gvle/javacard/api_2_bte_gvle.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gvle/javacard/api_2_bte_gvle.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gvle/javacard/api_2_bte_gvle.exp
new file mode 100644
index 0000000000000000000000000000000000000000..00c0c399fd68b2916bbdf263ee885f7139dfa8a5
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gvle/javacard/api_2_bte_gvle.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gvsh/javacard/api_2_bte_gvsh.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gvsh/javacard/api_2_bte_gvsh.cap
index 2644e4383d5176a577c6b63205f69877b1ac25b7..c75974085e44bf2c7e0a9323aa1e859850fbe9fd 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gvsh/javacard/api_2_bte_gvsh.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gvsh/javacard/api_2_bte_gvsh.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gvsh/javacard/api_2_bte_gvsh.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gvsh/javacard/api_2_bte_gvsh.exp
new file mode 100644
index 0000000000000000000000000000000000000000..a1f8615a2e77b6ffc9eb22825c86e502e162b184
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_gvsh/javacard/api_2_bte_gvsh.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_sttg/javacard/api_2_bte_sttg.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_sttg/javacard/api_2_bte_sttg.cap
index ba021c74acf4975979537b5d886fc311ebb7edce..9dae1840f96a7f229f9de1e999c2ba1b4061d73a 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_sttg/javacard/api_2_bte_sttg.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_sttg/javacard/api_2_bte_sttg.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_sttg/javacard/api_2_bte_sttg.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_sttg/javacard/api_2_bte_sttg.exp
new file mode 100644
index 0000000000000000000000000000000000000000..2a8cc503124e6e6bbbfe9c6405d6fd90341088e0
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_bte_sttg/javacard/api_2_bte_sttg.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_ehs_gthd/javacard/api_2_ehs_gthd.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_ehs_gthd/javacard/api_2_ehs_gthd.cap
index bfb864f1a8f9bb5e7f6ad8721938a5172163fd94..385a28ee91aabeeb299b0da76e50c5709475adea 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_ehs_gthd/javacard/api_2_ehs_gthd.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_ehs_gthd/javacard/api_2_ehs_gthd.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_ehs_gthd/javacard/api_2_ehs_gthd.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_ehs_gthd/javacard/api_2_ehs_gthd.exp
new file mode 100644
index 0000000000000000000000000000000000000000..3df1c26d20c8a796d668c528fca6c5918bb24a07
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_ehs_gthd/javacard/api_2_ehs_gthd.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_copy/javacard/api_2_enh_copy.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_copy/javacard/api_2_enh_copy.cap
index ea6058d506bd96c68ca3085fa85b40add00dbde0..fbd525f8a243728e7b03eeab7e686659ebadc2c4 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_copy/javacard/api_2_enh_copy.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_copy/javacard/api_2_enh_copy.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_copy/javacard/api_2_enh_copy.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_copy/javacard/api_2_enh_copy.exp
new file mode 100644
index 0000000000000000000000000000000000000000..ce210f38f7a7e453d02d769d37770b30392462e8
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_copy/javacard/api_2_enh_copy.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_cprv/javacard/api_2_enh_cprv.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_cprv/javacard/api_2_enh_cprv.cap
index e6c6dccc9f8fdc98338e10d265dfb3b97a5e6474..d97d3a9a3527787f7c11819c1fe5080c7160b497 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_cprv/javacard/api_2_enh_cprv.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_cprv/javacard/api_2_enh_cprv.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_cprv/javacard/api_2_enh_cprv.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_cprv/javacard/api_2_enh_cprv.exp
new file mode 100644
index 0000000000000000000000000000000000000000..7a9cf828c659081e90598aed4ce55cb7c26a4454
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_cprv/javacard/api_2_enh_cprv.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_cpyv/javacard/api_2_enh_cpyv.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_cpyv/javacard/api_2_enh_cpyv.cap
index 9f63444adf7a39a755ec55bb327254cbe34cb1dc..db205360a87c7eb68fa5ac0cc949cbda02964f60 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_cpyv/javacard/api_2_enh_cpyv.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_cpyv/javacard/api_2_enh_cpyv.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_cpyv/javacard/api_2_enh_cpyv.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_cpyv/javacard/api_2_enh_cpyv.exp
new file mode 100644
index 0000000000000000000000000000000000000000..1c6e490d529de5c7fef279ec02b8d7f656cf6aed
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_cpyv/javacard/api_2_enh_cpyv.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_facrb_bs/javacard/api_2_enh_facrb_bs.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_facrb_bs/javacard/api_2_enh_facrb_bs.cap
index 1f36e469ad034ec80fe51217fbc8c8e1c19953d5..6e28c4af500e70a2c15f7bbea96f0078d5826255 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_facrb_bs/javacard/api_2_enh_facrb_bs.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_facrb_bs/javacard/api_2_enh_facrb_bs.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_facrb_bs/javacard/api_2_enh_facrb_bs.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_facrb_bs/javacard/api_2_enh_facrb_bs.exp
new file mode 100644
index 0000000000000000000000000000000000000000..a7e7aaa1dea3770148a2676174192b5c46efe57f
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_facrb_bs/javacard/api_2_enh_facrb_bs.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_facrbbs_bss/javacard/api_2_enh_facrbbs_bss.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_facrbbs_bss/javacard/api_2_enh_facrbbs_bss.cap
index 2ca6427bfbd04f66146ca8617389b39be02700c1..eb2a3a84a09e3b806484189971f2914c5d1d6533 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_facrbbs_bss/javacard/api_2_enh_facrbbs_bss.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_facrbbs_bss/javacard/api_2_enh_facrbbs_bss.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_facrbbs_bss/javacard/api_2_enh_facrbbs_bss.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_facrbbs_bss/javacard/api_2_enh_facrbbs_bss.exp
new file mode 100644
index 0000000000000000000000000000000000000000..8e89b4f55f6c29a225f0384ec94e7e846e899729
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_facrbbs_bss/javacard/api_2_enh_facrbbs_bss.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_facyb_bs/javacard/api_2_enh_facyb_bs.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_facyb_bs/javacard/api_2_enh_facyb_bs.cap
index e8f89570f882ef2d3834905ae18c273767d99d8e..9ebf0feebc25c2762c0733666ca41fcae900dc0f 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_facyb_bs/javacard/api_2_enh_facyb_bs.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_facyb_bs/javacard/api_2_enh_facyb_bs.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_facyb_bs/javacard/api_2_enh_facyb_bs.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_facyb_bs/javacard/api_2_enh_facyb_bs.exp
new file mode 100644
index 0000000000000000000000000000000000000000..0fa80ac2259ee3af1fa3e0cc7630ac550654277e
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_facyb_bs/javacard/api_2_enh_facyb_bs.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_facyb_bss/javacard/api_2_enh_facyb_bss.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_facyb_bss/javacard/api_2_enh_facyb_bss.cap
index ec0829faf68f3ba2bd44cb2114ffcee12117ae86..4735d976132fb4b402314a58f92c95b3627a906b 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_facyb_bss/javacard/api_2_enh_facyb_bss.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_facyb_bss/javacard/api_2_enh_facyb_bss.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_facyb_bss/javacard/api_2_enh_facyb_bss.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_facyb_bss/javacard/api_2_enh_facyb_bss.exp
new file mode 100644
index 0000000000000000000000000000000000000000..92f461f664a1613fbaabc698eb4828692faa6e39
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_facyb_bss/javacard/api_2_enh_facyb_bss.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_find/javacard/api_2_enh_find.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_find/javacard/api_2_enh_find.cap
index 76a19e38c2c851091c2b56ef978097667025969c..238eeea12b8b46162c7360619945743649776394 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_find/javacard/api_2_enh_find.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_find/javacard/api_2_enh_find.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_find/javacard/api_2_enh_find.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_find/javacard/api_2_enh_find.exp
new file mode 100644
index 0000000000000000000000000000000000000000..78c120463371ac4ad04e6eede3b72ac117ef00a8
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_find/javacard/api_2_enh_find.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gcap/javacard/api_2_enh_gcap.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gcap/javacard/api_2_enh_gcap.cap
index 9d478e2f45681cba10bb5b6d7ca44d6c7ab9345e..1d4acd7126f95de4fc179ebd12be3bbd25361702 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gcap/javacard/api_2_enh_gcap.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gcap/javacard/api_2_enh_gcap.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gcap/javacard/api_2_enh_gcap.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gcap/javacard/api_2_enh_gcap.exp
new file mode 100644
index 0000000000000000000000000000000000000000..1c4efbfa05afc9fd374f072ac3222485b0c26a5a
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gcap/javacard/api_2_enh_gcap.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gcid/javacard/api_2_enh_gcid.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gcid/javacard/api_2_enh_gcid.cap
index bcf5697bd7a183978577b3ffce85bbcf42630b39..f73c3ec07ab972599e881a430b91c3e83195d741 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gcid/javacard/api_2_enh_gcid.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gcid/javacard/api_2_enh_gcid.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gcid/javacard/api_2_enh_gcid.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gcid/javacard/api_2_enh_gcid.exp
new file mode 100644
index 0000000000000000000000000000000000000000..48f65062112df3b93be9084b527b06837d21263c
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gcid/javacard/api_2_enh_gcid.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gcst/javacard/Api_2_Enh_Gcst.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gcst/javacard/Api_2_Enh_Gcst.cap
index fb8eab407b31ac77ac9b6a3d6f77d714d0822a61..92d40adb0c46b6b421917b54106c4fbb2b914f63 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gcst/javacard/Api_2_Enh_Gcst.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gcst/javacard/Api_2_Enh_Gcst.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gcst/javacard/api_2_enh_gcst.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gcst/javacard/api_2_enh_gcst.exp
new file mode 100644
index 0000000000000000000000000000000000000000..4255f11416d5c964a38cb6dd916c57ce00fda15e
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gcst/javacard/api_2_enh_gcst.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_giid/javacard/api_2_enh_giid.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_giid/javacard/api_2_enh_giid.cap
index 59d53b51e19b233ec493923f48a8033e87f7a7ac..d04906de9d1dce60e817ae2fad99e1bcacf2f3dc 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_giid/javacard/api_2_enh_giid.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_giid/javacard/api_2_enh_giid.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_giid/javacard/api_2_enh_giid.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_giid/javacard/api_2_enh_giid.exp
new file mode 100644
index 0000000000000000000000000000000000000000..be1b3732d4696489329c8df330c9eb9dd958a808
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_giid/javacard/api_2_enh_giid.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_glen/javacard/Api_2_Enh_Glen.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_glen/javacard/Api_2_Enh_Glen.cap
index 649558eea61d033ebe1019f7eccf6c0b4986dbba..6c1d512e3c31d16915af6ed160467d85482f74b1 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_glen/javacard/Api_2_Enh_Glen.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_glen/javacard/Api_2_Enh_Glen.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_glen/javacard/api_2_enh_glen.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_glen/javacard/api_2_enh_glen.exp
new file mode 100644
index 0000000000000000000000000000000000000000..cb377cd25b968fd690775fab069b6e65ebbd07d8
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_glen/javacard/api_2_enh_glen.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gtsz/javacard/api_2_enh_gtsz.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gtsz/javacard/api_2_enh_gtsz.cap
index f2af2e498015656b1cf79779d6e0b75e57e365b5..939064d24c14b78a367f54086f522d48c3084f95 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gtsz/javacard/api_2_enh_gtsz.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gtsz/javacard/api_2_enh_gtsz.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gtsz/javacard/api_2_enh_gtsz.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gtsz/javacard/api_2_enh_gtsz.exp
new file mode 100644
index 0000000000000000000000000000000000000000..4f23493dbfccc2f18b3bbdf2bd92a71c1550e11f
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gtsz/javacard/api_2_enh_gtsz.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gttg/javacard/api_2_enh_gttg.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gttg/javacard/api_2_enh_gttg.cap
index aafd77975981ce812babd33909a7995a067ea1eb..a25e53bfc67787861f2eded51bc4c2efd4cf96a5 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gttg/javacard/api_2_enh_gttg.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gttg/javacard/api_2_enh_gttg.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gttg/javacard/api_2_enh_gttg.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gttg/javacard/api_2_enh_gttg.exp
new file mode 100644
index 0000000000000000000000000000000000000000..0a86b7a8381e894525a56491fc45e91ff7738ae9
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gttg/javacard/api_2_enh_gttg.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gvby/javacard/api_2_enh_gvby.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gvby/javacard/api_2_enh_gvby.cap
index a45713b1e18749c680337ebfa10f05a27fd6ff36..eb2ddf4c05338dbe5bfc178b7d88fa5070531ae9 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gvby/javacard/api_2_enh_gvby.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gvby/javacard/api_2_enh_gvby.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gvby/javacard/api_2_enh_gvby.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gvby/javacard/api_2_enh_gvby.exp
new file mode 100644
index 0000000000000000000000000000000000000000..a0819db2acf1483a0daa86703df3d37258863a70
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gvby/javacard/api_2_enh_gvby.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gvle/javacard/api_2_enh_gvle.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gvle/javacard/api_2_enh_gvle.cap
index 427569ac17dc75b833b3b484c259296eb347690c..cf52d23791b2abecd441cb825e8719bac7094029 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gvle/javacard/api_2_enh_gvle.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gvle/javacard/api_2_enh_gvle.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gvle/javacard/api_2_enh_gvle.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gvle/javacard/api_2_enh_gvle.exp
new file mode 100644
index 0000000000000000000000000000000000000000..efe0e789fefc54d8f7fd45c14f638f2f30d8b440
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gvle/javacard/api_2_enh_gvle.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gvsh/javacard/api_2_enh_gvsh.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gvsh/javacard/api_2_enh_gvsh.cap
index 17a82f96ca069db6165e156945227b7e6d7d5a82..f9f6a1fb681ca39bdc4711876237de2ba2014479 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gvsh/javacard/api_2_enh_gvsh.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gvsh/javacard/api_2_enh_gvsh.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gvsh/javacard/api_2_enh_gvsh.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gvsh/javacard/api_2_enh_gvsh.exp
new file mode 100644
index 0000000000000000000000000000000000000000..a181b7984cf65be75bec9d888a2527222087c40f
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_enh_gvsh/javacard/api_2_enh_gvsh.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_apda_bss/javacard/api_2_erh_apda_bss.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_apda_bss/javacard/api_2_erh_apda_bss.cap
index c7077a0287fc9a7aebf2b309d3c0876ac1b3cce7..94dcedaedccdbfeabb62bb00f818da87a76ccfcf 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_apda_bss/javacard/api_2_erh_apda_bss.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_apda_bss/javacard/api_2_erh_apda_bss.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_apda_bss/javacard/api_2_erh_apda_bss.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_apda_bss/javacard/api_2_erh_apda_bss.exp
new file mode 100644
index 0000000000000000000000000000000000000000..f8befa8fd6c968389ef6c36740a59c8951d8f612
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_apda_bss/javacard/api_2_erh_apda_bss.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlb_bss/javacard/api_2_erh_aptlb_bss.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlb_bss/javacard/api_2_erh_aptlb_bss.cap
index 2050d2aa40f6ffcd4c7365911212e5a62e23c8eb..1b1959efcd4a564dd81c603b697b59e90c7b40a9 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlb_bss/javacard/api_2_erh_aptlb_bss.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlb_bss/javacard/api_2_erh_aptlb_bss.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlb_bss/javacard/api_2_erh_aptlb_bss.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlb_bss/javacard/api_2_erh_aptlb_bss.exp
new file mode 100644
index 0000000000000000000000000000000000000000..f2514dd187d2e124fd67ccce6ff16344fe08745d
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlb_bss/javacard/api_2_erh_aptlb_bss.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlb_bss_bss/javacard/api_2_erh_aptlb_bss_bss.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlb_bss_bss/javacard/api_2_erh_aptlb_bss_bss.cap
index 28911329bbc720ec206bf637be856e63959209cc..93993ad4eba0e429ac6d0a76979e3ada433299a6 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlb_bss_bss/javacard/api_2_erh_aptlb_bss_bss.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlb_bss_bss/javacard/api_2_erh_aptlb_bss_bss.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlb_bss_bss/javacard/api_2_erh_aptlb_bss_bss.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlb_bss_bss/javacard/api_2_erh_aptlb_bss_bss.exp
new file mode 100644
index 0000000000000000000000000000000000000000..3b7d30f9deaf5932416d623372073f406cc28ed2
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlb_bss_bss/javacard/api_2_erh_aptlb_bss_bss.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbb/javacard/api_2_erh_aptlbb.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbb/javacard/api_2_erh_aptlbb.cap
index 5a778411794c4115e3675b827264fd393b738084..9e6abbe4a0eb4f02dc6c2dc3924dfe56f93ed2d3 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbb/javacard/api_2_erh_aptlbb.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbb/javacard/api_2_erh_aptlbb.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbb/javacard/api_2_erh_aptlbb.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbb/javacard/api_2_erh_aptlbb.exp
new file mode 100644
index 0000000000000000000000000000000000000000..b8dcc9874f5b341552f5b79f016faa6e0f07a72d
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbb/javacard/api_2_erh_aptlbb.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbb_bss/javacard/api_2_erh_aptlbb_bss.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbb_bss/javacard/api_2_erh_aptlbb_bss.cap
index e148feaa5a1cc0d2b8b69f3286483b89bf7bd8fa..9427638c82b63b243679b20c6247f6dcf77bb859 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbb_bss/javacard/api_2_erh_aptlbb_bss.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbb_bss/javacard/api_2_erh_aptlbb_bss.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbb_bss/javacard/api_2_erh_aptlbb_bss.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbb_bss/javacard/api_2_erh_aptlbb_bss.exp
new file mode 100644
index 0000000000000000000000000000000000000000..ba1dca3669d870b3330349e3efda785b5e6d0521
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbb_bss/javacard/api_2_erh_aptlbb_bss.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbbb/javacard/api_2_erh_aptlbbb.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbbb/javacard/api_2_erh_aptlbbb.cap
index 0fe428bd00a33f60f3bd792be29afda97213ac1a..cd1072e33f47966087997a9630349ee459428f8c 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbbb/javacard/api_2_erh_aptlbbb.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbbb/javacard/api_2_erh_aptlbbb.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbbb/javacard/api_2_erh_aptlbbb.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbbb/javacard/api_2_erh_aptlbbb.exp
new file mode 100644
index 0000000000000000000000000000000000000000..4067eebd71e9cea6b9b8ca44ebcf9f49c89cca55
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbbb/javacard/api_2_erh_aptlbbb.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbbs/javacard/api_2_erh_aptlbbs.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbbs/javacard/api_2_erh_aptlbbs.cap
index 08d23dac7d7ed83ff1a5a9d8cd6148db696d949a..0ff2aa0f5f504e49d3a742d5287554a97e88d4c0 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbbs/javacard/api_2_erh_aptlbbs.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbbs/javacard/api_2_erh_aptlbbs.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbbs/javacard/api_2_erh_aptlbbs.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbbs/javacard/api_2_erh_aptlbbs.exp
new file mode 100644
index 0000000000000000000000000000000000000000..0d6f4f445d554da8b5163118ac3b8dd421d8443c
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbbs/javacard/api_2_erh_aptlbbs.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbs/javacard/api_2_erh_aptlbs.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbs/javacard/api_2_erh_aptlbs.cap
index 0753e3be0c974c5f4ae710571adaa408dedc361a..ff73e69ea07b66d46514069f8824f57ca73addbf 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbs/javacard/api_2_erh_aptlbs.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbs/javacard/api_2_erh_aptlbs.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbs/javacard/api_2_erh_aptlbs.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbs/javacard/api_2_erh_aptlbs.exp
new file mode 100644
index 0000000000000000000000000000000000000000..8b25d6248807d68cf9ec55ccb5bc9a21145fd1c1
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbs/javacard/api_2_erh_aptlbs.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbss/javacard/api_2_erh_aptlbss.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbss/javacard/api_2_erh_aptlbss.cap
index 663b35551aafac465382a83619005b3c51c7ba25..41ad97051c98b68cb35acc92cce9cf52766c1d3e 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbss/javacard/api_2_erh_aptlbss.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbss/javacard/api_2_erh_aptlbss.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbss/javacard/api_2_erh_aptlbss.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbss/javacard/api_2_erh_aptlbss.exp
new file mode 100644
index 0000000000000000000000000000000000000000..8ee6f9d666691e02ed109e3c766e43d9e2e57cec
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_aptlbss/javacard/api_2_erh_aptlbss.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_cler/javacard/api_2_erh_cler.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_cler/javacard/api_2_erh_cler.cap
index d38f863c6cb5841193cd8a46c257a981d885c160..f5768d33b20421ff47a092b5c21aed5a03346246 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_cler/javacard/api_2_erh_cler.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_cler/javacard/api_2_erh_cler.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_cler/javacard/api_2_erh_cler.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_cler/javacard/api_2_erh_cler.exp
new file mode 100644
index 0000000000000000000000000000000000000000..38e814119c5c70d7f40710aeb943d7a1c2a90ffd
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_cler/javacard/api_2_erh_cler.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_copy/javacard/api_2_erh_copy.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_copy/javacard/api_2_erh_copy.cap
index 9e614d5c43f640e2b0cbf5e2a0152b1ee1c0666c..c9276c82f710b6f69612367262601a451ef21598 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_copy/javacard/api_2_erh_copy.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_copy/javacard/api_2_erh_copy.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_copy/javacard/api_2_erh_copy.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_copy/javacard/api_2_erh_copy.exp
new file mode 100644
index 0000000000000000000000000000000000000000..15511a5304b8d06eb1569ffe0a6605ac967a7509
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_copy/javacard/api_2_erh_copy.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_cprv/javacard/api_2_erh_cprv.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_cprv/javacard/api_2_erh_cprv.cap
index 3ecfdafc94ea990dda8db3de546513d3b16e1fc5..eebea2e1075e098394b58e78c854577c01089eac 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_cprv/javacard/api_2_erh_cprv.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_cprv/javacard/api_2_erh_cprv.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_cprv/javacard/api_2_erh_cprv.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_cprv/javacard/api_2_erh_cprv.exp
new file mode 100644
index 0000000000000000000000000000000000000000..c120c23d0fab0149fb1da0f2c23d6939a1377762
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_cprv/javacard/api_2_erh_cprv.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_cpyv/javacard/api_2_erh_cpyv.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_cpyv/javacard/api_2_erh_cpyv.cap
index 3fb6ed26f2ea06a2175b0246f08905ee227df6f5..d6afbf3c21ed52badf3c7afc746a4b9416903029 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_cpyv/javacard/api_2_erh_cpyv.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_cpyv/javacard/api_2_erh_cpyv.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_cpyv/javacard/api_2_erh_cpyv.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_cpyv/javacard/api_2_erh_cpyv.exp
new file mode 100644
index 0000000000000000000000000000000000000000..c99a04c223990345b429ca688fea9093f72b5912
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_cpyv/javacard/api_2_erh_cpyv.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_facrb_bs/javacard/api_2_erh_facrb_bs.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_facrb_bs/javacard/api_2_erh_facrb_bs.cap
index b60749f2ae410dd03a7ccc21b436c8bceb0ca6c2..2bb6e4f258812b32198adfa139f1bff9143dcf5e 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_facrb_bs/javacard/api_2_erh_facrb_bs.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_facrb_bs/javacard/api_2_erh_facrb_bs.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_facrb_bs/javacard/api_2_erh_facrb_bs.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_facrb_bs/javacard/api_2_erh_facrb_bs.exp
new file mode 100644
index 0000000000000000000000000000000000000000..ad0f38a44f8456061028e54fe7f59c9610d84b1e
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_facrb_bs/javacard/api_2_erh_facrb_bs.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_facrbbs_bss/javacard/api_2_erh_facrbbs_bss.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_facrbbs_bss/javacard/api_2_erh_facrbbs_bss.cap
index c475877806eab217f7094af0360b76ce6bffcb86..6c16127fbf3c2c0cf9caa58db6b6924a27db814a 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_facrbbs_bss/javacard/api_2_erh_facrbbs_bss.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_facrbbs_bss/javacard/api_2_erh_facrbbs_bss.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_facrbbs_bss/javacard/api_2_erh_facrbbs_bss.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_facrbbs_bss/javacard/api_2_erh_facrbbs_bss.exp
new file mode 100644
index 0000000000000000000000000000000000000000..3df6822d312c92e047d24d781937c7642eaebc97
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_facrbbs_bss/javacard/api_2_erh_facrbbs_bss.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_facyb_bs/javacard/api_2_erh_facyb_bs.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_facyb_bs/javacard/api_2_erh_facyb_bs.cap
index 1c13131d452497dd9fd7dfea494e53d1ae61333e..0cb7ead33ce0f40ec84ec5acf5fed49178358832 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_facyb_bs/javacard/api_2_erh_facyb_bs.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_facyb_bs/javacard/api_2_erh_facyb_bs.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_facyb_bs/javacard/api_2_erh_facyb_bs.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_facyb_bs/javacard/api_2_erh_facyb_bs.exp
new file mode 100644
index 0000000000000000000000000000000000000000..e98c90605576a5dd22e86f946c64f53e6d19db60
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_facyb_bs/javacard/api_2_erh_facyb_bs.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_facybbs_bss/javacard/api_2_erh_facybbs_bss.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_facybbs_bss/javacard/api_2_erh_facybbs_bss.cap
index 9c030bf2f46e8ffc174de0ccbded4e8ad8fd6050..ce1b5f8d73bbad165ed6d884dadfb445c7f396e1 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_facybbs_bss/javacard/api_2_erh_facybbs_bss.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_facybbs_bss/javacard/api_2_erh_facybbs_bss.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_facybbs_bss/javacard/api_2_erh_facybbs_bss.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_facybbs_bss/javacard/api_2_erh_facybbs_bss.exp
new file mode 100644
index 0000000000000000000000000000000000000000..50112d5abcdbe826a2571a6002582fd613378d9c
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_facybbs_bss/javacard/api_2_erh_facybbs_bss.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_find/javacard/api_2_erh_find.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_find/javacard/api_2_erh_find.cap
index 3ccc0c7d59239285be6d735b77df3fcde8a9ed7d..2925de14cbf4a3fe8d3a432c987210747011d0d2 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_find/javacard/api_2_erh_find.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_find/javacard/api_2_erh_find.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_find/javacard/api_2_erh_find.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_find/javacard/api_2_erh_find.exp
new file mode 100644
index 0000000000000000000000000000000000000000..3fde8e7b5b9a0f6b7f08a3ac4aaab6ce56806eb5
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_find/javacard/api_2_erh_find.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gcap/javacard/api_2_erh_gcap.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gcap/javacard/api_2_erh_gcap.cap
index deef3d2c884bfe474f9470d33b5d52a7aca9f884..2c61f4435ef4cd27fca9b484d6fab7bf66255e7b 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gcap/javacard/api_2_erh_gcap.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gcap/javacard/api_2_erh_gcap.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gcap/javacard/api_2_erh_gcap.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gcap/javacard/api_2_erh_gcap.exp
new file mode 100644
index 0000000000000000000000000000000000000000..b4416cf67e249953be4fee44e841443509d90c14
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gcap/javacard/api_2_erh_gcap.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_glen/javacard/api_2_erh_glen.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_glen/javacard/api_2_erh_glen.cap
index e4ba602be04d5af7bafc4f14037693c9723da327..cbb52422f3dee2f3d25924086eb003c50bd8efa6 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_glen/javacard/api_2_erh_glen.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_glen/javacard/api_2_erh_glen.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_glen/javacard/api_2_erh_glen.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_glen/javacard/api_2_erh_glen.exp
new file mode 100644
index 0000000000000000000000000000000000000000..0e48546135d65467b0379a571580e764b7a8408c
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_glen/javacard/api_2_erh_glen.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gvby/javacard/api_2_erh_gvby.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gvby/javacard/api_2_erh_gvby.cap
index 20fa9859d13db6cf580085a724da3abc6da7d687..bfe3db034144fef7ddf4e1d91172490aaa19b7a0 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gvby/javacard/api_2_erh_gvby.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gvby/javacard/api_2_erh_gvby.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gvby/javacard/api_2_erh_gvby.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gvby/javacard/api_2_erh_gvby.exp
new file mode 100644
index 0000000000000000000000000000000000000000..93cbf167c1e92499e555c84579cec9993076c16a
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gvby/javacard/api_2_erh_gvby.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gvle/javacard/api_2_erh_gvle.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gvle/javacard/api_2_erh_gvle.cap
index b3b32a808f90ce54f4f4bd51661ea783b9b67579..c85630b609be06ad462a333c61b920d3511faff5 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gvle/javacard/api_2_erh_gvle.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gvle/javacard/api_2_erh_gvle.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gvle/javacard/api_2_erh_gvle.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gvle/javacard/api_2_erh_gvle.exp
new file mode 100644
index 0000000000000000000000000000000000000000..20706b6dc26a556eaadbc28fcb1260bb2fc2c665
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gvle/javacard/api_2_erh_gvle.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gvsh/javacard/api_2_erh_gvsh.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gvsh/javacard/api_2_erh_gvsh.cap
index fba68443e093df9e405fc8351354c0c9d74dedaf..e178933f06f9a28603232fb9b7f0af11a9b03f39 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gvsh/javacard/api_2_erh_gvsh.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gvsh/javacard/api_2_erh_gvsh.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gvsh/javacard/api_2_erh_gvsh.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gvsh/javacard/api_2_erh_gvsh.exp
new file mode 100644
index 0000000000000000000000000000000000000000..bb326f3e8df78c168af57f106d12622f45d39caa
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_gvsh/javacard/api_2_erh_gvsh.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_poab/javacard/api_2_erh_poab.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_poab/javacard/api_2_erh_poab.cap
index 78020486ecf8435ade3c5d98f28bb042d319d213..8813dfce27069a1923b545acada793211b1d4221 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_poab/javacard/api_2_erh_poab.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_poab/javacard/api_2_erh_poab.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_poab/javacard/api_2_erh_poab.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_poab/javacard/api_2_erh_poab.exp
new file mode 100644
index 0000000000000000000000000000000000000000..219c3ad20ef1849ec03c9052181b74dd963cee43
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_poab/javacard/api_2_erh_poab.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_post/javacard/api_2_erh_post.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_post/javacard/api_2_erh_post.cap
index 621484c1d7ff92cfff3fea055cbfdd24aa87955f..20e442e9113405a14649a3c72b7db2cbe3b4607a 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_post/javacard/api_2_erh_post.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_post/javacard/api_2_erh_post.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_post/javacard/api_2_erh_post.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_post/javacard/api_2_erh_post.exp
new file mode 100644
index 0000000000000000000000000000000000000000..332fa845e598f1a88f9fc981de2d2a34971baf31
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_erh_post/javacard/api_2_erh_post.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_ers_gthd/javacard/api_2_ers_gthd.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_ers_gthd/javacard/api_2_ers_gthd.cap
index 180fc4a3bc6e5855a83899c88c4b4cf61d709f16..9e10965183f6712184e15882c0664c20e6b76e8c 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_ers_gthd/javacard/api_2_ers_gthd.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_ers_gthd/javacard/api_2_ers_gthd.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_ers_gthd/javacard/api_2_ers_gthd.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_ers_gthd/javacard/api_2_ers_gthd.exp
new file mode 100644
index 0000000000000000000000000000000000000000..fc15ac70dc409f75ae6c7441717242090cba1244
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_ers_gthd/javacard/api_2_ers_gthd.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_apda/javacard/api_2_pah_apda.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_apda/javacard/api_2_pah_apda.cap
index f26dc88aaef0e414139e655b0ede2bb760430905..a3b127f2621ab081b14ad64a0ecd69b3ce9b0534 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_apda/javacard/api_2_pah_apda.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_apda/javacard/api_2_pah_apda.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_apda/javacard/api_2_pah_apda.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_apda/javacard/api_2_pah_apda.exp
new file mode 100644
index 0000000000000000000000000000000000000000..87228445f24fd682fdc1e0c5097909ec634ecf4a
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_apda/javacard/api_2_pah_apda.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlb_bss/javacard/api_2_pah_aptlb_bss.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlb_bss/javacard/api_2_pah_aptlb_bss.cap
index 1750177d84b38255d08233ee5a65eb88c4310dc3..def65a9b93730c901d5c8db99ebfed5212c3e68f 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlb_bss/javacard/api_2_pah_aptlb_bss.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlb_bss/javacard/api_2_pah_aptlb_bss.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlb_bss/javacard/api_2_pah_aptlb_bss.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlb_bss/javacard/api_2_pah_aptlb_bss.exp
new file mode 100644
index 0000000000000000000000000000000000000000..18aba2cfee931cc9b241032fb06bbcaa272c60b4
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlb_bss/javacard/api_2_pah_aptlb_bss.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlb_bss_bss/javacard/api_2_pah_aptlb_bss_bss.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlb_bss_bss/javacard/api_2_pah_aptlb_bss_bss.cap
index f94e4b549696e43174122ba1dfbbcdb1038d33c0..1c650ea56f3f9311fb1c4a3257be57d42f9bf0a8 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlb_bss_bss/javacard/api_2_pah_aptlb_bss_bss.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlb_bss_bss/javacard/api_2_pah_aptlb_bss_bss.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlb_bss_bss/javacard/api_2_pah_aptlb_bss_bss.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlb_bss_bss/javacard/api_2_pah_aptlb_bss_bss.exp
new file mode 100644
index 0000000000000000000000000000000000000000..7c6ab995f2dc6c1edc839ed31e084b1d0b142023
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlb_bss_bss/javacard/api_2_pah_aptlb_bss_bss.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbb/javacard/api_2_pah_aptlbb.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbb/javacard/api_2_pah_aptlbb.cap
index da8a71de34204a72fd828910dadb8201c51dcdb3..81d570f22b40a681c13e3a6f91ab3f4ebe14576c 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbb/javacard/api_2_pah_aptlbb.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbb/javacard/api_2_pah_aptlbb.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbb/javacard/api_2_pah_aptlbb.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbb/javacard/api_2_pah_aptlbb.exp
new file mode 100644
index 0000000000000000000000000000000000000000..5b8416122fd9aa3c3d158a611ca78b46604df0e2
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbb/javacard/api_2_pah_aptlbb.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbb_bss/javacard/api_2_pah_aptlbb_bss.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbb_bss/javacard/api_2_pah_aptlbb_bss.cap
index 70ca98924f69e7abec3350c91fc0cef3b7e28e50..1ac06b5045d0763f4103723ba73f07e8c3e63a00 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbb_bss/javacard/api_2_pah_aptlbb_bss.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbb_bss/javacard/api_2_pah_aptlbb_bss.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbb_bss/javacard/api_2_pah_aptlbb_bss.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbb_bss/javacard/api_2_pah_aptlbb_bss.exp
new file mode 100644
index 0000000000000000000000000000000000000000..2aac5de0aa8d8efdba35a3ca90218664d44e73d9
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbb_bss/javacard/api_2_pah_aptlbb_bss.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbbb/javacard/api_2_pah_aptlbbb.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbbb/javacard/api_2_pah_aptlbbb.cap
index d97bcf4886fbc2fe4005d410ffcfd315b5cd0266..13d4499eb06416a03cc22a74feb579337e09077b 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbbb/javacard/api_2_pah_aptlbbb.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbbb/javacard/api_2_pah_aptlbbb.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbbb/javacard/api_2_pah_aptlbbb.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbbb/javacard/api_2_pah_aptlbbb.exp
new file mode 100644
index 0000000000000000000000000000000000000000..f9c02e0f8b4fcc546933b6f7c9d1e67f2b8a7b4c
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbbb/javacard/api_2_pah_aptlbbb.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbbs/javacard/api_2_pah_aptlbbs.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbbs/javacard/api_2_pah_aptlbbs.cap
index e46904557d8e65c29e91907aee9a6dc6d0444f0d..b09e57fafbf2757957f0aa0df6f86bcb14eb89b2 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbbs/javacard/api_2_pah_aptlbbs.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbbs/javacard/api_2_pah_aptlbbs.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbbs/javacard/api_2_pah_aptlbbs.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbbs/javacard/api_2_pah_aptlbbs.exp
new file mode 100644
index 0000000000000000000000000000000000000000..16b725f0514528dc0e47b6f34d4c35041a8110a9
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbbs/javacard/api_2_pah_aptlbbs.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbs/javacard/api_2_pah_aptlbs.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbs/javacard/api_2_pah_aptlbs.cap
index c7fc259b8118b41ee9f1e853a7e810af85bc5704..e05300ddb98aab94517f5cd4e3a70e855e3118c3 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbs/javacard/api_2_pah_aptlbs.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbs/javacard/api_2_pah_aptlbs.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbs/javacard/api_2_pah_aptlbs.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbs/javacard/api_2_pah_aptlbs.exp
new file mode 100644
index 0000000000000000000000000000000000000000..7c631afbb717cc1d2fe3f1a67e2353f90853d170
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbs/javacard/api_2_pah_aptlbs.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbss/javacard/api_2_pah_aptlbss.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbss/javacard/api_2_pah_aptlbss.cap
index 7bd14e88822c6161da9e2eac1687363d408300dd..d0bffa48d4b1b856d3aab19f4106de568b6e1329 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbss/javacard/api_2_pah_aptlbss.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbss/javacard/api_2_pah_aptlbss.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbss/javacard/api_2_pah_aptlbss.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbss/javacard/api_2_pah_aptlbss.exp
new file mode 100644
index 0000000000000000000000000000000000000000..ae79074c6aaacad08cd95cd94f513baf0da25870
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_aptlbss/javacard/api_2_pah_aptlbss.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_cler/javacard/api_2_pah_cler.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_cler/javacard/api_2_pah_cler.cap
index 11dcc76b0de5dd693e23f8ab37a817556903ce87..f312029874c2bdd45d9f348ee2932eb529ae3d62 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_cler/javacard/api_2_pah_cler.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_cler/javacard/api_2_pah_cler.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_cler/javacard/api_2_pah_cler.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_cler/javacard/api_2_pah_cler.exp
new file mode 100644
index 0000000000000000000000000000000000000000..0d6bd60faba2fd7c51f961eada38dec7cbb9c7b6
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_cler/javacard/api_2_pah_cler.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_copy/javacard/api_2_pah_copy.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_copy/javacard/api_2_pah_copy.cap
index e4b40b5f515fca9842aa209397bf67260bae36de..9c6ca9965805a6ba0498c45981db7fe9f5afd489 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_copy/javacard/api_2_pah_copy.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_copy/javacard/api_2_pah_copy.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_copy/javacard/api_2_pah_copy.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_copy/javacard/api_2_pah_copy.exp
new file mode 100644
index 0000000000000000000000000000000000000000..e446201852feb81dd95c99d2896b498ccc0f2302
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_copy/javacard/api_2_pah_copy.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_cprv/javacard/api_2_pah_cprv.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_cprv/javacard/api_2_pah_cprv.cap
index b23232639f27d3333e875c0a285babba335cbae0..5204b05caa33c199975f4f030d917c7953184ac9 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_cprv/javacard/api_2_pah_cprv.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_cprv/javacard/api_2_pah_cprv.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_cprv/javacard/api_2_pah_cprv.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_cprv/javacard/api_2_pah_cprv.exp
new file mode 100644
index 0000000000000000000000000000000000000000..59d4050595bf6e8c1b2d3d7c0d3fd22bca9c3391
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_cprv/javacard/api_2_pah_cprv.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_cpyv/javacard/api_2_pah_cpyv.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_cpyv/javacard/api_2_pah_cpyv.cap
index 2a540559de5a9e2b46b7562f37e3bff613ffba53..b84696e0e661f75bebb4b8a91a6bc6983a64378d 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_cpyv/javacard/api_2_pah_cpyv.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_cpyv/javacard/api_2_pah_cpyv.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_cpyv/javacard/api_2_pah_cpyv.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_cpyv/javacard/api_2_pah_cpyv.exp
new file mode 100644
index 0000000000000000000000000000000000000000..142021daad90f4b49b204b02316493bb8fd08c3a
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_cpyv/javacard/api_2_pah_cpyv.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_facrb_bs/javacard/api_2_pah_facrb_bs.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_facrb_bs/javacard/api_2_pah_facrb_bs.cap
index 5d0bd27811defc88354508fa86e0897f05aaf00e..554613d798291cb0e2199387c588db6b8ced51ae 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_facrb_bs/javacard/api_2_pah_facrb_bs.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_facrb_bs/javacard/api_2_pah_facrb_bs.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_facrb_bs/javacard/api_2_pah_facrb_bs.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_facrb_bs/javacard/api_2_pah_facrb_bs.exp
new file mode 100644
index 0000000000000000000000000000000000000000..372fc8e61d0dee1baaf846f199dfb1a77b9c565a
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_facrb_bs/javacard/api_2_pah_facrb_bs.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_facrbbs_bss/javacard/api_2_pah_facrbbs_bss.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_facrbbs_bss/javacard/api_2_pah_facrbbs_bss.cap
index 336504c4529d075991416febd445368c63489620..6a114b697e46a8dc37400c1bae2f0c2015d4c35a 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_facrbbs_bss/javacard/api_2_pah_facrbbs_bss.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_facrbbs_bss/javacard/api_2_pah_facrbbs_bss.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_facrbbs_bss/javacard/api_2_pah_facrbbs_bss.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_facrbbs_bss/javacard/api_2_pah_facrbbs_bss.exp
new file mode 100644
index 0000000000000000000000000000000000000000..b3b37a1719e12648781e124428867e06335dda9e
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_facrbbs_bss/javacard/api_2_pah_facrbbs_bss.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_facyb_bs/javacard/api_2_pah_facyb_bs.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_facyb_bs/javacard/api_2_pah_facyb_bs.cap
index 28581ba67f1a9819b277631ff1e5762d991cdb1e..855144b891b9b2e83e5ddc7c04d73284d881ba75 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_facyb_bs/javacard/api_2_pah_facyb_bs.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_facyb_bs/javacard/api_2_pah_facyb_bs.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_facyb_bs/javacard/api_2_pah_facyb_bs.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_facyb_bs/javacard/api_2_pah_facyb_bs.exp
new file mode 100644
index 0000000000000000000000000000000000000000..0eae087bfa243c46c78d8832beabfdc47ff54026
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_facyb_bs/javacard/api_2_pah_facyb_bs.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_facybbs_bss/javacard/api_2_pah_facybbs_bss.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_facybbs_bss/javacard/api_2_pah_facybbs_bss.cap
index cf27fc60472d6c61f518dfd288dd5239ef93a052..cc77e65467be382e940e63d74387d54fcf2d0ece 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_facybbs_bss/javacard/api_2_pah_facybbs_bss.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_facybbs_bss/javacard/api_2_pah_facybbs_bss.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_facybbs_bss/javacard/api_2_pah_facybbs_bss.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_facybbs_bss/javacard/api_2_pah_facybbs_bss.exp
new file mode 100644
index 0000000000000000000000000000000000000000..9c20dbd137df5a2f12f8d30cbcb8fe1e67d7c0ca
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_facybbs_bss/javacard/api_2_pah_facybbs_bss.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_find/javacard/api_2_pah_find.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_find/javacard/api_2_pah_find.cap
index 076ea7c71e039c6280a874acbe9a442945ecf596..bff55fedf1c7fd6438552e6bee58bd57a51a54d5 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_find/javacard/api_2_pah_find.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_find/javacard/api_2_pah_find.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_find/javacard/api_2_pah_find.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_find/javacard/api_2_pah_find.exp
new file mode 100644
index 0000000000000000000000000000000000000000..a84c371dd36676d2650aa5b04f18aa6175a94234
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_find/javacard/api_2_pah_find.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_gcap/javacard/api_2_pah_gcap.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_gcap/javacard/api_2_pah_gcap.cap
index aadf0f23bb2e2c4c59e2babb9ce5675d834103c7..f005d86799bb8704f521e695b2da195c5a2f81b6 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_gcap/javacard/api_2_pah_gcap.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_gcap/javacard/api_2_pah_gcap.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_gcap/javacard/api_2_pah_gcap.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_gcap/javacard/api_2_pah_gcap.exp
new file mode 100644
index 0000000000000000000000000000000000000000..50bd41fc261ce58ac9dd0770337e055f811c8875
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_gcap/javacard/api_2_pah_gcap.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_glen/javacard/api_2_pah_glen.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_glen/javacard/api_2_pah_glen.cap
index dd746092870a89326d91722cf82a3a2b8455492c..963c8d230098fcc4daec71a5ca29183c1a977ca6 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_glen/javacard/api_2_pah_glen.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_glen/javacard/api_2_pah_glen.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_glen/javacard/api_2_pah_glen.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_glen/javacard/api_2_pah_glen.exp
new file mode 100644
index 0000000000000000000000000000000000000000..4ba62286af4988824c5dac9f0bbcc1d00919ae8e
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_glen/javacard/api_2_pah_glen.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_gvby/javacard/api_2_pah_gvby.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_gvby/javacard/api_2_pah_gvby.cap
index 695780722b0ee07f63603acab44e82d33ef12198..34604c94cc54b660b5a1ba4b608d70f0a0d07843 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_gvby/javacard/api_2_pah_gvby.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_gvby/javacard/api_2_pah_gvby.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_gvby/javacard/api_2_pah_gvby.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_gvby/javacard/api_2_pah_gvby.exp
new file mode 100644
index 0000000000000000000000000000000000000000..d43d644d499675246a5f50178d0a0f3d355a7a2a
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_gvby/javacard/api_2_pah_gvby.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_gvle/javacard/api_2_pah_gvle.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_gvle/javacard/api_2_pah_gvle.cap
index 1202b723f5b12a2d21561c007ebcf0a1ce2c6631..25528c7e99a9bd688b76726cd621f0a54a2ee1be 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_gvle/javacard/api_2_pah_gvle.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_gvle/javacard/api_2_pah_gvle.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_gvle/javacard/api_2_pah_gvle.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_gvle/javacard/api_2_pah_gvle.exp
new file mode 100644
index 0000000000000000000000000000000000000000..68e2ea72d34aa700045683fe11105cf6f6ddf293
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_gvle/javacard/api_2_pah_gvle.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_gvsh/javacard/api_2_pah_gvsh.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_gvsh/javacard/api_2_pah_gvsh.cap
index d72243b00119d873c9df28e7e22d7cd6f6242929..2912a324b26565ff0b91a936c07283c7995d1285 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_gvsh/javacard/api_2_pah_gvsh.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_gvsh/javacard/api_2_pah_gvsh.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_gvsh/javacard/api_2_pah_gvsh.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_gvsh/javacard/api_2_pah_gvsh.exp
new file mode 100644
index 0000000000000000000000000000000000000000..e56ea9be59c5f6771e0600de8f75953d51f4235d
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_gvsh/javacard/api_2_pah_gvsh.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_icch/javacard/api_2_pah_icch.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_icch/javacard/api_2_pah_icch.cap
index f7a29dc5e5db8e179481dd6e0ddce3a96514a5bb..41d737772d7ca4b02c0fbf8f6b210d0fa48cb3a0 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_icch/javacard/api_2_pah_icch.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_icch/javacard/api_2_pah_icch.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_icch/javacard/api_2_pah_icch.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_icch/javacard/api_2_pah_icch.exp
new file mode 100644
index 0000000000000000000000000000000000000000..0554d802b7b3e2b09a3652e06578c6c43984fffe
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_icch/javacard/api_2_pah_icch.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_indt/javacard/api_2_pah_indt.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_indt/javacard/api_2_pah_indt.cap
index 51dc6ebef20298c2758493708067dc81092846d8..b9cc2b197f364649576f3e50e04e704f45f9d23c 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_indt/javacard/api_2_pah_indt.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_indt/javacard/api_2_pah_indt.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_indt/javacard/api_2_pah_indt.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_indt/javacard/api_2_pah_indt.exp
new file mode 100644
index 0000000000000000000000000000000000000000..db04fa4021400031f69467e73a8be44240ebd416
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_indt/javacard/api_2_pah_indt.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_ingk/javacard/api_2_pah_ingk.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_ingk/javacard/api_2_pah_ingk.cap
index 7b62faef1c078164a73acc5568c8db12914d2604..64a08eb47ba2b7093aad4e6d0f9e089f50abf652 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_ingk/javacard/api_2_pah_ingk.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_ingk/javacard/api_2_pah_ingk.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_ingk/javacard/api_2_pah_ingk.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_ingk/javacard/api_2_pah_ingk.exp
new file mode 100644
index 0000000000000000000000000000000000000000..3de947d1b54d585578357def50e11b6a2e9343d3
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_ingk/javacard/api_2_pah_ingk.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_ingp/javacard/api_2_pah_ingp.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_ingp/javacard/api_2_pah_ingp.cap
index ee7c83c859636b9a29588c3a5ec70ba91986c218..1cc5db843c7cff599b619ac95e6073bf3363b359 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_ingp/javacard/api_2_pah_ingp.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_ingp/javacard/api_2_pah_ingp.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_ingp/javacard/api_2_pah_ingp.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_ingp/javacard/api_2_pah_ingp.exp
new file mode 100644
index 0000000000000000000000000000000000000000..390f7959c1097e45eeb8598ac7070d6ecf587dff
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_ingp/javacard/api_2_pah_ingp.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_init/javacard/api_2_pah_init.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_init/javacard/api_2_pah_init.cap
index 67926de83095157a8cca0296ebe79669288961d8..a1be5ad7b4124f488736a44997f64a3c87a71ef2 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_init/javacard/api_2_pah_init.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_init/javacard/api_2_pah_init.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_init/javacard/api_2_pah_init.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_init/javacard/api_2_pah_init.exp
new file mode 100644
index 0000000000000000000000000000000000000000..5f8ba6aac2fe1c46166ca7ed137e75a0ed835081
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_init/javacard/api_2_pah_init.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_inmt/javacard/api_2_pah_inmt.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_inmt/javacard/api_2_pah_inmt.cap
index 6473b82f7b293a86d9add11863243a3f18a357c1..ae40935e96d7eb66bec879bc39bfbb784338bc3c 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_inmt/javacard/api_2_pah_inmt.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_inmt/javacard/api_2_pah_inmt.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_inmt/javacard/api_2_pah_inmt.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_inmt/javacard/api_2_pah_inmt.exp
new file mode 100644
index 0000000000000000000000000000000000000000..9f52c55c9cbd35c00ff03dad06ee8e88ad97aff7
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_inmt/javacard/api_2_pah_inmt.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_send/javacard/api_2_pah_send.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_send/javacard/api_2_pah_send.cap
index e057e801925189e206b75c0b5d1fd1c88bd66700..2aad3833c725267c278e7607eaf83f67509bde86 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_send/javacard/api_2_pah_send.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_send/javacard/api_2_pah_send.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_send/javacard/api_2_pah_send.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_send/javacard/api_2_pah_send.exp
new file mode 100644
index 0000000000000000000000000000000000000000..f4df08f066f451e70c937b5b5251c1ea6d62216a
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_pah_send/javacard/api_2_pah_send.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_phs_gthd/javacard/api_2_phs_gthd.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_phs_gthd/javacard/api_2_phs_gthd.cap
index fc48192c41b4c9c613ad4f24b5808d7b36022cb4..43aa3ece08755afb8178667d2ca4514c735a20f2 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_phs_gthd/javacard/api_2_phs_gthd.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_phs_gthd/javacard/api_2_phs_gthd.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_phs_gthd/javacard/api_2_phs_gthd.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_phs_gthd/javacard/api_2_phs_gthd.exp
new file mode 100644
index 0000000000000000000000000000000000000000..71e6e173e5acddb07a3e1ddccd6e09a283ad6a5a
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_phs_gthd/javacard/api_2_phs_gthd.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cchd/javacard/api_2_prh_cchd.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cchd/javacard/api_2_prh_cchd.cap
index 9c6c4b9e092eefdc6e09eb42ed33a301a7f9eb44..c818b2b1fab78f6e66d936553538c1dd069a2205 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cchd/javacard/api_2_prh_cchd.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cchd/javacard/api_2_prh_cchd.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cchd/javacard/api_2_prh_cchd.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cchd/javacard/api_2_prh_cchd.exp
new file mode 100644
index 0000000000000000000000000000000000000000..85d8c4f6756bb47276c3614d2bc11c7682ddff3f
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cchd/javacard/api_2_prh_cchd.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_copy/javacard/api_2_prh_copy.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_copy/javacard/api_2_prh_copy.cap
index 24a70bc5063696f93c4157a956694dac2dcc7c83..e49feb8cca689f19c4a41f0eaf77bd663db8ab18 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_copy/javacard/api_2_prh_copy.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_copy/javacard/api_2_prh_copy.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_copy/javacard/api_2_prh_copy.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_copy/javacard/api_2_prh_copy.exp
new file mode 100644
index 0000000000000000000000000000000000000000..37cb2805628cf741b1b59141af9d08cd14dc5b11
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_copy/javacard/api_2_prh_copy.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cpai/javacard/api_2_prh_cpai.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cpai/javacard/api_2_prh_cpai.cap
index 1db5b136c628d3c9176a8a86f1822ecf57c7af26..967b1532ce1a39aa8b4ec8facd94d2119ac4bf1b 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cpai/javacard/api_2_prh_cpai.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cpai/javacard/api_2_prh_cpai.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cpai/javacard/api_2_prh_cpai.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cpai/javacard/api_2_prh_cpai.exp
new file mode 100644
index 0000000000000000000000000000000000000000..b4d0ed8816cc0cf5aff19cba4afcc87a9fadeb72
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cpai/javacard/api_2_prh_cpai.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cprv/javacard/api_2_prh_cprv.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cprv/javacard/api_2_prh_cprv.cap
index d76a62b9c506ab10f4e003a4747eb0328a3a9f5f..8a31ab19660984a630bba215bf0fb3e2de42ed3e 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cprv/javacard/api_2_prh_cprv.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cprv/javacard/api_2_prh_cprv.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cprv/javacard/api_2_prh_cprv.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cprv/javacard/api_2_prh_cprv.exp
new file mode 100644
index 0000000000000000000000000000000000000000..901317fd8915269252e6b639f05d7bd0274bb28e
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cprv/javacard/api_2_prh_cprv.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cpts/javacard/api_2_prh_cpts.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cpts/javacard/api_2_prh_cpts.cap
index e60f9154629be08da83215af455f8aa4d16c6681..3adde68947560b3eea76da1d060937289587a88a 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cpts/javacard/api_2_prh_cpts.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cpts/javacard/api_2_prh_cpts.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cpts/javacard/api_2_prh_cpts.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cpts/javacard/api_2_prh_cpts.exp
new file mode 100644
index 0000000000000000000000000000000000000000..388d2273b32e1fe3267f67694b50d3683735a041
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cpts/javacard/api_2_prh_cpts.exp differ
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 5651fc214eb6617677a466ab2c522ccdbf261ea8..fa27ccac8f496ed2bd7721ede470127751bf76f0 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
@@ -90,7 +90,7 @@ public class Test_Api_2_Prh_Cpyv extends UiccTestModel
+ "78749102 0010"));
response = test.terminalResponse("81030123 00020282 81030100 0D110400"
- + "02030405060708090A0B0C0D0E0F");
+ + "0102030405060708090A0B0C0D0E0F");
addResult(response.checkSw("9000"));
/*********************************************************************/
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cpyv/javacard/api_2_prh_cpyv.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cpyv/javacard/api_2_prh_cpyv.cap
index fbe8323f6d0620867738bf61e4e8166d59922a69..0699778b76d6961689259566b486b3931e7634fc 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cpyv/javacard/api_2_prh_cpyv.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cpyv/javacard/api_2_prh_cpyv.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cpyv/javacard/api_2_prh_cpyv.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cpyv/javacard/api_2_prh_cpyv.exp
new file mode 100644
index 0000000000000000000000000000000000000000..73ebd40ac4661f9b23402e4c102972aca530c46b
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_cpyv/javacard/api_2_prh_cpyv.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_facrb_bs/javacard/api_2_prh_facrb_bs.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_facrb_bs/javacard/api_2_prh_facrb_bs.cap
index 958d0ecc3b22e8e28eca822c31e1cd571427567c..d3084fc7a38b8237637fe952a9721d69517101ee 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_facrb_bs/javacard/api_2_prh_facrb_bs.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_facrb_bs/javacard/api_2_prh_facrb_bs.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_facrb_bs/javacard/api_2_prh_facrb_bs.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_facrb_bs/javacard/api_2_prh_facrb_bs.exp
new file mode 100644
index 0000000000000000000000000000000000000000..4984bcfad82b1eedcbe74a7c634c363cdddda730
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_facrb_bs/javacard/api_2_prh_facrb_bs.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_facrbbs_bss/javacard/api_2_prh_facrbbs_bss.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_facrbbs_bss/javacard/api_2_prh_facrbbs_bss.cap
index 3100729b25b59b72bb14a444db5a431995f9c65e..770c1086dcb5455680b735c7c7dac29c2f4ae565 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_facrbbs_bss/javacard/api_2_prh_facrbbs_bss.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_facrbbs_bss/javacard/api_2_prh_facrbbs_bss.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_facrbbs_bss/javacard/api_2_prh_facrbbs_bss.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_facrbbs_bss/javacard/api_2_prh_facrbbs_bss.exp
new file mode 100644
index 0000000000000000000000000000000000000000..e198ad4e6e9e8125fcb527bed280090a5407148c
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_facrbbs_bss/javacard/api_2_prh_facrbbs_bss.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_facyb_bs/javacard/api_2_prh_facyb_bs.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_facyb_bs/javacard/api_2_prh_facyb_bs.cap
index 9c8c0ebcfcd5d2f280790cc36470a3a4157a5fb9..64051245da84b0d564c36ad4a7b16b4c38f07f52 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_facyb_bs/javacard/api_2_prh_facyb_bs.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_facyb_bs/javacard/api_2_prh_facyb_bs.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_facyb_bs/javacard/api_2_prh_facyb_bs.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_facyb_bs/javacard/api_2_prh_facyb_bs.exp
new file mode 100644
index 0000000000000000000000000000000000000000..34be1b4daaa38ddb00f4547b54698aeb51d3d383
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_facyb_bs/javacard/api_2_prh_facyb_bs.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_facybbs_bss/javacard/api_2_prh_facybbs_bss.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_facybbs_bss/javacard/api_2_prh_facybbs_bss.cap
index df0242efc28c4fc248e66a0a71de81ad5d56c393..09585047195047220de8c1e526022d6d81d3635c 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_facybbs_bss/javacard/api_2_prh_facybbs_bss.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_facybbs_bss/javacard/api_2_prh_facybbs_bss.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_facybbs_bss/javacard/api_2_prh_facybbs_bss.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_facybbs_bss/javacard/api_2_prh_facybbs_bss.exp
new file mode 100644
index 0000000000000000000000000000000000000000..27dcc1dd04e4d0ee1bdeeb7a020b12a64de8f7cb
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_facybbs_bss/javacard/api_2_prh_facybbs_bss.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_find/javacard/api_2_prh_find.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_find/javacard/api_2_prh_find.cap
index b095b31abd51072ccef2dee543cccba14906b2df..d17abe2e0d054ea71f8ebb82091eaf68c33f624e 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_find/javacard/api_2_prh_find.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_find/javacard/api_2_prh_find.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_find/javacard/api_2_prh_find.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_find/javacard/api_2_prh_find.exp
new file mode 100644
index 0000000000000000000000000000000000000000..aadfed07c4b09cc5553f439b216ec409bf702d2b
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_find/javacard/api_2_prh_find.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gcap/javacard/api_2_prh_gcap.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gcap/javacard/api_2_prh_gcap.cap
index c5af320bad9458a7b8f4133173641cd48910100b..afbd11d1a3cd9597e20ffd9341396560f626f5cb 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gcap/javacard/api_2_prh_gcap.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gcap/javacard/api_2_prh_gcap.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gcap/javacard/api_2_prh_gcap.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gcap/javacard/api_2_prh_gcap.exp
new file mode 100644
index 0000000000000000000000000000000000000000..b73f19c6af04f0a97c145d126cafec3ec0e81038
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gcap/javacard/api_2_prh_gcap.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gcid/javacard/api_2_prh_gcid.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gcid/javacard/api_2_prh_gcid.cap
index 75a72c3cc9f30595cd80ce935aed30eb8b743b62..e03a43273b9e766bcff91bdc166daea76e1dc78d 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gcid/javacard/api_2_prh_gcid.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gcid/javacard/api_2_prh_gcid.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gcid/javacard/api_2_prh_gcid.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gcid/javacard/api_2_prh_gcid.exp
new file mode 100644
index 0000000000000000000000000000000000000000..e35cf822be714e25e403b30960c249312fbb205d
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gcid/javacard/api_2_prh_gcid.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gcst/javacard/api_2_prh_gcst.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gcst/javacard/api_2_prh_gcst.cap
index 557a299d6e356fe02eca74d6d1c44545207ff1ba..d2afdca1bf5f65d0da37a273012b51aac4fbd6d8 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gcst/javacard/api_2_prh_gcst.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gcst/javacard/api_2_prh_gcst.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gcst/javacard/api_2_prh_gcst.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gcst/javacard/api_2_prh_gcst.exp
new file mode 100644
index 0000000000000000000000000000000000000000..4ccb4595ba1dbfb6e985aefa6f14aa6bec0cb535
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gcst/javacard/api_2_prh_gcst.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_glen/javacard/api_2_prh_glen.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_glen/javacard/api_2_prh_glen.cap
index 93eb1b6f290989d687386338c6a1a43e179291d9..cafed8a341c1306cba4c03451220257d057f6ae1 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_glen/javacard/api_2_prh_glen.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_glen/javacard/api_2_prh_glen.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_glen/javacard/api_2_prh_glen.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_glen/javacard/api_2_prh_glen.exp
new file mode 100644
index 0000000000000000000000000000000000000000..4a1ca09513d67487d0909d7d833b200a0a184416
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_glen/javacard/api_2_prh_glen.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gtcs/javacard/api_2_prh_gtcs.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gtcs/javacard/api_2_prh_gtcs.cap
index 60d1635fe2ce4f0dcfe830b8ab9df1595cfc797d..36bf61eff82a7f15fd8c17142d01da9a8b924f4e 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gtcs/javacard/api_2_prh_gtcs.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gtcs/javacard/api_2_prh_gtcs.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gtcs/javacard/api_2_prh_gtcs.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gtcs/javacard/api_2_prh_gtcs.exp
new file mode 100644
index 0000000000000000000000000000000000000000..8b3f589f49049997ef61b94c2136db3b86103c1d
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gtcs/javacard/api_2_prh_gtcs.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gtgr/javacard/api_2_prh_gtgr.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gtgr/javacard/api_2_prh_gtgr.cap
index 5de963e570d7cea0e1c601c4977a260fd4649d8f..e64e0001903b3af732e44d8f335b41c5d786084c 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gtgr/javacard/api_2_prh_gtgr.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gtgr/javacard/api_2_prh_gtgr.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gtgr/javacard/api_2_prh_gtgr.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gtgr/javacard/api_2_prh_gtgr.exp
new file mode 100644
index 0000000000000000000000000000000000000000..fe0afdc907dfeddf2e1ef4dfa0b92254e4f4f709
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gtgr/javacard/api_2_prh_gtgr.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gtii/javacard/api_2_prh_gtii.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gtii/javacard/api_2_prh_gtii.cap
index f27b1e22ac99e627dfd7fb920af277027e7932a3..75ad17e659d6a2b1dfa2c7f1e2ab80e12114a18e 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gtii/javacard/api_2_prh_gtii.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gtii/javacard/api_2_prh_gtii.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gtii/javacard/api_2_prh_gtii.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gtii/javacard/api_2_prh_gtii.exp
new file mode 100644
index 0000000000000000000000000000000000000000..745d26741fdabce29b1c0895a5041bdfe5e476ea
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gtii/javacard/api_2_prh_gtii.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gtil/javacard/api_2_prh_gtil.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gtil/javacard/api_2_prh_gtil.cap
index 2eafaa03a498574e18a84c323ae11a56cd042d76..8f8ffdca1e748be2e061ab90539f123ba56fb9fa 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gtil/javacard/api_2_prh_gtil.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gtil/javacard/api_2_prh_gtil.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gtil/javacard/api_2_prh_gtil.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gtil/javacard/api_2_prh_gtil.exp
new file mode 100644
index 0000000000000000000000000000000000000000..fbca1161942c2d62877644eeb9d99daaf97586e0
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gtil/javacard/api_2_prh_gtil.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gttl/javacard/api_2_prh_gttl.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gttl/javacard/api_2_prh_gttl.cap
index 50fc2db9156e05667352a140998ccdb136ad8c02..80cb2c52c392de99254ba23884c87d62264b23e1 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gttl/javacard/api_2_prh_gttl.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gttl/javacard/api_2_prh_gttl.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gttl/javacard/api_2_prh_gttl.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gttl/javacard/api_2_prh_gttl.exp
new file mode 100644
index 0000000000000000000000000000000000000000..79fd21d6e67082838bbac7843905edd1e32d615d
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gttl/javacard/api_2_prh_gttl.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gvby/javacard/api_2_prh_gvby.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gvby/javacard/api_2_prh_gvby.cap
index 3a8879702972e0de9d18a83e165ab9424712fa71..54cadc507a9b7cdb3a1f8dc610145e4466170093 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gvby/javacard/api_2_prh_gvby.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gvby/javacard/api_2_prh_gvby.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gvby/javacard/api_2_prh_gvby.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gvby/javacard/api_2_prh_gvby.exp
new file mode 100644
index 0000000000000000000000000000000000000000..120147f80d70ddd65ad84b6fdd7b66880d6d4f90
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gvby/javacard/api_2_prh_gvby.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gvle/javacard/api_2_prh_gvle.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gvle/javacard/api_2_prh_gvle.cap
index 968f2d1ed78231f9c7448d9f266633cd8748126a..4e664b649714ac43531084841df3a8cfa6088f85 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gvle/javacard/api_2_prh_gvle.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gvle/javacard/api_2_prh_gvle.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gvle/javacard/api_2_prh_gvle.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gvle/javacard/api_2_prh_gvle.exp
new file mode 100644
index 0000000000000000000000000000000000000000..b6c089cfcf861fe97a9504ec84ed29053d9b6262
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gvle/javacard/api_2_prh_gvle.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gvsh/javacard/api_2_prh_gvsh.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gvsh/javacard/api_2_prh_gvsh.cap
index 82a09a8cbcb23c1f2fb3411fc08e0996e7df0c36..36d6c505eb74bb8ece663297f30d82b1470f9372 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gvsh/javacard/api_2_prh_gvsh.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gvsh/javacard/api_2_prh_gvsh.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gvsh/javacard/api_2_prh_gvsh.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gvsh/javacard/api_2_prh_gvsh.exp
new file mode 100644
index 0000000000000000000000000000000000000000..36931ac501ab961fb99829504f6602e21cb81293
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prh_gvsh/javacard/api_2_prh_gvsh.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prs_gthd/javacard/api_2_prs_gthd.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prs_gthd/javacard/api_2_prs_gthd.cap
index bf2c29000c6a3bba6ae89c98f0246d904003c2fa..278a0d9ab0abf2c5f242da2b5b7a1b2bd7277aff 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prs_gthd/javacard/api_2_prs_gthd.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prs_gthd/javacard/api_2_prs_gthd.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prs_gthd/javacard/api_2_prs_gthd.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prs_gthd/javacard/api_2_prs_gthd.exp
new file mode 100644
index 0000000000000000000000000000000000000000..a77ac1d62db7408e48401ef1eaf87abd18fb871b
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_prs_gthd/javacard/api_2_prs_gthd.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_chec_bss/javacard/api_2_tep_chec_bss.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_chec_bss/javacard/api_2_tep_chec_bss.cap
index f373cc3c7421d5102212a3fdb0d2104cc28f7e89..6581c75dac0207149733dbfb1240f8c7a1fef19b 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_chec_bss/javacard/api_2_tep_chec_bss.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_chec_bss/javacard/api_2_tep_chec_bss.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_chec_bss/javacard/api_2_tep_chec_bss.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_chec_bss/javacard/api_2_tep_chec_bss.exp
new file mode 100644
index 0000000000000000000000000000000000000000..44f81255254458d551076afd077727f09bccb484
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_chec_bss/javacard/api_2_tep_chec_bss.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_checb/javacard/api_2_tep_checb.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_checb/javacard/api_2_tep_checb.cap
index ad978bce7efcc8f4d3fc13375a338ab9c97863d6..5c9240a8b25b68c69db2311ec02e691a78736d1e 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_checb/javacard/api_2_tep_checb.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_checb/javacard/api_2_tep_checb.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_checb/javacard/api_2_tep_checb.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_checb/javacard/api_2_tep_checb.exp
new file mode 100644
index 0000000000000000000000000000000000000000..69842780626874a92990e07c53cf96efe7675a87
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_checb/javacard/api_2_tep_checb.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_checs/javacard/api_2_tep_checs.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_checs/javacard/api_2_tep_checs.cap
index 101de1ac6dbbdec979ba2597ffa3a119c9843901..60928a95629ab0ccd00770dd56182db95ad43cf3 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_checs/javacard/api_2_tep_checs.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_checs/javacard/api_2_tep_checs.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_checs/javacard/api_2_tep_checs.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_checs/javacard/api_2_tep_checs.exp
new file mode 100644
index 0000000000000000000000000000000000000000..3d860eab9dbda90fde06d9a40bdfc2252e4998d7
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_checs/javacard/api_2_tep_checs.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_copy/javacard/api_2_tep_copy.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_copy/javacard/api_2_tep_copy.cap
index 5571cc0f1266644c30b208d477ebb2c4888d83a2..a025fa67963c1967d348ca5da304451095975a7f 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_copy/javacard/api_2_tep_copy.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_copy/javacard/api_2_tep_copy.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_copy/javacard/api_2_tep_copy.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_copy/javacard/api_2_tep_copy.exp
new file mode 100644
index 0000000000000000000000000000000000000000..27a6bbbecf81f0927fe7b8dc9178b5352f08476c
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_copy/javacard/api_2_tep_copy.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_gval/javacard/api_2_tep_gval.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_gval/javacard/api_2_tep_gval.cap
index 403c805ee107bb119d2327acb3fe2fa8f293adf3..bca007f3a3558c394a9c9a61c9e1d60aa2531b00 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_gval/javacard/api_2_tep_gval.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_gval/javacard/api_2_tep_gval.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_gval/javacard/api_2_tep_gval.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_gval/javacard/api_2_tep_gval.exp
new file mode 100644
index 0000000000000000000000000000000000000000..75e23e226940014a7d182aaacbcc910f11f59341
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tep_gval/javacard/api_2_tep_gval.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tke_coor/javacard/api_2_tke_coor.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tke_coor/javacard/api_2_tke_coor.cap
index ab42b7d93f9f99d67449abc5259ad1e735d2309c..7a70caaea3ddfcff19af079f7aba1a235a314d72 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tke_coor/javacard/api_2_tke_coor.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tke_coor/javacard/api_2_tke_coor.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tke_coor/javacard/api_2_tke_coor.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tke_coor/javacard/api_2_tke_coor.exp
new file mode 100644
index 0000000000000000000000000000000000000000..14da6521769190f0bd8723df79ee9b4d0367aeee
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tke_coor/javacard/api_2_tke_coor.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tke_thit/javacard/api_2_tke_thit.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tke_thit/javacard/api_2_tke_thit.cap
index facc4168640543973b26c825da2b5062696b06ea..12df19163754d3f9bb6f94b3c2bda4b463fd5b69 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tke_thit/javacard/api_2_tke_thit.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tke_thit/javacard/api_2_tke_thit.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tke_thit/javacard/api_2_tke_thit.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tke_thit/javacard/api_2_tke_thit.exp
new file mode 100644
index 0000000000000000000000000000000000000000..9df0a95f13fb756082e7e4aebe1187bf187ce8b8
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tke_thit/javacard/api_2_tke_thit.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_asid/javacard/api_2_tkr_asid.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_asid/javacard/api_2_tkr_asid.cap
index 3d43f0c38920abeca9016036da26401a8d313942..e80a9bdec857eb8aa2e9e5d24e38928c17dc6525 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_asid/javacard/api_2_tkr_asid.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_asid/javacard/api_2_tkr_asid.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_asid/javacard/api_2_tkr_asid.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_asid/javacard/api_2_tkr_asid.exp
new file mode 100644
index 0000000000000000000000000000000000000000..70966dbe550eb1f389e31a19a19695b93d55bbd8
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_asid/javacard/api_2_tkr_asid.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_atim/javacard/api_2_tkr_atim.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_atim/javacard/api_2_tkr_atim.cap
index c82f595a9661875961ef63090ce4514793f3cb64..0b38b8a92f4561b032777263b1412e86ac074d75 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_atim/javacard/api_2_tkr_atim.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_atim/javacard/api_2_tkr_atim.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_atim/javacard/api_2_tkr_atim.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_atim/javacard/api_2_tkr_atim.exp
new file mode 100644
index 0000000000000000000000000000000000000000..7d3f42a9caa789bfa700979ffaa0240d16d56492
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_atim/javacard/api_2_tkr_atim.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_cevt/javacard/api_2_tkr_cevt.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_cevt/javacard/api_2_tkr_cevt.cap
index 1d9584eeb8371376897f83563d83a23f908453e8..78aea41750362d6905116904ef135d4910b6178b 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_cevt/javacard/api_2_tkr_cevt.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_cevt/javacard/api_2_tkr_cevt.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_cevt/javacard/api_2_tkr_cevt.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_cevt/javacard/api_2_tkr_cevt.exp
new file mode 100644
index 0000000000000000000000000000000000000000..4016b5c2d0a0cb12c79d3d435f66e1dde2e3ff42
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_cevt/javacard/api_2_tkr_cevt.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_cmet/javacard/api_2_tkr_cmet.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_cmet/javacard/api_2_tkr_cmet.cap
index bb187e604e795087cfa0cee8e2e63af6fcaddeaf..8afd0acd7b2ee4ff18c7b916b56f6237cb30c0e0 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_cmet/javacard/api_2_tkr_cmet.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_cmet/javacard/api_2_tkr_cmet.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_cmet/javacard/api_2_tkr_cmet.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_cmet/javacard/api_2_tkr_cmet.exp
new file mode 100644
index 0000000000000000000000000000000000000000..a6f4d277ce186404c886e7a039cdf26a4844e263
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_cmet/javacard/api_2_tkr_cmet.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_dmet/javacard/api_2_tkr_dmet.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_dmet/javacard/api_2_tkr_dmet.cap
index accd7cc73e86f87c786b1a0749dae5d844c68450..a3b2865e0eb989266dff31a235b624fa17353ce5 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_dmet/javacard/api_2_tkr_dmet.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_dmet/javacard/api_2_tkr_dmet.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_dmet/javacard/api_2_tkr_dmet.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_dmet/javacard/api_2_tkr_dmet.exp
new file mode 100644
index 0000000000000000000000000000000000000000..70f2dd6eb4665a5faedce2dc18e996e21660756d
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_dmet/javacard/api_2_tkr_dmet.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_drfes_bss_bsb/javacard/api_2_tkr_drfes_bss_bsb.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_drfes_bss_bsb/javacard/api_2_tkr_drfes_bss_bsb.cap
index 26abc8b1691ae2d1de9426fe0b2a9140bd8fb768..2c40efe7f0518897927da69cc5ccd25639a2a423 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_drfes_bss_bsb/javacard/api_2_tkr_drfes_bss_bsb.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_drfes_bss_bsb/javacard/api_2_tkr_drfes_bss_bsb.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_drfes_bss_bsb/javacard/api_2_tkr_drfes_bss_bsb.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_drfes_bss_bsb/javacard/api_2_tkr_drfes_bss_bsb.exp
new file mode 100644
index 0000000000000000000000000000000000000000..891b54148843496eb60bffe1ecda7e3344ed1f0e
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_drfes_bss_bsb/javacard/api_2_tkr_drfes_bss_bsb.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_drfeso/javacard/api_2_tkr_drfeso.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_drfeso/javacard/api_2_tkr_drfeso.cap
index 619ac33680a1024bf28157f9e8a550e2a1e3e471..d374b4cbfb3eb0a3b595a130f0a712cbe6c7272b 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_drfeso/javacard/api_2_tkr_drfeso.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_drfeso/javacard/api_2_tkr_drfeso.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_drfeso/javacard/api_2_tkr_drfeso.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_drfeso/javacard/api_2_tkr_drfeso.exp
new file mode 100644
index 0000000000000000000000000000000000000000..f8d19dfcc535e51bc971f5a49009f27d0b82c665
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_drfeso/javacard/api_2_tkr_drfeso.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_emet/javacard/api_2_tkr_emet.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_emet/javacard/api_2_tkr_emet.cap
index 2dfb7daa48212e4b2c94de940b1ec1bb613c3c32..fd896c29826b1f2a13ac3c6bcd666d0958d306bd 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_emet/javacard/api_2_tkr_emet.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_emet/javacard/api_2_tkr_emet.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_emet/javacard/api_2_tkr_emet.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_emet/javacard/api_2_tkr_emet.exp
new file mode 100644
index 0000000000000000000000000000000000000000..9cc4e81feabf05aa7312db2bb645bd1f55611c9e
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_emet/javacard/api_2_tkr_emet.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_gpol/javacard/api_2_tkr_gpol.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_gpol/javacard/api_2_tkr_gpol.cap
index c36742f54b4fc1a3799355692514e632b1d0d3a0..8533ada6384a067d2eeabc0749652dc3bb2fd930 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_gpol/javacard/api_2_tkr_gpol.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_gpol/javacard/api_2_tkr_gpol.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_gpol/javacard/api_2_tkr_gpol.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_gpol/javacard/api_2_tkr_gpol.exp
new file mode 100644
index 0000000000000000000000000000000000000000..7e950fa66cb95f07ac6b700a5ff50172244148a9
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_gpol/javacard/api_2_tkr_gpol.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_ievs/javacard/api_2_tkr_ievs.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_ievs/javacard/api_2_tkr_ievs.cap
index ae1d86798be3051cfeb7803752ccee4f85d38082..4d9c6ff350e6b6b699c2871187fc59372df6ccdf 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_ievs/javacard/api_2_tkr_ievs.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_ievs/javacard/api_2_tkr_ievs.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_ievs/javacard/api_2_tkr_ievs.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_ievs/javacard/api_2_tkr_ievs.exp
new file mode 100644
index 0000000000000000000000000000000000000000..a60ea988f8a8d4906ef7ab882c2e3415d01ba11a
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_ievs/javacard/api_2_tkr_ievs.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_imet/javacard/api_2_tkr_imet.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_imet/javacard/api_2_tkr_imet.cap
index 83e0b08963886c7efdbfed80f3e5104fb5e02c31..30f9d05314eaea82267495a3a4e880bc00270c59 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_imet/javacard/api_2_tkr_imet.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_imet/javacard/api_2_tkr_imet.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_imet/javacard/api_2_tkr_imet.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_imet/javacard/api_2_tkr_imet.exp
new file mode 100644
index 0000000000000000000000000000000000000000..5645cf71ad426225bc0fcb29a395738631bb06a8
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_imet/javacard/api_2_tkr_imet.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rgfes_bss_bsb/javacard/api_2_tkr_rgfes_bss_bsb.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rgfes_bss_bsb/javacard/api_2_tkr_rgfes_bss_bsb.cap
index d3604434836881a75bb3859288e8b871bff95a5b..42e2c563beb17531eab90402c6ddd72130ba0675 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rgfes_bss_bsb/javacard/api_2_tkr_rgfes_bss_bsb.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rgfes_bss_bsb/javacard/api_2_tkr_rgfes_bss_bsb.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rgfes_bss_bsb/javacard/api_2_tkr_rgfes_bss_bsb.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rgfes_bss_bsb/javacard/api_2_tkr_rgfes_bss_bsb.exp
new file mode 100644
index 0000000000000000000000000000000000000000..3ab0181a7a4d6b6343592f48a9e50813abcecac8
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rgfes_bss_bsb/javacard/api_2_tkr_rgfes_bss_bsb.exp differ
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 2483c6fcc83ca5f33de966e2578a3790660ca19c..91d48910b754a181720c0630924fedc3589d697c 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
@@ -227,7 +227,7 @@ public class Test_Api_2_Tkr_Rgfeso extends UiccTestModel {
test.selectFile(DF_TEST);
test.selectFile(EF_TARU);
String FFx130 = "";
- for (int i=0; i<=130; i++)
+ for (int i=0; i<130; i++)
FFx130 += "FF";
test.updateBinary("0000", FFx130);
test.updateBinary("0082", FFx130);
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rgfeso/javacard/api_2_tkr_rgfeso.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rgfeso/javacard/api_2_tkr_rgfeso.cap
index fa7ce6effcc18757f10841ed27dadeea4aecc922..df0032636b5db7ea6948fcb4fc196fa6afa45b52 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rgfeso/javacard/api_2_tkr_rgfeso.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rgfeso/javacard/api_2_tkr_rgfeso.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rgfeso/javacard/api_2_tkr_rgfeso.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rgfeso/javacard/api_2_tkr_rgfeso.exp
new file mode 100644
index 0000000000000000000000000000000000000000..c76376b3ef10c2cdb6f71069a0bd6440b3deb756
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rgfeso/javacard/api_2_tkr_rgfeso.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rpol/javacard/api_2_tkr_rpol.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rpol/javacard/api_2_tkr_rpol.cap
index 0d9018b40604e0da4cdb62dbaf9a1a80f72661c3..034dc0f99093cdc3cb9cd86035751dd3ade7fc14 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rpol/javacard/api_2_tkr_rpol.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rpol/javacard/api_2_tkr_rpol.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rpol/javacard/api_2_tkr_rpol.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rpol/javacard/api_2_tkr_rpol.exp
new file mode 100644
index 0000000000000000000000000000000000000000..bf584ffe4370cd5b25ffa6ec9e817ede7bb0b9c3
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rpol/javacard/api_2_tkr_rpol.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rsid/javacard/api_2_tkr_rsid.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rsid/javacard/api_2_tkr_rsid.cap
index bfe2037ddc0257f798de148cfa4547dbb1644b0f..62c16d34e59855f9c2319a93b0f5e195b5443357 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rsid/javacard/api_2_tkr_rsid.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rsid/javacard/api_2_tkr_rsid.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rsid/javacard/api_2_tkr_rsid.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rsid/javacard/api_2_tkr_rsid.exp
new file mode 100644
index 0000000000000000000000000000000000000000..f2492bd86d5b7349e53e14e9c58eef4bc4b386dd
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rsid/javacard/api_2_tkr_rsid.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rtim/javacard/api_2_tkr_rtim.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rtim/javacard/api_2_tkr_rtim.cap
index cbeba42601ba2f193ee4ef4f93dea4950680e013..7eca000ead975dd9bb5f9b8c3575dab02fd54b58 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rtim/javacard/api_2_tkr_rtim.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rtim/javacard/api_2_tkr_rtim.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rtim/javacard/api_2_tkr_rtim.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rtim/javacard/api_2_tkr_rtim.exp
new file mode 100644
index 0000000000000000000000000000000000000000..c302f4e2b46b745d60ce0ffb82b9bed8250e30ba
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_rtim/javacard/api_2_tkr_rtim.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_sevl/javacard/api_2_tkr_sevl.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_sevl/javacard/api_2_tkr_sevl.cap
index 257f839d22a5099c9ec38721fe2aa50da2102976..8f0ff681cd236f708c6a839c47c60d3bf6502752 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_sevl/javacard/api_2_tkr_sevl.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_sevl/javacard/api_2_tkr_sevl.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_sevl/javacard/api_2_tkr_sevl.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_sevl/javacard/api_2_tkr_sevl.exp
new file mode 100644
index 0000000000000000000000000000000000000000..053fa3c62d194017a95baba69484d310719d1d1d
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_sevl/javacard/api_2_tkr_sevl.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_sevt/javacard/api_2_tkr_sevt.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_sevt/javacard/api_2_tkr_sevt.cap
index 0f761af787712b3ca6b26d00a693af0c06f4c202..3ea30b636bae4149b4960fe95b1645c6882f3708 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_sevt/javacard/api_2_tkr_sevt.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_sevt/javacard/api_2_tkr_sevt.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_sevt/javacard/api_2_tkr_sevt.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_sevt/javacard/api_2_tkr_sevt.exp
new file mode 100644
index 0000000000000000000000000000000000000000..23178bc88e87cea8d387c7f575b4d29cf178344e
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_sevt/javacard/api_2_tkr_sevt.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_smta/javacard/api_2_tkr_smta.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_smta/javacard/api_2_tkr_smta.cap
index 59bceaab82ba41dc4414bbe7424aa01ab80ca211..72f2fc6e4a506af04d76ad5ba992bb38cae776a7 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_smta/javacard/api_2_tkr_smta.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_smta/javacard/api_2_tkr_smta.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_smta/javacard/api_2_tkr_smta.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_smta/javacard/api_2_tkr_smta.exp
new file mode 100644
index 0000000000000000000000000000000000000000..77afdac077547e9530a7a69dda30ee1d03d008fc
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_tkr_smta/javacard/api_2_tkr_smta.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_trs_gety/javacard/api_2_trs_gety.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_trs_gety/javacard/api_2_trs_gety.cap
index 4c918855f30f6d5d6535eea70d0a7b076c738c39..97e4f654e25a95c6444cf09c251649eba4b7b758 100644
Binary files a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_trs_gety/javacard/api_2_trs_gety.cap and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_trs_gety/javacard/api_2_trs_gety.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_trs_gety/javacard/api_2_trs_gety.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_trs_gety/javacard/api_2_trs_gety.exp
new file mode 100644
index 0000000000000000000000000000000000000000..2483ed9ebe1f55a28e2a44ecb23fb1ebe0f2842f
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_trs_gety/javacard/api_2_trs_gety.exp differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_trs_isprav/Api_2_Trs_IsPrAv_1.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_trs_isprav/Api_2_Trs_IsPrAv_1.java
new file mode 100644
index 0000000000000000000000000000000000000000..a3b914d15fbb1ec496a4ee679cec9be05f5e2d58
--- /dev/null
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_trs_isprav/Api_2_Trs_IsPrAv_1.java
@@ -0,0 +1,72 @@
+//-----------------------------------------------------------------------------
+// Api_2_Trs_IsPrAv_1.java
+//-----------------------------------------------------------------------------
+
+//-----------------------------------------------------------------------------
+// Package Definition
+//-----------------------------------------------------------------------------
+package uicc.test.toolkit.api_2_trs_isprav;
+
+//-----------------------------------------------------------------------------
+// Imports
+//-----------------------------------------------------------------------------
+import uicc.test.util.* ;
+import uicc.toolkit.*;
+
+
+
+public class Api_2_Trs_IsPrAv_1 extends TestToolkitApplet
+{
+
+ private static byte bNbInstance = (byte)0 ; // instance number
+ private byte bMyInstanceId ;
+
+ /**
+ * Constructor of the applet
+ */
+ public Api_2_Trs_IsPrAv_1()
+ {
+ }
+
+ /**
+ * Method called by the JCRE at the installation of the applet
+ */
+ public static void install(byte bArray[], short bOffset, byte bLength)
+ {
+ // Create a new applet instance
+ Api_2_Trs_IsPrAv_1 thisApplet = new Api_2_Trs_IsPrAv_1();
+
+ // Register the new applet instance to the JCRE
+ thisApplet.register(bArray, (short)(bOffset+1), bArray[bOffset]);
+
+ // Initialise the data of the test applet
+ thisApplet.init();
+
+ // register instance with the EVENT_PROACTIVE_HANDLER_AVAILABLE event
+ thisApplet.obReg.setEvent(EVENT_PROACTIVE_HANDLER_AVAILABLE);
+ }
+
+
+ /**
+ * Method called by the UICC CRE
+ */
+ public void processToolkit(short event)
+ {
+ if (event == EVENT_PROACTIVE_HANDLER_AVAILABLE) {
+ try {
+ if ( ToolkitRegistrySystem.isPrioritizedProactiveHandlerAvailableEventSet() == true ) {
+ reportTestOutcome((byte)1, true) ;
+ }
+ else {
+ reportTestOutcome((byte)1, false) ;
+ }
+ }
+ catch (Exception e) {
+ reportTestOutcome((byte)1, false) ;
+ }
+ }
+ }
+}
+
+
+
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_trs_isprav/Api_2_Trs_IsPrAv_2.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_trs_isprav/Api_2_Trs_IsPrAv_2.java
new file mode 100644
index 0000000000000000000000000000000000000000..6abc35a16f13b1a06edbdd4ac738bafdca341024
--- /dev/null
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_trs_isprav/Api_2_Trs_IsPrAv_2.java
@@ -0,0 +1,87 @@
+//-----------------------------------------------------------------------------
+// Api_2_Trs_IsPrAv_2.java
+//-----------------------------------------------------------------------------
+
+//-----------------------------------------------------------------------------
+// Package Definition
+//-----------------------------------------------------------------------------
+package uicc.test.toolkit.api_2_trs_isprav;
+
+//-----------------------------------------------------------------------------
+// Imports
+//-----------------------------------------------------------------------------
+import uicc.test.util.* ;
+import uicc.toolkit.*;
+
+
+
+public class Api_2_Trs_IsPrAv_2 extends TestToolkitApplet
+{
+
+ private static byte bNbInstance = (byte)0 ; // instance number
+ private byte bMyInstanceId ;
+
+ /**
+ * Constructor of the applet
+ */
+ public Api_2_Trs_IsPrAv_2()
+ {
+ Api_2_Trs_IsPrAv_2.bNbInstance ++;
+ this.bMyInstanceId = bNbInstance;
+ }
+
+ /**
+ * Method called by the JCRE at the installation of the applet
+ */
+ public static void install(byte bArray[], short bOffset, byte bLength)
+ {
+ // Create a new applet instance
+ Api_2_Trs_IsPrAv_2 thisApplet = new Api_2_Trs_IsPrAv_2();
+
+ // Register the new applet instance to the JCRE
+ thisApplet.register(bArray, (short)(bOffset+1), bArray[bOffset]);
+
+ // Initialise the data of the test applet
+ thisApplet.init();
+
+ // register instance with the EVENT_PROACTIVE_HANDLER_AVAILABLE event
+ thisApplet.obReg.setEvent(EVENT_PROACTIVE_HANDLER_AVAILABLE);
+ }
+
+
+ /**
+ * Method called by the UICC CRE
+ */
+ public void processToolkit(short event)
+ {
+ if (event == EVENT_PROACTIVE_HANDLER_AVAILABLE)
+ {
+ try{
+ switch(bMyInstanceId){
+ case (byte)1:
+ if ( ToolkitRegistrySystem.isPrioritizedProactiveHandlerAvailableEventSet() == false) {
+ reportTestOutcome((byte)1, true);
+ }
+ else {
+ reportTestOutcome((byte)1, false);
+ }
+ break;
+ case (byte)2:
+ if ( ToolkitRegistrySystem.isPrioritizedProactiveHandlerAvailableEventSet() == true ) {
+ reportTestOutcome((byte)1, true) ;
+ }
+ else {
+ reportTestOutcome((byte)1, false) ;
+ }
+ break;
+ default: reportTestOutcome ((byte)1, false);
+ }
+ }
+ catch(Exception e){
+ }
+ }
+ }
+}
+
+
+
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_trs_isprav/Test_Api_2_Trs_IsPrAv.java b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_trs_isprav/Test_Api_2_Trs_IsPrAv.java
new file mode 100644
index 0000000000000000000000000000000000000000..1b7d1160bbd377c243297c22081ae6df8ece128a
--- /dev/null
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_trs_isprav/Test_Api_2_Trs_IsPrAv.java
@@ -0,0 +1,177 @@
+//-----------------------------------------------------------------------------
+// Package Definition
+//-----------------------------------------------------------------------------
+package uicc.test.toolkit.api_2_trs_isprav;
+
+//-----------------------------------------------------------------------------
+// Imports
+//-----------------------------------------------------------------------------
+import org.etsi.scp.wg3.uicc.jcapi.userinterface.*;
+import org.etsi.scp.wg3.uicc.jcapi.userclass.*;
+
+public class Test_Api_2_Trs_IsPrAv extends UiccTestModel {
+
+ static final String CAP_FILE_PATH = "uicc/test/toolkit/api_2_trs_isprav";
+ static final String CLASS_AID_1 = "A0000000 090005FF FFFFFF89 50010001";
+ static final String APPLET_AID_1 = "A0000000 090005FF FFFFFF89 50010102";
+ static final String APPLET_AID_2 = "A0000000 090005FF FFFFFF89 50010202";
+ static final String APPLET_AID_3 = "A0000000 090005FF FFFFFF89 50010302";
+ static final String APPLET_AID_4 = "A0000000 090005FF FFFFFF89 50010402";
+
+ private UiccAPITestCardService test;
+ APDUResponse response;
+
+
+ public Test_Api_2_Trs_IsPrAv() {
+ test = UiccAPITestCardService.getTheUiccTestCardService();
+ }
+
+ public boolean run() {
+ APDUResponse data = null;
+ initialiseResults();
+
+ // test script
+ test.reset();
+ test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
+
+ // Install package
+ test.loadPackage(CAP_FILE_PATH);
+
+ /*********************************************************************/
+ /** Testcase 1 */
+ /*********************************************************************/
+
+ // Install Applet1
+ test.installApplet(CAP_FILE_PATH, CLASS_AID_1, APPLET_AID_1,
+ "8008" + // TLV UICC Toolkit application specific parameters
+ "01" + // V Priority Level
+ "00" + // V Max. number of timers
+ "0A" + // V Maximum text length for a menu entry
+ "00" + // V Maximum number of menu entries
+ "00" + // V Maximum number of channels
+ "00" + // LV Minimum Security Level field
+ "00" + // LV TAR Value(s)
+ "00"); // V Maximum number of services
+
+ addResult(response.checkSw("9000"));
+
+ // Install Applet2
+ test.installApplet(CAP_FILE_PATH, CLASS_AID_1, APPLET_AID_2,
+ "8008" + // TLV UICC Toolkit application specific parameters
+ "02" + // V Priority Level
+ "00" + // V Max. number of timers
+ "0A" + // V Maximum text length for a menu entry
+ "00" + // V Maximum number of menu entries
+ "00" + // V Maximum number of channels
+ "00" + // LV Minimum Security Level field
+ "00" + // LV TAR Value(s)
+ "00"); // V Maximum number of services
+
+ addResult(response.checkSw("9000"));
+
+ // Card Initialisation
+ test.reset();
+ test.terminalProfileSession("09030020 21");
+
+ // Trigger the applets
+ response = test.envelopeEventProactiveHandlerAvailable();
+ addResult(response.checkSw("9000"));
+
+
+ /*********************************************************************/
+ /*********************************************************************/
+ /** Check Applets */
+ /*********************************************************************/
+ /*********************************************************************/
+
+ response = test.selectApplication(APPLET_AID_1);
+ addResult(response.checkData("10" + APPLET_AID_1 + "01" + "CC"));
+ response = test.selectApplication(APPLET_AID_2);
+ addResult(response.checkData("10" + APPLET_AID_2 + "01" + "CC"));
+
+
+ /*********************************************************************/
+ /*********************************************************************/
+ /** Restore card */
+ /*********************************************************************/
+ /*********************************************************************/
+
+ test.reset();
+ test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
+ // delete applets and package
+ test.deleteApplet(APPLET_AID_1);
+ test.deleteApplet(APPLET_AID_2);
+ test.deletePackage(CAP_FILE_PATH);
+ addResult(response.checkSw("9000"));
+
+ /*********************************************************************/
+ /** Testcase 2 */
+ /*********************************************************************/
+
+ // Install Applet1
+ test.installApplet(CAP_FILE_PATH, CLASS_AID_1, APPLET_AID_3,
+ "8008" + // TLV UICC Toolkit application specific parameters
+ "01" + // V Priority Level
+ "00" + // V Max. number of timers
+ "0A" + // V Maximum text length for a menu entry
+ "00" + // V Maximum number of menu entries
+ "00" + // V Maximum number of channels
+ "00" + // LV Minimum Security Level field
+ "00" + // LV TAR Value(s)
+ "00"); // V Maximum number of services
+
+ addResult(response.checkSw("9000"));
+
+ // Install Applet2
+ test.installApplet(CAP_FILE_PATH, CLASS_AID_1, APPLET_AID_4,
+ "8008" + // TLV UICC Toolkit application specific parameters
+ "01" + // V Priority Level
+ "00" + // V Max. number of timers
+ "0A" + // V Maximum text length for a menu entry
+ "00" + // V Maximum number of menu entries
+ "00" + // V Maximum number of channels
+ "00" + // LV Minimum Security Level field
+ "00" + // LV TAR Value(s)
+ "00"); // V Maximum number of services
+
+ addResult(response.checkSw("9000"));
+
+ // Card Initialisation
+ test.reset();
+ test.terminalProfileSession("09030020 21");
+
+ // Trigger the applets
+ response = test.envelopeEventProactiveHandlerAvailable();
+ addResult(response.checkSw("9000"));
+
+
+ /*********************************************************************/
+ /*********************************************************************/
+ /** Check Applets */
+ /*********************************************************************/
+ /*********************************************************************/
+
+ response = test.selectApplication(APPLET_AID_3);
+ addResult(response.checkData("10" + APPLET_AID_1 + "01" + "CC"));
+ response = test.selectApplication(APPLET_AID_4);
+ addResult(response.checkData("10" + APPLET_AID_2 + "01" + "CC"));
+
+
+ /*********************************************************************/
+ /*********************************************************************/
+ /** Restore card */
+ /*********************************************************************/
+ /*********************************************************************/
+
+ test.reset();
+ test.terminalProfileSession(UiccCardManagementService.DEFAULT_TERMINAL_PROFILE);
+ // delete applets and package
+ test.deleteApplet(APPLET_AID_3);
+ test.deleteApplet(APPLET_AID_4);
+ test.deletePackage(CAP_FILE_PATH);
+ addResult(response.checkSw("9000"));
+
+
+ return getOverallResult();
+ }
+}
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_trs_isprav/applet.opt b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_trs_isprav/applet.opt
new file mode 100644
index 0000000000000000000000000000000000000000..f026151ac1f151c6595c321aa7bff5d18d715a80
--- /dev/null
+++ b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_trs_isprav/applet.opt
@@ -0,0 +1,5 @@
+-out EXP CAP JCA
+-applet 0xa0:0x00:0x00:0x00:0x09:0x00:0x05:0xff:0xff:0xff:0xff:0x89:0x20:0x01:0x00:0x01 uicc.test.toolkit.api_2_trs_isprav.Api_2_Trs_IsPrAv_1
+-applet 0xa0:0x00:0x00:0x00:0x09:0x00:0x05:0xff:0xff:0xff:0xff:0x89:0x20:0x01:0x00:0x02 uicc.test.toolkit.api_2_trs_isprav.Api_2_Trs_IsPrAv_2
+uicc.test.toolkit.api_2_trs_isprav
+0xa0:0x00:0x00:0x00:0x09:0x00:0x05:0xff:0xff:0xff:0xff:0x89:0x20:0x00:0x00:0x00 1.0
\ No newline at end of file
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_trs_isprav/javacard/api_2_trs_isprav.cap b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_trs_isprav/javacard/api_2_trs_isprav.cap
new file mode 100644
index 0000000000000000000000000000000000000000..26fe508f2ad7a449063150299f38820f8a79c9b1
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_trs_isprav/javacard/api_2_trs_isprav.cap differ
diff --git a/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_trs_isprav/javacard/api_2_trs_isprav.exp b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_trs_isprav/javacard/api_2_trs_isprav.exp
new file mode 100644
index 0000000000000000000000000000000000000000..13a9d649a4a62645de6178f15f6b80ab0025378a
Binary files /dev/null and b/source/Annex_E_SourceCode/uicc/test/toolkit/api_2_trs_isprav/javacard/api_2_trs_isprav.exp differ