Commit 303a4243 authored by Sebastian Hans's avatar Sebastian Hans
Browse files

Merge branch 'REL-7.1.0' into 'master'

merge 7.1.0 published version inot master

See merge request !4
parents 5b4c752e e579487d
Loading
Loading
Loading
Loading
+397 −2
Original line number Diff line number Diff line
@@ -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.
    }

}
+1 −33
Original line number Diff line number Diff line
@@ -9,36 +9,4 @@ package org.etsi.scp.wg3.uicc.jcapi.userclass;
public abstract class UiccTestModel  {

    public abstract boolean run();

    /**
     * Initialises the results, removing all previous results.
     */
    protected final void initialiseResults()
    {
        UiccAPITestCardService.getTheUiccTestCardService().initialiseResults();
    }

    /**
     * Adds a new result.
     */
    protected final void addResult(boolean result)
    {
        UiccAPITestCardService.getTheUiccTestCardService().addResult(result);
    }

    /**
     * Returns the overall result, based on all results submitted via {@link #addResult(boolean)}
     * since the last call to {@link #initialiseResults()}.
     * <p>
     * The following logic is used:
     * <ul>
     * <li> if no results have been submitted, <code>false</code> will be returned; </li>
     * <li> if any <code>false</code> results have been submitted, <code>false</code> will be returned; </li>
     * <li> otherwise, <code>true</code> will be returned. </li>
     * </ul>
     */
    protected final boolean getOverallResult()
    {
        return UiccAPITestCardService.getTheUiccTestCardService().getOverallResult();
    }
}
+20 −5
Original line number Diff line number Diff line
/**
 * @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();
    
    /**
     * 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();
}
+0 −1
Original line number Diff line number Diff line
-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
+4 −0
Original line number Diff line number Diff line
@@ -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,
Loading