diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/AbstractProvisioningIntegrationTest.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/AbstractProvisioningIntegrationTest.java index cb8381e356f..026236bbf55 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/AbstractProvisioningIntegrationTest.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/AbstractProvisioningIntegrationTest.java @@ -19,73 +19,20 @@ */ package com.evolveum.midpoint.provisioning.impl; -import static com.evolveum.midpoint.test.IntegrationTestTools.display; -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 java.io.File; -import java.util.List; - -import javax.xml.bind.JAXBElement; -import com.evolveum.midpoint.common.refinery.RefinedResourceSchemaImpl; -import com.evolveum.midpoint.schema.processor.ResourceSchemaImpl; -import org.apache.commons.io.FileUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; -import org.testng.AssertJUnit; -import org.testng.annotations.Test; -import org.w3c.dom.Element; -import com.evolveum.midpoint.common.refinery.RefinedResourceSchema; -import com.evolveum.midpoint.prism.Containerable; -import com.evolveum.midpoint.prism.PrismContainer; -import com.evolveum.midpoint.prism.PrismContainerDefinition; -import com.evolveum.midpoint.prism.PrismContext; -import com.evolveum.midpoint.prism.PrismObject; -import com.evolveum.midpoint.prism.util.PrismTestUtil; -import com.evolveum.midpoint.prism.xnode.PrimitiveXNode; import com.evolveum.midpoint.provisioning.api.ProvisioningService; -import com.evolveum.midpoint.provisioning.impl.dummy.TestDummy; import com.evolveum.midpoint.provisioning.impl.mock.SynchornizationServiceMock; -import com.evolveum.midpoint.provisioning.impl.opendj.TestOpenDj; -import com.evolveum.midpoint.schema.CapabilityUtil; -import com.evolveum.midpoint.schema.constants.SchemaConstants; import com.evolveum.midpoint.schema.internals.InternalsConfig; -import com.evolveum.midpoint.schema.processor.ResourceSchema; import com.evolveum.midpoint.schema.result.OperationResult; -import com.evolveum.midpoint.schema.util.ObjectTypeUtil; -import com.evolveum.midpoint.schema.util.ResourceTypeUtil; import com.evolveum.midpoint.task.api.Task; -import com.evolveum.midpoint.task.api.TaskManager; import com.evolveum.midpoint.test.AbstractIntegrationTest; -import com.evolveum.midpoint.test.IntegrationTestTools; -import com.evolveum.midpoint.test.util.TestUtil; -import com.evolveum.midpoint.util.MiscUtil; -import com.evolveum.midpoint.util.exception.CommunicationException; -import com.evolveum.midpoint.util.exception.ConfigurationException; -import com.evolveum.midpoint.util.exception.ObjectNotFoundException; -import com.evolveum.midpoint.util.exception.SchemaException; -import com.evolveum.midpoint.util.exception.SecurityViolationException; import com.evolveum.midpoint.util.logging.Trace; import com.evolveum.midpoint.util.logging.TraceManager; -import com.evolveum.midpoint.xml.ns._public.common.common_3.CachingMetadataType; -import com.evolveum.midpoint.xml.ns._public.common.common_3.CapabilityCollectionType; -import com.evolveum.midpoint.xml.ns._public.common.common_3.ConnectorType; -import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectFactory; -import com.evolveum.midpoint.xml.ns._public.common.common_3.ProvisioningScriptArgumentType; -import com.evolveum.midpoint.xml.ns._public.common.common_3.ProvisioningScriptHostType; -import com.evolveum.midpoint.xml.ns._public.common.common_3.ProvisioningScriptType; -import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType; -import com.evolveum.midpoint.xml.ns._public.common.common_3.XmlSchemaType; -import com.evolveum.midpoint.xml.ns._public.resource.capabilities_3.ActivationCapabilityType; -import com.evolveum.midpoint.xml.ns._public.resource.capabilities_3.ScriptCapabilityType; -import com.evolveum.midpoint.xml.ns._public.resource.capabilities_3.ScriptCapabilityType.Host; -import com.evolveum.prism.xml.ns._public.types_3.RawType; /** * @author Radovan Semancik diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/ProvisioningTestUtil.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/ProvisioningTestUtil.java index 6a53a7eb418..eb0d8cca4c6 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/ProvisioningTestUtil.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/ProvisioningTestUtil.java @@ -51,9 +51,11 @@ public class ProvisioningTestUtil { public static final File COMMON_TEST_DIR_FILE = new File("src/test/resources/common/"); public static final File TEST_DIR_IMPL_FILE = new File("src/test/resources/impl/"); + public static final File RESOURCE_OPENDJ_FILE = new File(COMMON_TEST_DIR_FILE, "resource-opendj.xml"); + public static final String RESOURCE_DUMMY_NS = "http://midpoint.evolveum.com/xml/ns/public/resource/instance/ef2bc95b-76e0-59e2-86d6-9999dddddddd"; - public static final String DOT_JPG_FILENAME = "src/test/resources/dot.jpg"; + public static final String DOT_JPG_FILENAME = "src/test/resources/common/dot.jpg"; public static final File USER_ADMIN_FILE = new File(COMMON_TEST_DIR_FILE, "admin.xml"); diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/TestDBTable.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/TestDBTable.java index 8608045ef84..7d5e4829f96 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/TestDBTable.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/TestDBTable.java @@ -69,9 +69,11 @@ @DirtiesContext public class TestDBTable extends AbstractIntegrationTest { - private static final File RESOURCE_DERBY_FILE = new File(ProvisioningTestUtil.COMMON_TEST_DIR_FILE, "resource-derby.xml"); + protected static final File TEST_DIR = new File("src/test/resources/db"); + + private static final File RESOURCE_DERBY_FILE = new File(TEST_DIR, "resource-derby.xml"); private static final String RESOURCE_DERBY_OID = "ef2bc95b-76e0-59e2-86d6-999902d3abab"; - private static final File ACCOUNT_WILL_FILE = new File(ProvisioningTestUtil.TEST_DIR_IMPL_FILE, "account-derby.xml"); + private static final File ACCOUNT_WILL_FILE = new File(TEST_DIR, "account-derby.xml"); private static final String ACCOUNT_WILL_OID = "c0c010c0-d34d-b44f-f11d-333222123456"; private static final String ACCOUNT_WILL_USERNAME = "will"; private static final String ACCOUNT_WILL_FULLNAME = "Will Turner"; diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/AbstractBasicDummyTest.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/AbstractBasicDummyTest.java index 54df4e04b8b..ba0b15f72f6 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/AbstractBasicDummyTest.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/AbstractBasicDummyTest.java @@ -1232,7 +1232,7 @@ public void test105ApplyDefinitionModifyDelta() throws Exception { Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); - ObjectModificationType changeAddRoleCaptain = PrismTestUtil.parseAtomicValue(new File(FILENAME_MODIFY_ACCOUNT), + ObjectModificationType changeAddRoleCaptain = PrismTestUtil.parseAtomicValue(MODIFY_ACCOUNT_FILE, ObjectModificationType.COMPLEX_TYPE); ObjectDelta accountDelta = DeltaConvertor.createObjectDelta(changeAddRoleCaptain, ShadowType.class, prismContext); diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/AbstractDummyTest.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/AbstractDummyTest.java index c08062ca8e0..bf11b6a0145 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/AbstractDummyTest.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/AbstractDummyTest.java @@ -15,7 +15,6 @@ */ package com.evolveum.midpoint.provisioning.impl.dummy; -import static org.testng.AssertJUnit.assertFalse; import static com.evolveum.midpoint.test.IntegrationTestTools.display; import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertNotNull; @@ -31,57 +30,43 @@ import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.namespace.QName; -import com.evolveum.midpoint.prism.PrismContext; - -import com.evolveum.midpoint.prism.query.builder.QueryBuilder; -import com.evolveum.midpoint.schema.processor.*; import org.springframework.beans.factory.annotation.Autowired; import org.testng.AssertJUnit; import org.w3c.dom.Element; import com.evolveum.icf.dummy.resource.ConflictException; import com.evolveum.icf.dummy.resource.DummyAccount; -import com.evolveum.icf.dummy.resource.DummyAttributeDefinition; import com.evolveum.icf.dummy.resource.DummyGroup; import com.evolveum.icf.dummy.resource.DummyObject; -import com.evolveum.icf.dummy.resource.DummyObjectClass; import com.evolveum.icf.dummy.resource.DummyPrivilege; import com.evolveum.icf.dummy.resource.DummyResource; import com.evolveum.icf.dummy.resource.SchemaViolationException; import com.evolveum.midpoint.common.refinery.RefinedResourceSchema; -import com.evolveum.midpoint.prism.ItemDefinition; -import com.evolveum.midpoint.prism.Objectable; +import com.evolveum.midpoint.prism.PrismContext; import com.evolveum.midpoint.prism.PrismObject; import com.evolveum.midpoint.prism.PrismProperty; import com.evolveum.midpoint.prism.PrismPropertyDefinition; import com.evolveum.midpoint.prism.match.MatchingRule; -import com.evolveum.midpoint.prism.match.MatchingRuleRegistry; import com.evolveum.midpoint.prism.path.ItemPath; -import com.evolveum.midpoint.prism.query.EqualFilter; import com.evolveum.midpoint.prism.query.ObjectQuery; -import com.evolveum.midpoint.prism.util.PrismAsserts; +import com.evolveum.midpoint.prism.query.builder.QueryBuilder; import com.evolveum.midpoint.prism.util.PrismTestUtil; import com.evolveum.midpoint.prism.xml.XmlTypeConverter; -import com.evolveum.midpoint.provisioning.api.ProvisioningService; import com.evolveum.midpoint.provisioning.impl.AbstractProvisioningIntegrationTest; import com.evolveum.midpoint.provisioning.impl.ConnectorManager; import com.evolveum.midpoint.provisioning.impl.ProvisioningContextFactory; -import com.evolveum.midpoint.provisioning.impl.ProvisioningTestUtil; import com.evolveum.midpoint.provisioning.impl.ResourceManager; -import com.evolveum.midpoint.provisioning.impl.mock.SynchornizationServiceMock; import com.evolveum.midpoint.provisioning.ucf.api.ConnectorInstance; import com.evolveum.midpoint.schema.constants.SchemaConstants; -import com.evolveum.midpoint.schema.internals.CachingStatistics; import com.evolveum.midpoint.schema.internals.InternalMonitor; import com.evolveum.midpoint.schema.internals.InternalsConfig; import com.evolveum.midpoint.schema.processor.ResourceSchema; +import com.evolveum.midpoint.schema.processor.ResourceSchemaImpl; import com.evolveum.midpoint.schema.result.OperationResult; import com.evolveum.midpoint.schema.util.ObjectTypeUtil; -import com.evolveum.midpoint.schema.util.ShadowUtil; import com.evolveum.midpoint.schema.util.ResourceTypeUtil; +import com.evolveum.midpoint.schema.util.ShadowUtil; import com.evolveum.midpoint.task.api.Task; -import com.evolveum.midpoint.task.api.TaskManager; -import com.evolveum.midpoint.test.AbstractIntegrationTest; import com.evolveum.midpoint.test.DummyResourceContoller; import com.evolveum.midpoint.test.IntegrationTestTools; import com.evolveum.midpoint.test.util.TestUtil; @@ -94,8 +79,6 @@ import com.evolveum.midpoint.xml.ns._public.common.common_3.CachingMetadataType; import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType; import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType; -import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowAssociationType; -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.XmlSchemaType; import com.evolveum.midpoint.xml.ns._public.resource.capabilities_3.ReadCapabilityType; @@ -106,16 +89,17 @@ */ public abstract class AbstractDummyTest extends AbstractProvisioningIntegrationTest { - protected static final String TEST_DIR = "src/test/resources/impl/dummy/"; + public static final File TEST_DIR_DUMMY = new File("src/test/resources/dummy/"); + protected static final File TEST_DIR = TEST_DIR_DUMMY; - public static final File RESOURCE_DUMMY_FILE = new File(ProvisioningTestUtil.COMMON_TEST_DIR_FILE, "resource-dummy.xml"); + public static final File RESOURCE_DUMMY_FILE = new File(TEST_DIR, "resource-dummy.xml"); public static final String RESOURCE_DUMMY_OID = "ef2bc95b-76e0-59e2-86d6-9999dddddddd"; public static final String RESOURCE_DUMMY_NS = "http://midpoint.evolveum.com/xml/ns/public/resource/instance/ef2bc95b-76e0-59e2-86d6-9999dddddddd"; public static final String RESOURCE_DUMMY_INTENT_GROUP = "group"; protected static final String RESOURCE_DUMMY_NONEXISTENT_OID = "ef2bc95b-000-000-000-009900dddddd"; - protected static final String ACCOUNT_WILL_FILENAME = TEST_DIR + "account-will.xml"; + protected static final File ACCOUNT_WILL_FILE = new File(TEST_DIR, "account-will.xml"); protected static final String ACCOUNT_WILL_OID = "c0c010c0-d34d-b44f-f11d-33322212dddd"; protected static final String ACCOUNT_WILL_USERNAME = "Will"; protected static final XMLGregorianCalendar ACCOUNT_WILL_ENABLE_TIMESTAMP = XmlTypeConverter.createXMLGregorianCalendar(2013, 5, 30, 12, 30, 42); @@ -130,11 +114,11 @@ public abstract class AbstractDummyTest extends AbstractProvisioningIntegrationT protected static final String ACCOUNT_MORGAN_OID = "c0c010c0-d34d-b44f-f11d-444400008888"; protected static final String ACCOUNT_MORGAN_NAME = "morgan"; - protected static final String ACCOUNT_LECHUCK_FILENAME = TEST_DIR + "account-lechuck.xml"; + protected static final File ACCOUNT_LECHUCK_FILE = new File(TEST_DIR, "account-lechuck.xml"); protected static final String ACCOUNT_LECHUCK_OID = "c0c010c0-d34d-b44f-f11d-444400009aa9"; protected static final String ACCOUNT_LECHUCK_NAME = "lechuck"; - protected static final String GROUP_PIRATES_FILENAME = TEST_DIR + "group-pirates.xml"; + protected static final File GROUP_PIRATES_FILE = new File(TEST_DIR, "group-pirates.xml"); protected static final String GROUP_PIRATES_OID = "c0c010c0-d34d-b44f-f11d-3332eeee0000"; protected static final String GROUP_PIRATES_NAME = "pirates"; @@ -142,18 +126,18 @@ public abstract class AbstractDummyTest extends AbstractProvisioningIntegrationT protected static final String PRIVILEGE_PILLAGE_OID = "c0c010c0-d34d-b44f-f11d-3332eeff0000"; protected static final String PRIVILEGE_PILLAGE_NAME = "pillage"; - protected static final String PRIVILEGE_BARGAIN_FILENAME = TEST_DIR + "privilege-bargain.xml"; + protected static final File PRIVILEGE_BARGAIN_FILE = new File(TEST_DIR, "privilege-bargain.xml"); protected static final String PRIVILEGE_BARGAIN_OID = "c0c010c0-d34d-b44f-f11d-3332eeff0001"; protected static final String PRIVILEGE_BARGAIN_NAME = "bargain"; protected static final String PRIVILEGE_NONSENSE_NAME = "NoNsEnSe"; - protected static final String FILENAME_ACCOUNT_SCRIPT = TEST_DIR + "account-script.xml"; + protected static final File ACCOUNT_SCRIPT_FILE = new File(TEST_DIR, "account-script.xml"); protected static final String ACCOUNT_NEW_SCRIPT_OID = "c0c010c0-d34d-b44f-f11d-33322212abcd"; - protected static final String FILENAME_ENABLE_ACCOUNT = TEST_DIR + "modify-will-enable.xml"; - protected static final String FILENAME_DISABLE_ACCOUNT = TEST_DIR + "modify-will-disable.xml"; - protected static final String FILENAME_MODIFY_ACCOUNT = TEST_DIR + "modify-will-fullname.xml"; - protected static final File FILE_SCRIPTS = new File(TEST_DIR, "scripts.xml"); + protected static final File ENABLE_ACCOUNT_FILE = new File(TEST_DIR, "modify-will-enable.xml"); + protected static final File DISABLE_ACCOUNT_FILE = new File(TEST_DIR, "modify-will-disable.xml"); + protected static final File MODIFY_ACCOUNT_FILE = new File(TEST_DIR, "modify-will-fullname.xml"); + protected static final File SCRIPTS_FILE = new File(TEST_DIR, "scripts.xml"); protected static final String NOT_PRESENT_OID = "deaddead-dead-dead-dead-deaddeaddead"; @@ -241,7 +225,7 @@ protected File getResourceDummyFilename() { } protected File getAccountWillFile() { - return new File(ACCOUNT_WILL_FILENAME); + return ACCOUNT_WILL_FILE; } protected String transformNameFromResource(String origName) { diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummy.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummy.java index e12a12564a2..814c1826e9b 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummy.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummy.java @@ -451,7 +451,7 @@ public void test105ApplyDefinitionModifyDelta() throws Exception { Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); - ObjectModificationType changeAddRoleCaptain = PrismTestUtil.parseAtomicValue(new File(FILENAME_MODIFY_ACCOUNT), + ObjectModificationType changeAddRoleCaptain = PrismTestUtil.parseAtomicValue(MODIFY_ACCOUNT_FILE, ObjectModificationType.COMPLEX_TYPE); ObjectDelta accountDelta = DeltaConvertor.createObjectDelta(changeAddRoleCaptain, ShadowType.class, prismContext); @@ -1428,10 +1428,10 @@ public void test131AddScript() throws Exception { syncServiceMock.reset(); dummyResource.purgeScriptHistory(); - ShadowType account = parseObjectTypeFromFile(FILENAME_ACCOUNT_SCRIPT, ShadowType.class); + ShadowType account = parseObjectType(ACCOUNT_SCRIPT_FILE, ShadowType.class); display("Account before add", account); - OperationProvisioningScriptsType scriptsType = unmarshallValueFromFile(FILE_SCRIPTS, OperationProvisioningScriptsType.class); + OperationProvisioningScriptsType scriptsType = unmarshallValueFromFile(SCRIPTS_FILE, OperationProvisioningScriptsType.class); display("Provisioning scripts", PrismTestUtil.serializeAnyDataWrapped(scriptsType)); // WHEN @@ -1484,7 +1484,7 @@ public void test132ModifyScript() throws Exception { syncServiceMock.reset(); dummyResource.purgeScriptHistory(); - OperationProvisioningScriptsType scriptsType = unmarshallValueFromFile(FILE_SCRIPTS, OperationProvisioningScriptsType.class); + OperationProvisioningScriptsType scriptsType = unmarshallValueFromFile(SCRIPTS_FILE, OperationProvisioningScriptsType.class); display("Provisioning scripts", PrismTestUtil.serializeAnyDataWrapped(scriptsType)); ObjectDelta delta = ObjectDelta.createModificationReplaceProperty(ShadowType.class, @@ -1533,7 +1533,7 @@ public void test133ModifyScriptNoExec() throws Exception { syncServiceMock.reset(); dummyResource.purgeScriptHistory(); - OperationProvisioningScriptsType scriptsType = unmarshallValueFromFile(FILE_SCRIPTS, OperationProvisioningScriptsType.class); + OperationProvisioningScriptsType scriptsType = unmarshallValueFromFile(SCRIPTS_FILE, OperationProvisioningScriptsType.class); display("Provisioning scripts", PrismTestUtil.serializeAnyDataWrapped(scriptsType)); ObjectDelta delta = ObjectDelta.createModificationReplaceProperty(ShadowType.class, @@ -1575,7 +1575,7 @@ public void test134DeleteScript() throws Exception { syncServiceMock.reset(); dummyResource.purgeScriptHistory(); - OperationProvisioningScriptsType scriptsType = unmarshallValueFromFile(FILE_SCRIPTS, OperationProvisioningScriptsType.class); + OperationProvisioningScriptsType scriptsType = unmarshallValueFromFile(SCRIPTS_FILE, OperationProvisioningScriptsType.class); display("Provisioning scripts", PrismTestUtil.serializeAnyDataWrapped(scriptsType)); // WHEN @@ -1612,7 +1612,7 @@ public void test135ExecuteScript() throws Exception { syncServiceMock.reset(); dummyResource.purgeScriptHistory(); - OperationProvisioningScriptsType scriptsType = unmarshallValueFromFile(FILE_SCRIPTS, OperationProvisioningScriptsType.class); + OperationProvisioningScriptsType scriptsType = unmarshallValueFromFile(SCRIPTS_FILE, OperationProvisioningScriptsType.class); display("Provisioning scripts", PrismTestUtil.serializeAnyDataWrapped(scriptsType)); ProvisioningScriptType script = scriptsType.getScript().get(0); @@ -2514,7 +2514,7 @@ public void test200AddGroup() throws Exception { OperationResult result = task.getResult(); syncServiceMock.reset(); - PrismObject group = prismContext.parseObject(new File(GROUP_PIRATES_FILENAME)); + PrismObject group = prismContext.parseObject(GROUP_PIRATES_FILE); group.checkConsistence(); rememberDummyResourceGroupMembersReadCount(null); @@ -2794,7 +2794,7 @@ public void test214AddPrivilegeBargain() throws Exception { OperationResult result = task.getResult(); syncServiceMock.reset(); - PrismObject priv = prismContext.parseObject(new File(PRIVILEGE_BARGAIN_FILENAME)); + PrismObject priv = prismContext.parseObject(PRIVILEGE_BARGAIN_FILE); priv.checkConsistence(); rememberDummyResourceGroupMembersReadCount(null); @@ -3410,7 +3410,7 @@ public void test260AddAccountLeChuck() throws Exception { OperationResult result = task.getResult(); syncServiceMock.reset(); - PrismObject accountBefore = prismContext.parseObject(new File(ACCOUNT_LECHUCK_FILENAME)); + PrismObject accountBefore = prismContext.parseObject(ACCOUNT_LECHUCK_FILE); accountBefore.checkConsistence(); display("Adding shadow", accountBefore); diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyCaching.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyCaching.java index 2f6c7f26010..a8c820ab2ab 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyCaching.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyCaching.java @@ -65,7 +65,7 @@ @DirtiesContext public class TestDummyCaching extends TestDummy { - public static final File TEST_DIR = new File("src/test/resources/impl/dummy-caching/"); + public static final File TEST_DIR = new File(TEST_DIR_DUMMY, "dummy-caching"); public static final File RESOURCE_DUMMY_FILE = new File(TEST_DIR, "resource-dummy.xml"); @Override diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyCaseIgnore.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyCaseIgnore.java index e278a879d03..6e190e826c6 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyCaseIgnore.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyCaseIgnore.java @@ -52,7 +52,7 @@ @DirtiesContext public class TestDummyCaseIgnore extends TestDummy { - public static final File TEST_DIR = new File("src/test/resources/impl/dummy-case-ignore/"); + public static final File TEST_DIR = new File(TEST_DIR_DUMMY, "dummy-case-ignore"); public static final File RESOURCE_DUMMY_FILE = new File(TEST_DIR, "resource-dummy.xml"); private MatchingRule uidMatchingRule; diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyCaseIgnoreUpcaseName.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyCaseIgnoreUpcaseName.java index 7ad2e1f523e..c181524e99c 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyCaseIgnoreUpcaseName.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyCaseIgnoreUpcaseName.java @@ -35,7 +35,7 @@ @DirtiesContext public class TestDummyCaseIgnoreUpcaseName extends TestDummyCaseIgnore { - public static final File TEST_DIR = new File("src/test/resources/impl/dummy-case-ignore-upcase-name/"); + public static final File TEST_DIR = new File(TEST_DIR_DUMMY, "dummy-case-ignore-upcase-name"); public static final File RESOURCE_DUMMY_FILE = new File(TEST_DIR, "resource-dummy.xml"); @Override diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyExpression.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyExpression.java index 6d64cd3bab7..c95f4271d53 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyExpression.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyExpression.java @@ -40,7 +40,7 @@ @DirtiesContext public class TestDummyExpression extends AbstractBasicDummyTest { - public static final File TEST_DIR = new File("src/test/resources/impl/dummy-expression/"); + public static final File TEST_DIR = new File(TEST_DIR_DUMMY, "dummy-expression"); public static final File RESOURCE_DUMMY_FILE = new File(TEST_DIR, "resource-dummy.xml"); @Override diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyExtra.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyExtra.java index dfbe2ec4592..19effa63696 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyExtra.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyExtra.java @@ -45,7 +45,7 @@ @DirtiesContext public class TestDummyExtra extends TestDummy { - public static final File TEST_DIR = new File("src/test/resources/impl/dummy-extra/"); + public static final File TEST_DIR = new File(TEST_DIR_DUMMY, "dummy-extra"); public static final File RESOURCE_DUMMY_FILE = new File(TEST_DIR, "resource-dummy.xml"); @Override diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyHacks.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyHacks.java index 8a4b7555743..f6070778084 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyHacks.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyHacks.java @@ -23,6 +23,8 @@ import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertNotNull; +import java.io.File; + import javax.xml.namespace.QName; import com.evolveum.midpoint.prism.PrismContext; @@ -70,11 +72,11 @@ @DirtiesContext public class TestDummyHacks extends AbstractIntegrationTest { - private static final String TEST_DIR = "src/test/resources/impl/dummy-hacks/"; + private static final File TEST_DIR = new File(AbstractDummyTest.TEST_DIR_DUMMY, "dummy-hacks"); - private static final String CONNECTOR_DUMMY_FILENAME = TEST_DIR + "connector-dummy.xml"; + private static final File CONNECTOR_DUMMY_FILE = new File(TEST_DIR, "connector-dummy.xml"); - private static final String RESOURCE_DUMMY_FILENAME = TEST_DIR + "resource-dummy.xml"; + private static final File RESOURCE_DUMMY_FILE = new File(TEST_DIR, "resource-dummy.xml"); private static final String RESOURCE_DUMMY_OID = "ef2bc95b-76e0-59e2-86d6-9999dddddddd"; private static final Trace LOGGER = TraceManager.getTrace(TestDummyHacks.class); @@ -112,9 +114,9 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti // We want to avoid connector discovery and insert our own connector object // provisioningService.postInit(initResult); - connector = repoAddObjectFromFile(CONNECTOR_DUMMY_FILENAME, initResult); + connector = repoAddObjectFromFile(CONNECTOR_DUMMY_FILE, initResult); - resource = repoAddObjectFromFile(RESOURCE_DUMMY_FILENAME, initResult); + resource = repoAddObjectFromFile(RESOURCE_DUMMY_FILE, initResult); resourceType = resource.asObjectable(); dummyResource = DummyResource.getInstance(); diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyIncomplete.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyIncomplete.java index d447c6c6723..355c11c1143 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyIncomplete.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyIncomplete.java @@ -50,7 +50,7 @@ @DirtiesContext public class TestDummyIncomplete extends TestDummy { - public static final File TEST_DIR = new File("src/test/resources/impl/dummy-incomplete/"); + public static final File TEST_DIR = new File(TEST_DIR_DUMMY, "dummy-incomplete"); public static final File RESOURCE_DUMMY_FILE = new File(TEST_DIR, "resource-dummy.xml"); @Override diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyLegacy.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyLegacy.java index a6d2788fa5d..8721cad1e29 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyLegacy.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyLegacy.java @@ -16,9 +16,7 @@ package com.evolveum.midpoint.provisioning.impl.dummy; -import static com.evolveum.midpoint.test.IntegrationTestTools.assertTestResourceSuccess; import static com.evolveum.midpoint.test.IntegrationTestTools.display; -import static com.evolveum.midpoint.test.util.TestUtil.assertSuccess; import static org.testng.AssertJUnit.assertNotNull; import static org.testng.AssertJUnit.assertNull; @@ -33,7 +31,6 @@ import org.w3c.dom.Element; import com.evolveum.icf.dummy.resource.DummyResource; -import com.evolveum.midpoint.common.refinery.RefinedResourceSchema; import com.evolveum.midpoint.prism.PrismObject; import com.evolveum.midpoint.provisioning.api.ProvisioningService; import com.evolveum.midpoint.schema.constants.ConnectorTestOperation; @@ -57,7 +54,7 @@ @DirtiesContext public class TestDummyLegacy extends AbstractIntegrationTest { - private static final File TEST_DIR = new File("src/test/resources/impl/dummy-legacy/"); + private static final File TEST_DIR = new File(AbstractDummyTest.TEST_DIR_DUMMY, "dummy-legacy"); private static final File RESOURCE_DUMMY_NATIVE_FILE = new File(TEST_DIR, "resource-dummy-native.xml"); private static final String RESOURCE_DUMMY_NATIVE_OID = "17e6e88c-4be6-11e5-8abd-001e8c717e5b"; diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyNegative.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyNegative.java index d52ea2ad160..2248302ecd6 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyNegative.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyNegative.java @@ -24,6 +24,8 @@ import static org.testng.AssertJUnit.assertNotNull; import static org.testng.AssertJUnit.assertTrue; +import java.io.File; + import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.testng.AssertJUnit; @@ -59,7 +61,7 @@ public class TestDummyNegative extends AbstractDummyTest { private static final Trace LOGGER = TraceManager.getTrace(TestDummyNegative.class); - private static final String ACCOUNT_ELAINE_RESOURCE_NOT_FOUND_FILENAME = TEST_DIR + "account-elaine-resource-not-found.xml"; + private static final File ACCOUNT_ELAINE_RESOURCE_NOT_FOUND_FILE = new File(TEST_DIR, "account-elaine-resource-not-found.xml"); @Test public void test110GetResourceBrokenSchemaNetwork() throws Exception { @@ -147,7 +149,7 @@ public void test200AddAccountNullAttributes() throws Exception { OperationResult result = task.getResult(); syncServiceMock.reset(); - ShadowType accountType = parseObjectTypeFromFile(ACCOUNT_WILL_FILENAME, ShadowType.class); + ShadowType accountType = parseObjectType(ACCOUNT_WILL_FILE, ShadowType.class); PrismObject account = accountType.asPrismObject(); account.checkConsistence(); @@ -180,7 +182,7 @@ public void test201AddAccountEmptyAttributes() throws Exception { + ".test201AddAccountEmptyAttributes"); syncServiceMock.reset(); - ShadowType accountType = parseObjectTypeFromFile(ACCOUNT_WILL_FILENAME, ShadowType.class); + ShadowType accountType = parseObjectType(ACCOUNT_WILL_FILE, ShadowType.class); PrismObject account = accountType.asPrismObject(); account.checkConsistence(); @@ -211,7 +213,7 @@ public void test210AddAccountNoObjectclass() throws Exception { + ".test210AddAccountNoObjectclass"); syncServiceMock.reset(); - ShadowType accountType = parseObjectTypeFromFile(ACCOUNT_WILL_FILENAME, ShadowType.class); + ShadowType accountType = parseObjectType(ACCOUNT_WILL_FILE, ShadowType.class); PrismObject account = accountType.asPrismObject(); account.checkConsistence(); @@ -244,7 +246,7 @@ public void test220AddAccountNoResourceRef() throws Exception { OperationResult result = task.getResult(); syncServiceMock.reset(); - ShadowType accountType = parseObjectTypeFromFile(ACCOUNT_WILL_FILENAME, ShadowType.class); + ShadowType accountType = parseObjectType(ACCOUNT_WILL_FILE, ShadowType.class); PrismObject account = accountType.asPrismObject(); account.checkConsistence(); @@ -276,7 +278,7 @@ public void test221DeleteAccountResourceNotFound() throws Exception { OperationResult result = task.getResult(); syncServiceMock.reset(); - ShadowType accountType = parseObjectTypeFromFile(ACCOUNT_ELAINE_RESOURCE_NOT_FOUND_FILENAME, ShadowType.class); + ShadowType accountType = parseObjectType(ACCOUNT_ELAINE_RESOURCE_NOT_FOUND_FILE); PrismObject account = accountType.asPrismObject(); account.checkConsistence(); diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyNoActivation.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyNoActivation.java index bf1f934d117..db1e14c673d 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyNoActivation.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyNoActivation.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 Evolveum + * Copyright (c) 2010-2017 Evolveum * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -52,7 +52,7 @@ @DirtiesContext public class TestDummyNoActivation extends TestDummy { - public static final File TEST_DIR = new File("src/test/resources/impl/dummy-no-activation/"); + public static final File TEST_DIR = new File(TEST_DIR_DUMMY, "dummy-no-activation"); public static final File RESOURCE_DUMMY_FILE = new File(TEST_DIR, "resource-dummy.xml"); protected static final File ACCOUNT_WILL_FILE = new File(TEST_DIR, "account-will.xml"); diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyPrioritiesAndReadReplace.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyPrioritiesAndReadReplace.java index 6320b3a1d75..cfba19d8cd8 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyPrioritiesAndReadReplace.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyPrioritiesAndReadReplace.java @@ -83,7 +83,7 @@ public class TestDummyPrioritiesAndReadReplace extends AbstractDummyTest { protected String willIcfUid; - public static final File TEST_DIR = new File("src/test/resources/impl/dummy-priorities-read-replace/"); + public static final File TEST_DIR = new File(TEST_DIR_DUMMY, "dummy-priorities-read-replace"); public static final File RESOURCE_DUMMY_FILE = new File(TEST_DIR, "resource-dummy.xml"); @Override diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyReadReplaceForAll.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyReadReplaceForAll.java index 2aa823f4cfd..7d727a7c202 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyReadReplaceForAll.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyReadReplaceForAll.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2014 Evolveum + * Copyright (c) 2010-2017 Evolveum * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,7 +34,7 @@ @DirtiesContext public class TestDummyReadReplaceForAll extends TestDummy { - public static final File TEST_DIR = new File("src/test/resources/impl/dummy-priorities-read-replace/"); + public static final File TEST_DIR = new File(TEST_DIR_DUMMY, "dummy-priorities-read-replace"); public static final File RESOURCE_DUMMY_FILENAME = new File(TEST_DIR, "resource-dummy-all-read-replace.xml"); @Override diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyResourceAndSchemaCaching.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyResourceAndSchemaCaching.java index 2b1e7c40105..b615a402a8d 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyResourceAndSchemaCaching.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyResourceAndSchemaCaching.java @@ -26,19 +26,15 @@ import java.util.ArrayList; import java.util.Collection; -import javax.xml.namespace.QName; - -import com.evolveum.midpoint.common.refinery.RefinedResourceSchemaImpl; -import com.evolveum.midpoint.prism.*; -import org.apache.commons.lang.StringUtils; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.testng.AssertJUnit; import org.testng.annotations.Test; import org.w3c.dom.Element; -import com.evolveum.midpoint.common.refinery.RefinedResourceSchema; -import com.evolveum.midpoint.prism.delta.DiffUtil; +import com.evolveum.midpoint.common.refinery.RefinedResourceSchemaImpl; +import com.evolveum.midpoint.prism.PrismObject; +import com.evolveum.midpoint.prism.PrismPropertyDefinitionImpl; import com.evolveum.midpoint.prism.delta.ItemDelta; import com.evolveum.midpoint.prism.delta.ObjectDelta; import com.evolveum.midpoint.prism.delta.PropertyDelta; @@ -79,8 +75,6 @@ public class TestDummyResourceAndSchemaCaching extends AbstractDummyTest { private static final Trace LOGGER = TraceManager.getTrace(TestDummyResourceAndSchemaCaching.class); - - @Test public void test010GetResource() throws Exception { final String TEST_NAME = "test010GetResource"; @@ -223,7 +217,7 @@ public void test012AddAccountGetResource() throws Exception { + "." + TEST_NAME); // WHEN - addAccount(ACCOUNT_WILL_FILENAME); + addAccount(ACCOUNT_WILL_FILE); // THEN display("Resource cache (1)", InternalMonitor.getResourceCacheStats()); @@ -586,11 +580,11 @@ private void assertConnectorConfigChanged() throws ObjectNotFoundException, Sche assertConnectorInstanceChanged(resourceProvisioning); } - private String addAccount(String filename) throws SchemaException, ObjectAlreadyExistsException, CommunicationException, ObjectNotFoundException, ConfigurationException, SecurityViolationException, IOException, ExpressionEvaluationException { + private String addAccount(File file) throws SchemaException, ObjectAlreadyExistsException, CommunicationException, ObjectNotFoundException, ConfigurationException, SecurityViolationException, IOException, ExpressionEvaluationException { Task task = taskManager.createTaskInstance(TestDummyResourceAndSchemaCaching.class.getName() + ".addAccount"); OperationResult result = task.getResult(); - PrismObject account = PrismTestUtil.parseObject(new File(filename)); + PrismObject account = PrismTestUtil.parseObject(file); String oid = provisioningService.addObject(account, null, null, task, result); result.computeStatus(); TestUtil.assertSuccess(result); diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummySchemaless.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummySchemaless.java index aa846720d3a..d13087b5036 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummySchemaless.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummySchemaless.java @@ -19,8 +19,6 @@ */ package com.evolveum.midpoint.provisioning.impl.dummy; -import static com.evolveum.midpoint.test.IntegrationTestTools.assertTestResourceFailure; -import static com.evolveum.midpoint.test.IntegrationTestTools.assertTestResourceSuccess; import static com.evolveum.midpoint.test.IntegrationTestTools.display; import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertFalse; @@ -33,7 +31,6 @@ import javax.xml.namespace.QName; -import com.evolveum.midpoint.common.refinery.RefinedResourceSchemaImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; @@ -43,7 +40,7 @@ import com.evolveum.icf.dummy.resource.DummyAccount; import com.evolveum.icf.dummy.resource.DummyResource; -import com.evolveum.midpoint.common.refinery.RefinedResourceSchema; +import com.evolveum.midpoint.common.refinery.RefinedResourceSchemaImpl; import com.evolveum.midpoint.prism.PrismObject; import com.evolveum.midpoint.prism.util.PrismAsserts; import com.evolveum.midpoint.prism.util.PrismTestUtil; @@ -55,8 +52,8 @@ import com.evolveum.midpoint.schema.internals.InternalsConfig; import com.evolveum.midpoint.schema.processor.ResourceSchema; import com.evolveum.midpoint.schema.result.OperationResult; -import com.evolveum.midpoint.schema.util.ShadowUtil; import com.evolveum.midpoint.schema.util.ResourceTypeUtil; +import com.evolveum.midpoint.schema.util.ShadowUtil; import com.evolveum.midpoint.task.api.Task; import com.evolveum.midpoint.test.AbstractIntegrationTest; import com.evolveum.midpoint.test.DummyResourceContoller; @@ -86,7 +83,7 @@ @DirtiesContext public class TestDummySchemaless extends AbstractIntegrationTest { - private static final String TEST_DIR = "src/test/resources/impl/dummy-schemaless/"; + private static final File TEST_DIR = new File(AbstractDummyTest.TEST_DIR_DUMMY, "dummy-schemaless"); private static final File RESOURCE_DUMMY_NO_SCHEMA_FILE = new File(TEST_DIR, "resource-dummy-schemaless-no-schema.xml"); private static final String RESOURCE_DUMMY_NO_SCHEMA_OID = "ef2bc95b-76e0-59e2-86d6-9999dddd0000"; @@ -96,7 +93,7 @@ public class TestDummySchemaless extends AbstractIntegrationTest { private static final String RESOURCE_DUMMY_STATIC_SCHEMA_OID = "ef2bc95b-76e0-59e2-86d6-9999dddd0505"; private static final String RESOURCE_DUMMY_STATIC_SCHEMA_INSTANCE_ID = "staticSchema"; - private static final String ACCOUNT_WILL_FILENAME = TEST_DIR + "account-will.xml"; + private static final File ACCOUNT_WILL_FILE = new File(TEST_DIR, "account-will.xml"); private static final String ACCOUNT_WILL_OID = "c0c010c0-d34d-b44f-f11d-33322212dddd"; private static final String ACCOUNT_WILL_ICF_UID = "will"; @@ -407,7 +404,7 @@ public void test200AddAccount() throws Exception { // GIVEN OperationResult result = new OperationResult(TestDummy.class.getName() + "." + TEST_NAME); - ShadowType account = parseObjectTypeFromFile(ACCOUNT_WILL_FILENAME, ShadowType.class); + ShadowType account = parseObjectType(ACCOUNT_WILL_FILE, ShadowType.class); account.asPrismObject().checkConsistence(); display("Adding shadow", account.asPrismObject()); diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummySecurity.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummySecurity.java index b358d3f2201..9b94c8e3ea9 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummySecurity.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummySecurity.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2016 Evolveum + * Copyright (c) 2010-2017 Evolveum * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -78,7 +78,7 @@ public void test100AddAccountDrink() throws Exception { + "." + TEST_NAME); syncServiceMock.reset(); - PrismObject account = prismContext.parseObject(new File(ACCOUNT_WILL_FILENAME)); + PrismObject account = prismContext.parseObject(ACCOUNT_WILL_FILE); account.checkConsistence(); setAttribute(account, DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_DRINK_NAME, "water"); @@ -117,7 +117,7 @@ public void test199AddAccount() throws Exception { + "." + TEST_NAME); syncServiceMock.reset(); - PrismObject account = prismContext.parseObject(new File(ACCOUNT_WILL_FILENAME)); + PrismObject account = prismContext.parseObject(ACCOUNT_WILL_FILE); account.checkConsistence(); setAttribute(account, DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_QUOTE_NAME, "At the moment?"); diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyUuid.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyUuid.java index d6741c09c8d..b0499f9957b 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyUuid.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyUuid.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Evolveum + * Copyright (c) 2013-2017 Evolveum * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,7 +30,7 @@ @DirtiesContext public class TestDummyUuid extends TestDummy { - public static final File TEST_DIR = new File("src/test/resources/impl/dummy-uuid/"); + public static final File TEST_DIR = new File(TEST_DIR_DUMMY, "dummy-uuid"); public static final File RESOURCE_DUMMY_FILE = new File(TEST_DIR, "resource-dummy.xml"); @Override diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyUuidNonUniqueName.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyUuidNonUniqueName.java index a9acf27d167..12cabe6df01 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyUuidNonUniqueName.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyUuidNonUniqueName.java @@ -71,7 +71,7 @@ @DirtiesContext public class TestDummyUuidNonUniqueName extends TestDummyUuid { - public static final File TEST_DIR = new File("src/test/resources/impl/dummy-uuid-nonunique-name/"); + public static final File TEST_DIR = new File(TEST_DIR_DUMMY, "dummy-uuid-nonunique-name"); public static final File RESOURCE_DUMMY_FILE = new File(TEST_DIR, "resource-dummy.xml"); public static final String ACCOUNT_FETTUCINI_NAME = "fettucini"; diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/AbstractOpenDjTest.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/AbstractOpenDjTest.java index baa3660625b..c53cb51c63e 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/AbstractOpenDjTest.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/AbstractOpenDjTest.java @@ -49,11 +49,10 @@ */ public abstract class AbstractOpenDjTest extends AbstractIntegrationTest { - protected static final String TEST_DIR_NAME = "src/test/resources/impl/opendj"; - protected static final File TEST_DIR = new File(TEST_DIR_NAME); + protected static final File TEST_DIR = new File("src/test/resources/opendj"); - protected static final File RESOURCE_OPENDJ_FILE = new File(ProvisioningTestUtil.COMMON_TEST_DIR_FILE, "resource-opendj.xml"); - protected static final File RESOURCE_OPENDJ_INITIALIZED_FILE = new File(ProvisioningTestUtil.COMMON_TEST_DIR_FILE, "resource-opendj-initialized.xml"); + protected static final File RESOURCE_OPENDJ_FILE = ProvisioningTestUtil.RESOURCE_OPENDJ_FILE; + protected static final File RESOURCE_OPENDJ_INITIALIZED_FILE = new File(TEST_DIR, "resource-opendj-initialized.xml"); protected static final String RESOURCE_OPENDJ_OID = "ef2bc95b-76e0-59e2-86d6-3d4f02d3ffff"; protected static final String RESOURCE_OPENDJ_NS = "http://midpoint.evolveum.com/xml/ns/public/resource/instance/ef2bc95b-76e0-59e2-86d6-3d4f02d3ffff"; @@ -63,8 +62,8 @@ public abstract class AbstractOpenDjTest extends AbstractIntegrationTest { protected static final File RESOURCE_OPENDJ_BAD_BIND_DN_FILE = new File(TEST_DIR, "resource-opendj-bad-bind-dn.xml"); protected static final String RESOURCE_OPENDJ_BAD_BIND_DN_OID = "d180258a-ef5f-11e4-8737-001e8c717e5b"; - protected static final File ACCOUNT1_FILE = new File (TEST_DIR_NAME, "account1.xml"); - protected static final File ACCOUNT1_REPO_FILE = new File(TEST_DIR_NAME, "account1-repo.xml"); + protected static final File ACCOUNT1_FILE = new File (TEST_DIR, "account1.xml"); + protected static final File ACCOUNT1_REPO_FILE = new File(TEST_DIR, "account1-repo.xml"); protected static final String ACCOUNT1_OID = "dbb0c37d-9ee6-44a4-8d39-016dbce1cccc"; protected static final File ACCOUNT_WILL_FILE = new File(TEST_DIR, "account-will.xml"); @@ -82,20 +81,20 @@ public abstract class AbstractOpenDjTest extends AbstractIntegrationTest { protected static final String ACCOUNT_BARBOSSA_DN = "uid=hbarbossa,ou=People,dc=example,dc=com"; - protected static final File ACCOUNT_MODIFY_PASSWORD_FILE = new File(TEST_DIR_NAME, "account-modify-password.xml"); + protected static final File ACCOUNT_MODIFY_PASSWORD_FILE = new File(TEST_DIR, "account-modify-password.xml"); protected static final String ACCOUNT_MODIFY_PASSWORD_OID = "c0c010c0-d34d-b44f-f11d-333222444566"; - protected static final File ACCOUNT_SPARROW_FILE = new File(TEST_DIR_NAME, "account-sparrow.xml"); - protected static final File ACCOUNT_SPARROW_REPO_FILE = new File(TEST_DIR_NAME, "account-sparrow-repo.xml"); + protected static final File ACCOUNT_SPARROW_FILE = new File(TEST_DIR, "account-sparrow.xml"); + protected static final File ACCOUNT_SPARROW_REPO_FILE = new File(TEST_DIR, "account-sparrow-repo.xml"); protected static final String ACCOUNT_SPARROW_OID = "c0c010c0-d34d-b44f-f11d-333222654321"; - protected static final String ACCOUNT_SEARCH_ITERATIVE_FILENAME = TEST_DIR_NAME + "/account-search-iterative.xml"; + protected static final File ACCOUNT_SEARCH_ITERATIVE_FILE = new File(TEST_DIR, "account-search-iterative.xml"); protected static final String ACCOUNT_SEARCH_ITERATIVE_OID = "c0c010c0-d34d-b44f-f11d-333222666666"; - protected static final String ACCOUNT_SEARCH_FILENAME = TEST_DIR_NAME + "/account-search.xml"; + protected static final File ACCOUNT_SEARCH_FILE = new File(TEST_DIR, "account-search.xml"); protected static final String ACCOUNT_SEARCH_OID = "c0c010c0-d34d-b44f-f11d-333222777777"; - protected static final String ACCOUNT_NEW_WITH_PASSWORD_FILENAME = TEST_DIR_NAME + "/account-new-with-password.xml";; + protected static final File ACCOUNT_NEW_WITH_PASSWORD_FILE = new File(TEST_DIR, "account-new-with-password.xml"); protected static final String ACCOUNT_NEW_WITH_PASSWORD_OID = "c0c010c0-d34d-b44f-f11d-333222124422"; protected static final File ACCOUNT_NEW_DISABLED_FILE = new File (TEST_DIR, "account-new-disabled.xml"); @@ -104,7 +103,7 @@ public abstract class AbstractOpenDjTest extends AbstractIntegrationTest { protected static final File ACCOUNT_NEW_ENABLED_FILE = new File (TEST_DIR, "account-new-enabled.xml"); protected static final String ACCOUNT_NEW_ENABLED_OID = "c0c010c0-d34d-b44f-f11d-d3d2d2d2d4d3"; - protected static final String ACCOUNT_DISABLE_SIMULATED_FILENAME = TEST_DIR_NAME + "/account-disable-simulated-opendj.xml"; + protected static final File ACCOUNT_DISABLE_SIMULATED_FILE = new File(TEST_DIR, "account-disable-simulated-opendj.xml"); protected static final String ACCOUNT_DISABLE_SIMULATED_OID = "dbb0c37d-9ee6-44a4-8d39-016dbce1aaaa"; protected static final File ACCOUNT_POSIX_MCMUTTON_FILE = new File (TEST_DIR, "account-posix-mcmutton.xml"); @@ -114,9 +113,9 @@ public abstract class AbstractOpenDjTest extends AbstractIntegrationTest { protected static final File ACCOUNT_POSIX_VANHELGEN_LDIF_FILE = new File(TEST_DIR, "vanhelgen.ldif"); - protected static final String REQUEST_DISABLE_ACCOUNT_SIMULATED_FILENAME = TEST_DIR_NAME + "/disable-account-simulated.xml"; + protected static final File REQUEST_DISABLE_ACCOUNT_SIMULATED_FILE = new File(TEST_DIR, "disable-account-simulated.xml"); - protected static final String ACCOUNT_NO_SN_FILENAME = TEST_DIR_NAME + "/account-opendj-no-sn.xml"; + protected static final File ACCOUNT_NO_SN_FILE = new File(TEST_DIR, "account-opendj-no-sn.xml"); protected static final String ACCOUNT_NO_SN_OID = "c0c010c0-d34d-beef-f33d-113222123444"; protected static final File ACCOUNT_MORGAN_FILE = new File(TEST_DIR, "account-morgan.xml"); diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDj.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDj.java index e3d9899ce19..408fd3894d1 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDj.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDj.java @@ -15,7 +15,6 @@ */ package com.evolveum.midpoint.provisioning.impl.opendj; -import static com.evolveum.midpoint.test.util.TestUtil.assertSuccess; import static com.evolveum.midpoint.test.IntegrationTestTools.display; import static com.evolveum.midpoint.test.IntegrationTestTools.getAttributeValue; import static org.testng.AssertJUnit.assertEquals; @@ -71,7 +70,6 @@ import com.evolveum.midpoint.prism.match.UuidMatchingRule; import com.evolveum.midpoint.prism.match.XmlMatchingRule; import com.evolveum.midpoint.prism.path.ItemPath; -import com.evolveum.midpoint.prism.query.ObjectFilter; import com.evolveum.midpoint.prism.query.ObjectOrdering; import com.evolveum.midpoint.prism.query.ObjectPaging; import com.evolveum.midpoint.prism.query.ObjectQuery; @@ -81,7 +79,6 @@ import com.evolveum.midpoint.prism.util.PrismTestUtil; import com.evolveum.midpoint.prism.xml.XmlTypeConverter; import com.evolveum.midpoint.provisioning.impl.ProvisioningTestUtil; -import com.evolveum.midpoint.provisioning.impl.dummy.TestDummy; import com.evolveum.midpoint.schema.CapabilityUtil; import com.evolveum.midpoint.schema.DeltaConvertor; import com.evolveum.midpoint.schema.ResultHandler; @@ -103,11 +100,9 @@ import com.evolveum.midpoint.util.JAXBUtil; import com.evolveum.midpoint.util.MiscUtil; import com.evolveum.midpoint.util.exception.CommunicationException; -import com.evolveum.midpoint.util.exception.ConfigurationException; import com.evolveum.midpoint.util.exception.ObjectAlreadyExistsException; import com.evolveum.midpoint.util.exception.ObjectNotFoundException; import com.evolveum.midpoint.util.exception.SchemaException; -import com.evolveum.midpoint.util.exception.SecurityViolationException; import com.evolveum.midpoint.util.exception.SystemException; import com.evolveum.midpoint.util.logging.Trace; import com.evolveum.midpoint.util.logging.TraceManager; @@ -852,7 +847,7 @@ public void test121RenameAccountWillOnResource() throws Exception{ Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); - openDJController.executeRenameChange(TEST_DIR_NAME + "/rename.ldif"); + openDJController.executeRenameChange(new File(TEST_DIR, "rename.ldif").getPath()); Entry entry = openDJController.fetchEntry("uid=will123,ou=People,dc=example,dc=com"); assertNotNull("Entry with dn uid=will123,ou=People,dc=example,dc=com does not exist", entry); @@ -1188,7 +1183,7 @@ public void test151AddObjectWithPassword() throws Exception { Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); - ShadowType object = parseObjectTypeFromFile(ACCOUNT_NEW_WITH_PASSWORD_FILENAME, ShadowType.class); + ShadowType object = parseObjectType(ACCOUNT_NEW_WITH_PASSWORD_FILE, ShadowType.class); System.out.println(SchemaDebugUtil.prettyPrint(object)); System.out.println(object.asPrismObject().debugDump()); @@ -1313,7 +1308,7 @@ public void test170DisableAccount() throws Exception{ Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); - ShadowType object = parseObjectTypeFromFile(ACCOUNT_DISABLE_SIMULATED_FILENAME, ShadowType.class); + ShadowType object = parseObjectType(ACCOUNT_DISABLE_SIMULATED_FILE, ShadowType.class); System.out.println(SchemaDebugUtil.prettyPrint(object)); System.out.println(object.asPrismObject().debugDump()); @@ -1322,7 +1317,7 @@ public void test170DisableAccount() throws Exception{ assertEquals(ACCOUNT_DISABLE_SIMULATED_OID, addedObjectOid); ObjectModificationType objectChange = PrismTestUtil.parseAtomicValue( - new File(REQUEST_DISABLE_ACCOUNT_SIMULATED_FILENAME), ObjectModificationType.COMPLEX_TYPE); + REQUEST_DISABLE_ACCOUNT_SIMULATED_FILE, ObjectModificationType.COMPLEX_TYPE); ObjectDelta delta = DeltaConvertor.createObjectDelta(objectChange, object.asPrismObject().getDefinition()); display("Object change",delta); @@ -1549,7 +1544,7 @@ public void test200SearchObjectsIterative() throws Exception { Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); - ShadowType object = parseObjectTypeFromFile(ACCOUNT_SEARCH_ITERATIVE_FILENAME, ShadowType.class); + ShadowType object = parseObjectType(ACCOUNT_SEARCH_ITERATIVE_FILE, ShadowType.class); System.out.println(SchemaDebugUtil.prettyPrint(object)); System.out.println(object.asPrismObject().debugDump()); @@ -1592,7 +1587,7 @@ public void test201SearchObjects() throws Exception { Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); - ShadowType object = parseObjectTypeFromFile(ACCOUNT_SEARCH_FILENAME, ShadowType.class); + ShadowType object = parseObjectType(ACCOUNT_SEARCH_FILE, ShadowType.class); display("New object", object); String addedObjectOid = provisioningService.addObject(object.asPrismObject(), null, null, taskManager.createTaskInstance(), result); @@ -1951,7 +1946,7 @@ public void test300AddObjectObjectAlreadyExistResource() throws Exception { Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); - PrismObject account = PrismTestUtil.parseObject(new File(ACCOUNT_SEARCH_FILENAME)); + PrismObject account = PrismTestUtil.parseObject(ACCOUNT_SEARCH_FILE); display("Account to add", account); try { @@ -1980,7 +1975,7 @@ public void test310AddObjectNoSn() throws Exception { Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); - PrismObject account = PrismTestUtil.parseObject(new File(ACCOUNT_NO_SN_FILENAME)); + PrismObject account = PrismTestUtil.parseObject(ACCOUNT_NO_SN_FILE); display("Account to add", account); try { @@ -2731,7 +2726,7 @@ public void test701ConfiguredCapabilityNoRead() throws Exception{ Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); - addResourceFromFile(new File(ProvisioningTestUtil.COMMON_TEST_DIR_FILE, "resource-opendj-no-read.xml"), IntegrationTestTools.CONNECTOR_LDAP_TYPE, true, result); + addResourceFromFile(new File(TEST_DIR, "resource-opendj-no-read.xml"), IntegrationTestTools.CONNECTOR_LDAP_TYPE, true, result); try { provisioningService.getObject(ShadowType.class, ACCOUNT_WILL_OID, @@ -2750,7 +2745,7 @@ public void test702ConfiguredCapabilityNoCreate() throws Exception{ Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); - addResourceFromFile(new File(ProvisioningTestUtil.COMMON_TEST_DIR_FILE, "/resource-opendj-no-create.xml"), IntegrationTestTools.CONNECTOR_LDAP_TYPE, true, result); + addResourceFromFile(new File(TEST_DIR, "/resource-opendj-no-create.xml"), IntegrationTestTools.CONNECTOR_LDAP_TYPE, true, result); try { PrismObject shadow = parseObjectType(ACCOUNT_WILL_FILE, ShadowType.class).asPrismObject(); @@ -2770,7 +2765,7 @@ public void test703ConfiguredCapabilityNoDelete() throws Exception{ Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); - addResourceFromFile(new File(ProvisioningTestUtil.COMMON_TEST_DIR_FILE, "/resource-opendj-no-delete.xml"), IntegrationTestTools.CONNECTOR_LDAP_TYPE, true, result); + addResourceFromFile(new File(TEST_DIR, "/resource-opendj-no-delete.xml"), IntegrationTestTools.CONNECTOR_LDAP_TYPE, true, result); try { provisioningService.deleteObject(ShadowType.class, ACCOUNT_WILL_OID, null, null, task, result); @@ -2788,7 +2783,7 @@ public void test704ConfiguredCapabilityNoUpdate() throws Exception{ Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); - addResourceFromFile(new File(ProvisioningTestUtil.COMMON_TEST_DIR_FILE, "/resource-opendj-no-update.xml"), IntegrationTestTools.CONNECTOR_LDAP_TYPE, true, result); + addResourceFromFile(new File(TEST_DIR, "/resource-opendj-no-update.xml"), IntegrationTestTools.CONNECTOR_LDAP_TYPE, true, result); try { PropertyDelta delta = PropertyDelta.createModificationReplaceProperty(new ItemPath(ShadowType.F_ATTRIBUTES, new QName(resourceType.getNamespace(), "sn")), prismContext.getSchemaRegistry().findObjectDefinitionByCompileTimeClass(ShadowType.class), "doesnotmatter"); diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDjDumber.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDjDumber.java index a37816a648f..711739de6b8 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDjDumber.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDjDumber.java @@ -35,7 +35,7 @@ @DirtiesContext public class TestOpenDjDumber extends TestOpenDj { - protected static final File RESOURCE_OPENDJ_DUMBER_FILE = new File(ProvisioningTestUtil.COMMON_TEST_DIR_FILE, "resource-opendj-dumber.xml"); + protected static final File RESOURCE_OPENDJ_DUMBER_FILE = new File(TEST_DIR, "resource-opendj-dumber.xml"); private static Trace LOGGER = TraceManager.getTrace(TestOpenDjDumber.class); diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestSynchronization.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestSynchronization.java index bfca9736777..7148ae4e82b 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestSynchronization.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestSynchronization.java @@ -59,7 +59,7 @@ public class TestSynchronization extends AbstractIntegrationTest { private static final File TEST_DIR = new File("src/test/resources/synchronization/"); - private static final File RESOURCE_OPENDJ_FILE = new File(ProvisioningTestUtil.COMMON_TEST_DIR_FILE, "resource-opendj.xml"); + private static final File RESOURCE_OPENDJ_FILE = ProvisioningTestUtil.RESOURCE_OPENDJ_FILE; private static final File SYNC_TASK_FILE = new File(TEST_DIR, "sync-task-example.xml"); private static final String SYNC_TASK_OID = "91919191-76e0-59e2-86d6-3d4f02d3ffff"; diff --git a/provisioning/provisioning-impl/src/test/resources/dot.jpg b/provisioning/provisioning-impl/src/test/resources/common/dot.jpg similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/dot.jpg rename to provisioning/provisioning-impl/src/test/resources/common/dot.jpg diff --git a/provisioning/provisioning-impl/src/test/resources/impl/account-derby.xml b/provisioning/provisioning-impl/src/test/resources/db/account-derby.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/account-derby.xml rename to provisioning/provisioning-impl/src/test/resources/db/account-derby.xml diff --git a/provisioning/provisioning-impl/src/test/resources/common/resource-derby.xml b/provisioning/provisioning-impl/src/test/resources/db/resource-derby.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/common/resource-derby.xml rename to provisioning/provisioning-impl/src/test/resources/db/resource-derby.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/dummy/account-daemon.xml b/provisioning/provisioning-impl/src/test/resources/dummy/account-daemon.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/dummy/account-daemon.xml rename to provisioning/provisioning-impl/src/test/resources/dummy/account-daemon.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/dummy/account-elaine-resource-not-found.xml b/provisioning/provisioning-impl/src/test/resources/dummy/account-elaine-resource-not-found.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/dummy/account-elaine-resource-not-found.xml rename to provisioning/provisioning-impl/src/test/resources/dummy/account-elaine-resource-not-found.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/dummy/account-lechuck.xml b/provisioning/provisioning-impl/src/test/resources/dummy/account-lechuck.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/dummy/account-lechuck.xml rename to provisioning/provisioning-impl/src/test/resources/dummy/account-lechuck.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/dummy/account-morgan.xml b/provisioning/provisioning-impl/src/test/resources/dummy/account-morgan.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/dummy/account-morgan.xml rename to provisioning/provisioning-impl/src/test/resources/dummy/account-morgan.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/dummy/account-script.xml b/provisioning/provisioning-impl/src/test/resources/dummy/account-script.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/dummy/account-script.xml rename to provisioning/provisioning-impl/src/test/resources/dummy/account-script.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/dummy/account-will.xml b/provisioning/provisioning-impl/src/test/resources/dummy/account-will.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/dummy/account-will.xml rename to provisioning/provisioning-impl/src/test/resources/dummy/account-will.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/dummy-caching/resource-dummy.xml b/provisioning/provisioning-impl/src/test/resources/dummy/dummy-caching/resource-dummy.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/dummy-caching/resource-dummy.xml rename to provisioning/provisioning-impl/src/test/resources/dummy/dummy-caching/resource-dummy.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/dummy-case-ignore-upcase-name/resource-dummy.xml b/provisioning/provisioning-impl/src/test/resources/dummy/dummy-case-ignore-upcase-name/resource-dummy.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/dummy-case-ignore-upcase-name/resource-dummy.xml rename to provisioning/provisioning-impl/src/test/resources/dummy/dummy-case-ignore-upcase-name/resource-dummy.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/dummy-case-ignore/resource-dummy.xml b/provisioning/provisioning-impl/src/test/resources/dummy/dummy-case-ignore/resource-dummy.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/dummy-case-ignore/resource-dummy.xml rename to provisioning/provisioning-impl/src/test/resources/dummy/dummy-case-ignore/resource-dummy.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/dummy-expression/resource-dummy.xml b/provisioning/provisioning-impl/src/test/resources/dummy/dummy-expression/resource-dummy.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/dummy-expression/resource-dummy.xml rename to provisioning/provisioning-impl/src/test/resources/dummy/dummy-expression/resource-dummy.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/dummy-extra/resource-dummy.xml b/provisioning/provisioning-impl/src/test/resources/dummy/dummy-extra/resource-dummy.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/dummy-extra/resource-dummy.xml rename to provisioning/provisioning-impl/src/test/resources/dummy/dummy-extra/resource-dummy.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/dummy-hacks/connector-dummy.xml b/provisioning/provisioning-impl/src/test/resources/dummy/dummy-hacks/connector-dummy.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/dummy-hacks/connector-dummy.xml rename to provisioning/provisioning-impl/src/test/resources/dummy/dummy-hacks/connector-dummy.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/dummy-hacks/resource-dummy.xml b/provisioning/provisioning-impl/src/test/resources/dummy/dummy-hacks/resource-dummy.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/dummy-hacks/resource-dummy.xml rename to provisioning/provisioning-impl/src/test/resources/dummy/dummy-hacks/resource-dummy.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/dummy-incomplete/resource-dummy.xml b/provisioning/provisioning-impl/src/test/resources/dummy/dummy-incomplete/resource-dummy.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/dummy-incomplete/resource-dummy.xml rename to provisioning/provisioning-impl/src/test/resources/dummy/dummy-incomplete/resource-dummy.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/dummy-legacy/resource-dummy-legacy.xml b/provisioning/provisioning-impl/src/test/resources/dummy/dummy-legacy/resource-dummy-legacy.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/dummy-legacy/resource-dummy-legacy.xml rename to provisioning/provisioning-impl/src/test/resources/dummy/dummy-legacy/resource-dummy-legacy.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/dummy-legacy/resource-dummy-native.xml b/provisioning/provisioning-impl/src/test/resources/dummy/dummy-legacy/resource-dummy-native.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/dummy-legacy/resource-dummy-native.xml rename to provisioning/provisioning-impl/src/test/resources/dummy/dummy-legacy/resource-dummy-native.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/dummy-no-activation/account-will.xml b/provisioning/provisioning-impl/src/test/resources/dummy/dummy-no-activation/account-will.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/dummy-no-activation/account-will.xml rename to provisioning/provisioning-impl/src/test/resources/dummy/dummy-no-activation/account-will.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/dummy-no-activation/resource-dummy.xml b/provisioning/provisioning-impl/src/test/resources/dummy/dummy-no-activation/resource-dummy.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/dummy-no-activation/resource-dummy.xml rename to provisioning/provisioning-impl/src/test/resources/dummy/dummy-no-activation/resource-dummy.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/dummy-priorities-read-replace/resource-dummy-all-read-replace.xml b/provisioning/provisioning-impl/src/test/resources/dummy/dummy-priorities-read-replace/resource-dummy-all-read-replace.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/dummy-priorities-read-replace/resource-dummy-all-read-replace.xml rename to provisioning/provisioning-impl/src/test/resources/dummy/dummy-priorities-read-replace/resource-dummy-all-read-replace.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/dummy-priorities-read-replace/resource-dummy.xml b/provisioning/provisioning-impl/src/test/resources/dummy/dummy-priorities-read-replace/resource-dummy.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/dummy-priorities-read-replace/resource-dummy.xml rename to provisioning/provisioning-impl/src/test/resources/dummy/dummy-priorities-read-replace/resource-dummy.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/dummy-schemaless/account-will.xml b/provisioning/provisioning-impl/src/test/resources/dummy/dummy-schemaless/account-will.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/dummy-schemaless/account-will.xml rename to provisioning/provisioning-impl/src/test/resources/dummy/dummy-schemaless/account-will.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/dummy-schemaless/resource-dummy-schemaless-no-schema.xml b/provisioning/provisioning-impl/src/test/resources/dummy/dummy-schemaless/resource-dummy-schemaless-no-schema.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/dummy-schemaless/resource-dummy-schemaless-no-schema.xml rename to provisioning/provisioning-impl/src/test/resources/dummy/dummy-schemaless/resource-dummy-schemaless-no-schema.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/dummy-schemaless/resource-dummy-schemaless-static-schema.xml b/provisioning/provisioning-impl/src/test/resources/dummy/dummy-schemaless/resource-dummy-schemaless-static-schema.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/dummy-schemaless/resource-dummy-schemaless-static-schema.xml rename to provisioning/provisioning-impl/src/test/resources/dummy/dummy-schemaless/resource-dummy-schemaless-static-schema.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/dummy-uuid-nonunique-name/account-alfredo-fettucini.xml b/provisioning/provisioning-impl/src/test/resources/dummy/dummy-uuid-nonunique-name/account-alfredo-fettucini.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/dummy-uuid-nonunique-name/account-alfredo-fettucini.xml rename to provisioning/provisioning-impl/src/test/resources/dummy/dummy-uuid-nonunique-name/account-alfredo-fettucini.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/dummy-uuid-nonunique-name/account-bill-fettucini.xml b/provisioning/provisioning-impl/src/test/resources/dummy/dummy-uuid-nonunique-name/account-bill-fettucini.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/dummy-uuid-nonunique-name/account-bill-fettucini.xml rename to provisioning/provisioning-impl/src/test/resources/dummy/dummy-uuid-nonunique-name/account-bill-fettucini.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/dummy-uuid-nonunique-name/resource-dummy.xml b/provisioning/provisioning-impl/src/test/resources/dummy/dummy-uuid-nonunique-name/resource-dummy.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/dummy-uuid-nonunique-name/resource-dummy.xml rename to provisioning/provisioning-impl/src/test/resources/dummy/dummy-uuid-nonunique-name/resource-dummy.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/dummy-uuid/resource-dummy.xml b/provisioning/provisioning-impl/src/test/resources/dummy/dummy-uuid/resource-dummy.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/dummy-uuid/resource-dummy.xml rename to provisioning/provisioning-impl/src/test/resources/dummy/dummy-uuid/resource-dummy.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/dummy/group-pirates.xml b/provisioning/provisioning-impl/src/test/resources/dummy/group-pirates.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/dummy/group-pirates.xml rename to provisioning/provisioning-impl/src/test/resources/dummy/group-pirates.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/dummy/modify-will-disable.xml b/provisioning/provisioning-impl/src/test/resources/dummy/modify-will-disable.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/dummy/modify-will-disable.xml rename to provisioning/provisioning-impl/src/test/resources/dummy/modify-will-disable.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/dummy/modify-will-enable.xml b/provisioning/provisioning-impl/src/test/resources/dummy/modify-will-enable.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/dummy/modify-will-enable.xml rename to provisioning/provisioning-impl/src/test/resources/dummy/modify-will-enable.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/dummy/modify-will-fullname.xml b/provisioning/provisioning-impl/src/test/resources/dummy/modify-will-fullname.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/dummy/modify-will-fullname.xml rename to provisioning/provisioning-impl/src/test/resources/dummy/modify-will-fullname.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/dummy/privilege-bargain.xml b/provisioning/provisioning-impl/src/test/resources/dummy/privilege-bargain.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/dummy/privilege-bargain.xml rename to provisioning/provisioning-impl/src/test/resources/dummy/privilege-bargain.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/dummy/privilege-pillage.xml b/provisioning/provisioning-impl/src/test/resources/dummy/privilege-pillage.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/dummy/privilege-pillage.xml rename to provisioning/provisioning-impl/src/test/resources/dummy/privilege-pillage.xml diff --git a/provisioning/provisioning-impl/src/test/resources/common/resource-dummy.xml b/provisioning/provisioning-impl/src/test/resources/dummy/resource-dummy.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/common/resource-dummy.xml rename to provisioning/provisioning-impl/src/test/resources/dummy/resource-dummy.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/dummy/scripts.xml b/provisioning/provisioning-impl/src/test/resources/dummy/scripts.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/dummy/scripts.xml rename to provisioning/provisioning-impl/src/test/resources/dummy/scripts.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/opendj/account-bad.xml b/provisioning/provisioning-impl/src/test/resources/opendj/account-bad.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/opendj/account-bad.xml rename to provisioning/provisioning-impl/src/test/resources/opendj/account-bad.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/opendj/account-change-password.xml b/provisioning/provisioning-impl/src/test/resources/opendj/account-change-password.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/opendj/account-change-password.xml rename to provisioning/provisioning-impl/src/test/resources/opendj/account-change-password.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/opendj/account-disable-simulated-opendj.xml b/provisioning/provisioning-impl/src/test/resources/opendj/account-disable-simulated-opendj.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/opendj/account-disable-simulated-opendj.xml rename to provisioning/provisioning-impl/src/test/resources/opendj/account-disable-simulated-opendj.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/opendj/account-jack-change.xml b/provisioning/provisioning-impl/src/test/resources/opendj/account-jack-change.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/opendj/account-jack-change.xml rename to provisioning/provisioning-impl/src/test/resources/opendj/account-jack-change.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/opendj/account-jack-repo.xml b/provisioning/provisioning-impl/src/test/resources/opendj/account-jack-repo.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/opendj/account-jack-repo.xml rename to provisioning/provisioning-impl/src/test/resources/opendj/account-jack-repo.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/opendj/account-jack.xml b/provisioning/provisioning-impl/src/test/resources/opendj/account-jack.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/opendj/account-jack.xml rename to provisioning/provisioning-impl/src/test/resources/opendj/account-jack.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/opendj/account-modify-password.xml b/provisioning/provisioning-impl/src/test/resources/opendj/account-modify-password.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/opendj/account-modify-password.xml rename to provisioning/provisioning-impl/src/test/resources/opendj/account-modify-password.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/opendj/account-morgan.xml b/provisioning/provisioning-impl/src/test/resources/opendj/account-morgan.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/opendj/account-morgan.xml rename to provisioning/provisioning-impl/src/test/resources/opendj/account-morgan.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/opendj/account-new-disabled.xml b/provisioning/provisioning-impl/src/test/resources/opendj/account-new-disabled.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/opendj/account-new-disabled.xml rename to provisioning/provisioning-impl/src/test/resources/opendj/account-new-disabled.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/opendj/account-new-enabled.xml b/provisioning/provisioning-impl/src/test/resources/opendj/account-new-enabled.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/opendj/account-new-enabled.xml rename to provisioning/provisioning-impl/src/test/resources/opendj/account-new-enabled.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/opendj/account-new-with-password.xml b/provisioning/provisioning-impl/src/test/resources/opendj/account-new-with-password.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/opendj/account-new-with-password.xml rename to provisioning/provisioning-impl/src/test/resources/opendj/account-new-with-password.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/opendj/account-opendj-no-sn.xml b/provisioning/provisioning-impl/src/test/resources/opendj/account-opendj-no-sn.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/opendj/account-opendj-no-sn.xml rename to provisioning/provisioning-impl/src/test/resources/opendj/account-opendj-no-sn.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/opendj/account-posix-mcmutton-change.xml b/provisioning/provisioning-impl/src/test/resources/opendj/account-posix-mcmutton-change.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/opendj/account-posix-mcmutton-change.xml rename to provisioning/provisioning-impl/src/test/resources/opendj/account-posix-mcmutton-change.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/opendj/account-posix-mcmutton.xml b/provisioning/provisioning-impl/src/test/resources/opendj/account-posix-mcmutton.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/opendj/account-posix-mcmutton.xml rename to provisioning/provisioning-impl/src/test/resources/opendj/account-posix-mcmutton.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/opendj/account-search-iterative.xml b/provisioning/provisioning-impl/src/test/resources/opendj/account-search-iterative.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/opendj/account-search-iterative.xml rename to provisioning/provisioning-impl/src/test/resources/opendj/account-search-iterative.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/opendj/account-search.xml b/provisioning/provisioning-impl/src/test/resources/opendj/account-search.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/opendj/account-search.xml rename to provisioning/provisioning-impl/src/test/resources/opendj/account-search.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/opendj/account-sparrow-repo.xml b/provisioning/provisioning-impl/src/test/resources/opendj/account-sparrow-repo.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/opendj/account-sparrow-repo.xml rename to provisioning/provisioning-impl/src/test/resources/opendj/account-sparrow-repo.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/opendj/account-sparrow.xml b/provisioning/provisioning-impl/src/test/resources/opendj/account-sparrow.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/opendj/account-sparrow.xml rename to provisioning/provisioning-impl/src/test/resources/opendj/account-sparrow.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/opendj/account-will.xml b/provisioning/provisioning-impl/src/test/resources/opendj/account-will.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/opendj/account-will.xml rename to provisioning/provisioning-impl/src/test/resources/opendj/account-will.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/opendj/account1-repo.xml b/provisioning/provisioning-impl/src/test/resources/opendj/account1-repo.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/opendj/account1-repo.xml rename to provisioning/provisioning-impl/src/test/resources/opendj/account1-repo.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/opendj/account1.xml b/provisioning/provisioning-impl/src/test/resources/opendj/account1.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/opendj/account1.xml rename to provisioning/provisioning-impl/src/test/resources/opendj/account1.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/opendj/disable-account-simulated.xml b/provisioning/provisioning-impl/src/test/resources/opendj/disable-account-simulated.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/opendj/disable-account-simulated.xml rename to provisioning/provisioning-impl/src/test/resources/opendj/disable-account-simulated.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/opendj/group-corsairs.xml b/provisioning/provisioning-impl/src/test/resources/opendj/group-corsairs.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/opendj/group-corsairs.xml rename to provisioning/provisioning-impl/src/test/resources/opendj/group-corsairs.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/opendj/group-specialists.xml b/provisioning/provisioning-impl/src/test/resources/opendj/group-specialists.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/opendj/group-specialists.xml rename to provisioning/provisioning-impl/src/test/resources/opendj/group-specialists.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/opendj/group-swashbucklers.xml b/provisioning/provisioning-impl/src/test/resources/opendj/group-swashbucklers.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/opendj/group-swashbucklers.xml rename to provisioning/provisioning-impl/src/test/resources/opendj/group-swashbucklers.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/opendj/query-complex-filter.xml b/provisioning/provisioning-impl/src/test/resources/opendj/query-complex-filter.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/opendj/query-complex-filter.xml rename to provisioning/provisioning-impl/src/test/resources/opendj/query-complex-filter.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/opendj/query-filter-all-accounts.xml b/provisioning/provisioning-impl/src/test/resources/opendj/query-filter-all-accounts.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/opendj/query-filter-all-accounts.xml rename to provisioning/provisioning-impl/src/test/resources/opendj/query-filter-all-accounts.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/opendj/query-vanhelgen.xml b/provisioning/provisioning-impl/src/test/resources/opendj/query-vanhelgen.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/opendj/query-vanhelgen.xml rename to provisioning/provisioning-impl/src/test/resources/opendj/query-vanhelgen.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/opendj/rename.ldif b/provisioning/provisioning-impl/src/test/resources/opendj/rename.ldif similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/opendj/rename.ldif rename to provisioning/provisioning-impl/src/test/resources/opendj/rename.ldif diff --git a/provisioning/provisioning-impl/src/test/resources/impl/opendj/resource-opendj-bad-bind-dn.xml b/provisioning/provisioning-impl/src/test/resources/opendj/resource-opendj-bad-bind-dn.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/opendj/resource-opendj-bad-bind-dn.xml rename to provisioning/provisioning-impl/src/test/resources/opendj/resource-opendj-bad-bind-dn.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/opendj/resource-opendj-bad-credentials.xml b/provisioning/provisioning-impl/src/test/resources/opendj/resource-opendj-bad-credentials.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/opendj/resource-opendj-bad-credentials.xml rename to provisioning/provisioning-impl/src/test/resources/opendj/resource-opendj-bad-credentials.xml diff --git a/provisioning/provisioning-impl/src/test/resources/common/resource-opendj-bad.xml b/provisioning/provisioning-impl/src/test/resources/opendj/resource-opendj-bad.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/common/resource-opendj-bad.xml rename to provisioning/provisioning-impl/src/test/resources/opendj/resource-opendj-bad.xml diff --git a/provisioning/provisioning-impl/src/test/resources/common/resource-opendj-dumber.xml b/provisioning/provisioning-impl/src/test/resources/opendj/resource-opendj-dumber.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/common/resource-opendj-dumber.xml rename to provisioning/provisioning-impl/src/test/resources/opendj/resource-opendj-dumber.xml diff --git a/provisioning/provisioning-impl/src/test/resources/common/resource-opendj-initialized.xml b/provisioning/provisioning-impl/src/test/resources/opendj/resource-opendj-initialized.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/common/resource-opendj-initialized.xml rename to provisioning/provisioning-impl/src/test/resources/opendj/resource-opendj-initialized.xml diff --git a/provisioning/provisioning-impl/src/test/resources/common/resource-opendj-no-create.xml b/provisioning/provisioning-impl/src/test/resources/opendj/resource-opendj-no-create.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/common/resource-opendj-no-create.xml rename to provisioning/provisioning-impl/src/test/resources/opendj/resource-opendj-no-create.xml diff --git a/provisioning/provisioning-impl/src/test/resources/common/resource-opendj-no-delete.xml b/provisioning/provisioning-impl/src/test/resources/opendj/resource-opendj-no-delete.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/common/resource-opendj-no-delete.xml rename to provisioning/provisioning-impl/src/test/resources/opendj/resource-opendj-no-delete.xml diff --git a/provisioning/provisioning-impl/src/test/resources/common/resource-opendj-no-read.xml b/provisioning/provisioning-impl/src/test/resources/opendj/resource-opendj-no-read.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/common/resource-opendj-no-read.xml rename to provisioning/provisioning-impl/src/test/resources/opendj/resource-opendj-no-read.xml diff --git a/provisioning/provisioning-impl/src/test/resources/common/resource-opendj-no-update.xml b/provisioning/provisioning-impl/src/test/resources/opendj/resource-opendj-no-update.xml similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/common/resource-opendj-no-update.xml rename to provisioning/provisioning-impl/src/test/resources/opendj/resource-opendj-no-update.xml diff --git a/provisioning/provisioning-impl/src/test/resources/impl/opendj/vanhelgen.ldif b/provisioning/provisioning-impl/src/test/resources/opendj/vanhelgen.ldif similarity index 100% rename from provisioning/provisioning-impl/src/test/resources/impl/opendj/vanhelgen.ldif rename to provisioning/provisioning-impl/src/test/resources/opendj/vanhelgen.ldif