Make tests in notification-impl work

For some strange reasons, beans in task-quartz-impl were not initialized correctly when running tests in notification-impl. At least in some environments. This small change in Spring contexts seems to fix that.
Evolveum · Mar 2, 2021 · 1d21843 · 1d21843
1 parent d9f4c70
commit 1d21843
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 29 deletions.
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
@@ -46,20 +46,7 @@
 /**
  *
  */
-@ContextConfiguration(locations = {"classpath:ctx-task.xml",
-        "classpath:ctx-repo-cache.xml",
-        "classpath:ctx-provisioning.xml",
-        "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",
-        "classpath:ctx-model.xml",
-        "classpath:ctx-model-common.xml",
-        "classpath:ctx-notifications-test.xml",
-        "classpath*:ctx-notifications.xml"})
+@ContextConfiguration(locations = {"classpath:ctx-notifications-test.xml"})
 public class TestTextFormatter extends AbstractSpringTest {
 
     private static final String OBJECTS_DIR_NAME = "src/test/resources/objects";

diff --git a/...tions-impl/src/test/java/com/evolveum/midpoint/notifications/impl/TestTransportUtils.java b/...tions-impl/src/test/java/com/evolveum/midpoint/notifications/impl/TestTransportUtils.java
@@ -34,20 +34,7 @@
 /**
  * @author skublik
  */
-@ContextConfiguration(locations = { "classpath:ctx-task.xml",
-        "classpath:ctx-repo-cache.xml",
-        "classpath:ctx-provisioning.xml",
-        "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",
-        "classpath:ctx-model.xml",
-        "classpath:ctx-model-common.xml",
-        "classpath:ctx-notifications-test.xml",
-        "classpath*:ctx-notifications.xml" })
+@ContextConfiguration(locations = {"classpath:ctx-notifications-test.xml"})
 public class TestTransportUtils extends AbstractSpringTest {
 
     @Autowired protected ExpressionFactory expressionFactory;

diff --git a/model/notifications-impl/src/test/resources/ctx-notifications-test.xml b/model/notifications-impl/src/test/resources/ctx-notifications-test.xml
@@ -15,4 +15,20 @@
 
     <context:annotation-config/>
     <context:component-scan base-package="com.evolveum.midpoint.notifications.impl"/>
+    <context:spring-configured/>
+
+    <import resource="ctx-model.xml"/>
+    <import resource="ctx-model-common.xml"/>
+    <import resource="classpath*:ctx-repository-test.xml"/>
+    <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"/>
+    <import resource="ctx-task.xml"/>
+    <import resource="ctx-audit.xml"/>
+    <import resource="ctx-security.xml"/>
+    <import resource="ctx-notifications.xml"/>
 </beans>
diff --git a/...artz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/ClusterManager.java b/...artz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/ClusterManager.java
@@ -99,7 +99,6 @@ public boolean isCurrentNode(String node) {
         return nodeRegistrar.isCurrentNode(node);
     }
 
-
     public void deleteNode(String nodeOid, OperationResult result) throws SchemaException, ObjectNotFoundException {
         nodeRegistrar.deleteNode(nodeOid, result);
     }