Better test for CSV connector

Evolveum · Apr 18, 2017 · 6e9f423 · 6e9f423
1 parent 03c2733
commit 6e9f423
Show file tree

Hide file tree

Showing 6 changed files with 207 additions and 48 deletions.
diff --git a/...est/java/com/evolveum/midpoint/provisioning/impl/AbstractProvisioningIntegrationTest.java b/...est/java/com/evolveum/midpoint/provisioning/impl/AbstractProvisioningIntegrationTest.java
@@ -55,6 +55,7 @@
 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;
@@ -105,6 +106,7 @@ public abstract class AbstractProvisioningIntegrationTest extends AbstractIntegr
 
 	@Override
 	public void initSystem(Task initTask, OperationResult initResult) throws Exception {
+		InternalsConfig.encryptionChecks = false;
 		provisioningService.postInit(initResult);
 	}
 

diff --git a/...ning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/TestCsv.java b/...ning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/TestCsv.java
@@ -20,6 +20,7 @@
 package com.evolveum.midpoint.provisioning.impl;
 
 import static com.evolveum.midpoint.test.IntegrationTestTools.display;
+import static com.evolveum.midpoint.test.IntegrationTestTools.getAttributeValue;
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertFalse;
 import static org.testng.AssertJUnit.assertNotNull;
@@ -29,60 +30,56 @@
 import java.io.File;
 import java.util.List;
 
-import javax.xml.bind.JAXBElement;
+import javax.xml.namespace.QName;
 
-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.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.common.refinery.RefinedResourceSchemaImpl;
 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.PrismAsserts;
 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.opendj.TestOpenDj;
 import com.evolveum.midpoint.schema.CapabilityUtil;
+import com.evolveum.midpoint.schema.constants.MidPointConstants;
 import com.evolveum.midpoint.schema.constants.SchemaConstants;
+import com.evolveum.midpoint.schema.processor.ObjectClassComplexTypeDefinition;
+import com.evolveum.midpoint.schema.processor.ResourceAttributeDefinition;
 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.ResourceTypeUtil;
 import com.evolveum.midpoint.task.api.Task;
