08 01 25

Навёл порядок в тестах.
Всё красиво и работает!

src/test/java/test/it/IT_RunAllCleanStartWsMain.java

@@ -1,6 +1,8 @@
 package test.it;
 
 import server.ws.WsServer;
+import test.it.runner.IT_CleanAllDate;
+import test.it.runner.IT_RunAllMain;
 
 public class IT_RunAllCleanStartWsMain {
 

src/test/java/test/it/blockchain/AddBlockSender.java

@@ -1,13 +1,13 @@
-package test.it.addBlockUtils;
+package test.it.blockchain;
 
 import blockchain.BchBlockEntry;
 import blockchain.BchCryptoVerifier;
 import blockchain.body.BodyRecord;
-import test.it.utils.JsonParsers;
+import test.it.utils.json.JsonParsers;
 import test.it.utils.TestConfig;
 import test.it.utils.TestIds;
-import test.it.utils.TestLog;
+import test.it.utils.log.TestLog;
-import test.it.utils.WsSession;
+import test.it.utils.ws.WsSession;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;

src/test/java/test/it/blockchain/ChainState.java

@@ -1,4 +1,4 @@
-package test.it.addBlockUtils;
+package test.it.blockchain;
 
 import java.util.Arrays;
 import java.util.HashMap;

src/test/java/test/it/blockchain/JsonMini.java

@@ -1,4 +1,4 @@
-package test.it.addBlockUtils;
+package test.it.blockchain;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;

src/test/java/test/it/cases/IT_01_AddUser.java

@@ -1,6 +1,10 @@
-package test.it;
+package test.it.cases;
 
-import test.it.utils.*;
+import test.it.utils.TestConfig;
+import test.it.utils.json.JsonBuilders;
+import test.it.utils.json.JsonParsers;
+import test.it.utils.log.TestResult;
+import test.it.utils.ws.WsSession;
 
 import java.time.Duration;
 

src/test/java/test/it/cases/IT_02_Sessions.java

@@ -1,6 +1,11 @@
-package test.it;
+package test.it.cases;
 
-import test.it.utils.*;
+import test.it.utils.TestConfig;
+import test.it.utils.json.JsonBuilders;
+import test.it.utils.json.JsonParsers;
+import test.it.utils.log.TestLog;
+import test.it.utils.log.TestResult;
+import test.it.utils.ws.WsSession;
 
 import java.time.Duration;
 import java.util.List;

src/test/java/test/it/cases/IT_03_AddBlock_NoAuth.java

@@ -1,16 +1,16 @@
-package test.it;
+package test.it.cases;
 
 import blockchain.body.ConnectionBody;
 import blockchain.body.HeaderBody;
 import blockchain.body.ReactionBody;
 import blockchain.body.TextBody;
 import blockchain.body.UserParamBody;
-import test.it.addBlockUtils.AddBlockSender;
+import test.it.blockchain.AddBlockSender;
-import test.it.addBlockUtils.ChainState;
+import test.it.blockchain.ChainState;
 import test.it.utils.TestConfig;
-import test.it.utils.TestLog;
+import test.it.utils.log.TestLog;
-import test.it.utils.TestResult;
+import test.it.utils.log.TestResult;
-import test.it.utils.WsSession;
+import test.it.utils.ws.WsSession;
 
 import java.time.Duration;
 

src/test/java/test/it/cases/IT_04_UserParams_NoAuth.java

@@ -1,8 +1,13 @@
-package test.it;
+package test.it.cases;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import test.it.utils.*;
+import test.it.utils.TestConfig;
+import test.it.utils.json.JsonParsers;
+import test.it.utils.log.TestLog;
+import test.it.utils.log.TestResult;
+import test.it.utils.ws.WsSession;
 import utils.config.ShineSignatureConstants;
 import utils.crypto.Ed25519Util;
 

src/test/java/test/it/runner/IT_CleanAllDate.java

@@ -1,7 +1,7 @@
-package test.it;
+package test.it.runner;
 
 import test.it.utils.TestConfig;
-import test.it.utils.TestLog;
+import test.it.utils.log.TestLog;
 
 import java.io.IOException;
 import java.nio.file.*;

src/test/java/test/it/runner/IT_RunAllMain.java

@@ -1,6 +1,10 @@
-package test.it;
+package test.it.runner;
 
-import test.it.utils.TestLog;
+import test.it.cases.IT_01_AddUser;
+import test.it.cases.IT_02_Sessions;
+import test.it.cases.IT_03_AddBlock_NoAuth;
+import test.it.cases.IT_04_UserParams_NoAuth;
+import test.it.utils.log.TestLog;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -31,7 +35,7 @@ public class IT_RunAllMain {
         TestLog.title("IT RUN RESULT (per test)");
         for (String s : summaries) System.out.println(s);
 
-        if (failed == 0) TestLog.ok("✅ ВСЕ IT ТЕСТЫ УСПЕШНО ЗАВЕРШЕНЫ");
+        if (failed == 0) TestLog.ok("\n  ВСЕ IT ТЕСТЫ УСПЕШНО ЗАВЕРШЕНЫ");
         else TestLog.boom("❌ IT ПРОГОН УПАЛ: failed=" + failed + " из " + summaries.size());
 
         return failed;

src/test/java/test/it/suite/IT_00_Suite.java

@@ -1,13 +1,16 @@
-package test.it;
+package test.it.suite;
 
 import org.junit.platform.suite.api.SelectClasses;
 import org.junit.platform.suite.api.Suite;
+import test.it.cases.IT_01_AddUser;
+import test.it.cases.IT_02_Sessions;
+import test.it.cases.IT_03_AddBlock_NoAuth;
 
 /**
  * Сьют, который запускает IT тесты строго в заданном порядке.
  *
  * Запуск:
- *   ./gradlew test --tests test.it.IT_00_Suite
+ *   ./gradlew test --tests test.it.suite.IT_00_Suite
  */
 @Suite
 @SelectClasses({

src/test/java/test/it/utils/json/JsonBuilders.java

@@ -1,5 +1,7 @@
-package test.it.utils;
+package test.it.utils.json;
 
+import test.it.utils.TestIds;
+import test.it.utils.TestConfig;
 import utils.crypto.Ed25519Util;
 
 import java.nio.charset.StandardCharsets;

src/test/java/test/it/utils/json/JsonParsers.java

@@ -1,4 +1,4 @@
-package test.it.utils;
+package test.it.utils.json;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;

src/test/java/test/it/utils/log/TestLog.java

@@ -1,4 +1,6 @@
-package test.it.utils;
+package test.it.utils.log;
+
+import test.it.utils.TestConfig;
 
 /**
  * TestLog — единое место для:

src/test/java/test/it/utils/log/TestResult.java

@@ -1,4 +1,4 @@
-package test.it.utils;
+package test.it.utils.log;
 
 import java.util.ArrayList;
 import java.util.List;

src/test/java/test/it/utils/ws/WsSession.java

@@ -1,7 +1,9 @@
-package test.it.utils;
+package test.it.utils.ws;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import test.it.utils.TestConfig;
+import test.it.utils.log.TestLog;
 
 import java.time.Duration;
 

src/test/java/test/it/utils/ws/WsTestClient.java

@@ -1,4 +1,4 @@
-package test.it.utils;
+package test.it.utils.ws;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;