Commit 5b4c752e authored by Sebastian Hans's avatar Sebastian Hans
Browse files

Merge branch 'REL-6.2.0' into 'master'

Rel 6.2.0

See merge request scp/ts-102-268-uicc-api-testspec!2
parents 787c8357 115f176f
Loading
Loading
Loading
Loading
+32 −0
Original line number Original line Diff line number Diff line
@@ -9,4 +9,36 @@ package org.etsi.scp.wg3.uicc.jcapi.userclass;
public abstract class UiccTestModel {
public abstract class UiccTestModel {


    public abstract boolean run();
    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();
    }
}
}
+30 −0
Original line number Original line Diff line number Diff line
package org.etsi.scp.wg3.uicc.jcapi.userinterface;

/**
 * A service to allow results to be reported.
 */
public interface UiccResultsService
{
    /**
     * Initialises the results, removing all previous results.
     */
    public void initialiseResults();

    /**
     * Adds a new result.
     */
    public void addResult(boolean result);

    /**
     * Returns the overall result, based on all results submitted via {@link #addResult(boolean)}
     * since the last call to {@link #initialiseResults()}.
     * <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>
     */
    public boolean getOverallResult();
}
+50 −50
Original line number Original line Diff line number Diff line
@@ -49,7 +49,7 @@ public class Test_Api_1_Cont extends UiccTestModel {
    }
    }


    public boolean run() {
    public boolean run() {
        boolean result = true;
        initialiseResults();


        // start test
        // start test
        test.reset();
        test.reset();
@@ -112,7 +112,7 @@ public class Test_Api_1_Cont extends UiccTestModel {


        //10
        //10
        response = test.activate(EF_TNR);
        response = test.activate(EF_TNR);
        result &= response.checkSw("9000");
        addResult(response.checkSw("9000"));


        //11
        //11
        test.selectFile(MF);
        test.selectFile(MF);
@@ -121,7 +121,7 @@ public class Test_Api_1_Cont extends UiccTestModel {


        //12
        //12
        response = test.readBinary("0000", "02");
        response = test.readBinary("0000", "02");
        result &= response.checkData("0101");
        addResult(response.checkData("0101"));


        //13
        //13
        test.updateBinary("0000", "FFFFFF");
        test.updateBinary("0000", "FFFFFF");
@@ -133,14 +133,14 @@ public class Test_Api_1_Cont extends UiccTestModel {


        //15
        //15
        response = test.activate(EF_CNR);
        response = test.activate(EF_CNR);
        result &= response.checkSw("9000");
        addResult(response.checkSw("9000"));


        //16
        //16
        test.selectFile(EF_TARU);
        test.selectFile(EF_TARU);
        
        
        //17
        //17
        response = test.readBinary("0000", "02");
        response = test.readBinary("0000", "02");
        result &= response.checkData("0202");
        addResult(response.checkData("0202"));


        //18
        //18
        test.updateBinary("0000", "FFFFFF");
        test.updateBinary("0000", "FFFFFF");
@@ -160,7 +160,7 @@ public class Test_Api_1_Cont extends UiccTestModel {
        test.selectFile(DF_TEST);
        test.selectFile(DF_TEST);
        test.selectFile(EF_TARU);
        test.selectFile(EF_TARU);
        response = test.readBinary("0000", "04");
        response = test.readBinary("0000", "04");
        result &= response.checkData("01010202");
        addResult(response.checkData("01010202"));


        //12
        //12
        test.updateBinary("0000", "FFFFFFFF");
        test.updateBinary("0000", "FFFFFFFF");
@@ -170,7 +170,7 @@ public class Test_Api_1_Cont extends UiccTestModel {
        test.selectFile(DF_TEST);
        test.selectFile(DF_TEST);
        test.selectFile(EF_TARU);
        test.selectFile(EF_TARU);
        response = test.readBinary("0000", "04");
        response = test.readBinary("0000", "04");
        result &= response.checkData("03030404");
        addResult(response.checkData("03030404"));


        //14
        //14
        test.updateBinary("0000", "FFFFFFFF");
        test.updateBinary("0000", "FFFFFFFF");
@@ -195,11 +195,11 @@ public class Test_Api_1_Cont extends UiccTestModel {
        test.selectFile(DF_TEST);
        test.selectFile(DF_TEST);
        test.selectFile(EF_LUPC);
        test.selectFile(EF_LUPC);
        response = test.readRecord("01", "04", "0A");
        response = test.readRecord("01", "04", "0A");
        result &= response.checkData("11111111 11111111 1111");
        addResult(response.checkData("11111111 11111111 1111"));


        //14
        //14
        response = test.readRecord("02", "04", "0A");
        response = test.readRecord("02", "04", "0A");
        result &= response.checkData("33333333 33333333 3333");
        addResult(response.checkData("33333333 33333333 3333"));


        //15
        //15
        test.updateRecord("01", "04", "11111111 11111111 1111");
        test.updateRecord("01", "04", "11111111 11111111 1111");
@@ -212,11 +212,11 @@ public class Test_Api_1_Cont extends UiccTestModel {
        test.selectFile(DF_TEST);
        test.selectFile(DF_TEST);
        test.selectFile(EF_LUPC);
        test.selectFile(EF_LUPC);
        response = test.readRecord("01", "04", "0A");
        response = test.readRecord("01", "04", "0A");
        result &= response.checkData("11111111 11111111 1111");
        addResult(response.checkData("11111111 11111111 1111"));


        //18
        //18
        response = test.readRecord("02", "04", "0A");
        response = test.readRecord("02", "04", "0A");
        result &= response.checkData("11111111 11111111 1111");
        addResult(response.checkData("11111111 11111111 1111"));


        //19
        //19
        test.updateRecord("01", "04", "11111111 11111111 1111");
        test.updateRecord("01", "04", "11111111 11111111 1111");
@@ -239,11 +239,11 @@ public class Test_Api_1_Cont extends UiccTestModel {
        test.selectFile(DF_TEST);
        test.selectFile(DF_TEST);
        test.selectFile(EF_LARU);
        test.selectFile(EF_LARU);
        response = test.readRecord("00", "02", "04");
        response = test.readRecord("00", "02", "04");
        result &= response.checkData("66666666");
        addResult(response.checkData("66666666"));


        //18
        //18
        response = test.readRecord("00", "02", "04");
        response = test.readRecord("00", "02", "04");
        result &= response.checkData("BBBBBBBB");
        addResult(response.checkData("BBBBBBBB"));


        //19
        //19
        test.updateRecord("01", "04", "55555555");
        test.updateRecord("01", "04", "55555555");
@@ -256,11 +256,11 @@ public class Test_Api_1_Cont extends UiccTestModel {
        test.selectFile(DF_TEST);
        test.selectFile(DF_TEST);
        test.selectFile(EF_LARU);
        test.selectFile(EF_LARU);
        response = test.readRecord("00", "02", "04");
        response = test.readRecord("00", "02", "04");
        result &= response.checkData("44444444");
        addResult(response.checkData("44444444"));


        //22
        //22
        response = test.readRecord("00", "02", "04");
        response = test.readRecord("00", "02", "04");
        result &= response.checkData("99999999");
        addResult(response.checkData("99999999"));


        //23
        //23
        test.updateRecord("01", "04", "55555555");
        test.updateRecord("01", "04", "55555555");
@@ -281,17 +281,17 @@ public class Test_Api_1_Cont extends UiccTestModel {
        //11
        //11
        test.selectFile(DF_TEST);
        test.selectFile(DF_TEST);
        response = test.selectFile(EF_TNU);
        response = test.selectFile(EF_TNU);
        result &= response.checkSw("6283");
        addResult(response.checkSw("6283"));


        //12
        //12
        response = test.activate(EF_TNU);
        response = test.activate(EF_TNU);
        result &= response.checkSw("9000");
        addResult(response.checkSw("9000"));


        //13
        //13
        test.selectApplication(AID_ADF_1);
        test.selectApplication(AID_ADF_1);
        test.selectFile(DF_TEST);
        test.selectFile(DF_TEST);
        response = test.selectFile(EF_TNU);
        response = test.selectFile(EF_TNU);
        result &= response.checkSw("9000");
        addResult(response.checkSw("9000"));


        /** test case 7
        /** test case 7
         *  Increase
         *  Increase
@@ -307,46 +307,46 @@ public class Test_Api_1_Cont extends UiccTestModel {
        test.selectFile(DF_TEST);
        test.selectFile(DF_TEST);
        test.selectFile(EF_CARU);
        test.selectFile(EF_CARU);
        response = test.readRecord("00", "04", "03");
        response = test.readRecord("00", "04", "03");
        result &= response.checkSw("6A83");
        addResult(response.checkSw("6A83"));


        //21
        //21
        response = test.readRecord("00", "03", "03");
        response = test.readRecord("00", "03", "03");
        result &= response.checkData("000001");
        addResult(response.checkData("000001"));


        //22
        //22
        response = test.readRecord("00", "03", "03");
        response = test.readRecord("00", "03", "03");
        result &= response.checkData("000002");
        addResult(response.checkData("000002"));


        //23
        //23
        response = test.updateRecord("00", "03", "AAAAAA");
        response = test.updateRecord("00", "03", "AAAAAA");
        result &= response.checkSw("9000");
        addResult(response.checkSw("9000"));


        //24
        //24
        response = test.updateRecord("00", "03", "555555");
        response = test.updateRecord("00", "03", "555555");
        result &= response.checkSw("9000");
        addResult(response.checkSw("9000"));


        //25
        //25
        test.selectApplication(AID_ADF_1);
        test.selectApplication(AID_ADF_1);
        test.selectFile(DF_TEST);
        test.selectFile(DF_TEST);
        test.selectFile(EF_CARU);
        test.selectFile(EF_CARU);
        response = test.readRecord("00", "04", "03");
        response = test.readRecord("00", "04", "03");
        result &= response.checkSw("6A83");
        addResult(response.checkSw("6A83"));


        //26
        //26
        response = test.readRecord("00", "03", "03");
        response = test.readRecord("00", "03", "03");
        result &= response.checkData("000002");
        addResult(response.checkData("000002"));


        //27
        //27
        response = test.readRecord("00", "03", "03");
        response = test.readRecord("00", "03", "03");
        result &= response.checkData("000004");
        addResult(response.checkData("000004"));


        //28
        //28
        response = test.updateRecord("00", "03", "AAAAAA");
        response = test.updateRecord("00", "03", "AAAAAA");
        result &= response.checkSw("9000");
        addResult(response.checkSw("9000"));


        //29
        //29
        response = test.updateRecord("00", "03", "555555");
        response = test.updateRecord("00", "03", "555555");
        result &= response.checkSw("9000");
        addResult(response.checkSw("9000"));
        
        
        
        


@@ -362,18 +362,18 @@ public class Test_Api_1_Cont extends UiccTestModel {


        //21
        //21
        test.selectFile(DF_TEST);
        test.selectFile(DF_TEST);
        result &= test.selectFile(EF_RFU0).checkSw("9000");
        addResult(test.selectFile(EF_RFU0).checkSw("9000"));


        //22
        //22
        result &= test.selectFile(EF_RFU1).checkSw("9000");
        addResult(test.selectFile(EF_RFU1).checkSw("9000"));


        //23
        //23
        test.selectApplication(AID_ADF_1);
        test.selectApplication(AID_ADF_1);
        test.selectFile(DF_TEST);
        test.selectFile(DF_TEST);
        result &= test.selectFile(EF_RFU0).checkSw("9000");
        addResult(test.selectFile(EF_RFU0).checkSw("9000"));


        //24
        //24
        result &= test.selectFile(EF_RFU1).checkSw("9000");
        addResult(test.selectFile(EF_RFU1).checkSw("9000"));


        /** test case 9
        /** test case 9
         *  CreateFile DF
         *  CreateFile DF
@@ -387,17 +387,17 @@ public class Test_Api_1_Cont extends UiccTestModel {


        //21
        //21
        test.selectFile(DF_TEST);
        test.selectFile(DF_TEST);
        result &= test.selectFile(DF_RFU1).checkSw("9000");
        addResult(test.selectFile(DF_RFU1).checkSw("9000"));


        //22
        //22
        result &= test.selectFile(DF_RFU2).checkSw("9000");
        addResult(test.selectFile(DF_RFU2).checkSw("9000"));


        //23
        //23
        test.selectApplication(AID_ADF_1);
        test.selectApplication(AID_ADF_1);
        result &= test.selectFile(DF_RFU1).checkSw("9000");
        addResult(test.selectFile(DF_RFU1).checkSw("9000"));


        //24
        //24
        result &= test.selectFile(DF_RFU2).checkSw("9000");
        addResult(test.selectFile(DF_RFU2).checkSw("9000"));


        
        
        /** test case 10
        /** test case 10
@@ -414,31 +414,31 @@ public class Test_Api_1_Cont extends UiccTestModel {
        test.selectFile(DF_TEST);
        test.selectFile(DF_TEST);
        test.selectFile(EF_TDAC);
        test.selectFile(EF_TDAC);
        response = test.readBinary("0000", "06");
        response = test.readBinary("0000", "06");
        result &=(response.checkSw("9000")||response.checkSw("6282")||response.checkSw("6700"));
        addResult(response.checkSw("9000")||response.checkSw("6282")||response.checkSw("6700"));
        if (response.checkSw("9000"))
        if (response.checkSw("9000"))
        {
        {
            result &= response.checkData("000000FF");
            addResult(response.checkData("000000FF"));
        }   
        }   
        
        
        //12
        //12
        result &= test.readBinary("0000", "04").checkData("000000FF");
        addResult(test.readBinary("0000", "04").checkData("000000FF"));
 
 
        //13
        //13
        result &= test.resizeFile(EF_TDAC, "03").checkSw("9000");
        addResult(test.resizeFile(EF_TDAC, "03").checkSw("9000"));
 
 
        //14
        //14
        test.selectApplication(AID_ADF_1);
        test.selectApplication(AID_ADF_1);
        test.selectFile(DF_TEST);
        test.selectFile(DF_TEST);
        test.selectFile(EF_LNU);
        test.selectFile(EF_LNU);
        response = test.readRecord("00", "04", "04");
        response = test.readRecord("00", "04", "04");
        result &= response.checkSw("6A83");
        addResult(response.checkSw("6A83"));
 
 
        //15
        //15
        response = test.readRecord("00", "03", "04");
        response = test.readRecord("00", "03", "04");
        result &= response.checkData("FFFFFFFF");
        addResult(response.checkData("FFFFFFFF"));
 
 
        //16
        //16
        result &= test.resizeFile(EF_LNU, "08").checkSw("9000");
        addResult(test.resizeFile(EF_LNU, "08").checkSw("9000"));
        
        
        
        
 
 
@@ -461,7 +461,7 @@ public class Test_Api_1_Cont extends UiccTestModel {
 
 
        //4
        //4
        test.selectFile(DF_TEST);
        test.selectFile(DF_TEST);
        result &= test.selectFile(EF_NOSH).checkSw("6985");
        addResult(test.selectFile(EF_NOSH).checkSw("6985"));
 
 
        //5
        //5
        test.fetch("13");
        test.fetch("13");
@@ -476,7 +476,7 @@ public class Test_Api_1_Cont extends UiccTestModel {
        //4
        //4
        test.selectApplication(AID_ADF_1);
        test.selectApplication(AID_ADF_1);
        test.selectFile(DF_TEST);
        test.selectFile(DF_TEST);
        result &= test.selectFile(EF_NOSH).checkSw("6985");
        addResult(test.selectFile(EF_NOSH).checkSw("6985"));
 
 
        //5
        //5
        test.fetch("13");
        test.fetch("13");
@@ -491,7 +491,7 @@ public class Test_Api_1_Cont extends UiccTestModel {
 
 
        //2
        //2
        test.selectFile(DF_TEST);
        test.selectFile(DF_TEST);
        result &= test.selectFile(EF_NOSH).checkSw("9000");
        addResult(test.selectFile(EF_NOSH).checkSw("9000"));
 
 
        //3
        //3
        test.unrecognizedEnvelope();
        test.unrecognizedEnvelope();
@@ -506,7 +506,7 @@ public class Test_Api_1_Cont extends UiccTestModel {
        //2
        //2
        test.selectApplication(AID_ADF_1);
        test.selectApplication(AID_ADF_1);
        test.selectFile(DF_TEST);
        test.selectFile(DF_TEST);
        result &= test.selectFile(EF_NOSH).checkSw("9000");
        addResult(test.selectFile(EF_NOSH).checkSw("9000"));
 
 
        //3
        //3
        test.unrecognizedEnvelope();
        test.unrecognizedEnvelope();
@@ -545,8 +545,8 @@ public class Test_Api_1_Cont extends UiccTestModel {
        
        
        // check results
        // check results
        response = test.selectApplication(APPLET_AID_1);
        response = test.selectApplication(APPLET_AID_1);
        result &= response.checkData("10" + APPLET_AID_1 + "11CCCCCC CCCCCCCC CCCCCCCC" +
        addResult(response.checkData("10" + APPLET_AID_1 + "11CCCCCC CCCCCCCC CCCCCCCC" +
                                                           "CCCCCCCC CCCC");
                                                           "CCCCCCCC CCCC"));


        
        
        // delete applet and package
        // delete applet and package
@@ -555,6 +555,6 @@ public class Test_Api_1_Cont extends UiccTestModel {
        test.deleteApplet(APPLET_AID_1);
        test.deleteApplet(APPLET_AID_1);
        test.deletePackage(CAP_FILE_PATH);
        test.deletePackage(CAP_FILE_PATH);


        return result;
        return getOverallResult();
    }
    }
}
}
+4 −4
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ public class Test_Api_1_Fvw_Actf extends UiccTestModel {
    
    
    public boolean run() {
    public boolean run() {
        APDUResponse data = null;
        APDUResponse data = null;
        boolean result = false;
        initialiseResults();
        
        
        // test script
        // test script
        test.reset();
        test.reset();
@@ -64,7 +64,7 @@ public class Test_Api_1_Fvw_Actf extends UiccTestModel {


        // Trigger Applet
        // Trigger Applet
        response = test.envelopeMenuSelection("100101", "");
        response = test.envelopeMenuSelection("100101", "");
        result = response.checkSw("9000");                                              
        addResult(response.checkSw("9000"));
           
           


        /*********************************************************************/
        /*********************************************************************/
@@ -74,7 +74,7 @@ public class Test_Api_1_Fvw_Actf extends UiccTestModel {
        /*********************************************************************/
        /*********************************************************************/


        response = test.selectApplication(APPLET_AID_1);
        response = test.selectApplication(APPLET_AID_1);
        result &= response.checkData("10" + APPLET_AID_1 + "04" + "CCCCCCCC");
        addResult(response.checkData("10" + APPLET_AID_1 + "04" + "CCCCCCCC"));
                                     
                                     
        /*********************************************************************/
        /*********************************************************************/
        /*********************************************************************/
        /*********************************************************************/
@@ -88,6 +88,6 @@ public class Test_Api_1_Fvw_Actf extends UiccTestModel {
        test.deletePackage(CAP_FILE_PATH);
        test.deletePackage(CAP_FILE_PATH);
        
        
        
        
        return result;
        return getOverallResult();
    }
    }
}   
}   
+4 −4
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ public class Test_Api_1_Fvw_Dacf extends UiccTestModel {
    
    
    public boolean run() {
    public boolean run() {
        APDUResponse data = null;
        APDUResponse data = null;
        boolean result = false;
        initialiseResults();
        
        
        // test script
        // test script
        test.reset();
        test.reset();
@@ -64,7 +64,7 @@ public class Test_Api_1_Fvw_Dacf extends UiccTestModel {


        // Trigger Applet
        // Trigger Applet
        response = test.envelopeMenuSelection("100101", "");
        response = test.envelopeMenuSelection("100101", "");
        result = response.checkSw("9000");                                              
        addResult(response.checkSw("9000"));
           
           


        /*********************************************************************/
        /*********************************************************************/
@@ -74,7 +74,7 @@ public class Test_Api_1_Fvw_Dacf extends UiccTestModel {
        /*********************************************************************/
        /*********************************************************************/


        response = test.selectApplication(APPLET_AID_1);
        response = test.selectApplication(APPLET_AID_1);
        result &= response.checkData("10" + APPLET_AID_1 + "04" + "CCCCCCCC");
        addResult(response.checkData("10" + APPLET_AID_1 + "04" + "CCCCCCCC"));
                                     
                                     
        /*********************************************************************/
        /*********************************************************************/
        /*********************************************************************/
        /*********************************************************************/
@@ -88,6 +88,6 @@ public class Test_Api_1_Fvw_Dacf extends UiccTestModel {
        test.deletePackage(CAP_FILE_PATH);
        test.deletePackage(CAP_FILE_PATH);
        
        
        
        
        return result;
        return getOverallResult();
    }
    }
}   
}   
Loading