-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.ActivationStatusType;
 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.ShadowType;
 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;
 
 /**
  * The test of Provisioning service on the API level. The test is using CSV resource.
@@ -94,16 +91,36 @@
 @DirtiesContext
 public class TestCsv extends AbstractProvisioningIntegrationTest {
 
-	private static final File RESOURCE_CSV_FILE = new File(ProvisioningTestUtil.COMMON_TEST_DIR_FILE, "resource-csv.xml");
+	protected static final File TEST_DIR = new File("src/test/resources/csv/");
+
+	private static final File RESOURCE_CSV_FILE = new File(TEST_DIR, "resource-csv.xml");
 	private static final String RESOURCE_CSV_OID = "ef2bc95b-76e0-59e2-86d6-9999cccccccc";
+	private static final String RESOURCE_NS = MidPointConstants.NS_RI;
+
+	public static final QName RESOURCE_CSV_ACCOUNT_OBJECTCLASS = new QName(RESOURCE_NS, "AccountObjectClass");
+
+	private static final File ACCOUNT_JACK_FILE = new File(TEST_DIR, "account-jack.xml");;
+	private static final String ACCOUNT_JACK_OID = "2db718b6-243a-11e7-a9e5-bbb2545f80ed";
+	private static final String ACCOUNT_JACK_USERNAME = "jack";
+	private static final String ACCOUNT_JACK_FIRSTNAME = "Jack";
+	private static final String ACCOUNT_JACK_LASTNAME = "Sparrow";
 
 	private static final String CSV_CONNECTOR_TYPE = "com.evolveum.polygon.connector.csv.CsvConnector";
 
-	private static final String CSV_SOURCE_FILE_PATH = "src/test/resources/midpoint-flatfile.csv";
-	private static final String CSV_TARGET_FILE_PATH = "target/midpoint-flatfile.csv";
+	private static final File CSV_SOURCE_FILE = new File(TEST_DIR, "midpoint-flatfile.csv");
+	private static final File CSV_TARGET_FILE = new File("target/midpoint-flatfile.csv");
 
 	private static final Trace LOGGER = TraceManager.getTrace(TestCsv.class);
 
+	private static final String ATTR_USERNAME = "username";
+	private static final QName ATTR_USERNAME_QNAME = new QName(RESOURCE_NS, ATTR_USERNAME);
+
+	private static final String ATTR_FIRSTNAME = "firstname";
+	private static final QName ATTR_FIRSTNAME_QNAME = new QName(RESOURCE_NS, ATTR_FIRSTNAME);
+
+	private static final String ATTR_LASTNAME = "lastname";
+	private static final QName ATTR_LASTNAME_QNAME = new QName(RESOURCE_NS, ATTR_LASTNAME);
+
 	private PrismObject<ResourceType> resource;
 	private ResourceType resourceType;
 
@@ -115,22 +132,24 @@ public class TestCsv extends AbstractProvisioningIntegrationTest {
 
 	@Override
 	public void initSystem(Task initTask, OperationResult initResult) throws Exception {
-		provisioningService.postInit(initResult);
+		super.initSystem(initTask, initResult);
+
 		resource = addResourceFromFile(RESOURCE_CSV_FILE, CSV_CONNECTOR_TYPE, initResult);
 		resourceType = resource.asObjectable();
 
-		FileUtils.copyFile(new File(CSV_SOURCE_FILE_PATH), new File(CSV_TARGET_FILE_PATH));
+		FileUtils.copyFile(CSV_SOURCE_FILE, CSV_TARGET_FILE);
 	}
 
 	@Test
-	public void test000Integrity() throws ObjectNotFoundException, SchemaException {
-		TestUtil.displayTestTile("test000Integrity");
+	public void test000Integrity() throws Exception {
+		final String TEST_NAME = "test000Integrity";
+		TestUtil.displayTestTile(TEST_NAME);
 
 		assertNotNull("Resource is null", resource);
 		assertNotNull("ResourceType is null", resourceType);
 
 		OperationResult result = new OperationResult(TestCsv.class.getName()
-				+ ".test000Integrity");
+				+ "." + TEST_NAME);
 
 		ResourceType resource = repositoryService.getObject(ResourceType.class, RESOURCE_CSV_OID,
 				null, result).asObjectable();
@@ -152,11 +171,12 @@ public void test000Integrity() throws ObjectNotFoundException, SchemaException {
 	 * that executes testResource and checks whether the schema was generated.
 	 */
 	@Test
-	public void test003Connection() throws ObjectNotFoundException, SchemaException {
-		TestUtil.displayTestTile("test003Connection");
+	public void test003Connection() throws Exception {
+		final String TEST_NAME = "test003Connection";
+		TestUtil.displayTestTile(TEST_NAME);
 		// GIVEN
 		OperationResult result = new OperationResult(TestCsv.class.getName()
-				+ ".test003Connection");
+				+ "." + TEST_NAME);
 		// Check that there is no schema before test (pre-condition)
 		ResourceType resourceBefore = repositoryService.getObject(ResourceType.class, RESOURCE_CSV_OID,
 				null, result).asObjectable();
@@ -224,27 +244,49 @@ public void test004Configuration() throws ObjectNotFoundException, Communication
 	}
 
 	@Test
