refactored schema generation test, failing

Evolveum · Dec 4, 2017 · ab84f43 · ab84f43
1 parent 68649fc
commit ab84f43
Show file tree

Hide file tree

Showing 2 changed files with 80 additions and 59 deletions.
diff --git a/repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SchemaTest.java b/repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SchemaTest.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2010-2017 Evolveum
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.evolveum.midpoint.repo.sql;
+
+import com.evolveum.midpoint.repo.sql.util.*;
+import com.evolveum.midpoint.util.ClassPathUtil;
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.dialect.H2Dialect;
+import org.hibernate.dialect.Oracle12cDialect;
+import org.hibernate.tool.hbm2ddl.SchemaExport;
+import org.hibernate.tool.schema.TargetType;
+import org.testng.annotations.Test;
+
+import java.util.EnumSet;
+import java.util.Set;
+
+/**
+ * Created by Viliam Repan (lazyman).
+ */
+public class SchemaTest {
+
+    @Test
+    public void generateSchemas() throws Exception {
+        createSQLSchema("./target/h2-schema.sql", H2Dialect.class.getName());
+        createSQLSchema("./target/sqlserver-schema.sql", UnicodeSQLServer2008Dialect.class.getName());
+        createSQLSchema("./target/mysql-schema.sql", MidPointMySQLDialect.class.getName());
+        createSQLSchema("./target/oracle-schema.sql", Oracle12cDialect.class.getName());
+        createSQLSchema("./target/postgresql-schema.sql", MidPointPostgreSQLDialect.class.getName());
+    }
+
+    private void createSQLSchema(String fileName, String dialect) throws Exception {
+        MetadataSources metadata = new MetadataSources(
+                new StandardServiceRegistryBuilder()
+                        .applySetting("hibernate.implicit_naming_strategy", new MidPointImplicitNamingStrategy())
+                        .applySetting("hibernate.physical_naming_strategy", new MidPointPhysicalNamingStrategy())
+                        .applySetting("hibernate.dialect", dialect)
+                        .build());
+
+        addAnnotatedClasses("com.evolveum.midpoint.repo.sql.data.common", metadata);
+        addAnnotatedClasses("com.evolveum.midpoint.repo.sql.data.common.container", metadata);
+        addAnnotatedClasses("com.evolveum.midpoint.repo.sql.data.common.any", metadata);
+        addAnnotatedClasses("com.evolveum.midpoint.repo.sql.data.common.embedded", metadata);
+        addAnnotatedClasses("com.evolveum.midpoint.repo.sql.data.common.enums", metadata);
+        addAnnotatedClasses("com.evolveum.midpoint.repo.sql.data.common.id", metadata);
+        addAnnotatedClasses("com.evolveum.midpoint.repo.sql.data.common.other", metadata);
+        addAnnotatedClasses("com.evolveum.midpoint.repo.sql.data.common.type", metadata);
+        addAnnotatedClasses("com.evolveum.midpoint.repo.sql.data.audit", metadata);
+
+        metadata.addPackage("com.evolveum.midpoint.repo.sql.type");
+
+
+        SchemaExport export = new SchemaExport();
+        export.setOutputFile(fileName);
+        export.setDelimiter(";");
+        export.execute(EnumSet.of(TargetType.SCRIPT), SchemaExport.Action.CREATE, metadata.buildMetadata());
+    }
+
+    private void addAnnotatedClasses(String packageName, MetadataSources metadata) {
+        Set<Class> classes = ClassPathUtil.listClasses(packageName);
+        for (Class clazz : classes) {
+            metadata.addAnnotatedClass(clazz);
+        }
+    }
+}
diff --git a/...-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SpringApplicationContextTest.java b/...-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SpringApplicationContextTest.java
@@ -16,27 +16,12 @@
 
 package com.evolveum.midpoint.repo.sql;
 
