Fix junit compile fails due to data structure moves

core/java/test/junit/net/i2p/data/DataTestSuite.java

@@ -23,9 +23,6 @@ public class DataTestSuite {
         suite.addTestSuite(PayloadTest.class);
         suite.addTestSuite(PrivateKeyTest.class);
         suite.addTestSuite(PublicKeyTest.class);
-        suite.addTestSuite(RouterAddressTest.class);
-        suite.addTestSuite(RouterIdentityTest.class);
-        suite.addTestSuite(RouterInfoTest.class);
         suite.addTestSuite(SessionKeyTest.class);
         suite.addTestSuite(SignatureTest.class);
         suite.addTestSuite(SigningPrivateKeyTest.class);

router/java/test/junit/net/i2p/data/i2np/DatabaseStoreMessageTest.java

@@ -13,8 +13,8 @@ import org.junit.Test;
 import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataStructure;
-import net.i2p.data.RouterInfo;
+import net.i2p.data.router.RouterInfo;
-import net.i2p.data.RouterInfoTest;
+import net.i2p.data.router.RouterInfoTest;
 import net.i2p.data.StructureTest;
 import net.i2p.util.Clock;
 

router/java/test/junit/net/i2p/data/router/RouterAddressTest.java

@@ -1,4 +1,4 @@
-package net.i2p.data;
+package net.i2p.data.router;
 /*
  * free (adj.): unencumbered; not under the control of others
  * Written by jrandom in 2003 and released into the public domain 
@@ -11,6 +11,10 @@ package net.i2p.data;
 import java.io.ByteArrayOutputStream;
 import java.util.Properties;
 
+import net.i2p.data.DataFormatException;
+import net.i2p.data.DataStructure;
+import net.i2p.data.StructureTest;
+
 /**
  * Test harness for loading / storing Hash objects
  *

router/java/test/junit/net/i2p/data/router/RouterIdentityTest.java

@@ -1,4 +1,4 @@
-package net.i2p.data;
+package net.i2p.data.router;
 /*
  * free (adj.): unencumbered; not under the control of others
  * Written by jrandom in 2003 and released into the public domain 
@@ -10,6 +10,16 @@ package net.i2p.data;
 
 import java.io.ByteArrayOutputStream;
 
+import net.i2p.data.Certificate;
+import net.i2p.data.CertificateTest;
+import net.i2p.data.DataFormatException;
+import net.i2p.data.DataStructure;
+import net.i2p.data.PublicKey;
+import net.i2p.data.PublicKeyTest;
+import net.i2p.data.SigningPublicKey;
+import net.i2p.data.SigningPublicKeyTest;
+import net.i2p.data.StructureTest;
+
 /**
  * Test harness for loading / storing Hash objects
  *

router/java/test/junit/net/i2p/data/router/RouterInfoTest.java

@@ -1,4 +1,4 @@
-package net.i2p.data;
+package net.i2p.data.router;
 /*
  * free (adj.): unencumbered; not under the control of others
  * Written by jrandom in 2003 and released into the public domain 
@@ -12,6 +12,16 @@ import java.util.HashSet;
 import java.util.Properties;
 
 import net.i2p.crypto.KeyGenerator;
+import net.i2p.data.Certificate;
+import net.i2p.data.DataFormatException;
+import net.i2p.data.DataStructure;
+import net.i2p.data.Hash;
+import net.i2p.data.HashTest;
+import net.i2p.data.PrivateKey;
+import net.i2p.data.PublicKey;
+import net.i2p.data.SigningPrivateKey;
+import net.i2p.data.SigningPublicKey;
+import net.i2p.data.StructureTest;
 import net.i2p.util.Log;
 
 /**

router/java/test/junit/net/i2p/router/SSUDemo.java

@@ -10,8 +10,8 @@ import net.i2p.I2PAppContext;
 import net.i2p.data.Base64;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.Hash;
-import net.i2p.data.RouterIdentity;
+import net.i2p.data.router.RouterIdentity;
-import net.i2p.data.RouterInfo;
+import net.i2p.data.router.RouterInfo;
 import net.i2p.data.i2np.DatabaseStoreMessage;
 import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.data.i2np.I2NPMessageException;

router/java/test/junit/net/i2p/router/message/BuildTestMessageJob.java

@@ -14,7 +14,7 @@ import java.util.Set;
 import net.i2p.data.Certificate;
 import net.i2p.data.Hash;
 import net.i2p.data.PublicKey;
-import net.i2p.data.RouterInfo;
+import net.i2p.data.router.RouterInfo;
 import net.i2p.data.SessionKey;
 import net.i2p.data.SessionTag;
 import net.i2p.data.i2np.DeliveryInstructions;

router/java/test/junit/net/i2p/router/networkdb/kademlia/RouterGenerator.java

@@ -19,9 +19,9 @@ import net.i2p.crypto.KeyGenerator;
 import net.i2p.data.Certificate;
 import net.i2p.data.PrivateKey;
 import net.i2p.data.PublicKey;
-import net.i2p.data.RouterAddress;
+import net.i2p.data.router.RouterAddress;
-import net.i2p.data.RouterIdentity;
+import net.i2p.data.router.RouterIdentity;
-import net.i2p.data.RouterInfo;
+import net.i2p.data.router.RouterInfo;
 import net.i2p.data.SigningPrivateKey;
 import net.i2p.data.SigningPublicKey;
 import net.i2p.util.Clock;

router/java/test/junit/net/i2p/router/transport/BandwidthLimitedInputStream.java

@@ -12,7 +12,7 @@ import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
-import net.i2p.data.RouterIdentity;
+import net.i2p.data.router.RouterIdentity;
 import net.i2p.router.RouterContext;
 import net.i2p.util.Log;
 

router/java/test/junit/net/i2p/router/transport/BandwidthLimitedOutputStream.java

@@ -12,7 +12,7 @@ import java.io.FilterOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 
-import net.i2p.data.RouterIdentity;
+import net.i2p.data.router.RouterIdentity;
 import net.i2p.router.RouterContext;
 import net.i2p.util.Log;
 

router/java/test/junit/net/i2p/router/transport/udp/UDPFlooder.java

@@ -3,7 +3,7 @@ package net.i2p.router.transport.udp;
 import java.util.ArrayList;
 import java.util.List;
 
-import net.i2p.data.RouterInfo;
+import net.i2p.data.router.RouterInfo;
 import net.i2p.data.i2np.DataMessage;
 import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.router.OutNetMessage;

router/java/test/junit/net/i2p/router/tunnel/RouterTestBase.java

@@ -1,8 +1,8 @@
 package net.i2p.router.tunnel;
 
 import net.i2p.data.Hash;
-import net.i2p.data.RouterIdentity;
+import net.i2p.data.router.RouterIdentity;
-import net.i2p.data.RouterInfo;
+import net.i2p.data.router.RouterInfo;
 import net.i2p.router.Router;
 import net.i2p.router.RouterContext;