Fixing test spring contexts and dependencies

Evolveum · Oct 18, 2017 · 231f54f · 231f54f
1 parent 4bf2dd4
commit 231f54f
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 0 deletions.
diff --git a/model/certification-impl/src/test/resources/ctx-certification-test-main.xml b/model/certification-impl/src/test/resources/ctx-certification-test-main.xml
@@ -40,6 +40,7 @@
     <import resource="ctx-notifications.xml"/>
     <import resource="classpath*:ctx-repository-test.xml"/>
     <import resource="ctx-repo-cache.xml"/>
+    <import resource="ctx-repo-common.xml"/>
     <import resource="ctx-configuration-test.xml"/>
     <import resource="ctx-provisioning.xml"/>
     <import resource="ctx-common.xml"/>

diff --git a/model/certification-impl/src/test/resources/ctx-certification-test-with-workflows.xml b/model/certification-impl/src/test/resources/ctx-certification-test-with-workflows.xml
@@ -41,6 +41,7 @@
     <import resource="ctx-workflow.xml"/>
     <import resource="classpath*:ctx-repository-test.xml"/>
     <import resource="ctx-repo-cache.xml"/>
+    <import resource="ctx-repo-common.xml"/>
     <import resource="ctx-configuration-test.xml"/>
     <import resource="ctx-provisioning.xml"/>
     <import resource="ctx-common.xml"/>

diff --git a/model/model-intest/src/test/resources/ctx-model-intest-test-main.xml b/model/model-intest/src/test/resources/ctx-model-intest-test-main.xml
@@ -45,6 +45,7 @@
     <import resource="ctx-repo-cache.xml"/>
     <import resource="ctx-configuration-test.xml"/>
     <import resource="ctx-provisioning.xml"/>
+    <import resource="ctx-repo-common.xml"/>
     <import resource="ctx-common.xml"/>
     <import resource="ctx-security.xml"/>
     <import resource="ctx-security-enforcer.xml"/>

diff --git a/...ations-impl/src/test/java/com/evolveum/midpoint/notifications/impl/TestTextFormatter.java b/...ations-impl/src/test/java/com/evolveum/midpoint/notifications/impl/TestTextFormatter.java
@@ -59,6 +59,7 @@
         "classpath*:ctx-repository-test.xml",
         "classpath:ctx-configuration-test.xml",
         "classpath:ctx-common.xml",
+        "classpath:ctx-repo-common.xml",
         "classpath:ctx-security.xml",
         "classpath:ctx-security-enforcer.xml",
         "classpath:ctx-audit.xml",

diff --git a/model/workflow-impl/src/test/resources/ctx-workflow-test-main.xml b/model/workflow-impl/src/test/resources/ctx-workflow-test-main.xml
@@ -39,6 +39,7 @@
     <import resource="ctx-model-common.xml"/>
     <import resource="classpath*:ctx-repository-test.xml"/>
     <import resource="ctx-repo-cache.xml"/>
+    <import resource="ctx-repo-common.xml"/>
     <import resource="ctx-configuration-test.xml"/>
     <import resource="ctx-provisioning.xml"/>
     <import resource="ctx-common.xml"/>

diff --git a/samples/samples-test/pom.xml b/samples/samples-test/pom.xml
@@ -179,6 +179,12 @@
 			<version>3.7-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.evolveum.midpoint.repo</groupId>
+			<artifactId>security-enforcer-impl</artifactId>
+			<version>3.7-SNAPSHOT</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.model</groupId>
 			<artifactId>model-impl</artifactId>

diff --git a/samples/samples-test/src/test/resources/ctx-samples-test-main.xml b/samples/samples-test/src/test/resources/ctx-samples-test-main.xml
@@ -40,8 +40,10 @@
     <import resource="ctx-provisioning.xml"/>
     <import resource="ctx-samples-test.xml"/>
     <import resource="ctx-task.xml"/>
+    <import resource="ctx-repo-common.xml"/>
     <import resource="ctx-common.xml"/>
     <import resource="ctx-audit.xml"/>
+    <import resource="ctx-security-enforcer.xml"/>
     <import resource="ctx-security.xml"/>
     <import resource="classpath*:ctx-repository-test.xml"/>
     <import resource="ctx-repo-cache.xml"/>

diff --git a/testing/consistency-mechanism/pom.xml b/testing/consistency-mechanism/pom.xml
@@ -141,6 +141,12 @@
 			<version>3.7-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.evolveum.midpoint.repo</groupId>
+			<artifactId>security-enforcer-impl</artifactId>
+			<version>3.7-SNAPSHOT</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.repo</groupId>
 			<artifactId>repo-test-util</artifactId>

diff --git a/testing/consistency-mechanism/src/test/resources/ctx-consistency-test-main.xml b/testing/consistency-mechanism/src/test/resources/ctx-consistency-test-main.xml
@@ -44,6 +44,8 @@
     <import resource="ctx-audit.xml"/>
     <import resource="ctx-common.xml"/>
     <import resource="ctx-security.xml"/>
+    <import resource="ctx-security-enforcer.xml"/>
+    <import resource="ctx-repo-common.xml"/>
     <import resource="classpath*:ctx-repository-test.xml"/>
     <import resource="ctx-repo-cache.xml"/>
     <import resource="ctx-configuration-test.xml"/>

diff --git a/testing/sanity/pom.xml b/testing/sanity/pom.xml
@@ -141,6 +141,12 @@
 			<version>3.7-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.evolveum.midpoint.repo</groupId>
+			<artifactId>security-enforcer-impl</artifactId>
+			<version>3.7-SNAPSHOT</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.repo</groupId>
 			<artifactId>repo-test-util</artifactId>

diff --git a/testing/sanity/src/test/resources/ctx-sanity-test-main.xml b/testing/sanity/src/test/resources/ctx-sanity-test-main.xml
@@ -38,11 +38,13 @@
     <import resource="ctx-model-test.xml"/>
     <import resource="ctx-model-common.xml"/>
     <import resource="ctx-provisioning.xml"/>
+    <import resource="ctx-repo-common.xml"/>
     <import resource="ctx-common.xml"/>
     <import resource="ctx-sanity-test.xml"/>
     <import resource="ctx-task.xml"/>
     <import resource="ctx-audit.xml"/>
     <import resource="ctx-security.xml"/>
+    <import resource="ctx-security-enforcer.xml"/>
     <import resource="classpath*:ctx-repository-test.xml"/>
     <import resource="ctx-repo-cache.xml"/>
     <import resource="ctx-configuration-test.xml"/>