-	public void test005ParsedSchema() throws ObjectNotFoundException, CommunicationException, SchemaException, ConfigurationException {
-		TestUtil.displayTestTile("test005ParsedSchema");
-		// GIVEN
-		OperationResult result = new OperationResult(TestCsv.class.getName()
-				+ ".test005ParsedSchema");
+	public void test005ParsedSchema() throws Exception {
+		final String TEST_NAME = "test005ParsedSchema";
+		TestUtil.displayTestTile(TEST_NAME);
 
 		// THEN
 		// The returned type should have the schema pre-parsed
 		assertNotNull(RefinedResourceSchemaImpl.hasParsedSchema(resourceType));
 
 		// Also test if the utility method returns the same thing
-		ResourceSchema returnedSchema = RefinedResourceSchemaImpl.getResourceSchema(resourceType, prismContext);
+		ResourceSchema resourceSchema = RefinedResourceSchemaImpl.getResourceSchema(resourceType, prismContext);
+
+		display("Parsed resource schema", resourceSchema);
+		assertNotNull("No resource schema", resourceSchema);
+
+		ObjectClassComplexTypeDefinition accountDef = resourceSchema.findObjectClassDefinition(RESOURCE_CSV_ACCOUNT_OBJECTCLASS);
+		assertNotNull("Account definition is missing", accountDef);
+		assertNotNull("Null identifiers in account", accountDef.getPrimaryIdentifiers());
+		assertFalse("Empty identifiers in account", accountDef.getPrimaryIdentifiers().isEmpty());
+		assertNotNull("Null secondary identifiers in account", accountDef.getSecondaryIdentifiers());
+		assertFalse("Empty secondary identifiers in account", accountDef.getSecondaryIdentifiers().isEmpty());
+		assertNotNull("No naming attribute in account", accountDef.getNamingAttribute());
+		assertFalse("No nativeObjectClass in account", StringUtils.isEmpty(accountDef.getNativeObjectClass()));
+
+		ResourceAttributeDefinition<String> usernameDef = accountDef.findAttributeDefinition(ATTR_USERNAME);
+		assertNotNull("No definition for username", usernameDef);
+		assertEquals(1, usernameDef.getMaxOccurs());
+		assertEquals(1, usernameDef.getMinOccurs());
+		assertTrue("No username create", usernameDef.canAdd());
+		assertTrue("No username update", usernameDef.canModify());
+		assertTrue("No username read", usernameDef.canRead());
+
+		ResourceAttributeDefinition<String> icfsNameDef = accountDef.findAttributeDefinition(SchemaConstants.ICFS_NAME);
+		assertNull("ICFS NAME definition sneaked in", icfsNameDef);
+
+		ResourceAttributeDefinition<String> icfsUidDef = accountDef.findAttributeDefinition(SchemaConstants.ICFS_UID);
+		assertNull("ICFS UID definition sneaked in", icfsUidDef);
 
-		display("Parsed resource schema", returnedSchema);
-
 		// Check whether it is reusing the existing schema and not parsing it all over again
 		// Not equals() but == ... we want to really know if exactly the same
 		// object instance is returned
-		assertTrue("Broken caching", returnedSchema == RefinedResourceSchemaImpl.getResourceSchema(resourceType, prismContext));
+		assertTrue("Broken caching", resourceSchema == RefinedResourceSchemaImpl.getResourceSchema(resourceType, prismContext));
 
-		IntegrationTestTools.assertIcfResourceSchemaSanity(returnedSchema, resourceType);
+		IntegrationTestTools.assertIcfResourceSchemaSanity(resourceSchema, resourceType);
 
 	}
 
@@ -292,5 +334,68 @@ private void assertScriptHost(ScriptCapabilityType capScript, ProvisioningScript
 		}
 		AssertJUnit.fail("No script capability with host type "+expectedHostType);
 	}
