move test support classes to src folder and make it part of the lib

thsc42 · thsc42 · commit a7e831db0660 · 2022-04-18T11:24:27.000+02:00
diff --git a/src/main/java/net/sharksystem/asap/apps/testsupport/ASAPTestPeerFS.java b/src/main/java/net/sharksystem/asap/apps/testsupport/ASAPTestPeerFS.java
@@ -1,4 +1,4 @@
-package net.sharksystem.testsupport;
+package net.sharksystem.asap.apps.testsupport;
 
 import net.sharksystem.asap.ASAPPeerFS;
 import net.sharksystem.asap.ASAPException;
diff --git a/src/main/java/net/sharksystem/asap/apps/testsupport/SocketFactory.java b/src/main/java/net/sharksystem/asap/apps/testsupport/SocketFactory.java
@@ -1,4 +1,4 @@
-package net.sharksystem;
+package net.sharksystem.asap.apps.testsupport;
 
 import net.sharksystem.asap.ASAPEncounterHelper;
 
diff --git a/src/main/java/net/sharksystem/asap/apps/testsupport/TestASAPConnectionHandler.java b/src/main/java/net/sharksystem/asap/apps/testsupport/TestASAPConnectionHandler.java
@@ -1,4 +1,4 @@
-package net.sharksystem.asap.encounter;
+package net.sharksystem.asap.apps.testsupport;
 
 import net.sharksystem.asap.ASAPConnectionHandler;
 import net.sharksystem.asap.ASAPException;
