From 04ed830971f24b346b042a62a882bb7001747bbe Mon Sep 17 00:00:00 2001 From: Richard Richter Date: Mon, 27 Jan 2020 17:29:18 +0100 Subject: [PATCH] the rest of cleanup of test classes for future Checkstyle --- .../model/impl/TestRefinedSchema.java | 60 ++++++++----------- .../lens/TestProjectorRoleEntitlement.java | 16 +---- .../impl/sync/ActionManagerImplTest.java | 8 +-- .../sync/SynchronizationSituationTest.java | 5 +- .../impl/sync/TestSynchronizationService.java | 33 ++++------ .../intest/TestLoggingConfiguration.java | 53 ++++++++-------- .../midpoint/model/intest/rbac/TestRbac.java | 2 +- .../midpoint/testing/sanity/TestSanity.java | 12 +--- 8 files changed, 70 insertions(+), 119 deletions(-) diff --git a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/TestRefinedSchema.java b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/TestRefinedSchema.java index 67702bac76c..765e019f0ba 100644 --- a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/TestRefinedSchema.java +++ b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/TestRefinedSchema.java @@ -6,24 +6,20 @@ */ package com.evolveum.midpoint.model.impl; -import static org.testng.AssertJUnit.assertEquals; -import static org.testng.AssertJUnit.assertNotNull; -import static org.testng.AssertJUnit.assertTrue; +import static org.testng.AssertJUnit.*; import java.io.File; import java.util.Collection; - import javax.xml.namespace.QName; -import com.evolveum.midpoint.common.refinery.*; -import com.evolveum.midpoint.model.impl.util.ModelImplUtils; - import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; import org.springframework.test.context.ContextConfiguration; import org.testng.AssertJUnit; import org.testng.annotations.Test; +import com.evolveum.midpoint.common.refinery.*; +import com.evolveum.midpoint.model.impl.util.ModelImplUtils; import com.evolveum.midpoint.schema.internals.InternalMonitor; import com.evolveum.midpoint.schema.processor.ObjectClassComplexTypeDefinition; import com.evolveum.midpoint.schema.result.OperationResult; @@ -35,9 +31,8 @@ /** * @author semancik - * */ -@ContextConfiguration(locations = {"classpath:ctx-model-test-main.xml"}) +@ContextConfiguration(locations = { "classpath:ctx-model-test-main.xml" }) @DirtiesContext(classMode = ClassMode.AFTER_CLASS) public class TestRefinedSchema extends AbstractInternalModelIntegrationTest { @@ -55,7 +50,6 @@ public class TestRefinedSchema extends AbstractInternalModelIntegrationTest { "task-reconcile-dummy-kind-intent-objectclass.xml"); public static final String TASK_RECONCILE_DUMMY_KIND_INTENT_OBJECTCLASS_OID = "3f2a1140-e60e-11e5-adb7-776abfbb2227"; - private RefinedResourceSchema refinedSchema; private RefinedResourceSchema refinedSchemaModel; @@ -63,7 +57,6 @@ public class TestRefinedSchema extends AbstractInternalModelIntegrationTest { public void initSystem(Task initTask, OperationResult initResult) throws Exception { super.initSystem(initTask, initResult); InternalMonitor.reset(); -// InternalMonitor.setTraceShadowFetchOperation(true); } @Test @@ -81,7 +74,7 @@ public void test000Sanity() throws Exception { } @Test - public void test010SanityModel() throws Exception { + public void test010SanityModel() throws Exception { final String TEST_NAME = "test010SanityModel"; TestUtil.displayTestTitle(this, TEST_NAME); @@ -93,8 +86,8 @@ public void test010SanityModel() throws Exception { // THEN getDummyResourceController().assertRefinedSchemaSanity(refinedSchemaModel); - assertTrue("Not layer refined schema, it is "+refinedSchemaModel.getClass(), refinedSchemaModel instanceof LayerRefinedResourceSchema); - assertEquals("Wrong layer", LayerType.MODEL, ((LayerRefinedResourceSchema)refinedSchemaModel).getLayer()); + assertTrue("Not layer refined schema, it is " + refinedSchemaModel.getClass(), refinedSchemaModel instanceof LayerRefinedResourceSchema); + assertEquals("Wrong layer", LayerType.MODEL, ((LayerRefinedResourceSchema) refinedSchemaModel).getLayer()); } @Test @@ -108,9 +101,8 @@ public void test100EntitlementRefinedObjectClasses() throws Exception { display("entitlement rOcDefs", entitlementROcDefs); // THEN - - for (RefinedObjectClassDefinition entitlementROcDef: entitlementROcDefs) { - assertEquals("Wrong kind in "+entitlementROcDef, ShadowKindType.ENTITLEMENT, entitlementROcDef.getKind()); + for (RefinedObjectClassDefinition entitlementROcDef : entitlementROcDefs) { + assertEquals("Wrong kind in " + entitlementROcDef, ShadowKindType.ENTITLEMENT, entitlementROcDef.getKind()); } assertEquals("Wrong number of entitlement rOcDefs", 6, entitlementROcDefs.size()); @@ -127,9 +119,8 @@ public void test101EntitlementRefinedObjectClassesModel() throws Exception { display("entitlement rOcDefs", entitlementROcDefs); // THEN - - for (RefinedObjectClassDefinition entitlementROcDef: entitlementROcDefs) { - assertEquals("Wrong kind in "+entitlementROcDef, ShadowKindType.ENTITLEMENT, entitlementROcDef.getKind()); + for (RefinedObjectClassDefinition entitlementROcDef : entitlementROcDefs) { + assertEquals("Wrong kind in " + entitlementROcDef, ShadowKindType.ENTITLEMENT, entitlementROcDef.getKind()); } assertEquals("Wrong number of entitlement rOcDefs", 6, entitlementROcDefs.size()); @@ -140,7 +131,7 @@ public void test110DetermineObjectClassObjectClass() throws Exception { final String TEST_NAME = "test110DetermineObjectClassObjectClass"; TestUtil.displayTestTitle(this, TEST_NAME); - OperationResult result = new OperationResult(TestRefinedSchema.class.getName() + "." + TEST_NAME); + OperationResult result = new OperationResult(TestRefinedSchema.class.getName() + "." + TEST_NAME); importObjectFromFile(TASK_RECONCILE_DUMMY_OBJECTCLASS_FILE); @@ -163,7 +154,7 @@ public void test112DetermineObjectClassKindIntent() throws Exception { final String TEST_NAME = "test112DetermineObjectClassKindIntent"; TestUtil.displayTestTitle(this, TEST_NAME); - OperationResult result = new OperationResult(TestRefinedSchema.class.getName() + "." + TEST_NAME); + OperationResult result = new OperationResult(TestRefinedSchema.class.getName() + "." + TEST_NAME); importObjectFromFile(TASK_RECONCILE_DUMMY_KIND_INTENT_FILE); @@ -186,7 +177,7 @@ public void test114DetermineObjectClassKindIntentObjectClass() throws Exception final String TEST_NAME = "test114DetermineObjectClassKindIntentObjectClass"; TestUtil.displayTestTitle(this, TEST_NAME); - OperationResult result = new OperationResult(TestRefinedSchema.class.getName() + "." + TEST_NAME); + OperationResult result = new OperationResult(TestRefinedSchema.class.getName() + "." + TEST_NAME); importObjectFromFile(TASK_RECONCILE_DUMMY_KIND_INTENT_OBJECTCLASS_FILE); @@ -209,7 +200,7 @@ public void test120DetermineObjectClassObjectClassModel() throws Exception { final String TEST_NAME = "test120DetermineObjectClassObjectClassModel"; TestUtil.displayTestTitle(this, TEST_NAME); - OperationResult result = new OperationResult(TestRefinedSchema.class.getName() + "." + TEST_NAME); + OperationResult result = new OperationResult(TestRefinedSchema.class.getName() + "." + TEST_NAME); importObjectFromFile(TASK_RECONCILE_DUMMY_OBJECTCLASS_FILE); @@ -233,7 +224,7 @@ public void test122DetermineObjectClassKindIntentModel() throws Exception { final String TEST_NAME = "test122DetermineObjectClassKindIntentModel"; TestUtil.displayTestTitle(this, TEST_NAME); - OperationResult result = new OperationResult(TestRefinedSchema.class.getName() + "." + TEST_NAME); + OperationResult result = new OperationResult(TestRefinedSchema.class.getName() + "." + TEST_NAME); importObjectFromFile(TASK_RECONCILE_DUMMY_KIND_INTENT_FILE); @@ -258,7 +249,7 @@ public void test124DetermineObjectClassKindIntentObjectClassModel() throws Excep final String TEST_NAME = "test124DetermineObjectClassKindIntentObjectClassModel"; TestUtil.displayTestTitle(this, TEST_NAME); - OperationResult result = new OperationResult(TestRefinedSchema.class.getName() + "." + TEST_NAME); + OperationResult result = new OperationResult(TestRefinedSchema.class.getName() + "." + TEST_NAME); importObjectFromFile(TASK_RECONCILE_DUMMY_KIND_INTENT_OBJECTCLASS_FILE); @@ -281,26 +272,25 @@ public void test124DetermineObjectClassKindIntentObjectClassModel() throws Excep private void assertObjectClass(ObjectClassComplexTypeDefinition objectClass, QName objectClassQName) { assertNotNull("No object class", objectClass); - assertEquals("Wrong object class QName in object class "+objectClass, objectClassQName, objectClass.getTypeName()); + assertEquals("Wrong object class QName in object class " + objectClass, objectClassQName, objectClass.getTypeName()); } private void assertRefinedObjectClass(ObjectClassComplexTypeDefinition objectClass, QName objectClassQName, ShadowKindType kind, String intent) { assertNotNull("No object class", objectClass); if (!(objectClass instanceof RefinedObjectClassDefinition)) { - AssertJUnit.fail("Expected refined object class definition, but it was "+objectClass+" ("+objectClass.getClass()+")"); + AssertJUnit.fail("Expected refined object class definition, but it was " + objectClass + " (" + objectClass.getClass() + ")"); } - RefinedObjectClassDefinition rOcDef = (RefinedObjectClassDefinition)objectClass; - assertEquals("Wrong object class QName in rOcDef "+rOcDef, objectClassQName, rOcDef.getTypeName()); - assertEquals("Wrong kind in rOcDef "+rOcDef, kind, rOcDef.getKind()); - assertEquals("Wrong kind in rOcDef "+rOcDef, intent, rOcDef.getIntent()); + RefinedObjectClassDefinition rOcDef = (RefinedObjectClassDefinition) objectClass; + assertEquals("Wrong object class QName in rOcDef " + rOcDef, objectClassQName, rOcDef.getTypeName()); + assertEquals("Wrong kind in rOcDef " + rOcDef, kind, rOcDef.getKind()); + assertEquals("Wrong kind in rOcDef " + rOcDef, intent, rOcDef.getIntent()); } private void assertLayerRefinedObjectClass(ObjectClassComplexTypeDefinition objectClass, QName objectClassQName, ShadowKindType kind, String intent, LayerType layer) { assertRefinedObjectClass(objectClass, objectClassQName, kind, intent); - assertTrue("Not layer refined definition, it is "+refinedSchemaModel.getClass(), objectClass instanceof LayerRefinedObjectClassDefinition); - assertEquals("Wrong layer", layer, ((LayerRefinedObjectClassDefinition)objectClass).getLayer()); - + assertTrue("Not layer refined definition, it is " + refinedSchemaModel.getClass(), objectClass instanceof LayerRefinedObjectClassDefinition); + assertEquals("Wrong layer", layer, ((LayerRefinedObjectClassDefinition) objectClass).getLayer()); } } diff --git a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjectorRoleEntitlement.java b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjectorRoleEntitlement.java index 03d85c67bf7..5f2e0bb81f9 100644 --- a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjectorRoleEntitlement.java +++ b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjectorRoleEntitlement.java @@ -6,15 +6,10 @@ */ package com.evolveum.midpoint.model.impl.lens; -import static org.testng.AssertJUnit.assertEquals; -import static org.testng.AssertJUnit.assertFalse; -import static org.testng.AssertJUnit.assertNotNull; -import static org.testng.AssertJUnit.assertNull; -import static org.testng.AssertJUnit.assertTrue; +import static org.testng.AssertJUnit.*; import java.io.File; import java.util.Collection; - import javax.xml.namespace.QName; import org.springframework.beans.factory.annotation.Autowired; @@ -24,8 +19,6 @@ import org.testng.annotations.Test; import com.evolveum.midpoint.model.api.context.SynchronizationPolicyDecision; -import com.evolveum.midpoint.model.impl.lens.LensContext; -import com.evolveum.midpoint.model.impl.lens.LensProjectionContext; import com.evolveum.midpoint.model.impl.lens.projector.Projector; import com.evolveum.midpoint.prism.OriginType; import com.evolveum.midpoint.prism.PrismObject; @@ -42,15 +35,10 @@ import com.evolveum.midpoint.test.DummyResourceContoller; import com.evolveum.midpoint.test.IntegrationTestTools; import com.evolveum.midpoint.test.util.TestUtil; -import com.evolveum.midpoint.xml.ns._public.common.common_3.ActivationStatusType; -import com.evolveum.midpoint.xml.ns._public.common.common_3.AssignmentPolicyEnforcementType; -import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleType; -import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowKindType; -import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowType; +import com.evolveum.midpoint.xml.ns._public.common.common_3.*; /** * @author semancik - * */ @ContextConfiguration(locations = {"classpath:ctx-model-test-main.xml"}) @DirtiesContext(classMode = ClassMode.AFTER_CLASS) diff --git a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/sync/ActionManagerImplTest.java b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/sync/ActionManagerImplTest.java index 85557640231..f48ce884561 100644 --- a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/sync/ActionManagerImplTest.java +++ b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/sync/ActionManagerImplTest.java @@ -6,21 +6,17 @@ */ package com.evolveum.midpoint.model.impl.sync; -import static org.testng.AssertJUnit.assertNull; import static org.testng.AssertJUnit.assertNotNull; +import static org.testng.AssertJUnit.assertNull; -import org.testng.annotations.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.testng.AbstractTestNGSpringContextTests; +import org.testng.annotations.Test; -import com.evolveum.midpoint.model.impl.sync.Action; -import com.evolveum.midpoint.model.impl.sync.ActionManager; /** - * * @author lazyman - * */ @ContextConfiguration(locations = { "classpath:ctx-model-test-no-repo.xml" }) public class ActionManagerImplTest extends AbstractTestNGSpringContextTests { diff --git a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/sync/SynchronizationSituationTest.java b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/sync/SynchronizationSituationTest.java index ee0bdae6acb..c0aaec240a4 100644 --- a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/sync/SynchronizationSituationTest.java +++ b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/sync/SynchronizationSituationTest.java @@ -6,17 +6,14 @@ */ package com.evolveum.midpoint.model.impl.sync; -import org.testng.annotations.Test; import org.testng.AssertJUnit; +import org.testng.annotations.Test; -import com.evolveum.midpoint.model.impl.sync.SynchronizationSituation; import com.evolveum.midpoint.xml.ns._public.common.common_3.SynchronizationSituationType; import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType; /** - * * @author lazyman - * */ public class SynchronizationSituationTest { diff --git a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/sync/TestSynchronizationService.java b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/sync/TestSynchronizationService.java index 20ae93abb31..b8df391eb64 100644 --- a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/sync/TestSynchronizationService.java +++ b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/sync/TestSynchronizationService.java @@ -6,10 +6,7 @@ */ package com.evolveum.midpoint.model.impl.sync; -import static org.testng.AssertJUnit.assertEquals; -import static org.testng.AssertJUnit.assertNotNull; -import static org.testng.AssertJUnit.assertNull; -import static org.testng.AssertJUnit.assertFalse; +import static org.testng.AssertJUnit.*; import java.io.File; @@ -34,7 +31,6 @@ import com.evolveum.midpoint.prism.util.PrismAsserts; import com.evolveum.midpoint.provisioning.api.ResourceObjectShadowChangeDescription; import com.evolveum.midpoint.schema.ResourceShadowDiscriminator; -import com.evolveum.midpoint.schema.constants.MidPointConstants; import com.evolveum.midpoint.schema.constants.SchemaConstants; import com.evolveum.midpoint.schema.internals.InternalCounters; import com.evolveum.midpoint.schema.result.OperationResult; @@ -54,7 +50,6 @@ /** * @author semancik - * */ @ContextConfiguration(locations = {"classpath:ctx-model-test-main.xml"}) @DirtiesContext(classMode = ClassMode.AFTER_CLASS) @@ -65,7 +60,6 @@ public class TestSynchronizationService extends AbstractInternalModelIntegration public static final File RESOURCE_DUMMY_LIMITED_FILE = new File(TEST_DIR, "resource-dummy-limited.xml"); public static final String RESOURCE_DUMMY_LIMITED_OID = "cbe8baa0-64dd-11e8-9760-076bd690e1c4"; public static final String RESOURCE_DUMMY_LIMITED_NAME = "limited"; - public static final String RESOURCE_DUMMY_LIMITED_NAMESPACE = MidPointConstants.NS_RI; public static final File SHADOW_PIRATES_DUMMY_FILE = new File(TEST_DIR, "shadow-pirates-dummy.xml"); public static final String GROUP_PIRATES_DUMMY_NAME = "pirates"; @@ -233,7 +227,7 @@ public void test021ModifyLootAbsoluteEmpty() throws Exception { synchronizationService.notifyChange(change, task, result); // THEN - LensContext context = cleanDebugListener();; + LensContext context = cleanDebugListener(); display("Resulting context (as seen by debug listener)", context); assertNotNull("No resulting context (as seen by debug listener)", context); @@ -258,7 +252,7 @@ public void test021ModifyLootAbsoluteEmpty() throws Exception { assertLinked(context.getFocusContext().getObjectOld().getOid(), accountShadowJack.getOid()); PrismObject user = getUser(USER_JACK_OID); - assertEquals("Unexpected used constCenter", null, user.asObjectable().getCostCenter()); + assertNull("Unexpected used constCenter", user.asObjectable().getCostCenter()); PrismObject shadow = getShadowModelNoFetch(accountShadowJackDummyOid); assertIteration(shadow, 0, ""); @@ -571,8 +565,6 @@ public void test100AddedAccountJack() throws Exception { PrismAsserts.assertNoDelta("Unexpected account primary delta", accCtx.getPrimaryDelta()); //it this really expected?? delta was already executed, should we expect it in the secondary delta? -// assertNotNull("Missing account secondary delta", accCtx.getSecondaryDelta()); -// assertIterationDelta(accCtx.getSecondaryDelta(), 0, ""); assertLinked(context.getFocusContext().getObjectOld().getOid(), accountShadowJack.getOid()); @@ -817,7 +809,7 @@ public void test210AssignJackDummy() throws Exception { ResourceShadowDiscriminator rat = new ResourceShadowDiscriminator(getDummyResourceObject().getOid(), ShadowKindType.ACCOUNT, null, null, false); LensProjectionContext accCtx = context.findProjectionContext(rat); assertNotNull("No account sync context for "+rat, accCtx); - assertEquals("Wrong detected situation in context", null, accCtx.getSynchronizationSituationDetected()); + assertNull("Wrong detected situation in context", accCtx.getSynchronizationSituationDetected()); assertEquals("Wrong resolved situation in context", SynchronizationSituationType.LINKED, accCtx.getSynchronizationSituationResolved()); PrismAsserts.assertNoDelta("Unexpected account primary delta", accCtx.getPrimaryDelta()); @@ -866,7 +858,7 @@ public void test212AssignJackDummyLimited() throws Exception { ResourceShadowDiscriminator rat = new ResourceShadowDiscriminator(RESOURCE_DUMMY_LIMITED_OID, ShadowKindType.ACCOUNT, null, null, false); LensProjectionContext accCtx = context.findProjectionContext(rat); assertNotNull("No account sync context for "+rat, accCtx); - assertEquals("Wrong detected situation in context", null, accCtx.getSynchronizationSituationDetected()); + assertNull("Wrong detected situation in context", accCtx.getSynchronizationSituationDetected()); assertEquals("Wrong resolved situation in context", SynchronizationSituationType.LINKED, accCtx.getSynchronizationSituationResolved()); PrismAsserts.assertNoDelta("Unexpected account primary delta", accCtx.getPrimaryDelta()); @@ -947,14 +939,14 @@ public void test214UpdatedAccountJackLimited() throws Exception { LensProjectionContext accCtxDummy = context.findProjectionContext(ratDummy); assertNotNull("No account sync context for "+ratDummy, accCtxDummy); PrismAsserts.assertNoDelta("Unexpected account primary delta", accCtxDummy.getPrimaryDelta()); - assertEquals("Wrong fullShadow for "+ratDummy, false, accCtxDummy.isFullShadow()); - assertEquals("Wrong canProject for "+ratDummy, false, accCtxDummy.isCanProject()); + assertFalse("Wrong fullShadow for " + ratDummy, accCtxDummy.isFullShadow()); + assertFalse("Wrong canProject for " + ratDummy, accCtxDummy.isCanProject()); ResourceShadowDiscriminator ratDummyLimited = new ResourceShadowDiscriminator(RESOURCE_DUMMY_LIMITED_OID, ShadowKindType.ACCOUNT, null, null, false); LensProjectionContext accCtxDummyLimited = context.findProjectionContext(ratDummyLimited); assertNotNull("No account sync context for "+ratDummyLimited, accCtxDummyLimited); - assertEquals("Wrong fullShadow for "+ratDummyLimited, true, accCtxDummyLimited.isFullShadow()); - assertEquals("Wrong canProject for "+ratDummyLimited, true, accCtxDummyLimited.isCanProject()); + assertTrue("Wrong fullShadow for " + ratDummyLimited, accCtxDummyLimited.isFullShadow()); + assertTrue("Wrong canProject for " + ratDummyLimited, accCtxDummyLimited.isCanProject()); assertLinked(context.getFocusContext().getObjectOld().getOid(), accountShadowJackDummyOid); @@ -1018,9 +1010,8 @@ public void test300AddedGroupPirates() throws Exception { assertNotNull("No resulting context (as seen by debug listener)", context); assertNotNull("No focus primary delta", context.getFocusContext().getPrimaryDelta()); -// assertNotNull("No focus secondary delta", context.getFocusContext().getSecondaryDelta()); assertFalse("No executed focus deltas", context.getFocusContext().getExecutedDeltas().isEmpty()); - ObjectDelta userSecondaryDelta = (ObjectDelta) context.getFocusContext().getExecutedDeltas().iterator().next().getObjectDelta(); + ObjectDelta userSecondaryDelta = context.getFocusContext().getExecutedDeltas().iterator().next().getObjectDelta(); ResourceShadowDiscriminator rat = new ResourceShadowDiscriminator(getDummyResourceObject().getOid(), ShadowKindType.ENTITLEMENT, INTENT_GROUP, null, false); @@ -1030,9 +1021,6 @@ public void test300AddedGroupPirates() throws Exception { assertEquals("Wrong resolved situation in context", SynchronizationSituationType.LINKED, projCtx.getSynchronizationSituationResolved()); PrismAsserts.assertNoDelta("Unexpected projection primary delta", projCtx.getPrimaryDelta()); - //it this really expected?? delta was already executed, should we expect it in the secondary delta? -// assertNotNull("Missing account secondary delta", accCtx.getSecondaryDelta()); -// assertIterationDelta(accCtx.getSecondaryDelta(), 0, ""); assertLinked(RoleType.class, context.getFocusContext().getOid(), shadowPirates.getOid()); @@ -1065,5 +1053,4 @@ private LensContext cleanDebugListener() { DiagnosticContextHolder.pop(); return mockListener.getLastSyncContext(); } - } diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestLoggingConfiguration.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestLoggingConfiguration.java index 99dca72ac8d..2e35fe6d0a9 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestLoggingConfiguration.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestLoggingConfiguration.java @@ -6,10 +6,11 @@ */ package com.evolveum.midpoint.model.intest; -import static com.evolveum.midpoint.schema.util.ObjectTypeUtil.cast; -import static com.evolveum.midpoint.test.IntegrationTestTools.*; import static org.testng.AssertJUnit.*; +import static com.evolveum.midpoint.schema.util.ObjectTypeUtil.cast; +import static com.evolveum.midpoint.test.IntegrationTestTools.LOGGER; + import java.util.Collection; import java.util.Iterator; @@ -20,10 +21,6 @@ import ch.qos.logback.core.rolling.RollingFileAppender; import ch.qos.logback.core.rolling.RollingPolicy; import ch.qos.logback.core.rolling.TimeBasedRollingPolicy; -import com.evolveum.midpoint.prism.delta.*; -import com.evolveum.midpoint.util.aspect.ProfilingDataManager; - -import com.evolveum.midpoint.xml.ns._public.common.common_3.*; import org.slf4j.LoggerFactory; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; @@ -34,6 +31,9 @@ import com.evolveum.midpoint.common.LoggingConfigurationManager; import com.evolveum.midpoint.model.api.ModelExecuteOptions; import com.evolveum.midpoint.prism.PrismObject; +import com.evolveum.midpoint.prism.delta.DeltaFactory; +import com.evolveum.midpoint.prism.delta.ItemDelta; +import com.evolveum.midpoint.prism.delta.ObjectDelta; import com.evolveum.midpoint.prism.util.PrismTestUtil; import com.evolveum.midpoint.schema.internals.InternalsConfig; import com.evolveum.midpoint.schema.result.OperationResult; @@ -42,16 +42,17 @@ import com.evolveum.midpoint.test.IntegrationTestTools; import com.evolveum.midpoint.test.util.LogfileTestTailer; import com.evolveum.midpoint.test.util.TestUtil; +import com.evolveum.midpoint.util.aspect.ProfilingDataManager; +import com.evolveum.midpoint.xml.ns._public.common.common_3.*; /** * @author semancik - * */ -@ContextConfiguration(locations = {"classpath:ctx-model-intest-test-main.xml"}) +@ContextConfiguration(locations = { "classpath:ctx-model-intest-test-main.xml" }) @DirtiesContext(classMode = ClassMode.AFTER_CLASS) public class TestLoggingConfiguration extends AbstractConfiguredModelIntegrationTest { - private final String JUL_LOGGER_NAME = "com.example.jul.logger"; + private static final String JUL_LOGGER_NAME = "com.example.jul.logger"; @Override public void initSystem(Task initTask, OperationResult initResult) throws Exception { @@ -71,7 +72,7 @@ public void test001CreateSystemConfiguration() throws Exception { LogfileTestTailer tailer = new LogfileTestTailer(LoggingConfigurationManager.AUDIT_LOGGER_NAME); PrismObject systemConfiguration = PrismTestUtil.parseObject(SYSTEM_CONFIGURATION_FILE); - Task task = taskManager.createTaskInstance(TestLoggingConfiguration.class.getName()+"."+TEST_NAME); + Task task = taskManager.createTaskInstance(TestLoggingConfiguration.class.getName() + "." + TEST_NAME); OperationResult result = task.getResult(); ObjectDelta systemConfigurationAddDelta = DeltaFactory.Object.createAddDelta(systemConfiguration); Collection> deltas = MiscSchemaUtil.createCollection(systemConfigurationAddDelta); @@ -89,7 +90,6 @@ public void test001CreateSystemConfiguration() throws Exception { } - @Test public void test002InitialConfiguration() throws Exception { final String TEST_NAME = "test002InitialConfiguration"; @@ -98,7 +98,7 @@ public void test002InitialConfiguration() throws Exception { // GIVEN LogfileTestTailer tailer = new LogfileTestTailer(LoggingConfigurationManager.AUDIT_LOGGER_NAME); - Task task = taskManager.createTaskInstance(TestLoggingConfiguration.class.getName()+"."+TEST_NAME); + Task task = taskManager.createTaskInstance(TestLoggingConfiguration.class.getName() + "." + TEST_NAME); OperationResult result = task.getResult(); PrismObject systemConfiguration = PrismTestUtil.parseObject(SYSTEM_CONFIGURATION_FILE); @@ -111,7 +111,7 @@ public void test002InitialConfiguration() throws Exception { modelSubSystemLogger.setLevel(LoggingLevelType.TRACE); logging.getSubSystemLogger().add(modelSubSystemLogger); - Collection modifications = prismContext.deltaFor(SystemConfigurationType.class) + Collection> modifications = prismContext.deltaFor(SystemConfigurationType.class) .item(SystemConfigurationType.F_LOGGING) .replace(logging.asPrismContainerValue().clone()) .asItemDeltas(); @@ -152,7 +152,7 @@ public void test004OverwriteInitialConfiguration() throws Exception { // GIVEN LogfileTestTailer tailer = new LogfileTestTailer(LoggingConfigurationManager.AUDIT_LOGGER_NAME); - Task task = taskManager.createTaskInstance(TestLoggingConfiguration.class.getName()+"."+TEST_NAME); + Task task = taskManager.createTaskInstance(TestLoggingConfiguration.class.getName() + "." + TEST_NAME); OperationResult result = task.getResult(); PrismObject systemConfiguration = getObject(SystemConfigurationType.class, SystemObjectsType.SYSTEM_CONFIGURATION.value()); @@ -184,7 +184,7 @@ public void test004OverwriteInitialConfiguration() throws Exception { PrismObject systemConfigurationNew = getObject(SystemConfigurationType.class, SystemObjectsType.SYSTEM_CONFIGURATION.value()); String newVersion = systemConfigurationNew.getVersion(); - assertTrue("Versions do not follow: "+previousVersion+" -> "+newVersion, + assertTrue("Versions do not follow: " + previousVersion + " -> " + newVersion, Integer.parseInt(previousVersion) < Integer.parseInt(newVersion)); } @@ -197,7 +197,7 @@ public void test010AddModelSubsystemLogger() throws Exception { // GIVEN LogfileTestTailer tailer = new LogfileTestTailer(LoggingConfigurationManager.AUDIT_LOGGER_NAME); - Task task = taskManager.createTaskInstance(TestLoggingConfiguration.class.getName()+"."+TEST_NAME); + Task task = taskManager.createTaskInstance(TestLoggingConfiguration.class.getName() + "." + TEST_NAME); OperationResult result = task.getResult(); // Precondition @@ -210,7 +210,7 @@ public void test010AddModelSubsystemLogger() throws Exception { // Setup PrismObject systemConfiguration = - PrismTestUtil.parseObject(AbstractInitializedModelIntegrationTest.SYSTEM_CONFIGURATION_FILE); + PrismTestUtil.parseObject(AbstractInitializedModelIntegrationTest.SYSTEM_CONFIGURATION_FILE); LoggingConfigurationType logging = systemConfiguration.asObjectable().getLogging(); applyTestLoggingConfig(logging); @@ -251,7 +251,6 @@ public void test010AddModelSubsystemLogger() throws Exception { } - @Test public void test020JulLoggingDisabled() throws Exception { final String TEST_NAME = "test020JulLoggingDisabled"; @@ -293,12 +292,12 @@ public void test021JulLoggingEnabled() throws Exception { java.util.logging.Logger julLogger = java.util.logging.Logger.getLogger(JUL_LOGGER_NAME); - Task task = taskManager.createTaskInstance(TestLoggingConfiguration.class.getName()+"."+TEST_NAME); + Task task = taskManager.createTaskInstance(TestLoggingConfiguration.class.getName() + "." + TEST_NAME); OperationResult result = task.getResult(); // Setup PrismObject systemConfiguration = - PrismTestUtil.parseObject(AbstractInitializedModelIntegrationTest.SYSTEM_CONFIGURATION_FILE); + PrismTestUtil.parseObject(AbstractInitializedModelIntegrationTest.SYSTEM_CONFIGURATION_FILE); LoggingConfigurationType logging = systemConfiguration.asObjectable().getLogging(); applyTestLoggingConfig(logging); @@ -306,7 +305,7 @@ public void test021JulLoggingEnabled() throws Exception { ClassLoggerConfigurationType classLoggerConfig = new ClassLoggerConfigurationType(); classLoggerConfig.setPackage(JUL_LOGGER_NAME); classLoggerConfig.setLevel(LoggingLevelType.ALL); - logging.getClassLogger().add(classLoggerConfig ); + logging.getClassLogger().add(classLoggerConfig); ObjectDelta systemConfigDelta = prismContext.deltaFactory().object().createModificationReplaceContainer(SystemConfigurationType.class, AbstractInitializedModelIntegrationTest.SYSTEM_CONFIGURATION_OID, SystemConfigurationType.F_LOGGING, @@ -350,14 +349,14 @@ public void test030ConnectorLogging() throws Exception { // ICF logging is prefixing the messages; tailer.setAllowPrefix(true); - Task task = taskManager.createTaskInstance(TestLoggingConfiguration.class.getName()+"."+TEST_NAME); + Task task = taskManager.createTaskInstance(TestLoggingConfiguration.class.getName() + "." + TEST_NAME); OperationResult result = task.getResult(); importObjectFromFile(RESOURCE_DUMMY_FILE, result); // Setup PrismObject systemConfiguration = - PrismTestUtil.parseObject(AbstractInitializedModelIntegrationTest.SYSTEM_CONFIGURATION_FILE); + PrismTestUtil.parseObject(AbstractInitializedModelIntegrationTest.SYSTEM_CONFIGURATION_FILE); LoggingConfigurationType logging = systemConfiguration.asObjectable().getLogging(); applyTestLoggingConfig(logging); @@ -365,7 +364,7 @@ public void test030ConnectorLogging() throws Exception { ClassLoggerConfigurationType classLogerCongif = new ClassLoggerConfigurationType(); classLogerCongif.setPackage(DummyConnector.class.getPackage().getName()); classLogerCongif.setLevel(LoggingLevelType.ALL); - logging.getClassLogger().add(classLogerCongif ); + logging.getClassLogger().add(classLogerCongif); ObjectDelta systemConfigDelta = prismContext.deltaFactory().object().createModificationReplaceContainer(SystemConfigurationType.class, AbstractInitializedModelIntegrationTest.SYSTEM_CONFIGURATION_OID, SystemConfigurationType.F_LOGGING, @@ -409,7 +408,7 @@ public void test101EnableBasicAudit() throws Exception { // GIVEN LogfileTestTailer tailer = new LogfileTestTailer(LoggingConfigurationManager.AUDIT_LOGGER_NAME); - Task task = taskManager.createTaskInstance(TestLoggingConfiguration.class.getName()+".test101EnableBasicAudit"); + Task task = taskManager.createTaskInstance(TestLoggingConfiguration.class.getName() + ".test101EnableBasicAudit"); OperationResult result = task.getResult(); // Precondition @@ -472,7 +471,7 @@ public void test110SetMaxHistory() throws Exception { TestUtil.displayTestTitle("test110SetMaxHistory"); // GIVEN - Task task = taskManager.createTaskInstance(TestLoggingConfiguration.class.getName()+".test101EnableBasicAudit"); + Task task = taskManager.createTaskInstance(TestLoggingConfiguration.class.getName() + ".test101EnableBasicAudit"); OperationResult result = task.getResult(); // Setup @@ -510,7 +509,7 @@ public void test110SetMaxHistory() throws Exception { RollingPolicy rollingPolicy = fileAppender.getRollingPolicy(); System.out.println("Rolling policy = " + rollingPolicy); assertTrue("Wrong type of rolling policy", rollingPolicy instanceof TimeBasedRollingPolicy); - TimeBasedRollingPolicy timeBasedRollingPolicy = (TimeBasedRollingPolicy) rollingPolicy; + TimeBasedRollingPolicy timeBasedRollingPolicy = (TimeBasedRollingPolicy) rollingPolicy; assertEquals("Wrong maxHistory", 100, timeBasedRollingPolicy.getMaxHistory()); } diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java index 6eeaba44a7f..aeebe2b6f81 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java @@ -67,7 +67,7 @@ public class TestRbac extends AbstractRbacTest { private String userRedskullOid; private String userBignoseOid; - private final String EXISTING_GOSSIP = "Black spot!"; + private static final String EXISTING_GOSSIP = "Black spot!"; private String accountJackRedOid; diff --git a/testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java b/testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java index 17042234e12..ebdb5115758 100644 --- a/testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java +++ b/testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java @@ -314,7 +314,7 @@ public class TestSanity extends AbstractModelIntegrationTest { private int lastSyncToken; - @Autowired(required = true) + @Autowired private MatchingRuleRegistry matchingRuleRegistry; // This will get called from the superclass to init the repository @@ -4086,11 +4086,8 @@ public boolean check() throws CommonException { } int tokenNow = findSyncToken(syncCycle); display("tokenNow = " + tokenNow); - if (tokenNow >= tokenBefore + increment) { - return true; - } else { - return false; - } + + return tokenNow >= tokenBefore + increment; } @Override @@ -4102,9 +4099,6 @@ public void timeout() { private void setAssignmentEnforcement(AssignmentPolicyEnforcementType enforcementType) throws ObjectNotFoundException, SchemaException, ObjectAlreadyExistsException { assumeAssignmentPolicy(enforcementType); -// AccountSynchronizationSettingsType syncSettings = new AccountSynchronizationSettingsType(); -// syncSettings.setAssignmentPolicyEnforcement(enforcementType); -// applySyncSettings(SystemConfigurationType.class, syncSettings); } private void assertSyncSettingsAssignmentPolicyEnforcement(AssignmentPolicyEnforcementType assignmentPolicy) throws