diff --git a/pom.xml b/pom.xml index 28dbe96..fd41722 100644 --- a/pom.xml +++ b/pom.xml @@ -226,6 +226,7 @@ org.apache.maven.plugins maven-surefire-plugin + 2.19.1 true diff --git a/src/test/java/com/rise/psabsm/AbstractSimTestCase.java b/src/test/java/com/rise/psabsm/AbstractSimTestCase.java index 3788e4d..74157a7 100644 --- a/src/test/java/com/rise/psabsm/AbstractSimTestCase.java +++ b/src/test/java/com/rise/psabsm/AbstractSimTestCase.java @@ -55,8 +55,10 @@ import com.rise.smartcard.gpcardlib.smartcard.profiles.GenericGemaltoST33F1M_GP2 import com.rise.smartcard.gpcardlib.smartcard.profiles.GenericGemaltoSTM041_GP220; import com.rise.smartcard.gpcardlib.smartcard.profiles.GenericGemaltoSTM041_GP220_GenericInstallParameters; import com.rise.smartcard.gpcardlib.tools.GlobalPlatformTaskList; -import com.rise.tools.pcsccardtool.aram.dataobjects.RefArDo; -import com.rise.tools.pcsccardtool.aram.dataobjects.RefArDoList; +import com.rise.psabsm.dataobjects.RefArDo; +import com.rise.psabsm.dataobjects.RefArDoList; +//import com.rise.tools.pcsccardtool.aram.dataobjects.RefArDo; +//import com.rise.tools.pcsccardtool.aram.dataobjects.RefArDoList; import com.rise.tools.pcsccardtool.scriptparser.ScriptCommand; import com.rise.tools.pcsccardtool.scriptparser.ScriptCommandConverter; import com.rise.tools.pcsccardtool.scriptparser.ScriptParser; diff --git a/src/test/java/com/rise/psabsm/GlobalPlatformGetDataResponseParser.java b/src/test/java/com/rise/psabsm/GlobalPlatformGetDataResponseParser.java index ba4c207..7997161 100644 --- a/src/test/java/com/rise/psabsm/GlobalPlatformGetDataResponseParser.java +++ b/src/test/java/com/rise/psabsm/GlobalPlatformGetDataResponseParser.java @@ -3,8 +3,8 @@ package com.rise.psabsm; import java.io.ByteArrayOutputStream; import com.rise.securitycommons.utils.Utils; -import com.rise.tools.pcsccardtool.aram.dataobjects.DataObjectFactory; -import com.rise.tools.pcsccardtool.aram.dataobjects.RefArDoList; +import com.rise.psabsm.dataobjects.DataObjectFactory; +import com.rise.psabsm.dataobjects.RefArDoList; /** diff --git a/src/test/java/com/rise/psabsm/dataobjects/AidRefDo.java b/src/test/java/com/rise/psabsm/dataobjects/AidRefDo.java index 958e50c..64fa386 100644 --- a/src/test/java/com/rise/psabsm/dataobjects/AidRefDo.java +++ b/src/test/java/com/rise/psabsm/dataobjects/AidRefDo.java @@ -4,8 +4,9 @@ package com.rise.psabsm.dataobjects; import com.rise.psabsm.TLVHelper; import com.rise.securitycommons.smartcard.Aid; import com.rise.securitycommons.utils.Utils; +/* import com.rise.tools.pcsccardtool.aram.dataobjects.ParsableDataObject; - +*/ /** * This class represents an {@code AID-REF-DO}. diff --git a/src/test/java/com/rise/psabsm/dataobjects/ApduArDo.java b/src/test/java/com/rise/psabsm/dataobjects/ApduArDo.java index 2ecad4e..2519be6 100644 --- a/src/test/java/com/rise/psabsm/dataobjects/ApduArDo.java +++ b/src/test/java/com/rise/psabsm/dataobjects/ApduArDo.java @@ -4,8 +4,9 @@ package com.rise.psabsm.dataobjects; import java.util.Arrays; import com.rise.psabsm.TLVHelper; import com.rise.securitycommons.utils.Utils; +/* import com.rise.tools.pcsccardtool.aram.dataobjects.ParsableDataObject; - +*/ /** * This class represents an {@code APDU Access Rule Data Object (APDU-AR-DO)}. diff --git a/src/test/java/com/rise/psabsm/dataobjects/ArDo.java b/src/test/java/com/rise/psabsm/dataobjects/ArDo.java index 37bdd8c..b7330c2 100644 --- a/src/test/java/com/rise/psabsm/dataobjects/ArDo.java +++ b/src/test/java/com/rise/psabsm/dataobjects/ArDo.java @@ -3,10 +3,11 @@ package com.rise.psabsm.dataobjects; import com.rise.psabsm.TLVHelper; import com.rise.securitycommons.utils.Utils; +/* import com.rise.tools.pcsccardtool.aram.dataobjects.ApduArDo; import com.rise.tools.pcsccardtool.aram.dataobjects.NfcArDo; import com.rise.tools.pcsccardtool.aram.dataobjects.ParsableDataObject; - +*/ /** * This class represents a {@code Access Rule Data Object (AR-DO)} containing one or two access rules of type diff --git a/src/test/java/com/rise/psabsm/dataobjects/DataObjectFactory.java b/src/test/java/com/rise/psabsm/dataobjects/DataObjectFactory.java index 09ec1c6..8ae0711 100644 --- a/src/test/java/com/rise/psabsm/dataobjects/DataObjectFactory.java +++ b/src/test/java/com/rise/psabsm/dataobjects/DataObjectFactory.java @@ -1,5 +1,5 @@ package com.rise.psabsm.dataobjects; - +/* import com.rise.tools.pcsccardtool.aram.dataobjects.AidRefDo; import com.rise.tools.pcsccardtool.aram.dataobjects.ApduArDo; import com.rise.tools.pcsccardtool.aram.dataobjects.ArDo; @@ -8,7 +8,7 @@ import com.rise.tools.pcsccardtool.aram.dataobjects.NfcArDo; import com.rise.tools.pcsccardtool.aram.dataobjects.RefArDo; import com.rise.tools.pcsccardtool.aram.dataobjects.RefArDoList; import com.rise.tools.pcsccardtool.aram.dataobjects.RefDo; - +*/ /** * A Factory for {@code GlobalPlatform Data Objects}. diff --git a/src/test/java/com/rise/psabsm/dataobjects/DeviceAppIdRefDo.java b/src/test/java/com/rise/psabsm/dataobjects/DeviceAppIdRefDo.java index e9837cf..c08e320 100644 --- a/src/test/java/com/rise/psabsm/dataobjects/DeviceAppIdRefDo.java +++ b/src/test/java/com/rise/psabsm/dataobjects/DeviceAppIdRefDo.java @@ -4,8 +4,9 @@ package com.rise.psabsm.dataobjects; import java.util.Arrays; import com.rise.psabsm.TLVHelper; import com.rise.securitycommons.utils.Utils; +/* import com.rise.tools.pcsccardtool.aram.dataobjects.ParsableDataObject; - +*/ /** * This class represents a {@code DeviceAppID-REF-DO}. diff --git a/src/test/java/com/rise/psabsm/dataobjects/NfcArDo.java b/src/test/java/com/rise/psabsm/dataobjects/NfcArDo.java index fe11780..dd16856 100644 --- a/src/test/java/com/rise/psabsm/dataobjects/NfcArDo.java +++ b/src/test/java/com/rise/psabsm/dataobjects/NfcArDo.java @@ -3,8 +3,9 @@ package com.rise.psabsm.dataobjects; import com.rise.psabsm.TLVHelper; import com.rise.securitycommons.utils.Utils; +/* import com.rise.tools.pcsccardtool.aram.dataobjects.ParsableDataObject; - +*/ /** * This class represents an {@code NFC Event Access Rule Data Object (NFC-AR-DO)}. diff --git a/src/test/java/com/rise/psabsm/dataobjects/RefArDo.java b/src/test/java/com/rise/psabsm/dataobjects/RefArDo.java index 290ccc3..ba2362e 100644 --- a/src/test/java/com/rise/psabsm/dataobjects/RefArDo.java +++ b/src/test/java/com/rise/psabsm/dataobjects/RefArDo.java @@ -3,10 +3,11 @@ package com.rise.psabsm.dataobjects; import com.rise.psabsm.TLVHelper; import com.rise.securitycommons.utils.Utils; +/* import com.rise.tools.pcsccardtool.aram.dataobjects.ArDo; import com.rise.tools.pcsccardtool.aram.dataobjects.ParsableDataObject; import com.rise.tools.pcsccardtool.aram.dataobjects.RefDo; - +*/ /** * This class represents an {@code Access Rule Data Object (RefArDo)}. diff --git a/src/test/java/com/rise/psabsm/dataobjects/RefArDoList.java b/src/test/java/com/rise/psabsm/dataobjects/RefArDoList.java index c004e93..740bef1 100644 --- a/src/test/java/com/rise/psabsm/dataobjects/RefArDoList.java +++ b/src/test/java/com/rise/psabsm/dataobjects/RefArDoList.java @@ -4,10 +4,11 @@ package com.rise.psabsm.dataobjects; import java.util.ArrayList; import java.util.List; import com.rise.securitycommons.smartcard.Aid; +/* import com.rise.tools.pcsccardtool.aram.dataobjects.ParsableDataObject; import com.rise.tools.pcsccardtool.aram.dataobjects.RefArDo; import com.rise.tools.pcsccardtool.aram.dataobjects.RefDo; - +*/ /** * This class represents a List of {@code Access Rule Data Objects (RefArDo)}. diff --git a/src/test/java/com/rise/psabsm/dataobjects/RefDo.java b/src/test/java/com/rise/psabsm/dataobjects/RefDo.java index 9ed3493..1021713 100644 --- a/src/test/java/com/rise/psabsm/dataobjects/RefDo.java +++ b/src/test/java/com/rise/psabsm/dataobjects/RefDo.java @@ -3,10 +3,11 @@ package com.rise.psabsm.dataobjects; import com.rise.psabsm.TLVHelper; import com.rise.securitycommons.utils.Utils; +/* import com.rise.tools.pcsccardtool.aram.dataobjects.AidRefDo; import com.rise.tools.pcsccardtool.aram.dataobjects.DeviceAppIdRefDo; import com.rise.tools.pcsccardtool.aram.dataobjects.ParsableDataObject; - +*/ /** * This class represents a {@code Reference Data Object (RefDo)} containing an {@code AID-REF-DO} and a diff --git a/src/test/java/com/rise/psabsm/isdmobiletests/IsdAndMobileProfileTest.java b/src/test/java/com/rise/psabsm/isdmobiletests/IsdAndMobileProfileTest.java index c74f2b0..daaf9a9 100644 --- a/src/test/java/com/rise/psabsm/isdmobiletests/IsdAndMobileProfileTest.java +++ b/src/test/java/com/rise/psabsm/isdmobiletests/IsdAndMobileProfileTest.java @@ -26,7 +26,7 @@ import com.rise.securitycommons.utils.Utils; import com.rise.sem.secureelement.PcScSecureElementFactory; import com.rise.sem.secureelement.SecureElement; import com.rise.smartcard.gpcardlib.exception.GPException_MinorWarning; -import com.rise.tools.pcsccardtool.aram.dataobjects.RefArDoList; +import com.rise.psabsm.dataobjects.RefArDoList; public class IsdAndMobileProfileTest extends AbstractSimTestCase {