From 28cb5d4c83704b9f315d5d38f35b6a1e3df1767d Mon Sep 17 00:00:00 2001 From: carm Date: Thu, 17 Apr 2025 17:43:29 +0800 Subject: [PATCH] refactor(demo): Move all tests to demo. --- demo/pom.xml | 79 +++++++++++++++++-- .../tests/test/JSONConfigTests.java | 4 +- .../configuration/tests}/test/YamlTests.java | 2 +- .../tests/test/mongodb}/MongoConfig.java | 2 +- .../tests/test/mongodb}/MongoTest.java | 2 +- .../tests/test/sql}/SQLConfigTest.java | 2 +- .../src/test/resources/example.json | 0 .../src/test/resources/log4j2.xml | 2 +- providers/gson/pom.xml | 7 -- providers/hocon/pom.xml | 8 -- providers/mongodb/pom.xml | 36 --------- providers/sql/pom.xml | 52 ------------ providers/sql/src/test/resources/log4j2.xml | 19 ----- providers/yaml/pom.xml | 7 -- .../yaml/src/test/java/sample/SampleTest.java | 2 +- 15 files changed, 82 insertions(+), 142 deletions(-) rename providers/gson/src/test/java/config/JSONConfigTest.java => demo/src/test/java/cc/carm/lib/configuration/tests/test/JSONConfigTests.java (88%) rename {providers/yaml/src/test/java/yaml => demo/src/test/java/cc/carm/lib/configuration/tests}/test/YamlTests.java (97%) rename {providers/mongodb/src/test/java/config => demo/src/test/java/cc/carm/lib/configuration/tests/test/mongodb}/MongoConfig.java (90%) rename {providers/mongodb/src/test/java/config => demo/src/test/java/cc/carm/lib/configuration/tests/test/mongodb}/MongoTest.java (97%) rename {providers/sql/src/test/java/config => demo/src/test/java/cc/carm/lib/configuration/tests/test/sql}/SQLConfigTest.java (96%) rename {providers/gson => demo}/src/test/resources/example.json (100%) rename {providers/mongodb => demo}/src/test/resources/log4j2.xml (89%) delete mode 100644 providers/sql/src/test/resources/log4j2.xml diff --git a/demo/pom.xml b/demo/pom.xml index 6415e6c..36b319d 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -13,7 +13,10 @@ ${project.jdk.version} UTF-8 UTF-8 + true + 8.0.33 + 2.24.3 configured-demo jar @@ -24,42 +27,108 @@ ${project.parent.groupId} configured-core ${project.parent.version} - compile ${project.parent.groupId} configured-feature-commentable ${project.parent.version} - compile ${project.parent.groupId} configured-feature-versioned ${project.parent.version} - compile ${project.parent.groupId} configured-feature-validators ${project.parent.version} - compile ${project.parent.groupId} configured-feature-kotlin ${project.parent.version} - compile + + + ${project.parent.groupId} + configured-yaml + ${project.parent.version} + test + + + + ${project.parent.groupId} + configured-gson + ${project.parent.version} + test + + + + ${project.parent.groupId} + configured-sql + ${project.parent.version} + test + + + + cc.carm.lib + easysql-beecp + 0.4.7 + test + + + + mysql + mysql-connector-java + ${deps.mysql-driver.version} + test + + + + ${project.parent.groupId} + configured-mongodb + ${project.parent.version} + test + + + + ${project.parent.groupId} + configured-hocon + ${project.parent.version} + test + + org.jetbrains.kotlin kotlin-stdlib-jdk8 ${kotlin.version} + + org.apache.logging.log4j + log4j-api + ${log4j.version} + test + + + + org.apache.logging.log4j + log4j-core + ${log4j.version} + test + + + + org.apache.logging.log4j + log4j-slf4j-impl + ${log4j.version} + test + + diff --git a/providers/gson/src/test/java/config/JSONConfigTest.java b/demo/src/test/java/cc/carm/lib/configuration/tests/test/JSONConfigTests.java similarity index 88% rename from providers/gson/src/test/java/config/JSONConfigTest.java rename to demo/src/test/java/cc/carm/lib/configuration/tests/test/JSONConfigTests.java index c5cca74..4f9d77d 100644 --- a/providers/gson/src/test/java/config/JSONConfigTest.java +++ b/demo/src/test/java/cc/carm/lib/configuration/tests/test/JSONConfigTests.java @@ -1,4 +1,4 @@ -package config; +package cc.carm.lib.configuration.tests.test; import cc.carm.lib.configuration.demo.tests.ConfigurationTest; import cc.carm.lib.configuration.source.ConfigurationHolder; @@ -7,7 +7,7 @@ import org.junit.Test; import java.io.File; -public class JSONConfigTest { +public class JSONConfigTests { protected final ConfigurationHolder holder = JSONConfigFactory .from(new File("target"), "config.json") diff --git a/providers/yaml/src/test/java/yaml/test/YamlTests.java b/demo/src/test/java/cc/carm/lib/configuration/tests/test/YamlTests.java similarity index 97% rename from providers/yaml/src/test/java/yaml/test/YamlTests.java rename to demo/src/test/java/cc/carm/lib/configuration/tests/test/YamlTests.java index df6fe05..5c974b4 100644 --- a/providers/yaml/src/test/java/yaml/test/YamlTests.java +++ b/demo/src/test/java/cc/carm/lib/configuration/tests/test/YamlTests.java @@ -1,4 +1,4 @@ -package yaml.test; +package cc.carm.lib.configuration.tests.test; import cc.carm.lib.configuration.commentable.CommentableMeta; import cc.carm.lib.configuration.demo.tests.ConfigurationTest; diff --git a/providers/mongodb/src/test/java/config/MongoConfig.java b/demo/src/test/java/cc/carm/lib/configuration/tests/test/mongodb/MongoConfig.java similarity index 90% rename from providers/mongodb/src/test/java/config/MongoConfig.java rename to demo/src/test/java/cc/carm/lib/configuration/tests/test/mongodb/MongoConfig.java index b831c37..ec856c6 100644 --- a/providers/mongodb/src/test/java/config/MongoConfig.java +++ b/demo/src/test/java/cc/carm/lib/configuration/tests/test/mongodb/MongoConfig.java @@ -1,4 +1,4 @@ -package config; +package cc.carm.lib.configuration.tests.test.mongodb; import cc.carm.lib.configuration.Configuration; import cc.carm.lib.configuration.value.standard.ConfiguredValue; diff --git a/providers/mongodb/src/test/java/config/MongoTest.java b/demo/src/test/java/cc/carm/lib/configuration/tests/test/mongodb/MongoTest.java similarity index 97% rename from providers/mongodb/src/test/java/config/MongoTest.java rename to demo/src/test/java/cc/carm/lib/configuration/tests/test/mongodb/MongoTest.java index 7abdfd1..c179dd0 100644 --- a/providers/mongodb/src/test/java/config/MongoTest.java +++ b/demo/src/test/java/cc/carm/lib/configuration/tests/test/mongodb/MongoTest.java @@ -1,4 +1,4 @@ -package config; +package cc.carm.lib.configuration.tests.test.mongodb; import cc.carm.lib.configuration.demo.tests.ConfigurationTest; import cc.carm.lib.configuration.source.ConfigurationHolder; diff --git a/providers/sql/src/test/java/config/SQLConfigTest.java b/demo/src/test/java/cc/carm/lib/configuration/tests/test/sql/SQLConfigTest.java similarity index 96% rename from providers/sql/src/test/java/config/SQLConfigTest.java rename to demo/src/test/java/cc/carm/lib/configuration/tests/test/sql/SQLConfigTest.java index 24bf9cb..f8f36ff 100644 --- a/providers/sql/src/test/java/config/SQLConfigTest.java +++ b/demo/src/test/java/cc/carm/lib/configuration/tests/test/sql/SQLConfigTest.java @@ -1,4 +1,4 @@ -package config; +package cc.carm.lib.configuration.tests.test.sql; import cc.carm.lib.configuration.demo.DatabaseConfiguration; import cc.carm.lib.configuration.demo.tests.ConfigurationTest; diff --git a/providers/gson/src/test/resources/example.json b/demo/src/test/resources/example.json similarity index 100% rename from providers/gson/src/test/resources/example.json rename to demo/src/test/resources/example.json diff --git a/providers/mongodb/src/test/resources/log4j2.xml b/demo/src/test/resources/log4j2.xml similarity index 89% rename from providers/mongodb/src/test/resources/log4j2.xml rename to demo/src/test/resources/log4j2.xml index f06fcad..b624382 100644 --- a/providers/mongodb/src/test/resources/log4j2.xml +++ b/demo/src/test/resources/log4j2.xml @@ -1,5 +1,5 @@ - + diff --git a/providers/gson/pom.xml b/providers/gson/pom.xml index ade036f..188d3cc 100644 --- a/providers/gson/pom.xml +++ b/providers/gson/pom.xml @@ -41,13 +41,6 @@ compile - - ${project.parent.groupId} - configured-demo - ${project.parent.version} - test - - com.google.code.gson gson diff --git a/providers/hocon/pom.xml b/providers/hocon/pom.xml index c64d73e..e492a6f 100644 --- a/providers/hocon/pom.xml +++ b/providers/hocon/pom.xml @@ -43,14 +43,6 @@ ${project.parent.version} compile - - - ${project.parent.groupId} - configured-demo - ${project.parent.version} - test - - com.typesafe config diff --git a/providers/mongodb/pom.xml b/providers/mongodb/pom.xml index 2f14f20..8564633 100644 --- a/providers/mongodb/pom.xml +++ b/providers/mongodb/pom.xml @@ -16,7 +16,6 @@ UTF-8 5.3.1 - 2.24.3 configured-mongodb @@ -42,41 +41,6 @@ ${deps.mongodb.version} - - org.apache.logging.log4j - log4j-api - ${log4j.version} - test - - - - org.apache.logging.log4j - log4j-core - ${log4j.version} - test - - - - org.apache.logging.log4j - log4j-slf4j-impl - ${log4j.version} - test - - - - ${project.parent.groupId} - configured-demo - ${project.parent.version} - test - - - - ${project.parent.groupId} - configured-gson - ${project.parent.version} - test - - diff --git a/providers/sql/pom.xml b/providers/sql/pom.xml index bd30fd4..5bbc968 100644 --- a/providers/sql/pom.xml +++ b/providers/sql/pom.xml @@ -14,9 +14,6 @@ ${project.jdk.version} UTF-8 UTF-8 - - 8.0.33 - 2.24.3 configured-sql @@ -61,55 +58,6 @@ 0.4.7 - - cc.carm.lib - easysql-beecp - 0.4.7 - test - - - - ${project.parent.groupId} - configured-demo - ${project.parent.version} - test - - - - org.apache.logging.log4j - log4j-api - ${deps.log4j.version} - test - - - - org.apache.logging.log4j - log4j-core - ${deps.log4j.version} - test - - - - org.apache.logging.log4j - log4j-slf4j-impl - ${deps.log4j.version} - test - - - - ${project.parent.groupId} - configured-gson - ${project.parent.version} - test - - - - mysql - mysql-connector-java - ${deps.mysql-driver.version} - test - - diff --git a/providers/sql/src/test/resources/log4j2.xml b/providers/sql/src/test/resources/log4j2.xml deleted file mode 100644 index f06fcad..0000000 --- a/providers/sql/src/test/resources/log4j2.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/providers/yaml/pom.xml b/providers/yaml/pom.xml index af887c7..3f42f59 100644 --- a/providers/yaml/pom.xml +++ b/providers/yaml/pom.xml @@ -64,13 +64,6 @@ compile - - ${project.parent.groupId} - configured-demo - ${project.parent.version} - test - - diff --git a/providers/yaml/src/test/java/sample/SampleTest.java b/providers/yaml/src/test/java/sample/SampleTest.java index 259734a..3fa6014 100644 --- a/providers/yaml/src/test/java/sample/SampleTest.java +++ b/providers/yaml/src/test/java/sample/SampleTest.java @@ -4,7 +4,7 @@ import cc.carm.lib.configuration.source.ConfigurationHolder; import cc.carm.lib.configuration.source.yaml.YAMLConfigFactory; import org.junit.Test; -public class SampleTest { +public class SampleTest { @Test public void test() {