Commit afc41860 authored by Sebastian Hans's avatar Sebastian Hans
Browse files

Merge branch 'REL-7.2.0' into 'master'

Collection of implemented CR for TS 102 268 to create REL 7.2.0 from 7.1.0

See merge request !6
parents 303a4243 68d0893e
Loading
Loading
Loading
Loading
+2 −398
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ package org.etsi.scp.wg3.uicc.jcapi.userclass;

import org.etsi.scp.wg3.uicc.jcapi.userinterface.*;

public class UiccAPITestCardService implements UiccCardManagementService,UiccAdministrativeCommandsService,UiccApplicationManagementService,UiccToolkitService   {
public abstract class UiccAPITestCardService implements UiccCardManagementService,UiccAdministrativeCommandsService,UiccApplicationManagementService,UiccToolkitService,UiccResultsService   {

    public static UiccAPITestCardService TestReference = null;

@@ -19,406 +19,10 @@ public class UiccAPITestCardService implements UiccCardManagementService,UiccAdm
     */
    public static UiccAPITestCardService getTheUiccTestCardService() {
        if (TestReference == null) {
            return new UiccAPITestCardService();
            throw new UnsupportedOperationException("TestReference has not been set");
        }
        else {
            return TestReference;
        }
    }

    @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.
    }

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

    public abstract boolean run();

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

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

    /**
     * Returns the overall result, based on all results submitted via {@link #addResult(boolean)}
     * since the last call to {@link #initialiseResults()}.
     * <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();
    }
}
+78 −5

File changed.

Preview size limit exceeded, changes collapsed.

+28 −0
Original line number Diff line number Diff line
@@ -16,6 +16,15 @@ public interface UiccToolkitService {
     */
    public APDUResponse terminalProfileSession(String tpStr);

    /**
     * Perform Terminal Profile APDU command and all fetch/Terminal
     * Response APDU until (90 00) status word.
     * The test tool must not modify the Terminal Profile command.
     * @param Terminal Profile command parameters, as String
     * @return APDUResponse Object
     */
    public APDUResponse terminalProfileSessionExact(String tpStr);

    /**
     * perform a Terminal Profile APDU command
     * @param Terminal Profile command parameters, as String
@@ -23,8 +32,19 @@ public interface UiccToolkitService {
     */
    public APDUResponse terminalProfile(String tpStr);

    /**
     * Perform a Terminal Profile APDU command.
     * The test tool must not modify the Terminal Profile command.
     * @param Terminal Profile command parameters, as String
     * @return APDUResponse Object
     */
    public APDUResponse terminalProfileExact(String tpStr);

    /**
     * perform a fetch APDU command
     * This method shall check a) that there is a pending 91XX and b) that expDataLength == XX (from 91XX).
     * If either of these checks fail, a Fail shall be reported.
     * The value of Le for the Fetch command shall be XX (from 91XX) if available; otherwise expDataLength.
     * @param length of expected data, as String
     * @return APDUResponse Object
     */
@@ -224,4 +244,12 @@ public interface UiccToolkitService {
     *  "D6 07 99 01 13 82 02 82 81"
     */
    public APDUResponse envelopeEventDownloadHCIConnectivity();

    /**
     * perform an Envelope Event to trigger EVENT_PROACTIVE_HANDLER_AVAILABLE.
     * @return APDUResponse Object
     *  Send the following string :
     *  FFS - define the value to be sent
     */
    public APDUResponse envelopeEventProactiveHandlerAvailable();
}
+4 −2
Original line number Diff line number Diff line
@@ -464,7 +464,8 @@ public class Test_Api_1_Cont extends UiccTestModel {
        addResult(test.selectFile(EF_NOSH).checkSw("6985"));
 
        //5
        test.fetch("13");
        response = test.fetch("13");
        addResult(response.checkSw("9000"));
        response = test.terminalResponse("81030121 80820282 81830100");
 
        /** test case 14
@@ -479,7 +480,8 @@ public class Test_Api_1_Cont extends UiccTestModel {
        addResult(test.selectFile(EF_NOSH).checkSw("6985"));
 
        //5
        test.fetch("13");
        response = test.fetch("13");
        addResult(response.checkSw("9000"));
        response = test.terminalResponse("81030121 80820282 81830100");
 
        /** test case 15
Loading