Cleaning up SQL scripting in tests.

eclipse · Feb 24, 2017 · 0a4e9d9 · 0a4e9d9
1 parent 1a0fcb9
commit 0a4e9d9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/commons/pom.xml b/commons/pom.xml
@@ -15,11 +15,15 @@
 
     <dependencies>
         <!-- Internal dependencies -->
+        <dependency>
+            <groupId>org.eclipse.kapua</groupId>
+            <artifactId>kapua-liquibase</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.kapua</groupId>
             <artifactId>kapua-security-authentication-api</artifactId>
         </dependency>
-        
+
         <!-- External dependencies -->
         <dependency> 
             <groupId>joda-time</groupId>

diff --git a/commons/src/test/java/org/eclipse/kapua/commons/model/AbstractCommonServiceTest.java b/commons/src/test/java/org/eclipse/kapua/commons/model/AbstractCommonServiceTest.java
@@ -18,6 +18,7 @@
 import org.eclipse.kapua.commons.jpa.CommonsEntityManagerFactory;
 import org.eclipse.kapua.commons.jpa.EntityManager;
 import org.eclipse.kapua.commons.jpa.SimpleSqlScriptExecutor;
+import org.eclipse.kapua.service.liquibase.KapuaLiquibaseClient;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.slf4j.Logger;
@@ -68,7 +69,7 @@ public static void scriptSession(String path, String fileFilter)
     public static void tearUp()
         throws KapuaException
     {
-    	KapuaConfigurableServiceSchemaUtils.createSchemaObjects(DEFAULT_COMMONS_PATH);
+        new KapuaLiquibaseClient("jdbc:h2:mem:kapua;MODE=MySQL", "kapua", "kapua").update();
         scriptSession(DEFAULT_TEST_PATH, DEFAULT_TEST_FILTER);
     }
 

diff --git a/...nal/src/test/java/org/eclipse/kapua/service/account/internal/AccountServiceTestSteps.java b/...nal/src/test/java/org/eclipse/kapua/service/account/internal/AccountServiceTestSteps.java
@@ -121,7 +121,6 @@ public void beforeScenario(Scenario scenario)
         enableH2Connection();
 
         // Create the account service tables
-        KapuaConfigurableServiceSchemaUtils.createSchemaObjects(DEFAULT_COMMONS_PATH);
         new KapuaLiquibaseClient("jdbc:h2:mem:kapua;MODE=MySQL", "kapua", "kapua").update();
         XmlUtil.setContextProvider(new AccountsJAXBContextProvider());
 

diff --git a/...st/java/org/eclipse/kapua/service/datastore/internal/AbstractMessageStoreServiceTest.java b/...st/java/org/eclipse/kapua/service/datastore/internal/AbstractMessageStoreServiceTest.java
@@ -27,13 +27,6 @@ public abstract class AbstractMessageStoreServiceTest extends KapuaTest
     private static final Logger logger = LoggerFactory.getLogger(AbstractMessageStoreServiceTest.class);
 
     public static String DEFAULT_COMMONS_PATH = "../commons";
-
-    @BeforeClass
-    public static void tearUp()
-        throws KapuaException
-    {
-    	KapuaConfigurableServiceSchemaUtils.createSchemaObjects(DEFAULT_COMMONS_PATH);
-    }
 
     @AfterClass
     public static void tearDown()