Commit 115f176f authored by Sebastian Hans's avatar Sebastian Hans
Browse files

changes for REL-6.2.0

parent 1fcccadb
Loading
Loading
Loading
Loading
+50 −50
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ public class Test_Api_1_Cont extends UiccTestModel {
    }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

        response = test.selectApplication(APPLET_AID_1);
        result &= response.checkData("10" + APPLET_AID_1 + "04" + "CCCCCCCC");
        addResult(response.checkData("10" + APPLET_AID_1 + "04" + "CCCCCCCC"));
                                     
        /*********************************************************************/
        /*********************************************************************/
@@ -88,6 +88,6 @@ public class Test_Api_1_Fvw_Dacf extends UiccTestModel {
        test.deletePackage(CAP_FILE_PATH);
        
        
        return result;
        return getOverallResult();
    }
}   
+116 −19
Original line number Diff line number Diff line
@@ -22,15 +22,25 @@ public class Api_1_Fvw_Incr_1 extends TestToolkitApplet implements UICCConstants
    private ViewHandler createEFCmd = null;

    private static byte[] MenuInit = {(byte)'M',(byte)'e',(byte)'n',(byte)'u',(byte)'1'};
    private byte [] abCreateEF = {
    private byte [] abCreateEF_2C00 = {
            (byte)0x82,(byte)0x04,                       // Tag, Length - File descriptor
            (byte)0x46,(byte)0x21,(byte)0x00,(byte)0x7F, // Value - File descriptor (Cyclic) and record length (0x7F)
            (byte)0x46,(byte)0x21,(byte)0x00,(byte)0x00, // Value - File descriptor (Cyclic) and record length (0x00)
            (byte)0x83,(byte)0x02,                       // Tag, Length - File Id
            (byte)0x2C,(byte)0x7F,                       // Value - File Id
            (byte)0x2C,(byte)0x00,                       // Value - File Id
            (byte)0x8A,(byte)0x01,(byte)0x05,            // Tag, Length, Value - LCSI (Activated)
            (byte)0x8B,(byte)0x03,                       // Tag, Length - Security attribute
            (byte)0x2F,(byte)0x06,(byte)0x01,            // Value - Security attribute (EF Arr, record nb)
            (byte)0x80,(byte)0x02,(byte)0x00,(byte)0x7F, // Tag, Length, value - File size (0 bytes => no record)
            (byte)0x80,(byte)0x02,(byte)0x00,(byte)0x00, // Tag, Length, value - File size (0 bytes => no record)
            (byte)0x88,(byte)0x00};                      // Tag, Length - SFI (no SFI)
    private byte [] abCreateEF_2CFD = {
            (byte)0x82,(byte)0x04,                       // Tag, Length - File descriptor
            (byte)0x46,(byte)0x21,(byte)0x00,(byte)0xFD, // Value - File descriptor (Cyclic) and record length (0xFD)
            (byte)0x83,(byte)0x02,                       // Tag, Length - File Id
            (byte)0x2C,(byte)0xFD,                       // Value - File Id
            (byte)0x8A,(byte)0x01,(byte)0x05,            // Tag, Length, Value - LCSI (Activated)
            (byte)0x8B,(byte)0x03,                       // Tag, Length - Security attribute
            (byte)0x2F,(byte)0x06,(byte)0x01,            // Value - Security attribute (EF Arr, record nb)
            (byte)0x80,(byte)0x02,(byte)0x00,(byte)0xFD, // Tag, Length, value - File size (0 bytes => no record)
            (byte)0x88,(byte)0x00};                      // Tag, Length - SFI (no SFI)
    byte testCaseNb = (byte) 0x00;
    byte incr[] = null;
@@ -502,12 +512,13 @@ public class Api_1_Fvw_Incr_1 extends TestToolkitApplet implements UICCConstants
            // activate 
            UiccFileView.activateFile();
            // Restore Ef content
            // Set records to 55 55 55
            Util.arrayFillNonAtomic(data, (short)0, (short)data.length, (byte)0x55);
            UiccFileView.updateRecord((short)0, REC_ACC_MODE_PREVIOUS, (short)0, data, (short)0, (short)data.length);
            // Set records to AA AA AA
            Util.arrayFillNonAtomic(data, (short)0, (short)data.length, (byte)0xAA);
            UiccFileView.updateRecord((short)0, REC_ACC_MODE_PREVIOUS, (short)0, data, (short)0, (short)data.length);
            // Set records to 55 55 55
            Util.arrayFillNonAtomic(data, (short)0, (short)data.length, (byte)0x55);
            UiccFileView.updateRecord((short)0, REC_ACC_MODE_PREVIOUS, (short)0, data, (short)0, (short)data.length);

			bRes &= true;
        }
        catch (Exception e)