diff --git a/src/main/java/net/sharksystem/asap/apps/testsupport/TestConstants.java b/src/main/java/net/sharksystem/asap/apps/testsupport/TestConstants.java
@@ -1,4 +1,4 @@
-package net.sharksystem;
+package net.sharksystem.asap.apps.testsupport;
 
 public interface TestConstants {
     String ROOT_DIRECTORY = "testResultsRootFolder/";
diff --git a/src/main/java/net/sharksystem/asap/apps/testsupport/TestHelper.java b/src/main/java/net/sharksystem/asap/apps/testsupport/TestHelper.java
@@ -1,4 +1,4 @@
-package net.sharksystem;
+package net.sharksystem.asap.apps.testsupport;
 
 import net.sharksystem.asap.engine.ASAPEngineFS;
 import net.sharksystem.utils.Utils;
diff --git a/src/main/java/net/sharksystem/asap/engine/ASAPEngine.java b/src/main/java/net/sharksystem/asap/engine/ASAPEngine.java
@@ -5,8 +5,8 @@
 import net.sharksystem.asap.*;
 import net.sharksystem.asap.ASAPChunkStorage;
 import net.sharksystem.asap.ASAPMessages;
-import net.sharksystem.asap.management.ASAPManagementStorage;
-import net.sharksystem.asap.management.ASAPManagementStorageImpl;
+import net.sharksystem.asap.listenermanager.management.ASAPManagementStorage;
+import net.sharksystem.asap.listenermanager.management.ASAPManagementStorageImpl;
 import net.sharksystem.asap.protocol.*;
 import net.sharksystem.asap.utils.PeerIDHelper;
 import net.sharksystem.utils.Log;
diff --git a/src/main/java/net/sharksystem/asap/engine/ASAPInternalPeerFS.java b/src/main/java/net/sharksystem/asap/engine/ASAPInternalPeerFS.java
@@ -9,7 +9,7 @@
 import net.sharksystem.asap.ASAP;
 import net.sharksystem.asap.ASAPException;
 import net.sharksystem.asap.ASAPSecurityException;
-import net.sharksystem.asap.management.ASAPManagementMessageHandler;
+import net.sharksystem.asap.listenermanager.management.ASAPManagementMessageHandler;
 import net.sharksystem.asap.protocol.*;
 import net.sharksystem.asap.utils.Helper;
 import net.sharksystem.utils.Log;
diff --git a/src/main/java/net/sharksystem/asap/engine/ASAPInternalStorage.java b/src/main/java/net/sharksystem/asap/engine/ASAPInternalStorage.java
@@ -1,7 +1,7 @@
 package net.sharksystem.asap.engine;
 
 import net.sharksystem.asap.*;
-import net.sharksystem.asap.management.ASAPManagementStorage;
+import net.sharksystem.asap.listenermanager.management.ASAPManagementStorage;
 
 import java.io.IOException;
 import java.util.Collection;
diff --git a/src/main/java/net/sharksystem/asap/listenermanager/management/ASAPManagementCreateASAPStorageMessage.java b/src/main/java/net/sharksystem/asap/listenermanager/management/ASAPManagementCreateASAPStorageMessage.java
@@ -1,4 +1,4 @@
-package net.sharksystem.asap.management;
+package net.sharksystem.asap.listenermanager.management;
 
 import java.util.Set;
 
diff --git a/src/main/java/net/sharksystem/asap/listenermanager/management/ASAPManagementMessage.java b/src/main/java/net/sharksystem/asap/listenermanager/management/ASAPManagementMessage.java
@@ -1,4 +1,4 @@
-package net.sharksystem.asap.management;
+package net.sharksystem.asap.listenermanager.management;
 
 import net.sharksystem.asap.ASAPException;
 import net.sharksystem.asap.protocol.ASAP_1_0;
diff --git a/src/main/java/net/sharksystem/asap/listenermanager/management/ASAPManagementMessageHandler.java b/src/main/java/net/sharksystem/asap/listenermanager/management/ASAPManagementMessageHandler.java
@@ -1,4 +1,4 @@
-package net.sharksystem.asap.management;
+package net.sharksystem.asap.listenermanager.management;
 
 import net.sharksystem.asap.ASAPHop;
 import net.sharksystem.asap.ASAPMessages;
diff --git a/src/main/java/net/sharksystem/asap/listenermanager/management/ASAPManagementStorage.java b/src/main/java/net/sharksystem/asap/listenermanager/management/ASAPManagementStorage.java
@@ -1,4 +1,4 @@
-package net.sharksystem.asap.management;
+package net.sharksystem.asap.listenermanager.management;
 
 import net.sharksystem.asap.ASAPException;
 
diff --git a/src/main/java/net/sharksystem/asap/listenermanager/management/ASAPManagementStorageImpl.java b/src/main/java/net/sharksystem/asap/listenermanager/management/ASAPManagementStorageImpl.java
@@ -1,4 +1,4 @@
-package net.sharksystem.asap.management;
+package net.sharksystem.asap.listenermanager.management;
 
 import net.sharksystem.asap.engine.ASAPEngine;
 import net.sharksystem.asap.ASAPException;
diff --git a/src/test/java/junit5Tests/release_1/MultipleEncounterTests.java b/src/test/java/junit5Tests/release_1/MultipleEncounterTests.java
@@ -1,10 +1,10 @@
 package junit5Tests.release_1;
 
-import net.sharksystem.TestConstants;
-import net.sharksystem.TestHelper;
+import net.sharksystem.asap.apps.testsupport.TestConstants;
+import net.sharksystem.asap.apps.testsupport.TestHelper;
 import net.sharksystem.asap.ASAPException;
 import net.sharksystem.asap.ASAPPeer;
-import net.sharksystem.testsupport.ASAPTestPeerFS;
+import net.sharksystem.asap.apps.testsupport.ASAPTestPeerFS;
 import net.sharksystem.asap.engine.ASAPEngineFS;
 import net.sharksystem.asap.mockAndTemplates.ASAPMessageReceivedListenerExample;
 import net.sharksystem.asap.mockAndTemplates.TestUtils;
diff --git a/src/test/java/net/sharksystem/asap/appTests/Reenactment.java b/src/test/java/net/sharksystem/asap/appTests/Reenactment.java
@@ -1,6 +1,6 @@
 package net.sharksystem.asap.appTests;
 
-import net.sharksystem.testsupport.ASAPTestPeerFS;
+import net.sharksystem.asap.apps.testsupport.ASAPTestPeerFS;
 import net.sharksystem.asap.ASAPException;
 import org.junit.Test;
 
diff --git a/src/test/java/net/sharksystem/asap/crypto/CryptoUsage.java b/src/test/java/net/sharksystem/asap/crypto/CryptoUsage.java
@@ -8,8 +8,8 @@
 
 import java.io.IOException;
 
-import static net.sharksystem.TestConstants.ALICE_ID;
-import static net.sharksystem.TestConstants.BOB_ID;
+import static net.sharksystem.asap.apps.testsupport.TestConstants.ALICE_ID;
+import static net.sharksystem.asap.apps.testsupport.TestConstants.BOB_ID;
 
 public class CryptoUsage {
     private InMemoASAPKeyStore aliceKeyStorage;
diff --git a/src/test/java/net/sharksystem/asap/encounter/EncounterManagerTests.java b/src/test/java/net/sharksystem/asap/encounter/EncounterManagerTests.java
@@ -1,8 +1,9 @@
 package net.sharksystem.asap.encounter;
 
-import net.sharksystem.SocketFactory;
-import net.sharksystem.TestHelper;
+import net.sharksystem.asap.apps.testsupport.SocketFactory;
+import net.sharksystem.asap.apps.testsupport.TestHelper;
 import net.sharksystem.asap.*;
+import net.sharksystem.asap.apps.testsupport.TestASAPConnectionHandler;
 import net.sharksystem.streams.StreamPair;
 import net.sharksystem.streams.StreamPairImpl;
 import org.junit.Test;
diff --git a/src/test/java/net/sharksystem/asap/engine/CryptoTests.java b/src/test/java/net/sharksystem/asap/engine/CryptoTests.java
@@ -1,11 +1,7 @@
 package net.sharksystem.asap.engine;
 
-import net.sharksystem.TestConstants;
+import net.sharksystem.asap.apps.testsupport.TestConstants;
 import net.sharksystem.asap.ASAPException;
-import net.sharksystem.asap.engine.ASAPEngine;
-import net.sharksystem.asap.engine.ASAPEngineFS;
-import net.sharksystem.asap.engine.ASAPInternalPeer;
-import net.sharksystem.asap.engine.ASAPInternalPeerFS;
 import net.sharksystem.asap.utils.ASAPPeerHandleConnectionThread;
 import net.sharksystem.asap.cmdline.ExampleASAPChunkReceivedListener;
 import net.sharksystem.asap.cmdline.TCPStream;
diff --git a/src/test/java/net/sharksystem/asap/engine/LongerMessages.java b/src/test/java/net/sharksystem/asap/engine/LongerMessages.java
@@ -1,9 +1,8 @@
 package net.sharksystem.asap.engine;
 
-import net.sharksystem.TestConstants;
+import net.sharksystem.asap.apps.testsupport.TestConstants;
 import net.sharksystem.asap.ASAPException;
 import net.sharksystem.asap.ASAPChunkStorage;
-import net.sharksystem.asap.engine.*;
 import net.sharksystem.asap.utils.ASAPChunkReceivedTester;
 import net.sharksystem.asap.utils.ASAPPeerHandleConnectionThread;
 import net.sharksystem.asap.cmdline.TCPStream;
diff --git a/src/test/java/net/sharksystem/asap/engine/MultihopTests.java b/src/test/java/net/sharksystem/asap/engine/MultihopTests.java
@@ -1,13 +1,13 @@
 package net.sharksystem.asap.engine;
 
 import net.sharksystem.CountsReceivedMessagesListener;
-import net.sharksystem.TestConstants;
-import net.sharksystem.TestHelper;
+import net.sharksystem.asap.apps.testsupport.TestConstants;
+import net.sharksystem.asap.apps.testsupport.TestHelper;
 import net.sharksystem.asap.ASAPChannel;
 import net.sharksystem.asap.ASAPException;
 import net.sharksystem.asap.ASAPChunkStorage;
 import net.sharksystem.asap.ASAPStorage;
-import net.sharksystem.testsupport.ASAPTestPeerFS;
+import net.sharksystem.asap.apps.testsupport.ASAPTestPeerFS;
 import net.sharksystem.asap.cmdline.CmdLineUI;
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/net/sharksystem/asap/engine/Point2PointTests.java b/src/test/java/net/sharksystem/asap/engine/Point2PointTests.java
@@ -4,7 +4,7 @@
 import java.util.Iterator;
 import java.util.List;
 
-import net.sharksystem.TestConstants;
+import net.sharksystem.asap.apps.testsupport.TestConstants;
 import net.sharksystem.asap.ASAP;
 import net.sharksystem.asap.ASAPException;
 import net.sharksystem.asap.ASAPChunkStorage;
@@ -14,7 +14,7 @@
 import org.junit.Test;
 import org.junit.Assert;
 
-import static net.sharksystem.TestConstants.*;
+import static net.sharksystem.asap.apps.testsupport.TestConstants.*;
 import static net.sharksystem.asap.engine.ASAPInternalPeer.DEFAULT_MAX_PROCESSING_TIME;
 
 /**
diff --git a/src/test/java/net/sharksystem/asap/mockAndTemplates/DiscoverPeerAndStartEGChat.java b/src/test/java/net/sharksystem/asap/mockAndTemplates/DiscoverPeerAndStartEGChat.java
@@ -1,7 +1,7 @@
 package net.sharksystem.asap.mockAndTemplates;
 
 import net.sharksystem.asap.*;
-import net.sharksystem.testsupport.ASAPTestPeerFS;
+import net.sharksystem.asap.apps.testsupport.ASAPTestPeerFS;
 import org.junit.Test;
 
 import java.io.*;
diff --git a/src/test/java/net/sharksystem/asap/mockAndTemplates/UseThisAsTemplate4YourAppTests.java b/src/test/java/net/sharksystem/asap/mockAndTemplates/UseThisAsTemplate4YourAppTests.java
@@ -2,7 +2,7 @@
 
 import net.sharksystem.asap.ASAPException;
 import net.sharksystem.asap.ASAPPeer;
-import net.sharksystem.testsupport.ASAPTestPeerFS;
+import net.sharksystem.asap.apps.testsupport.ASAPTestPeerFS;
 import org.junit.Test;
 
 import java.io.*;
diff --git a/src/test/java/net/sharksystem/asap/peer/Point2Point2Test2.java b/src/test/java/net/sharksystem/asap/peer/Point2Point2Test2.java
@@ -1,10 +1,9 @@
 package net.sharksystem.asap.peer;
 
-import net.sharksystem.TestConstants;
-import net.sharksystem.TestHelper;
-import net.sharksystem.asap.ASAP;
+import net.sharksystem.asap.apps.testsupport.TestConstants;
+import net.sharksystem.asap.apps.testsupport.TestHelper;
 import net.sharksystem.asap.ASAPException;
-import net.sharksystem.testsupport.ASAPTestPeerFS;
+import net.sharksystem.asap.apps.testsupport.ASAPTestPeerFS;
 import net.sharksystem.testsupport.StoreReceivedMessages;
 import net.sharksystem.utils.Utils;
 import org.junit.Assert;
diff --git a/src/test/java/net/sharksystem/asap/peer/TransientMessages.java b/src/test/java/net/sharksystem/asap/peer/TransientMessages.java
@@ -1,19 +1,17 @@
 package net.sharksystem.asap.peer;
 
-import net.sharksystem.CountsReceivedMessagesListener;
-import net.sharksystem.TestConstants;
-import net.sharksystem.TestHelper;
+import net.sharksystem.asap.apps.testsupport.TestConstants;
+import net.sharksystem.asap.apps.testsupport.TestHelper;
 import net.sharksystem.asap.ASAP;
 import net.sharksystem.asap.ASAPException;
 import net.sharksystem.asap.engine.ASAPInternalChunk;
-import net.sharksystem.testsupport.ASAPTestPeerFS;
+import net.sharksystem.asap.apps.testsupport.ASAPTestPeerFS;
 import net.sharksystem.testsupport.StoreReceivedMessages;
 import net.sharksystem.utils.Utils;
 import org.junit.Assert;
 import org.junit.Test;
 
 import java.io.IOException;
-import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collection;
 
diff --git a/src/test/java/net/sharksystem/asap/storage/StorageTests.java b/src/test/java/net/sharksystem/asap/storage/StorageTests.java
@@ -1,6 +1,6 @@
 package net.sharksystem.asap.storage;
 
-import net.sharksystem.TestConstants;
+import net.sharksystem.asap.apps.testsupport.TestConstants;
 import net.sharksystem.asap.*;
 import net.sharksystem.asap.engine.ASAPEngine;
 import net.sharksystem.asap.engine.ASAPEngineFS;
diff --git a/src/test/java/net/sharksystem/streams/E2EStreamPairLinkTestVersion2.java b/src/test/java/net/sharksystem/streams/E2EStreamPairLinkTestVersion2.java
@@ -1,6 +1,6 @@
 package net.sharksystem.streams;
 
-import net.sharksystem.SocketFactory;
+import net.sharksystem.asap.apps.testsupport.SocketFactory;
 import org.junit.Assert;
 import org.junit.Test;
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package net.sharksystem.testsupport;`
	`1`	`+package net.sharksystem.asap.apps.testsupport;`
`2`	`2`
`3`	`3`	`import net.sharksystem.asap.ASAPPeerFS;`
`4`	`4`	`import net.sharksystem.asap.ASAPException;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package net.sharksystem;`
	`1`	`+package net.sharksystem.asap.apps.testsupport;`
`2`	`2`
`3`	`3`	`import net.sharksystem.asap.ASAPEncounterHelper;`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package net.sharksystem.asap.encounter;`
	`1`	`+package net.sharksystem.asap.apps.testsupport;`
`2`	`2`
`3`	`3`	`import net.sharksystem.asap.ASAPConnectionHandler;`
`4`	`4`	`import net.sharksystem.asap.ASAPException;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package net.sharksystem.asap.management;`
	`1`	`+package net.sharksystem.asap.listenermanager.management;`
`2`	`2`
`3`	`3`	`import java.util.Set;`
`4`	`4`