more tests reviewed and added missing our superclasses (still not all)

Evolveum · Mar 2, 2020 · 6aa5c78 · 6aa5c78
1 parent f4c6d08
commit 6aa5c78
Show file tree

Hide file tree

Showing 12 changed files with 320 additions and 394 deletions.
diff --git a/infra/common/src/test/java/com/evolveum/midpoint/common/AbstractActivationComputerTest.java b/infra/common/src/test/java/com/evolveum/midpoint/common/AbstractActivationComputerTest.java
diff --git a/infra/common/src/test/java/com/evolveum/midpoint/common/CommonTestConstants.java b/infra/common/src/test/java/com/evolveum/midpoint/common/CommonTestConstants.java
diff --git a/infra/common/src/test/java/com/evolveum/midpoint/common/LocalizationTest.java b/infra/common/src/test/java/com/evolveum/midpoint/common/LocalizationTest.java
@@ -8,6 +8,7 @@
 package com.evolveum.midpoint.common;
 
 import com.evolveum.midpoint.common.configuration.api.MidpointConfiguration;
+import com.evolveum.midpoint.tools.testng.AbstractUnitTest;
 import com.evolveum.midpoint.util.LocalizableMessage;
 import com.evolveum.midpoint.util.LocalizableMessageBuilder;
 import org.testng.AssertJUnit;
@@ -21,7 +22,8 @@
 /**
  * Created by Viliam Repan (lazyman).
  */