@@ -517,10 +528,98 @@ public class Api_1_Fvw_Incr_1 extends TestToolkitApplet implements UICCConstants
        reportTestOutcome(testCaseNb, bRes);

        // -----------------------------------------------------------------
        // Test Case 15 : incrLength out of range
        // -----------------------------------------------------------------
        // Test Case 15 : Record not found
        //
        testCaseNb = 15;
        try
        {
        	incr = new byte[3];
        	resp = new byte[3];
        	createEFCmd = HandlerBuilder.buildTLVHandler(HandlerBuilder.EDIT_HANDLER, (short)abCreateEF_2C00.length, abCreateEF_2C00, (short)0x00, (short)abCreateEF_2C00.length);
            UiccAdminFileView.createFile(createEFCmd);
            UiccAdminFileView.select((short)0x2C00);
            
            incrOffset = 0;
            incrLength = 3;
            respOffset = 0;
            
            respLength = UiccFileView.increase(incr, incrOffset, incrLength, resp, respOffset);
            bRes = false;
        }
        catch (UICCException e)
        {
            if (e.getReason() == UICCException.RECORD_NOT_FOUND)
                bRes = true;
            else
                bRes = false;
        }
        catch(Exception e)
        {
        	bRes = false;
        }
        
        UiccAdminFileView.deleteFile((short)0x2C00);
        reportTestOutcome(testCaseNb, bRes);
        
        // -----------------------------------------------------------------
        // Test Case 16 : incrLength out of range
        // -----------------------------------------------------------------
        testCaseNb = 16;
        try 
        {
            // Create EF 0x2CFD
            incr = new byte[128];
            resp = new byte[0xFF];
            comp = new byte[0xFF];
            createEFCmd = HandlerBuilder.buildTLVHandler(HandlerBuilder.EDIT_HANDLER, (short)abCreateEF_2CFD.length, abCreateEF_2CFD, (short)0x00, (short)abCreateEF_2CFD.length);
            UiccAdminFileView.createFile(createEFCmd);
            UiccAdminFileView.select((short)0x2CFD);

            Util.arrayFillNonAtomic(comp, (short)0, (short)126, (byte)0x00);
            Util.arrayFillNonAtomic(comp, (short)126, (short)(0xFD-126), (byte)0xFF);
            UiccAdminFileView.updateRecord((short)0, REC_ACC_MODE_PREVIOUS, (short)0, comp, (short)0, (short)0xFD);
            // increase
            Util.arrayFillNonAtomic(incr, (short)0, (short)incr.length, (byte)0);
            Util.arrayFillNonAtomic(resp, (short)0, (short)resp.length, (byte)0);
            Util.arrayFillNonAtomic(comp, (short)0, (short)resp.length, (byte)0);
            incr[127] = (byte)0x01;
            comp[125] = (byte)0x01;
            incrOffset = 1;
            incrLength = 127;
            respOffset = 0;
            respLength = UiccAdminFileView.increase(incr, incrOffset, incrLength, resp, respOffset);
            // Check result
            if ((respLength == (short)0xFD) &&
                (Util.arrayCompare(resp, (short)0, comp, (short)0, respLength) == 0))
                bRes = true;
            else
                bRes = false;
        }
        catch (Exception e)
        {
            bRes = false;
        }
        try 
        {
            // increase
            incrOffset = 0;
            incrLength = 128;
            respOffset = 0;
            respLength = UiccAdminFileView.increase(incr, incrOffset, incrLength, resp, respOffset);
            bRes = false;
        }
        catch (Exception e)
        {
            bRes &= true;
        }
        reportTestOutcome(testCaseNb, bRes);
        UiccAdminFileView.deleteFile((short)0x2CFD);
    }
}

/*
testCaseNb = 16;
try 
{
    // Create EF 0x2CFD
    incr = new byte[128];
@@ -569,6 +668,4 @@ public class Api_1_Fvw_Incr_1 extends TestToolkitApplet implements UICCConstants
}
reportTestOutcome(testCaseNb, bRes);
UiccAdminFileView.deleteFile((short)0x2C7F);

    }
}
*/
 No newline at end of file
+2 −2
Original line number Diff line number Diff line
@@ -81,8 +81,8 @@ public class Test_Api_1_Fvw_Incr extends UiccTestModel {
        /*********************************************************************/

        response = test.selectApplication(APPLET_AID_1);
        result &= response.checkData("10" + APPLET_AID_1 + "0F" + 
                "CCCCCCCC CCCCCCCC CCCCCCCC CCCCCC");
        result &= response.checkData("10" + APPLET_AID_1 + "10" + 
                "CCCCCCCC CCCCCCCC CCCCCCCC CCCCCCCC");
                                     
        /*********************************************************************/
        /*********************************************************************/
Loading