Fixed wf-related tests for DBs other than H2.

Evolveum · Jul 1, 2017 · c5e61c8 · c5e61c8
1 parent 43baaba
commit c5e61c8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WfConfiguration.java b/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WfConfiguration.java
@@ -95,7 +95,7 @@ public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
 
     private String[] autoDeploymentFrom;
 
-    boolean dropDatabase;
+    private boolean dropDatabase;
 
     @PostConstruct
     void initialize() {
@@ -126,8 +126,8 @@ void initialize() {
                 sqlConfig = sqlRepositoryFactory.getSqlConfiguration();
                 if (sqlConfig.isEmbedded()) {
                     defaultJdbcUrlPrefix = sqlRepositoryFactory.prepareJdbcUrlPrefix(sqlConfig);
-                    dropDatabase = sqlConfig.isDropIfExists();
                 }
+                dropDatabase = sqlConfig.isDropIfExists();
             }
         } catch(NoSuchBeanDefinitionException e) {
             LOGGER.debug("SqlRepositoryFactory is not available, Activiti database configuration (if any) will be taken from 'workflow' configuration section only.");

diff --git a/model/workflow-impl/src/test/resources/logback-test.xml b/model/workflow-impl/src/test/resources/logback-test.xml
@@ -27,17 +27,13 @@
 	<logger name="com.evolveum.midpoint.common.LoggingConfigurationManager" level="TRACE" />
 	<logger name="com.evolveum.midpoint.common.expression" level="INFO" />
     <logger name="com.evolveum.midpoint.model.controller.ModelOperationTaskHandler" level="TRACE" />
-	<logger name="com.evolveum.midpoint.model" level="TRACE" />
-	<!-- Projector "TRACE" is just too much info ... -->
-	<logger name="com.evolveum.midpoint.model.lens.projector" level="DEBUG" />
-	<!-- ... and expression trace as well -->
+	<logger name="com.evolveum.midpoint.model" level="DEBUG" />
 	<logger name="com.evolveum.midpoint.common.expression.Expression" level="DEBUG" />
-    <logger name="com.evolveum.midpoint.wf" level="TRACE" />
+    <logger name="com.evolveum.midpoint.wf" level="DEBUG" />
 	<logger name="com.evolveum.midpoint.provisioning" level="DEBUG" />
 	<logger name="com.evolveum.midpoint.repo" level="INFO" />
-	<logger name="com.evolveum.midpoint.model.sync.LiveSyncTaskHandler" level="TRACE" />
 	<logger name="com.evolveum.midpoint.test" level="TRACE" />
-    <logger name="com.evolveum.midpoint.task" level="TRACE" />
+    <logger name="com.evolveum.midpoint.task" level="DEBUG" />
     <!--<logger name="org.activiti" level="TRACE" />-->
     <!--<logger name="org.springframework" level="DEBUG" />-->