+
+	@Test
+	public void test100AddAccountJack() throws Exception {
+		final String TEST_NAME = "test100AddAccountJack";
+		TestUtil.displayTestTile(TEST_NAME);
+
+		Task task = createTask(TEST_NAME);
+		OperationResult result = task.getResult();
+
+		PrismObject<ShadowType> shadowBefore = parseObject(ACCOUNT_JACK_FILE);
 
+		// WHEN
+		TestUtil.displayWhen(TEST_NAME);
+		provisioningService.addObject(shadowBefore, null, null, task, result);
+
+		// THEN
+		TestUtil.displayThen(TEST_NAME);
+		assertSuccess(result);		
+	}
+
+	@Test
+	public void test110GetAccountJack() throws Exception {
+		final String TEST_NAME = "test110GetAccountJack";
+		TestUtil.displayTestTile(TEST_NAME);
+
+		Task task = createTask(TEST_NAME);
+		OperationResult result = task.getResult();
+
+		// WHEN
+		TestUtil.displayWhen(TEST_NAME);
+		PrismObject<ShadowType> shadow = provisioningService.getObject(ShadowType.class, ACCOUNT_JACK_OID, null, task, result);
+
+		// THEN
+		TestUtil.displayThen(TEST_NAME);
+		assertSuccess(result);
+
+		assertNotNull(shadow);
+
+		display("Shadow after", shadow);
+
+		ShadowType shadowType = shadow.asObjectable();
+		PrismAsserts.assertEqualsPolyString("Wrong name", "jack", shadow.getName());
+        assertNotNull(shadow.getOid());
+        assertEquals(RESOURCE_CSV_ACCOUNT_OBJECTCLASS, shadowType.getObjectClass());
+        assertEquals(RESOURCE_CSV_OID, shadowType.getResourceRef().getOid());
+        String idPrimaryVal = getAttributeValue(shadowType, ATTR_USERNAME_QNAME);
+        assertNotNull("No identifier ("+ATTR_USERNAME+")", idPrimaryVal);
+        // Capitalization is the same as returned by OpenDJ
+        assertEquals("Wrong identifier", ACCOUNT_JACK_USERNAME, ATTR_USERNAME);
+        assertEquals("Wrong firstname", ACCOUNT_JACK_FIRSTNAME, getAttributeValue(shadowType, ATTR_FIRSTNAME_QNAME));
+        assertEquals("Wrong lastname", ACCOUNT_JACK_LASTNAME, getAttributeValue(shadowType, ATTR_LASTNAME_QNAME));
+        assertNotNull("Missing activation", shadowType.getActivation());
+        assertNotNull("Missing activation status", shadowType.getActivation().getAdministrativeStatus());
+        assertEquals("Not enabled", ActivationStatusType.ENABLED, shadowType.getActivation().getAdministrativeStatus());
+
+        PrismObject<ShadowType> repoShadow = repositoryService.getObject(ShadowType.class, shadow.getOid(), null, result);
+        ShadowType repoShadowType = repoShadow.asObjectable();
+        assertEquals(RESOURCE_CSV_ACCOUNT_OBJECTCLASS, repoShadowType.getObjectClass());
+        assertEquals(RESOURCE_CSV_OID, repoShadowType.getResourceRef().getOid());
+        idPrimaryVal = getAttributeValue(repoShadowType, ATTR_USERNAME_QNAME);
+        assertNotNull("No primary identifier ("+ATTR_USERNAME+") (repo)", idPrimaryVal);
+        assertEquals("Wrong identifier (repo)", ACCOUNT_JACK_USERNAME, idPrimaryVal);
+	}
+
 }
diff --git a/...sioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDj.java b/...sioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDj.java
@@ -684,9 +684,13 @@ public void test110GetObject() throws Exception {
 		PropertyReferenceListType resolve = new PropertyReferenceListType();
 
 		// WHEN
+		TestUtil.displayWhen(TEST_NAME);
 		ShadowType shadow = provisioningService.getObject(ShadowType.class, ACCOUNT1_OID, null, task, result).asObjectable();
 
 		// THEN
+		TestUtil.displayThen(TEST_NAME);
+		assertSuccess(result);
+
 		assertNotNull(shadow);
 
 		display(SchemaDebugUtil.prettyPrint(shadow));

diff --git a/provisioning/provisioning-impl/src/test/resources/csv/account-jack.xml b/provisioning/provisioning-impl/src/test/resources/csv/account-jack.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2017 Evolveum
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<account oid="2db718b6-243a-11e7-a9e5-bbb2545f80ed"
+	xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
+	xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3">
+	<resourceRef oid="ef2bc95b-76e0-59e2-86d6-9999cccccccc" />
+	<objectClass>ri:AccountObjectClass</objectClass>
+	<kind>account</kind>
+	<attributes>
+		<ri:username>jack</ri:username>
+		<ri:firstname>Jack</ri:firstname>
+		<ri:lastname>Sparrow</ri:lastname>
+	</attributes>
+	<activation>
+		<administrativeStatus>enabled</administrativeStatus>
+	</activation>
+	<credentials>
+		<password>
+			<value>
+				<clearValue>d3dMENt3llNOtal3s</clearValue>
+			</value>
+		</password>
+	</credentials>
+</account>
diff --git a/.../src/test/resources/midpoint-flatfile.csv → .../test/resources/csv/midpoint-flatfile.csv b/.../src/test/resources/midpoint-flatfile.csv → .../test/resources/csv/midpoint-flatfile.csv
@@ -1,3 +1,3 @@
-"id","firstname","lastname","disabled","password"
+"username","firstname","lastname","disabled","password"
 "user01","Firstname","Lastname","false","secret"
 "user02","Test","Lastname","false","secret"