fix in repo test initialization

Evolveum · Dec 18, 2017 · 5003845 · 5003845
1 parent b1e0f10
commit 5003845
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 22 deletions.
diff --git a/repo/repo-sql-impl-test/sample-configurations/mysql.properties b/repo/repo-sql-impl-test/sample-configurations/mysql.properties
@@ -14,11 +14,7 @@
 # limitations under the License.
 #
 
-embedded=false
-driverClassName=com.mysql.jdbc.Driver
-hibernateHbm2ddl=validate
-hibernateDialect=com.evolveum.midpoint.repo.sql.util.MidPointMySQLDialect
+database=mysql
 jdbcUsername=midpoint
-jdbcPassword=qwe123
-jdbcUrl=jdbc:mysql://localhost:3306/midpoint?useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&clobCharacterEncoding=UTF-8
-useZip=true
+jdbcPassword=midpoint
+jdbcUrl=jdbc:mysql://localhost:3306/midpoint?useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&clobCharacterEncoding=UTF-8
diff --git a/repo/repo-sql-impl-test/sample-configurations/oracle.properties b/repo/repo-sql-impl-test/sample-configurations/oracle.properties
@@ -14,10 +14,7 @@
 # limitations under the License.
 #
 
-embedded=false
-driverClassName=oracle.jdbc.OracleDriver
-hibernateHbm2ddl=validate
-hibernateDialect=org.hibernate.dialect.Oracle10gDialect
+database=oracle
 jdbcPassword=qwe123
 jdbcUsername=bamboo
 jdbcUrl=jdbc:oracle:thin:@192.168.1.25:1521/xe
diff --git a/repo/repo-sql-impl-test/sample-configurations/postgresql.properties b/repo/repo-sql-impl-test/sample-configurations/postgresql.properties
@@ -14,10 +14,7 @@
 # limitations under the License.
 #
 
-embedded=false
-driverClassName=org.postgresql.Driver
-hibernateHbm2ddl=validate
-hibernateDialect=com.evolveum.midpoint.repo.sql.util.MidPointPostgreSQLDialect
+database=postgresql
 jdbcPassword=midpoint
 jdbcUsername=midpoint
 jdbcUrl=jdbc:postgresql://localhost:5432/midpoint
diff --git a/repo/repo-sql-impl-test/sample-configurations/sqlserver.properties b/repo/repo-sql-impl-test/sample-configurations/sqlserver.properties
@@ -14,13 +14,7 @@
 # limitations under the License.
 #
 
-embedded=false
-driverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver
-hibernateHbm2ddl=validate
-hibernateDialect=com.evolveum.midpoint.repo.sql.util.UnicodeSQLServer2008Dialect
-#jdbcPassword=password
-#jdbcUsername=midpoint
-#jdbcUrl=jdbc:sqlserver://localhost:1433;database=midpoint
+database=sqlserver
 jdbcUsername=bamboo
 jdbcPassword=qwer1234X
 jdbcUrl=jdbc:sqlserver://192.168.1.14:1433;database=midpoint
diff --git a/...l-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/TestSqlRepositoryFactory.java b/...l-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/TestSqlRepositoryFactory.java
@@ -85,6 +85,8 @@ private void updateConfigurationFromFile(Configuration configuration, String fil
     }
 
     private void updateConfigurationFromProperties(Configuration configuration, Properties properties) {
+        updateConfigurationStringProperty(configuration, properties, PROPERTY_DATABASE);
+
         updateConfigurationBooleanProperty(configuration, properties, PROPERTY_EMBEDDED);
         updateConfigurationBooleanProperty(configuration, properties, PROPERTY_DROP_IF_EXISTS);
         updateConfigurationBooleanProperty(configuration, properties, PROPERTY_AS_SERVER);