Push tests to separate package

Author: martinpaljak

library/src/main/java/module-info.java

@@ -5,11 +5,11 @@
     requires ber.tlv;
     requires org.bouncycastle.pkix;
     requires org.bouncycastle.provider; // FIXME: Hex. uses this
-    requires org.slf4j;
+    requires transitive org.slf4j;
     requires transitive pro.javacard.capfile;
 
     exports pro.javacard.gp;
     exports pro.javacard.gp.emv;
     exports pro.javacard.gp.keys;
     exports pro.javacard.gp.data;
-}
+}

library/src/main/java/pro/javacard/gp/GPCardProfile.java

@@ -25,7 +25,7 @@
 import java.util.Optional;
 
 // Various per-device configurations and workarounds
-// TODO: WIP, overrides, interface
+// TODO: retire with preferences
 public abstract class GPCardProfile {
 
     private GPCardProfile() {}
@@ -67,7 +67,7 @@ static class OldCardProfile extends GPCardProfile {
         }
     }
 
-    static GPCardProfile defaultProfile() {
+    public static GPCardProfile defaultProfile() {
         return new DefaultModernProfile();
     }
 

library/src/main/java/pro/javacard/gp/GPRegistry.java

@@ -42,7 +42,7 @@
 
 public final class GPRegistry implements Iterable<GPRegistryEntry> {
     private static final Logger logger = LoggerFactory.getLogger(GPRegistry.class);
-    GPRegistry() {}
+    public GPRegistry() {}
     final ArrayList<GPRegistryEntry> entries = new ArrayList<>();
 
     public void add(GPRegistryEntry entry) {
@@ -220,7 +220,8 @@ private void populate_tags(byte[] data, Kind type) throws GPDataException {
         }
     }
 
-    void parse_and_populate(int p1, byte[] data, Kind type, GPCardProfile profile) throws GPDataException {
+    // TODO: remove with new parser
+    public void parse_and_populate(int p1, byte[] data, Kind type, GPCardProfile profile) throws GPDataException {
         if (profile.getStatusUsesTags()) {
             populate_tags(data, type);
         } else {

library/src/main/java/pro/javacard/gp/GPUtils.java

@@ -157,7 +157,7 @@ static byte[] positive(BigInteger i) {
         return positive(bytes);
     }
 
-    static void trace_lv(byte[] data, Logger logger) {
+    public static void trace_lv(byte[] data, Logger logger) {
         try {
             for (String s : visualize_lv(data))
                 logger.trace(s);

…ava/pro/javacard/gp/TestDMTokenizer.java …ro/javacard/gp/test/TestDMTokenizer.javalibrary/src/test/java/pro/javacard/gp/TestDMTokenizer.java renamed to library/src/test/java/pro/javacard/gp/test/TestDMTokenizer.java library/src/test/java/pro/javacard/gp/TestDMTokenizer.java renamed to library/src/test/java/pro/javacard/gp/test/TestDMTokenizer.java

@@ -1,9 +1,11 @@
-package pro.javacard.gp;
+package pro.javacard.gp.test;
 
 import apdu4j.core.CommandAPDU;
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
+import pro.javacard.gp.DMTokenizer;
+import pro.javacard.gp.GPCrypto;
 
 import java.io.FileInputStream;
 import java.security.interfaces.RSAPrivateKey;

…/java/pro/javacard/gp/TestGPKeyInfo.java …/pro/javacard/gp/test/TestGPKeyInfo.javalibrary/src/test/java/pro/javacard/gp/TestGPKeyInfo.java renamed to library/src/test/java/pro/javacard/gp/test/TestGPKeyInfo.java library/src/test/java/pro/javacard/gp/TestGPKeyInfo.java renamed to library/src/test/java/pro/javacard/gp/test/TestGPKeyInfo.java

@@ -1,8 +1,9 @@
-package pro.javacard.gp;
+package pro.javacard.gp.test;
 
 import apdu4j.core.HexUtils;
 import org.testng.Assert;
 import org.testng.annotations.Test;
+import pro.javacard.gp.GPKeyInfo;
 
 import java.util.List;
 

…/java/pro/javacard/gp/TestParseTags.java …/pro/javacard/gp/test/TestParseTags.javalibrary/src/test/java/pro/javacard/gp/TestParseTags.java renamed to library/src/test/java/pro/javacard/gp/test/TestParseTags.java library/src/test/java/pro/javacard/gp/TestParseTags.java renamed to library/src/test/java/pro/javacard/gp/test/TestParseTags.java

@@ -1,4 +1,4 @@
-package pro.javacard.gp;
+package pro.javacard.gp.test;
 
 import apdu4j.core.HexUtils;
 import org.bouncycastle.util.encoders.Hex;
@@ -7,6 +7,7 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import pro.javacard.capfile.AID;
+import pro.javacard.gp.*;
 import pro.javacard.gp.GPRegistryEntry.Privilege;
 
 import java.time.LocalDate;