refactoring package location

WebFuzzing · Dec 16, 2024 · effb4c0 · effb4c0
1 parent 949f268
commit effb4c0
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 7 deletions.
diff --git a/...ster/client/java/sql/DbCleanerH2Test.java → ...ent/java/sql/cleaner/DbCleanerH2Test.java b/...ster/client/java/sql/DbCleanerH2Test.java → ...ent/java/sql/cleaner/DbCleanerH2Test.java
@@ -1,6 +1,8 @@
-package org.evomaster.client.java.sql;
+package org.evomaster.client.java.sql.cleaner;
 
 import org.evomaster.client.java.controller.api.dto.database.schema.DatabaseType;
+import org.evomaster.client.java.sql.DbCleaner;
+import org.evomaster.client.java.sql.SqlScriptRunner;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;

diff --git a/...client/java/sql/DbCleanerMariaDBTest.java → ...ava/sql/cleaner/DbCleanerMariaDBTest.java b/...client/java/sql/DbCleanerMariaDBTest.java → ...ava/sql/cleaner/DbCleanerMariaDBTest.java
@@ -1,6 +1,7 @@
-package org.evomaster.client.java.sql;
+package org.evomaster.client.java.sql.cleaner;
 
 import org.evomaster.client.java.controller.api.dto.database.schema.DatabaseType;
+import org.evomaster.client.java.sql.DbCleaner;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;

diff --git a/...r/client/java/sql/DbCleanerMySQLTest.java → .../java/sql/cleaner/DbCleanerMySQLTest.java b/...r/client/java/sql/DbCleanerMySQLTest.java → .../java/sql/cleaner/DbCleanerMySQLTest.java
@@ -1,7 +1,8 @@
-package org.evomaster.client.java.sql;
+package org.evomaster.client.java.sql.cleaner;
 
 
 import org.evomaster.client.java.controller.api.dto.database.schema.DatabaseType;
+import org.evomaster.client.java.sql.DbCleaner;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;

diff --git a/...lient/java/sql/DbCleanerPostgresTest.java → ...va/sql/cleaner/DbCleanerPostgresTest.java b/...lient/java/sql/DbCleanerPostgresTest.java → ...va/sql/cleaner/DbCleanerPostgresTest.java
@@ -1,6 +1,8 @@
-package org.evomaster.client.java.sql;
+package org.evomaster.client.java.sql.cleaner;
 
 import org.evomaster.client.java.controller.api.dto.database.schema.DatabaseType;
+import org.evomaster.client.java.sql.DbCleaner;
+import org.evomaster.client.java.sql.SqlScriptRunner;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;

diff --git a/...ient/java/sql/DbCleanerSQLServerTest.java → ...a/sql/cleaner/DbCleanerSQLServerTest.java b/...ient/java/sql/DbCleanerSQLServerTest.java → ...a/sql/cleaner/DbCleanerSQLServerTest.java
@@ -1,12 +1,15 @@
-package org.evomaster.client.java.sql;
+package org.evomaster.client.java.sql.cleaner;
 
 import org.evomaster.client.java.controller.api.dto.database.schema.DatabaseType;
 //TODO
 //import org.evomaster.e2etests.utils.CIUtils;
 import org.evomaster.ci.utils.CIUtils;
+import org.evomaster.client.java.sql.DbCleaner;
+import org.evomaster.client.java.sql.SqlScriptRunner;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.utility.DockerImageName;
 
@@ -17,6 +20,9 @@
 import java.util.HashMap;
 import java.util.List;
 
+//No longer support MSSQL
+@Deprecated
+@Disabled
 public class DbCleanerSQLServerTest extends DbCleanerTestBase{
 
     private static final int PORT = 1433;

diff --git a/...sql/DbCleanerSQLServerWithSchemaTest.java → ...ner/DbCleanerSQLServerWithSchemaTest.java b/...sql/DbCleanerSQLServerWithSchemaTest.java → ...ner/DbCleanerSQLServerWithSchemaTest.java
@@ -1,10 +1,11 @@
-package org.evomaster.client.java.sql;
+package org.evomaster.client.java.sql.cleaner;
 
 import org.evomaster.ci.utils.CIUtils;
 import org.evomaster.client.java.controller.api.dto.database.schema.DatabaseType;
 import org.evomaster.client.java.sql.DbCleaner;
 import org.evomaster.client.java.sql.QueryResult;
 import org.evomaster.client.java.sql.SqlScriptRunner;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.utility.DockerImageName;
@@ -16,6 +17,9 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
+//No longer support MSSQL
+@Deprecated
+@Disabled
 public class DbCleanerSQLServerWithSchemaTest {
 
     private static final int PORT = 1433;

diff --git a/...er/client/java/sql/DbCleanerTestBase.java → ...t/java/sql/cleaner/DbCleanerTestBase.java b/...er/client/java/sql/DbCleanerTestBase.java → ...t/java/sql/cleaner/DbCleanerTestBase.java
@@ -1,4 +1,4 @@
-package org.evomaster.client.java.sql;
+package org.evomaster.client.java.sql.cleaner;
 
 import org.evomaster.client.java.controller.api.dto.database.schema.DatabaseType;
 import org.evomaster.client.java.sql.QueryResult;