-import com.evolveum.midpoint.repo.sql.util.MidPointMySQLDialect;
-import com.evolveum.midpoint.repo.sql.util.MidPointNamingStrategy;
-import com.evolveum.midpoint.repo.sql.util.MidPointPostgreSQLDialect;
-import com.evolveum.midpoint.repo.sql.util.UnicodeSQLServer2008Dialect;
-import com.evolveum.midpoint.util.ClassPathUtil;
-import org.hibernate.boot.MetadataSources;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
-import org.hibernate.dialect.H2Dialect;
-import org.hibernate.dialect.Oracle10gDialect;
-import org.hibernate.dialect.Oracle12cDialect;
-import org.hibernate.tool.hbm2ddl.SchemaExport;
-import org.hibernate.tool.schema.TargetType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.orm.hibernate4.LocalSessionFactoryBean;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.testng.annotations.Test;
 
-import java.util.EnumSet;
-import java.util.Set;
-
 import static org.testng.AssertJUnit.assertNotNull;
 
 /**
@@ -50,51 +35,8 @@ public class SpringApplicationContextTest extends BaseSQLRepoTest {
     private LocalSessionFactoryBean sessionFactory;
 
     @Test
-    public void initApplicationContext() throws Exception {
+    public void initApplicationContext() {
         assertNotNull(repositoryService);
-
         assertNotNull(sessionFactory);
-
-        createSQLSchema("./target/h2-schema.sql", H2Dialect.class.getName());
-        createSQLSchema("./target/sqlserver-schema.sql", UnicodeSQLServer2008Dialect.class.getName());
-        createSQLSchema("./target/mysql-schema.sql", MidPointMySQLDialect.class.getName());
-        createSQLSchema("./target/oracle-schema.sql", Oracle12cDialect.class.getName());
-        createSQLSchema("./target/postgresql-schema.sql", MidPointPostgreSQLDialect.class.getName());
-    }
-
-    private void createSQLSchema(String fileName, String dialect) throws Exception {
-        System.out.println("Dialect: " + sessionFactory.getHibernateProperties().getProperty("hibernate.dialect"));
-
-        MetadataSources metadata = new MetadataSources(
-                new StandardServiceRegistryBuilder()
-                        .applySetting("namingStrategy", new MidPointNamingStrategy())
-                        .applySettings(sessionFactory.getHibernateProperties())
-                        .applySetting("hibernate.dialect", dialect)
-                        .build());
-
-        addAnnotatedClasses("com.evolveum.midpoint.repo.sql.data.common", metadata);
-        addAnnotatedClasses("com.evolveum.midpoint.repo.sql.data.common.container", metadata);
-        addAnnotatedClasses("com.evolveum.midpoint.repo.sql.data.common.any", metadata);
-        addAnnotatedClasses("com.evolveum.midpoint.repo.sql.data.common.embedded", metadata);
-        addAnnotatedClasses("com.evolveum.midpoint.repo.sql.data.common.enums", metadata);
-        addAnnotatedClasses("com.evolveum.midpoint.repo.sql.data.common.id", metadata);
-        addAnnotatedClasses("com.evolveum.midpoint.repo.sql.data.common.other", metadata);
-        addAnnotatedClasses("com.evolveum.midpoint.repo.sql.data.common.type", metadata);
-        addAnnotatedClasses("com.evolveum.midpoint.repo.sql.data.audit", metadata);
-
-        metadata.addPackage("com.evolveum.midpoint.repo.sql.type");
-
-
-        SchemaExport export = new SchemaExport();
-        export.setOutputFile(fileName);
-        export.setDelimiter(";");
-        export.execute(EnumSet.of(TargetType.SCRIPT), SchemaExport.Action.CREATE, metadata.buildMetadata());
-    }
-
-    private void addAnnotatedClasses(String packageName, MetadataSources metadata) throws ClassNotFoundException {
-        Set<Class> classes = ClassPathUtil.listClasses(packageName);
-        for (Class clazz : classes) {
-            metadata.addAnnotatedClass(clazz);
-        }
     }
 }