diff --git a/core/java/test/net/i2p/data/DataTestSuite.java b/core/java/test/net/i2p/data/DataTestSuite.java index dc1d7e824..4624929f8 100644 --- a/core/java/test/net/i2p/data/DataTestSuite.java +++ b/core/java/test/net/i2p/data/DataTestSuite.java @@ -9,41 +9,24 @@ public class DataTestSuite { TestSuite suite = new TestSuite("net.i2p.data.DataTestSuite"); - suite.addTestSuite(AbuseReasonTest.class); - suite.addTestSuite(AbuseSeverityTest.class); suite.addTestSuite(Base64Test.class); suite.addTestSuite(BooleanTest.class); suite.addTestSuite(CertificateTest.class); - suite.addTestSuite(CreateLeaseSetMessageTest.class); - suite.addTestSuite(CreateSessionMessageTest.class); suite.addTestSuite(DataHelperTest.class); suite.addTestSuite(DataStructureImplTest.class); suite.addTestSuite(DateTest.class); suite.addTestSuite(DestinationTest.class); - suite.addTestSuite(DestroySessionMessageTest.class); - suite.addTestSuite(DisconnectMessageTest.class); suite.addTestSuite(HashTest.class); suite.addTestSuite(LeaseSetTest.class); suite.addTestSuite(LeaseTest.class); suite.addTestSuite(MappingTest.class); - suite.addTestSuite(MessageIdTest.class); - suite.addTestSuite(MessagePayloadMessageTest.class); - suite.addTestSuite(MessageStatusMessageTest.class); suite.addTestSuite(PayloadTest.class); suite.addTestSuite(PrivateKeyTest.class); suite.addTestSuite(PublicKeyTest.class); - suite.addTestSuite(ReceiveMessageBeginMessageTest.class); - suite.addTestSuite(ReceiveMessageEndMessageTest.class); - suite.addTestSuite(ReportAbuseMessageTest.class); - suite.addTestSuite(RequestLeaseSetMessageTest.class); suite.addTestSuite(RouterAddressTest.class); suite.addTestSuite(RouterIdentityTest.class); suite.addTestSuite(RouterInfoTest.class); - suite.addTestSuite(SendMessageMessageTest.class); - suite.addTestSuite(SessionConfigTest.class); - suite.addTestSuite(SessionIdTest.class); suite.addTestSuite(SessionKeyTest.class); - suite.addTestSuite(SessionStatusMessageTest.class); suite.addTestSuite(SignatureTest.class); suite.addTestSuite(SigningPrivateKeyTest.class); suite.addTestSuite(SigningPublicKeyTest.class); @@ -53,4 +36,4 @@ public class DataTestSuite { return suite; } -} \ No newline at end of file +} diff --git a/core/java/test/net/i2p/data/AbuseReasonTest.java b/core/java/test/net/i2p/data/i2cp/AbuseReasonTest.java similarity index 84% rename from core/java/test/net/i2p/data/AbuseReasonTest.java rename to core/java/test/net/i2p/data/i2cp/AbuseReasonTest.java index f7c93d52d..969342807 100644 --- a/core/java/test/net/i2p/data/AbuseReasonTest.java +++ b/core/java/test/net/i2p/data/i2cp/AbuseReasonTest.java @@ -1,4 +1,4 @@ -package net.i2p.data; +package net.i2p.data.i2cp; /* * free (adj.): unencumbered; not under the control of others * Written by jrandom in 2003 and released into the public domain @@ -8,7 +8,9 @@ package net.i2p.data; * */ -import net.i2p.data.i2cp.AbuseReason; +import net.i2p.data.StructureTest; +import net.i2p.data.DataStructure; +import net.i2p.data.DataFormatException; /** * Test harness for loading / storing Hash objects diff --git a/core/java/test/net/i2p/data/AbuseSeverityTest.java b/core/java/test/net/i2p/data/i2cp/AbuseSeverityTest.java similarity index 83% rename from core/java/test/net/i2p/data/AbuseSeverityTest.java rename to core/java/test/net/i2p/data/i2cp/AbuseSeverityTest.java index 0f91c95a6..3c0fd3665 100644 --- a/core/java/test/net/i2p/data/AbuseSeverityTest.java +++ b/core/java/test/net/i2p/data/i2cp/AbuseSeverityTest.java @@ -1,4 +1,4 @@ -package net.i2p.data; +package net.i2p.data.i2cp; /* * free (adj.): unencumbered; not under the control of others * Written by jrandom in 2003 and released into the public domain @@ -8,7 +8,9 @@ package net.i2p.data; * */ -import net.i2p.data.i2cp.AbuseSeverity; +import net.i2p.data.StructureTest; +import net.i2p.data.DataStructure; +import net.i2p.data.DataFormatException; /** * Test harness for loading / storing Hash objects diff --git a/core/java/test/net/i2p/data/CreateLeaseSetMessageTest.java b/core/java/test/net/i2p/data/i2cp/CreateLeaseSetMessageTest.java similarity index 75% rename from core/java/test/net/i2p/data/CreateLeaseSetMessageTest.java rename to core/java/test/net/i2p/data/i2cp/CreateLeaseSetMessageTest.java index 9a37906dc..1bd017b0c 100644 --- a/core/java/test/net/i2p/data/CreateLeaseSetMessageTest.java +++ b/core/java/test/net/i2p/data/i2cp/CreateLeaseSetMessageTest.java @@ -1,4 +1,4 @@ -package net.i2p.data; +package net.i2p.data.i2cp; /* * free (adj.): unencumbered; not under the control of others * Written by jrandom in 2003 and released into the public domain @@ -8,8 +8,15 @@ package net.i2p.data; * */ -import net.i2p.data.i2cp.CreateLeaseSetMessage; -import net.i2p.data.i2cp.SessionId; +import net.i2p.data.StructureTest; +import net.i2p.data.DataStructure; +import net.i2p.data.DataFormatException; +import net.i2p.data.PrivateKey; +import net.i2p.data.PrivateKeyTest; +import net.i2p.data.SigningPrivateKey; +import net.i2p.data.SigningPrivateKeyTest; +import net.i2p.data.LeaseSet; +import net.i2p.data.LeaseSetTest; /** * Test harness for loading / storing CreateLeaseSetMessage objects diff --git a/core/java/test/net/i2p/data/CreateSessionMessageTest.java b/core/java/test/net/i2p/data/i2cp/CreateSessionMessageTest.java similarity index 85% rename from core/java/test/net/i2p/data/CreateSessionMessageTest.java rename to core/java/test/net/i2p/data/i2cp/CreateSessionMessageTest.java index 11704139e..9e0db391a 100644 --- a/core/java/test/net/i2p/data/CreateSessionMessageTest.java +++ b/core/java/test/net/i2p/data/i2cp/CreateSessionMessageTest.java @@ -1,4 +1,4 @@ -package net.i2p.data; +package net.i2p.data.i2cp; /* * free (adj.): unencumbered; not under the control of others * Written by jrandom in 2003 and released into the public domain @@ -8,8 +8,9 @@ package net.i2p.data; * */ -import net.i2p.data.i2cp.CreateSessionMessage; -import net.i2p.data.i2cp.SessionConfig; +import net.i2p.data.StructureTest; +import net.i2p.data.DataStructure; +import net.i2p.data.DataFormatException; /** * Test harness for loading / storing Hash objects diff --git a/core/java/test/net/i2p/data/DestroySessionMessageTest.java b/core/java/test/net/i2p/data/i2cp/DestroySessionMessageTest.java similarity index 85% rename from core/java/test/net/i2p/data/DestroySessionMessageTest.java rename to core/java/test/net/i2p/data/i2cp/DestroySessionMessageTest.java index 00531d8a2..59c092190 100644 --- a/core/java/test/net/i2p/data/DestroySessionMessageTest.java +++ b/core/java/test/net/i2p/data/i2cp/DestroySessionMessageTest.java @@ -1,4 +1,4 @@ -package net.i2p.data; +package net.i2p.data.i2cp; /* * free (adj.): unencumbered; not under the control of others * Written by jrandom in 2003 and released into the public domain @@ -8,8 +8,9 @@ package net.i2p.data; * */ -import net.i2p.data.i2cp.DestroySessionMessage; -import net.i2p.data.i2cp.SessionId; +import net.i2p.data.StructureTest; +import net.i2p.data.DataStructure; +import net.i2p.data.DataFormatException; /** * Test harness for loading / storing Hash objects diff --git a/core/java/test/net/i2p/data/DisconnectMessageTest.java b/core/java/test/net/i2p/data/i2cp/DisconnectMessageTest.java similarity index 84% rename from core/java/test/net/i2p/data/DisconnectMessageTest.java rename to core/java/test/net/i2p/data/i2cp/DisconnectMessageTest.java index fff2ca1a1..a02b1dbc9 100644 --- a/core/java/test/net/i2p/data/DisconnectMessageTest.java +++ b/core/java/test/net/i2p/data/i2cp/DisconnectMessageTest.java @@ -1,4 +1,4 @@ -package net.i2p.data; +package net.i2p.data.i2cp; /* * free (adj.): unencumbered; not under the control of others * Written by jrandom in 2003 and released into the public domain @@ -8,7 +8,9 @@ package net.i2p.data; * */ -import net.i2p.data.i2cp.DisconnectMessage; +import net.i2p.data.StructureTest; +import net.i2p.data.DataStructure; +import net.i2p.data.DataFormatException; /** * Test harness for loading / storing Hash objects diff --git a/core/java/test/net/i2p/data/MessageIdTest.java b/core/java/test/net/i2p/data/i2cp/MessageIdTest.java similarity index 83% rename from core/java/test/net/i2p/data/MessageIdTest.java rename to core/java/test/net/i2p/data/i2cp/MessageIdTest.java index f038798f2..2c8b4735c 100644 --- a/core/java/test/net/i2p/data/MessageIdTest.java +++ b/core/java/test/net/i2p/data/i2cp/MessageIdTest.java @@ -1,4 +1,4 @@ -package net.i2p.data; +package net.i2p.data.i2cp; /* * free (adj.): unencumbered; not under the control of others * Written by jrandom in 2003 and released into the public domain @@ -8,7 +8,9 @@ package net.i2p.data; * */ -import net.i2p.data.i2cp.MessageId; +import net.i2p.data.StructureTest; +import net.i2p.data.DataStructure; +import net.i2p.data.DataFormatException; /** * Test harness for loading / storing Hash objects diff --git a/core/java/test/net/i2p/data/MessagePayloadMessageTest.java b/core/java/test/net/i2p/data/i2cp/MessagePayloadMessageTest.java similarity index 88% rename from core/java/test/net/i2p/data/MessagePayloadMessageTest.java rename to core/java/test/net/i2p/data/i2cp/MessagePayloadMessageTest.java index 3625796ed..a757ebee0 100644 --- a/core/java/test/net/i2p/data/MessagePayloadMessageTest.java +++ b/core/java/test/net/i2p/data/i2cp/MessagePayloadMessageTest.java @@ -1,4 +1,4 @@ -package net.i2p.data; +package net.i2p.data.i2cp; /* * free (adj.): unencumbered; not under the control of others * Written by jrandom in 2003 and released into the public domain @@ -11,7 +11,11 @@ package net.i2p.data; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import net.i2p.data.i2cp.MessagePayloadMessage; +import net.i2p.data.StructureTest; +import net.i2p.data.DataStructure; +import net.i2p.data.DataFormatException; +import net.i2p.data.Payload; +import net.i2p.data.PayloadTest; /** * Test harness for loading / storing SendMessageMessage objects diff --git a/core/java/test/net/i2p/data/MessageStatusMessageTest.java b/core/java/test/net/i2p/data/i2cp/MessageStatusMessageTest.java similarity index 86% rename from core/java/test/net/i2p/data/MessageStatusMessageTest.java rename to core/java/test/net/i2p/data/i2cp/MessageStatusMessageTest.java index c737a2191..eb0cfe212 100644 --- a/core/java/test/net/i2p/data/MessageStatusMessageTest.java +++ b/core/java/test/net/i2p/data/i2cp/MessageStatusMessageTest.java @@ -1,4 +1,4 @@ -package net.i2p.data; +package net.i2p.data.i2cp; /* * free (adj.): unencumbered; not under the control of others * Written by jrandom in 2003 and released into the public domain @@ -8,7 +8,9 @@ package net.i2p.data; * */ -import net.i2p.data.i2cp.MessageStatusMessage; +import net.i2p.data.StructureTest; +import net.i2p.data.DataStructure; +import net.i2p.data.DataFormatException; /** * Test harness for loading / storing MessageStatusMessage objects diff --git a/core/java/test/net/i2p/data/ReceiveMessageBeginMessageTest.java b/core/java/test/net/i2p/data/i2cp/ReceiveMessageBeginMessageTest.java similarity index 85% rename from core/java/test/net/i2p/data/ReceiveMessageBeginMessageTest.java rename to core/java/test/net/i2p/data/i2cp/ReceiveMessageBeginMessageTest.java index b09eedc7d..16f201696 100644 --- a/core/java/test/net/i2p/data/ReceiveMessageBeginMessageTest.java +++ b/core/java/test/net/i2p/data/i2cp/ReceiveMessageBeginMessageTest.java @@ -1,4 +1,4 @@ -package net.i2p.data; +package net.i2p.data.i2cp; /* * free (adj.): unencumbered; not under the control of others * Written by jrandom in 2003 and released into the public domain @@ -8,7 +8,9 @@ package net.i2p.data; * */ -import net.i2p.data.i2cp.ReceiveMessageBeginMessage; +import net.i2p.data.StructureTest; +import net.i2p.data.DataStructure; +import net.i2p.data.DataFormatException; /** * Test harness for loading / storing Hash objects diff --git a/core/java/test/net/i2p/data/ReceiveMessageEndMessageTest.java b/core/java/test/net/i2p/data/i2cp/ReceiveMessageEndMessageTest.java similarity index 85% rename from core/java/test/net/i2p/data/ReceiveMessageEndMessageTest.java rename to core/java/test/net/i2p/data/i2cp/ReceiveMessageEndMessageTest.java index a399faefb..cfe738440 100644 --- a/core/java/test/net/i2p/data/ReceiveMessageEndMessageTest.java +++ b/core/java/test/net/i2p/data/i2cp/ReceiveMessageEndMessageTest.java @@ -1,4 +1,4 @@ -package net.i2p.data; +package net.i2p.data.i2cp; /* * free (adj.): unencumbered; not under the control of others * Written by jrandom in 2003 and released into the public domain @@ -8,7 +8,9 @@ package net.i2p.data; * */ -import net.i2p.data.i2cp.ReceiveMessageEndMessage; +import net.i2p.data.StructureTest; +import net.i2p.data.DataStructure; +import net.i2p.data.DataFormatException; /** * Test harness for loading / storing Hash objects diff --git a/core/java/test/net/i2p/data/ReportAbuseMessageTest.java b/core/java/test/net/i2p/data/i2cp/ReportAbuseMessageTest.java similarity index 82% rename from core/java/test/net/i2p/data/ReportAbuseMessageTest.java rename to core/java/test/net/i2p/data/i2cp/ReportAbuseMessageTest.java index 3edfbec05..e529d35f5 100644 --- a/core/java/test/net/i2p/data/ReportAbuseMessageTest.java +++ b/core/java/test/net/i2p/data/i2cp/ReportAbuseMessageTest.java @@ -1,4 +1,4 @@ -package net.i2p.data; +package net.i2p.data.i2cp; /* * free (adj.): unencumbered; not under the control of others * Written by jrandom in 2003 and released into the public domain @@ -8,11 +8,9 @@ package net.i2p.data; * */ -import net.i2p.data.i2cp.AbuseReason; -import net.i2p.data.i2cp.AbuseSeverity; -import net.i2p.data.i2cp.MessageId; -import net.i2p.data.i2cp.ReportAbuseMessage; -import net.i2p.data.i2cp.SessionId; +import net.i2p.data.StructureTest; +import net.i2p.data.DataStructure; +import net.i2p.data.DataFormatException; /** * Test harness for loading / storing Hash objects diff --git a/core/java/test/net/i2p/data/RequestLeaseSetMessageTest.java b/core/java/test/net/i2p/data/i2cp/RequestLeaseSetMessageTest.java similarity index 82% rename from core/java/test/net/i2p/data/RequestLeaseSetMessageTest.java rename to core/java/test/net/i2p/data/i2cp/RequestLeaseSetMessageTest.java index cd01d854c..0296c7219 100644 --- a/core/java/test/net/i2p/data/RequestLeaseSetMessageTest.java +++ b/core/java/test/net/i2p/data/i2cp/RequestLeaseSetMessageTest.java @@ -1,4 +1,4 @@ -package net.i2p.data; +package net.i2p.data.i2cp; /* * free (adj.): unencumbered; not under the control of others * Written by jrandom in 2003 and released into the public domain @@ -10,8 +10,12 @@ package net.i2p.data; import java.util.Date; -import net.i2p.data.i2cp.RequestLeaseSetMessage; -import net.i2p.data.i2cp.SessionId; +import net.i2p.data.StructureTest; +import net.i2p.data.DataStructure; +import net.i2p.data.DataFormatException; +import net.i2p.data.Hash; +import net.i2p.data.TunnelId; +import net.i2p.data.TunnelIdTest; /** * Test harness for loading / storing RequestLeaseSetMessage objects diff --git a/core/java/test/net/i2p/data/SendMessageMessageTest.java b/core/java/test/net/i2p/data/i2cp/SendMessageMessageTest.java similarity index 86% rename from core/java/test/net/i2p/data/SendMessageMessageTest.java rename to core/java/test/net/i2p/data/i2cp/SendMessageMessageTest.java index 4394e3ecb..dbb648235 100644 --- a/core/java/test/net/i2p/data/SendMessageMessageTest.java +++ b/core/java/test/net/i2p/data/i2cp/SendMessageMessageTest.java @@ -1,4 +1,4 @@ -package net.i2p.data; +package net.i2p.data.i2cp; /* * free (adj.): unencumbered; not under the control of others * Written by jrandom in 2003 and released into the public domain @@ -11,8 +11,13 @@ package net.i2p.data; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import net.i2p.data.i2cp.SendMessageMessage; -import net.i2p.data.i2cp.SessionId; +import net.i2p.data.StructureTest; +import net.i2p.data.DataStructure; +import net.i2p.data.DataFormatException; +import net.i2p.data.Destination; +import net.i2p.data.DestinationTest; +import net.i2p.data.Payload; +import net.i2p.data.PayloadTest; /** * Test harness for loading / storing SendMessageMessage objects @@ -54,4 +59,4 @@ import net.i2p.data.i2cp.SessionId; assertEquals(orig, ds); } -} \ No newline at end of file +} diff --git a/core/java/test/net/i2p/data/SessionConfigTest.java b/core/java/test/net/i2p/data/i2cp/SessionConfigTest.java similarity index 77% rename from core/java/test/net/i2p/data/SessionConfigTest.java rename to core/java/test/net/i2p/data/i2cp/SessionConfigTest.java index 8b1fc829c..b7bbbd23b 100644 --- a/core/java/test/net/i2p/data/SessionConfigTest.java +++ b/core/java/test/net/i2p/data/i2cp/SessionConfigTest.java @@ -1,4 +1,4 @@ -package net.i2p.data; +package net.i2p.data.i2cp; /* * free (adj.): unencumbered; not under the control of others * Written by jrandom in 2003 and released into the public domain @@ -10,7 +10,15 @@ package net.i2p.data; import java.util.Properties; -import net.i2p.data.i2cp.SessionConfig; +import net.i2p.data.StructureTest; +import net.i2p.data.DataStructure; +import net.i2p.data.DataFormatException; +import net.i2p.data.Destination; +import net.i2p.data.DestinationTest; +import net.i2p.data.Signature; +import net.i2p.data.SignatureTest; +import net.i2p.data.SigningPrivateKey; +import net.i2p.data.SigningPrivateKeyTest; /** * Test harness for loading / storing Hash objects diff --git a/core/java/test/net/i2p/data/SessionIdTest.java b/core/java/test/net/i2p/data/i2cp/SessionIdTest.java similarity index 83% rename from core/java/test/net/i2p/data/SessionIdTest.java rename to core/java/test/net/i2p/data/i2cp/SessionIdTest.java index de47ac10e..45f9e1bcb 100644 --- a/core/java/test/net/i2p/data/SessionIdTest.java +++ b/core/java/test/net/i2p/data/i2cp/SessionIdTest.java @@ -1,4 +1,4 @@ -package net.i2p.data; +package net.i2p.data.i2cp; /* * free (adj.): unencumbered; not under the control of others * Written by jrandom in 2003 and released into the public domain @@ -8,7 +8,9 @@ package net.i2p.data; * */ -import net.i2p.data.i2cp.SessionId; +import net.i2p.data.StructureTest; +import net.i2p.data.DataStructure; +import net.i2p.data.DataFormatException; /** * Test harness for loading / storing SessionId objects diff --git a/core/java/test/net/i2p/data/SessionStatusMessageTest.java b/core/java/test/net/i2p/data/i2cp/SessionStatusMessageTest.java similarity index 86% rename from core/java/test/net/i2p/data/SessionStatusMessageTest.java rename to core/java/test/net/i2p/data/i2cp/SessionStatusMessageTest.java index 402edf8fb..86db6fcf8 100644 --- a/core/java/test/net/i2p/data/SessionStatusMessageTest.java +++ b/core/java/test/net/i2p/data/i2cp/SessionStatusMessageTest.java @@ -1,4 +1,4 @@ -package net.i2p.data; +package net.i2p.data.i2cp; /* * free (adj.): unencumbered; not under the control of others * Written by jrandom in 2003 and released into the public domain @@ -8,8 +8,9 @@ package net.i2p.data; * */ -import net.i2p.data.i2cp.SessionId; -import net.i2p.data.i2cp.SessionStatusMessage; +import net.i2p.data.StructureTest; +import net.i2p.data.DataStructure; +import net.i2p.data.DataFormatException; /** * Test harness for loading / storing SessionStatusMessage objects