From 4753b8383137651f537d45a12f6346f7facc9715bb869cc371edc086fb695b00 Mon Sep 17 00:00:00 2001 From: AidarKC Date: Thu, 8 Jan 2026 14:21:55 +0300 Subject: [PATCH] =?UTF-8?q?08=2001=2025=20=D0=9D=D0=B0=D0=B2=D1=91=D0=BB?= =?UTF-8?q?=20=D0=BF=D0=BE=D1=80=D1=8F=D0=B4=D0=BE=D0=BA=20=D0=B2=20=D1=82?= =?UTF-8?q?=D0=B5=D1=81=D1=82=D0=B0=D1=85.=20=D0=92=D1=81=D1=91=20=D0=BA?= =?UTF-8?q?=D1=80=D0=B0=D1=81=D0=B8=D0=B2=D0=BE=20=D0=B8=20=D1=80=D0=B0?= =?UTF-8?q?=D0=B1=D0=BE=D1=82=D0=B0=D0=B5=D1=82!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/test/java/test/it/IT_RunAllCleanStartWsMain.java | 2 ++ .../AddBlockSender.java | 8 ++++---- .../it/{addBlockUtils => blockchain}/ChainState.java | 2 +- .../it/{addBlockUtils => blockchain}/JsonMini.java | 2 +- src/test/java/test/it/{ => cases}/IT_01_AddUser.java | 8 ++++++-- .../java/test/it/{ => cases}/IT_02_Sessions.java | 9 +++++++-- .../test/it/{ => cases}/IT_03_AddBlock_NoAuth.java | 12 ++++++------ .../test/it/{ => cases}/IT_04_UserParams_NoAuth.java | 7 ++++++- .../java/test/it/{ => runner}/IT_CleanAllDate.java | 4 ++-- .../java/test/it/{ => runner}/IT_RunAllMain.java | 10 +++++++--- src/test/java/test/it/{ => suite}/IT_00_Suite.java | 7 +++++-- .../java/test/it/utils/{ => json}/JsonBuilders.java | 4 +++- .../java/test/it/utils/{ => json}/JsonParsers.java | 2 +- src/test/java/test/it/utils/{ => log}/TestLog.java | 4 +++- .../java/test/it/utils/{ => log}/TestResult.java | 2 +- src/test/java/test/it/utils/{ => ws}/WsSession.java | 4 +++- .../java/test/it/utils/{ => ws}/WsTestClient.java | 2 +- 17 files changed, 59 insertions(+), 30 deletions(-) rename src/test/java/test/it/{addBlockUtils => blockchain}/AddBlockSender.java (97%) rename src/test/java/test/it/{addBlockUtils => blockchain}/ChainState.java (99%) rename src/test/java/test/it/{addBlockUtils => blockchain}/JsonMini.java (96%) rename src/test/java/test/it/{ => cases}/IT_01_AddUser.java (90%) rename src/test/java/test/it/{ => cases}/IT_02_Sessions.java (97%) rename src/test/java/test/it/{ => cases}/IT_03_AddBlock_NoAuth.java (95%) rename src/test/java/test/it/{ => cases}/IT_04_UserParams_NoAuth.java (98%) rename src/test/java/test/it/{ => runner}/IT_CleanAllDate.java (96%) rename src/test/java/test/it/{ => runner}/IT_RunAllMain.java (81%) rename src/test/java/test/it/{ => suite}/IT_00_Suite.java (67%) rename src/test/java/test/it/utils/{ => json}/JsonBuilders.java (98%) rename src/test/java/test/it/utils/{ => json}/JsonParsers.java (99%) rename src/test/java/test/it/utils/{ => log}/TestLog.java (98%) rename src/test/java/test/it/utils/{ => log}/TestResult.java (98%) rename src/test/java/test/it/utils/{ => ws}/WsSession.java (94%) rename src/test/java/test/it/utils/{ => ws}/WsTestClient.java (99%) diff --git a/src/test/java/test/it/IT_RunAllCleanStartWsMain.java b/src/test/java/test/it/IT_RunAllCleanStartWsMain.java index 27c163d..8c7ab5e 100644 --- a/src/test/java/test/it/IT_RunAllCleanStartWsMain.java +++ b/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 { diff --git a/src/test/java/test/it/addBlockUtils/AddBlockSender.java b/src/test/java/test/it/blockchain/AddBlockSender.java similarity index 97% rename from src/test/java/test/it/addBlockUtils/AddBlockSender.java rename to src/test/java/test/it/blockchain/AddBlockSender.java index 092a92b..919a048 100644 --- a/src/test/java/test/it/addBlockUtils/AddBlockSender.java +++ b/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.WsSession; +import test.it.utils.log.TestLog; +import test.it.utils.ws.WsSession; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/src/test/java/test/it/addBlockUtils/ChainState.java b/src/test/java/test/it/blockchain/ChainState.java similarity index 99% rename from src/test/java/test/it/addBlockUtils/ChainState.java rename to src/test/java/test/it/blockchain/ChainState.java index 026f896..c7c5bce 100644 --- a/src/test/java/test/it/addBlockUtils/ChainState.java +++ b/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; diff --git a/src/test/java/test/it/addBlockUtils/JsonMini.java b/src/test/java/test/it/blockchain/JsonMini.java similarity index 96% rename from src/test/java/test/it/addBlockUtils/JsonMini.java rename to src/test/java/test/it/blockchain/JsonMini.java index 309bbfb..ae50ad8 100644 --- a/src/test/java/test/it/addBlockUtils/JsonMini.java +++ b/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; diff --git a/src/test/java/test/it/IT_01_AddUser.java b/src/test/java/test/it/cases/IT_01_AddUser.java similarity index 90% rename from src/test/java/test/it/IT_01_AddUser.java rename to src/test/java/test/it/cases/IT_01_AddUser.java index 47d27ae..5ec3f04 100644 --- a/src/test/java/test/it/IT_01_AddUser.java +++ b/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; diff --git a/src/test/java/test/it/IT_02_Sessions.java b/src/test/java/test/it/cases/IT_02_Sessions.java similarity index 97% rename from src/test/java/test/it/IT_02_Sessions.java rename to src/test/java/test/it/cases/IT_02_Sessions.java index b431765..9db4bd4 100644 --- a/src/test/java/test/it/IT_02_Sessions.java +++ b/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; diff --git a/src/test/java/test/it/IT_03_AddBlock_NoAuth.java b/src/test/java/test/it/cases/IT_03_AddBlock_NoAuth.java similarity index 95% rename from src/test/java/test/it/IT_03_AddBlock_NoAuth.java rename to src/test/java/test/it/cases/IT_03_AddBlock_NoAuth.java index 1aed448..70355ad 100644 --- a/src/test/java/test/it/IT_03_AddBlock_NoAuth.java +++ b/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.addBlockUtils.ChainState; +import test.it.blockchain.AddBlockSender; +import test.it.blockchain.ChainState; import test.it.utils.TestConfig; -import test.it.utils.TestLog; -import test.it.utils.TestResult; -import test.it.utils.WsSession; +import test.it.utils.log.TestLog; +import test.it.utils.log.TestResult; +import test.it.utils.ws.WsSession; import java.time.Duration; diff --git a/src/test/java/test/it/IT_04_UserParams_NoAuth.java b/src/test/java/test/it/cases/IT_04_UserParams_NoAuth.java similarity index 98% rename from src/test/java/test/it/IT_04_UserParams_NoAuth.java rename to src/test/java/test/it/cases/IT_04_UserParams_NoAuth.java index e0c113c..68fc1cb 100644 --- a/src/test/java/test/it/IT_04_UserParams_NoAuth.java +++ b/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; diff --git a/src/test/java/test/it/IT_CleanAllDate.java b/src/test/java/test/it/runner/IT_CleanAllDate.java similarity index 96% rename from src/test/java/test/it/IT_CleanAllDate.java rename to src/test/java/test/it/runner/IT_CleanAllDate.java index fd8c7e0..eb3764a 100644 --- a/src/test/java/test/it/IT_CleanAllDate.java +++ b/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.*; diff --git a/src/test/java/test/it/IT_RunAllMain.java b/src/test/java/test/it/runner/IT_RunAllMain.java similarity index 81% rename from src/test/java/test/it/IT_RunAllMain.java rename to src/test/java/test/it/runner/IT_RunAllMain.java index e4df4c2..07fccdc 100644 --- a/src/test/java/test/it/IT_RunAllMain.java +++ b/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; diff --git a/src/test/java/test/it/IT_00_Suite.java b/src/test/java/test/it/suite/IT_00_Suite.java similarity index 67% rename from src/test/java/test/it/IT_00_Suite.java rename to src/test/java/test/it/suite/IT_00_Suite.java index 5931b76..bd7a47f 100644 --- a/src/test/java/test/it/IT_00_Suite.java +++ b/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({ diff --git a/src/test/java/test/it/utils/JsonBuilders.java b/src/test/java/test/it/utils/json/JsonBuilders.java similarity index 98% rename from src/test/java/test/it/utils/JsonBuilders.java rename to src/test/java/test/it/utils/json/JsonBuilders.java index bd3e1e7..5929fc7 100644 --- a/src/test/java/test/it/utils/JsonBuilders.java +++ b/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; diff --git a/src/test/java/test/it/utils/JsonParsers.java b/src/test/java/test/it/utils/json/JsonParsers.java similarity index 99% rename from src/test/java/test/it/utils/JsonParsers.java rename to src/test/java/test/it/utils/json/JsonParsers.java index 2d76b2b..bb05819 100644 --- a/src/test/java/test/it/utils/JsonParsers.java +++ b/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; diff --git a/src/test/java/test/it/utils/TestLog.java b/src/test/java/test/it/utils/log/TestLog.java similarity index 98% rename from src/test/java/test/it/utils/TestLog.java rename to src/test/java/test/it/utils/log/TestLog.java index 365ae83..629635d 100644 --- a/src/test/java/test/it/utils/TestLog.java +++ b/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 — единое место для: diff --git a/src/test/java/test/it/utils/TestResult.java b/src/test/java/test/it/utils/log/TestResult.java similarity index 98% rename from src/test/java/test/it/utils/TestResult.java rename to src/test/java/test/it/utils/log/TestResult.java index e82a1ce..cc0cf7b 100644 --- a/src/test/java/test/it/utils/TestResult.java +++ b/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; diff --git a/src/test/java/test/it/utils/WsSession.java b/src/test/java/test/it/utils/ws/WsSession.java similarity index 94% rename from src/test/java/test/it/utils/WsSession.java rename to src/test/java/test/it/utils/ws/WsSession.java index 23b49bc..13d8a45 100644 --- a/src/test/java/test/it/utils/WsSession.java +++ b/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; diff --git a/src/test/java/test/it/utils/WsTestClient.java b/src/test/java/test/it/utils/ws/WsTestClient.java similarity index 99% rename from src/test/java/test/it/utils/WsTestClient.java rename to src/test/java/test/it/utils/ws/WsTestClient.java index 224e01e..9623fa8 100644 --- a/src/test/java/test/it/utils/WsTestClient.java +++ b/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;