Merge branch 'master' of github.com:Evolveum/midpoint

Evolveum · Sep 29, 2022 · 1ff2142 · 1ff2142
2 parents c29a60c + 4b65b69
commit 1ff2142
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -231,7 +231,7 @@
         <groovy.version>3.0.12</groovy.version>
         <xmlsec.version>2.2.4</xmlsec.version>
         <!-- NOTE: also update the version number in TestConnectorManager -->
-        <connid.version>1.5.1.7</connid.version>
+        <connid.version>1.5.1.10</connid.version>
         <derby.version>10.15.2.0</derby.version>
         <poi.version>5.2.2</poi.version>
         <wro4j.version>1.10.1</wro4j.version>

diff --git a/...ning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/TestConnectorManager.java b/...ning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/TestConnectorManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2021 Evolveum and contributors
+ * Copyright (C) 2017-2022 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0
  * and European Union Public License. See LICENSE file for details.
@@ -10,13 +10,13 @@
 
 import java.util.Collection;
 
-import com.evolveum.midpoint.provisioning.impl.resources.ConnectorManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.testng.annotations.Test;
 
 import com.evolveum.midpoint.prism.util.PrismAsserts;
+import com.evolveum.midpoint.provisioning.impl.resources.ConnectorManager;
 import com.evolveum.midpoint.provisioning.ucf.api.ConnectorFactory;
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.task.api.Task;
@@ -29,7 +29,7 @@
 @DirtiesContext
 public class TestConnectorManager extends AbstractIntegrationTest {
 
-    private static final String CONNID_FRAMEWORK_VERSION = "1.5.1.7";
+    private static final String CONNID_FRAMEWORK_VERSION = "1.5.1.10";
 
     @Autowired private ConnectorManager connectorManager;
 
@@ -44,11 +44,9 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti
     public void test100ListConnectorFactories() {
         OperationResult result = createOperationResult();
 
-        // WHEN
         when();
         Collection<ConnectorFactory> connectorFactories = connectorManager.getConnectorFactories();
 
-        // THEN
         then();
         assertNotNull("Null connector factories", connectorFactories);
         assertFalse("No connector factories found", connectorFactories.isEmpty());
@@ -71,21 +69,19 @@ public void test110SelfTest() {
         Task task = getTestTask();
         OperationResult result = task.getResult();
 
-        // WHEN
         when();
         connectorManager.connectorFrameworkSelfTest(result, task);
 
-        // THEN
         then();
         assertSuccess(result);
     }
 
     @Test
     public void test120FrameworkVersion() {
-        // WHEN
+        when();
         String frameworkVersion = connectorManager.getConnIdFrameworkVersion();
 
-        // THEN
+        then();
         assertEquals("Unexpected framework version", CONNID_FRAMEWORK_VERSION, frameworkVersion);
     }
 }