-public class LocalizationTest {
+// TODO testing: missing from suite, 1 test failing
+public class LocalizationTest extends AbstractUnitTest {
 
     private static String midpointHome;
 
@@ -46,7 +48,7 @@ public static void afterClass() {
     }
 
     @Test
-    public void localization() throws Exception {
+    public void localization() {
         assertTranslation(service, "standardKey", "standardKeyCustomValue");
         assertTranslation(service, "customMidpointKey", "customMidpointValue");
         assertTranslation(service, "otherKey", "otherValue");
@@ -56,7 +58,7 @@ public void localization() throws Exception {
     }
 
     @Test
-    public void localizationParams2() throws Exception {
+    public void localizationParams2() {
         Object[] params = new Object[2];
         params[0] = "John";
         params[1] = "Couldn't find user with name 'John'";
@@ -68,12 +70,12 @@ public void localizationParams2() throws Exception {
     }
 
     @Test
-    public void localizationDefaults() throws Exception {
+    public void localizationDefaults() {
         assertTranslation(service, "unknownKey", "expectedValues", "expectedValues");
     }
 
     @Test
-    public void localizationParams() throws Exception {
+    public void localizationParams() {
         Object[] params = new Object[3];
         params[0] = 123;
         params[1] = new LocalizableMessageBuilder().key("someunknownkey").fallbackMessage("fallback").build();

diff --git a/infra/common/src/test/java/com/evolveum/midpoint/common/TestActivationComputerDefault.java b/infra/common/src/test/java/com/evolveum/midpoint/common/TestActivationComputerDefault.java
@@ -6,37 +6,12 @@
  */
 package com.evolveum.midpoint.common;
 
-import static org.testng.AssertJUnit.assertEquals;
-
-import java.io.IOException;
-
-import javax.xml.datatype.XMLGregorianCalendar;
-
-import org.testng.annotations.BeforeSuite;
-import org.testng.annotations.Test;
-import org.xml.sax.SAXException;
-
-import com.evolveum.midpoint.prism.util.PrismTestUtil;
-import com.evolveum.midpoint.prism.xml.XmlTypeConverter;
-import com.evolveum.midpoint.schema.MidPointPrismContextFactory;
-import com.evolveum.midpoint.schema.constants.MidPointConstants;
-import com.evolveum.midpoint.schema.constants.SchemaConstants;
-import com.evolveum.midpoint.util.PrettyPrinter;
-import com.evolveum.midpoint.util.exception.SchemaException;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ActivationStatusType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ActivationType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.LifecycleStateModelType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.TimeIntervalStatusType;
 
-/**
- * @author semancik
- *
- */
 public class TestActivationComputerDefault extends AbstractActivationComputerTest {
 
     @Override
-    protected LifecycleStateModelType createLifecycleModel() throws SchemaException, IOException {
+    protected LifecycleStateModelType createLifecycleModel() {
         return null;
     }
-
 }
diff --git a/infra/common/src/test/java/com/evolveum/midpoint/common/TestActivationComputerLifecycle.java b/infra/common/src/test/java/com/evolveum/midpoint/common/TestActivationComputerLifecycle.java
@@ -11,55 +11,42 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
-
 import javax.xml.datatype.XMLGregorianCalendar;
 
-import org.testng.annotations.BeforeSuite;
 import org.testng.annotations.Test;
-import org.xml.sax.SAXException;
 
 import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.prism.util.PrismTestUtil;
-import com.evolveum.midpoint.prism.xml.XmlTypeConverter;
-import com.evolveum.midpoint.schema.MidPointPrismContextFactory;
-import com.evolveum.midpoint.schema.constants.MidPointConstants;
 import com.evolveum.midpoint.schema.constants.SchemaConstants;
-import com.evolveum.midpoint.util.PrettyPrinter;
 import com.evolveum.midpoint.util.exception.SchemaException;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ActivationStatusType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ActivationType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.LifecycleStateModelType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectPolicyConfigurationType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.SystemConfigurationType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.TimeIntervalStatusType;
-
-/**
- * @author semancik
- *
- */
+import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
+
 public class TestActivationComputerLifecycle extends AbstractActivationComputerTest {
 
-    private static final File SYSTEM_CONFIGURATION_LIFECYCLE_FILE = new File("src/test/resources/system-configuration-lifecycle.xml");
+    private static final File SYSTEM_CONFIGURATION_LIFECYCLE_FILE =
+            new File("src/test/resources/system-configuration-lifecycle.xml");
 
     @Override
     protected LifecycleStateModelType createLifecycleModel() throws SchemaException, IOException {
-        PrismObject<SystemConfigurationType> systemConfig = PrismTestUtil.parseObject(SYSTEM_CONFIGURATION_LIFECYCLE_FILE);
-        List<ObjectPolicyConfigurationType> objectPolicyConfigurations = systemConfig.asObjectable().getDefaultObjectPolicyConfiguration();
+        PrismObject<SystemConfigurationType> systemConfig =
+                PrismTestUtil.parseObject(SYSTEM_CONFIGURATION_LIFECYCLE_FILE);
+        List<ObjectPolicyConfigurationType> objectPolicyConfigurations =
+                systemConfig.asObjectable().getDefaultObjectPolicyConfiguration();
         return objectPolicyConfigurations.get(0).getLifecycleStateModel();
     }
 
     @Test
     @Override
     public void testGetProposedAdministrativeEnabled() throws Exception {
-        System.out.println("\n===[ testGetProposedAdministrativeEnabled ]===\n");
-
         // GIVEN
         Clock clock = createClock(YEAR_START);
         ActivationComputer activationComputer = createActivationComputer(clock);
-        ActivationType activationType = createActivationType(ActivationStatusType.ENABLED, SPRING_EQUINOX, AUTUMN_EQUINOX);
+        ActivationType activationType =
+                createActivationType(ActivationStatusType.ENABLED, SPRING_EQUINOX, AUTUMN_EQUINOX);
 
         // WHEN
-        ActivationStatusType effectiveStatus = activationComputer.getEffectiveStatus(SchemaConstants.LIFECYCLE_PROPOSED, activationType, createLifecycleModel());
+        ActivationStatusType effectiveStatus = activationComputer.getEffectiveStatus(
+                SchemaConstants.LIFECYCLE_PROPOSED, activationType, createLifecycleModel());
 
         // THEN
         assertEquals("Unexpected effective status", ActivationStatusType.ENABLED, effectiveStatus);
@@ -68,42 +55,58 @@ public void testGetProposedAdministrativeEnabled() throws Exception {
     @Test
     @Override
     public void testGetDraftAdministrativeEnabled() throws Exception {
-        System.out.println("\n===[ testGetDraftAdministrativeEnabled ]===\n");
-
         // GIVEN
         Clock clock = createClock(YEAR_START);
         ActivationComputer activationComputer = createActivationComputer(clock);
-        ActivationType activationType = createActivationType(ActivationStatusType.DISABLED, SPRING_EQUINOX, AUTUMN_EQUINOX);
+        ActivationType activationType =
+                createActivationType(ActivationStatusType.DISABLED, SPRING_EQUINOX, AUTUMN_EQUINOX);
 
         // WHEN
-        ActivationStatusType effectiveStatus = activationComputer.getEffectiveStatus(SchemaConstants.LIFECYCLE_DRAFT, activationType, createLifecycleModel());
+        ActivationStatusType effectiveStatus = activationComputer.getEffectiveStatus(
+                SchemaConstants.LIFECYCLE_DRAFT, activationType, createLifecycleModel());
 
         // THEN
         assertEquals("Unexpected effective status", ActivationStatusType.ARCHIVED, effectiveStatus);
     }
 
     @Override
-    protected void testComputeDraft(final String TEST_NAME, XMLGregorianCalendar now, ActivationStatusType administrativeStatus, XMLGregorianCalendar validFrom,
-            XMLGregorianCalendar validTo, ActivationStatusType expectedEffective, TimeIntervalStatusType expectedValidity) throws SchemaException, IOException {
-        testCompute(TEST_NAME, SchemaConstants.LIFECYCLE_DRAFT, now, administrativeStatus, validFrom, validTo, ActivationStatusType.ARCHIVED, expectedValidity);
+    protected void testComputeDraft(
+            XMLGregorianCalendar now, ActivationStatusType administrativeStatus,
+            XMLGregorianCalendar validFrom, XMLGregorianCalendar validTo,
+            ActivationStatusType expectedEffective, TimeIntervalStatusType expectedValidity)
+            throws SchemaException, IOException {
+        testCompute(SchemaConstants.LIFECYCLE_DRAFT, now, administrativeStatus,
+                validFrom, validTo, ActivationStatusType.ARCHIVED, expectedValidity);
     }
 
     @Override
-    protected void testComputeProposed(final String TEST_NAME, XMLGregorianCalendar now, ActivationStatusType administrativeStatus, XMLGregorianCalendar validFrom,
-            XMLGregorianCalendar validTo, ActivationStatusType expectedEffective, TimeIntervalStatusType expectedValidity) throws SchemaException, IOException {
-        testCompute(TEST_NAME, SchemaConstants.LIFECYCLE_PROPOSED, now, administrativeStatus, validFrom, validTo, expectedEffective, expectedValidity);
+    protected void testComputeProposed(
+            XMLGregorianCalendar now, ActivationStatusType administrativeStatus,
+            XMLGregorianCalendar validFrom, XMLGregorianCalendar validTo,
+            ActivationStatusType expectedEffective, TimeIntervalStatusType expectedValidity)
+            throws SchemaException, IOException {
+        testCompute(SchemaConstants.LIFECYCLE_PROPOSED, now, administrativeStatus,
+                validFrom, validTo, expectedEffective, expectedValidity);
     }
 
     @Override
-    protected void testComputeCharmed(final String TEST_NAME, XMLGregorianCalendar now, ActivationStatusType administrativeStatus, XMLGregorianCalendar validFrom,
-            XMLGregorianCalendar validTo, ActivationStatusType expectedEffective, TimeIntervalStatusType expectedValidity) throws SchemaException, IOException {
-        testCompute(TEST_NAME, LIFECYCLE_STATE_CHARMED, now, administrativeStatus, validFrom, validTo, expectedEffective, expectedValidity);
+    protected void testComputeCharmed(
+            XMLGregorianCalendar now, ActivationStatusType administrativeStatus,
+            XMLGregorianCalendar validFrom, XMLGregorianCalendar validTo,
+            ActivationStatusType expectedEffective, TimeIntervalStatusType expectedValidity)
+            throws SchemaException, IOException {
+        testCompute(LIFECYCLE_STATE_CHARMED, now, administrativeStatus,
+                validFrom, validTo, expectedEffective, expectedValidity);
     }
 
     @Override
-    protected void testComputeInhumed(final String TEST_NAME, XMLGregorianCalendar now, ActivationStatusType administrativeStatus, XMLGregorianCalendar validFrom,
-            XMLGregorianCalendar validTo, ActivationStatusType expectedEffective, TimeIntervalStatusType expectedValidity) throws SchemaException, IOException {
-        testCompute(TEST_NAME, LIFECYCLE_STATE_INHUMED, now, administrativeStatus, validFrom, validTo, ActivationStatusType.ARCHIVED, expectedValidity);
+    protected void testComputeInhumed(
+            XMLGregorianCalendar now, ActivationStatusType administrativeStatus,
+            XMLGregorianCalendar validFrom, XMLGregorianCalendar validTo,
+            ActivationStatusType expectedEffective, TimeIntervalStatusType expectedValidity)
+            throws SchemaException, IOException {
+        testCompute(LIFECYCLE_STATE_INHUMED, now, administrativeStatus,
+                validFrom, validTo, ActivationStatusType.ARCHIVED, expectedValidity);
     }
 
 }
diff --git a/infra/common/src/test/java/com/evolveum/midpoint/common/TestCryptoUtil.java b/infra/common/src/test/java/com/evolveum/midpoint/common/TestCryptoUtil.java
@@ -6,12 +6,31 @@
  */
 package com.evolveum.midpoint.common;
 
+import static java.util.Collections.singleton;
+import static org.testng.Assert.fail;
+import static org.testng.AssertJUnit.*;
+
+import static com.evolveum.midpoint.prism.util.PrismTestUtil.getPrismContext;
+import static com.evolveum.midpoint.test.util.MidPointTestConstants.TEST_RESOURCES_DIR;
+import static com.evolveum.midpoint.test.util.MidPointTestConstants.TEST_RESOURCES_PATH;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.testng.annotations.BeforeSuite;
+import org.testng.annotations.Listeners;
+import org.testng.annotations.Test;
+import org.xml.sax.SAXException;
+
 import com.evolveum.midpoint.common.crypto.CryptoUtil;
 import com.evolveum.midpoint.prism.PrismContext;
 import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.prism.crypto.EncryptionException;
-import com.evolveum.midpoint.prism.crypto.Protector;
 import com.evolveum.midpoint.prism.crypto.KeyStoreBasedProtectorBuilder;
+import com.evolveum.midpoint.prism.crypto.Protector;
 import com.evolveum.midpoint.prism.delta.ItemDelta;
 import com.evolveum.midpoint.prism.delta.ItemDeltaCollectionsUtil;
 import com.evolveum.midpoint.prism.util.PrismAsserts;
@@ -23,28 +42,8 @@
 import com.evolveum.midpoint.util.exception.SchemaException;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 import com.evolveum.prism.xml.ns._public.types_3.ProtectedStringType;
-import org.testng.annotations.BeforeSuite;
-import org.testng.annotations.Listeners;
-import org.testng.annotations.Test;
-import org.xml.sax.SAXException;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import static com.evolveum.midpoint.prism.util.PrismTestUtil.getPrismContext;
-import static com.evolveum.midpoint.test.util.MidPointTestConstants.TEST_RESOURCES_DIR;
-import static com.evolveum.midpoint.test.util.MidPointTestConstants.TEST_RESOURCES_PATH;
-import static java.util.Collections.singleton;
-import static org.testng.Assert.fail;
-import static org.testng.AssertJUnit.*;
 
-/**
- * @author mederly
- */
-@Listeners({com.evolveum.midpoint.tools.testng.AlphabeticalMethodInterceptor.class})
+@Listeners({ com.evolveum.midpoint.tools.testng.AlphabeticalMethodInterceptor.class })
 public class TestCryptoUtil extends AbstractUnitTest {
 
     private static final File TEST_DIR = new File(TEST_RESOURCES_DIR, "crypto");
@@ -255,5 +254,4 @@ private Protector createCompromisedProtector() {
                 .encryptionAlgorithm(Protector.XMLSEC_ENCRYPTION_ALGORITHM_AES256_CBC)
                 .initialize();
     }
-
 }