fix: wrong boolean ok

InseeFr · Dec 4, 2023 · 0de2540 · 0de2540
1 parent 2bf87bd
commit 0de2540
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/...ices/importServlet/ImportStep1KoTest.java → .../services/importServlet/ImportKOTest.java b/...ices/importServlet/ImportStep1KoTest.java → .../services/importServlet/ImportKOTest.java
@@ -11,15 +11,14 @@
 import org.junit.Test;
 
 import fr.insee.arc.core.dataobjects.ArcPreparedStatementBuilder;
-import fr.insee.arc.utils.dao.SQL;
 import fr.insee.arc.utils.dao.UtilitaireDao;
 import fr.insee.arc.utils.exception.ArcException;
 import fr.insee.arc.utils.query.InitializeQueryTest;
 import fr.insee.arc.ws.services.importServlet.actions.SendResponse;
 import fr.insee.arc.ws.services.importServlet.bo.ExportTrackingType;
 import fr.insee.arc.ws.services.importServlet.dao.InitializeTestDataNoScalability;
 
-public class ImportStep1KoTest extends ServletArc {
+public class ImportKOTest extends ServletArc {
 
 	private static final long serialVersionUID = 4409305598494746785L;
 

diff --git a/...ices/importServlet/ImportStep1OkTest.java → .../services/importServlet/ImportOKTest.java b/...ices/importServlet/ImportStep1OkTest.java → .../services/importServlet/ImportOKTest.java
@@ -10,22 +10,18 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import fr.insee.arc.core.dataobjects.ArcPreparedStatementBuilder;
-import fr.insee.arc.utils.dao.SQL;
 import fr.insee.arc.utils.dao.UtilitaireDao;
 import fr.insee.arc.utils.exception.ArcException;
 import fr.insee.arc.utils.query.InitializeQueryTest;
 import fr.insee.arc.ws.services.importServlet.actions.SendResponse;
 import fr.insee.arc.ws.services.importServlet.dao.InitializeTestDataNoScalability;
 
-public class ImportStep1OkTest extends ServletArc {
+public class ImportOKTest extends ServletArc {
 
 	private static final long serialVersionUID = -7832574224892526397L;
 
-
 	@BeforeClass
     public static void setup() throws SQLException, ArcException {
-
 		InitializeTestDataNoScalability.destroyTestData();
 		InitializeTestDataNoScalability.initializeTestData(true);
 	}

diff --git a/...test/java/fr/insee/arc/ws/services/importServlet/dao/InitializeTestDataNoScalability.java b/...test/java/fr/insee/arc/ws/services/importServlet/dao/InitializeTestDataNoScalability.java
@@ -18,8 +18,6 @@ public class InitializeTestDataNoScalability {
 	 */
 	public static void initializeTestData(boolean ok) throws SQLException, ArcException {
 
-		InitializeQueryTest.buildPropertiesWithoutScalability(null);
-
 		ArcPreparedStatementBuilder query;
 		query = new ArcPreparedStatementBuilder();
 		query.append("CREATE SCHEMA arc;");
@@ -43,7 +41,7 @@ public static void initializeTestData(boolean ok) throws SQLException, ArcExcept
 		query.append(SQL.END_QUERY);
 
 
-		if (!ok)
+		if (ok)
 		{
 			query.append("CREATE TABLE arc_bas1.mod_variable_metier AS SELECT 'DSN' as id_famille, 'mapping_dsn_test1_ok' as nom_table_metier, 'id_source' as nom_variable_metier");
 			query.append(SQL.END_QUERY);
@@ -94,8 +92,9 @@ public static void initializeTestData(boolean ok) throws SQLException, ArcExcept
 	 */
 	public static void destroyTestData() throws SQLException, ArcException {
 
-		ArcPreparedStatementBuilder query;
+		InitializeQueryTest.buildPropertiesWithoutScalability(null);
 
+		ArcPreparedStatementBuilder query;
 		query = new ArcPreparedStatementBuilder();
 
 		query.append("DROP SCHEMA IF EXISTS arc CASCADE;");