Skip to content

Commit

Permalink
Fixing fallout of removing TestTrafo
Browse files Browse the repository at this point in the history
  • Loading branch information
@semancik
semancik committed Oct 16, 2019
1 parent 03c250d commit 4c71016
Show file tree
Hide file tree
Showing 16 changed files with 113 additions and 241 deletions.
63 changes: 14 additions & 49 deletions testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestDependencyRename.java
View file
Expand Up @@ -6,60 +6,25 @@
* and European Union Public License. See LICENSE file for details.
*/

import static com.evolveum.midpoint.test.IntegrationTestTools.display;
import static org.testng.AssertJUnit.assertEquals;
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.ArrayList;
import java.util.Collection;
import java.util.List;

import javax.xml.namespace.QName;

import org.opends.server.types.DirectoryException;
import org.opends.server.types.Entry;
import org.opends.server.types.SearchResultEntry;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.annotation.DirtiesContext.ClassMode;
import org.springframework.test.context.ContextConfiguration;
import org.testng.annotations.AfterClass;
import org.testng.annotations.Test;

import com.evolveum.icf.dummy.resource.DummyAccount;
import com.evolveum.icf.dummy.resource.DummyObjectClass;
import com.evolveum.icf.dummy.resource.DummyResource;
import com.evolveum.icf.dummy.resource.DummySyncStyle;
import com.evolveum.midpoint.model.impl.sync.ReconciliationTaskHandler;
import com.evolveum.midpoint.model.impl.util.DebugReconciliationTaskResultListener;
import com.evolveum.midpoint.prism.PrismObject;
import com.evolveum.midpoint.prism.PrismReferenceValue;
import com.evolveum.midpoint.prism.util.PrismAsserts;
import com.evolveum.midpoint.prism.util.PrismTestUtil;
import com.evolveum.midpoint.schema.constants.MidPointConstants;
import com.evolveum.midpoint.schema.result.OperationResult;
import com.evolveum.midpoint.task.api.Task;
import com.evolveum.midpoint.test.DummyResourceContoller;
import com.evolveum.midpoint.test.IntegrationTestTools;
import com.evolveum.midpoint.test.util.MidPointTestConstants;
import com.evolveum.midpoint.test.util.TestUtil;
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.xml.ns._public.common.common_3.AssignmentPolicyEnforcementType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.OperationResultType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.OrgType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.annotation.DirtiesContext.ClassMode;
import org.springframework.test.context.ContextConfiguration;
import org.testng.annotations.AfterClass;
import org.testng.annotations.Test;

import java.io.File;

import static org.testng.AssertJUnit.assertNotNull;

/**
* @author Radovan Semancik
Expand Down Expand Up @@ -139,7 +104,7 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti
public void test000Sanity() throws Exception {
final String TEST_NAME = "test000Sanity";
TestUtil.displayTestTitle(this, TEST_NAME);
Task task = taskManager.createTaskInstance(TestTrafo.class.getName() + "." + TEST_NAME);
Task task = taskManager.createTaskInstance(TestDependencyRename.class.getName() + "." + TEST_NAME);

OperationResult testResultHr = modelService.testResource(RESOURCE_DUMMY_PHONEBOOK_OID, task);
TestUtil.assertSuccess(testResultHr);
Expand All @@ -154,7 +119,7 @@ public void test000Sanity() throws Exception {
public void test100AddUserHerman() throws Exception {
final String TEST_NAME = "test100AddUserHerman";
TestUtil.displayTestTitle(this, TEST_NAME);
Task task = taskManager.createTaskInstance(TestTrafo.class.getName() + "." + TEST_NAME);
Task task = taskManager.createTaskInstance(TestDependencyRename.class.getName() + "." + TEST_NAME);
OperationResult result = task.getResult();

PrismObject<UserType> userBefore = getUserDefinition().instantiate();
Expand Down Expand Up @@ -185,7 +150,7 @@ public void test100AddUserHerman() throws Exception {
public void test110HermanAssignRoleBasic() throws Exception {
final String TEST_NAME = "test110HermanAssignRoleBasic";
TestUtil.displayTestTitle(this, TEST_NAME);
Task task = taskManager.createTaskInstance(TestTrafo.class.getName() + "." + TEST_NAME);
Task task = taskManager.createTaskInstance(TestDependencyRename.class.getName() + "." + TEST_NAME);
OperationResult result = task.getResult();

// WHEN
Expand Down Expand Up @@ -220,7 +185,7 @@ public void test110HermanAssignRoleBasic() throws Exception {
public void test112HermanRename() throws Exception {
final String TEST_NAME = "test112HermanRename";
TestUtil.displayTestTitle(this, TEST_NAME);
Task task = taskManager.createTaskInstance(TestTrafo.class.getName() + "." + TEST_NAME);
Task task = taskManager.createTaskInstance(TestDependencyRename.class.getName() + "." + TEST_NAME);
OperationResult result = task.getResult();

// WHEN
Expand Down Expand Up @@ -255,7 +220,7 @@ public void test112HermanRename() throws Exception {
public void test120AddUserCapsizeWithBasicRole() throws Exception {
final String TEST_NAME = "test120AddUserCapsizeWithBasicRole";
TestUtil.displayTestTitle(this, TEST_NAME);
Task task = taskManager.createTaskInstance(TestTrafo.class.getName() + "." + TEST_NAME);
Task task = taskManager.createTaskInstance(TestDependencyRename.class.getName() + "." + TEST_NAME);
OperationResult result = task.getResult();

PrismObject<UserType> userBefore = getUserDefinition().instantiate();
Expand Down
6 changes: 3 additions & 3 deletions testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestEntertainment.java
View file
Expand Up @@ -89,7 +89,7 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti
public void test000Sanity() throws Exception {
final String TEST_NAME = "test000Sanity";
displayTestTitle(TEST_NAME);
Task task = taskManager.createTaskInstance(TestTrafo.class.getName() + "." + TEST_NAME);
Task task = taskManager.createTaskInstance(TestEntertainment.class.getName() + "." + TEST_NAME);
OperationResult result = task.getResult();

OperationResult testResultOpenDj = modelService.testResource(RESOURCE_OPENDJ_OID, task);
Expand All @@ -111,7 +111,7 @@ public void test000Sanity() throws Exception {
public void test001AddParentOrg() throws Exception {
final String TEST_NAME = "test001AddParentOrg";
displayTestTitle(TEST_NAME);
Task task = taskManager.createTaskInstance(TestTrafo.class.getName() + "." + TEST_NAME);
Task task = taskManager.createTaskInstance(TestEntertainment.class.getName() + "." + TEST_NAME);
OperationResult result = task.getResult();

// WHEN
Expand Down Expand Up @@ -143,7 +143,7 @@ public void test001AddParentOrg() throws Exception {
public void test002AddChildOrg() throws Exception {
final String TEST_NAME = "test002AddChildOrg";
displayTestTitle(TEST_NAME);
Task task = taskManager.createTaskInstance(TestTrafo.class.getName() + "." + TEST_NAME);
Task task = taskManager.createTaskInstance(TestEntertainment.class.getName() + "." + TEST_NAME);
OperationResult result = task.getResult();

// WHEN
Expand Down
4 changes: 2 additions & 2 deletions testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestMachineIntelligence.java
View file
Expand Up @@ -140,7 +140,7 @@ SchemaConstants.ICF_CONFIGURATION_PROPERTIES, new QName(NS_RESOURCE_CSV, "filePa
public void test010importActiveUserRUR() throws Exception {
final String TEST_NAME = "test010importActiveUserRUR";
TestUtil.displayTestTitle(this, TEST_NAME);
Task task = taskManager.createTaskInstance(TestTrafo.class.getName() + "." + TEST_NAME);
Task task = taskManager.createTaskInstance(TestMachineIntelligence.class.getName() + "." + TEST_NAME);
OperationResult result = task.getResult();

// WHEN
Expand Down Expand Up @@ -173,7 +173,7 @@ public void test010importActiveUserRUR() throws Exception {
public void test011importInactiveUserChappie() throws Exception {
final String TEST_NAME = "test011importInactiveUserChappie";
TestUtil.displayTestTitle(this, TEST_NAME);
Task task = taskManager.createTaskInstance(TestTrafo.class.getName() + "." + TEST_NAME);
Task task = taskManager.createTaskInstance(TestMachineIntelligence.class.getName() + "." + TEST_NAME);
OperationResult result = task.getResult();

// WHEN
Expand Down
2 changes: 1 addition & 1 deletion testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestMapleLeaf.java
View file
Expand Up @@ -136,7 +136,7 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti
public void test000Sanity() throws Exception {
final String TEST_NAME = "test000Sanity";
displayTestTitle(TEST_NAME);
Task task = taskManager.createTaskInstance(TestTrafo.class.getName() + "." + TEST_NAME);
Task task = taskManager.createTaskInstance(TestMapleLeaf.class.getName() + "." + TEST_NAME);
OperationResult result = task.getResult();

OperationResult testResultOpenDj = modelService.testResource(RESOURCE_OPENDJ_OID, task);
Expand Down
2 changes: 1 addition & 1 deletion testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestNullAttribute.java
View file
Expand Up @@ -125,7 +125,7 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti
public void test000Sanity() throws Exception {
final String TEST_NAME = "test000Sanity";
displayTestTitle(TEST_NAME);
Task task = taskManager.createTaskInstance(TestTrafo.class.getName() + "." + TEST_NAME);
Task task = taskManager.createTaskInstance(TestNullAttribute.class.getName() + "." + TEST_NAME);

OperationResult testResult = modelService.testResource(RESOURCE_DUMMY_OID, task);
TestUtil.assertSuccess(testResult);
Expand Down
34 changes: 16 additions & 18 deletions testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestOrgSync.java
View file
Expand Up @@ -38,7 +38,6 @@
import com.evolveum.midpoint.prism.PrismObject;
import com.evolveum.midpoint.prism.PrismReferenceValue;
import com.evolveum.midpoint.prism.util.PrismAsserts;
import com.evolveum.midpoint.prism.util.PrismTestUtil;
import com.evolveum.midpoint.schema.constants.MidPointConstants;
import com.evolveum.midpoint.schema.result.OperationResult;
import com.evolveum.midpoint.task.api.Task;
Expand All @@ -53,7 +52,6 @@
import com.evolveum.midpoint.util.exception.SchemaException;
import com.evolveum.midpoint.util.exception.SecurityViolationException;
import com.evolveum.midpoint.xml.ns._public.common.common_3.AssignmentPolicyEnforcementType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.OperationResultType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.OrgType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType;
Expand Down Expand Up @@ -302,7 +300,7 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti
public void test000Sanity() throws Exception {
final String TEST_NAME = "test000Sanity";
displayTestTitle(TEST_NAME);
Task task = taskManager.createTaskInstance(TestTrafo.class.getName() + "." + TEST_NAME);
Task task = taskManager.createTaskInstance(TestOrgSync.class.getName() + "." + TEST_NAME);

OperationResult testResultHr = modelService.testResource(RESOURCE_DUMMY_HR_OID, task);
TestUtil.assertSuccess(testResultHr);
Expand All @@ -324,7 +322,7 @@ public void test000Sanity() throws Exception {
public void test100AddHrAccountHerman() throws Exception {
final String TEST_NAME = "test100AddHrAccountHerman";
displayTestTitle(TEST_NAME);
Task task = taskManager.createTaskInstance(TestTrafo.class.getName() + "." + TEST_NAME);
Task task = taskManager.createTaskInstance(TestOrgSync.class.getName() + "." + TEST_NAME);

DummyAccount newAccount = new DummyAccount(ACCOUNT_HERMAN_USERNAME);
newAccount.addAttributeValue(DUMMY_ACCOUNT_ATTRIBUTE_HR_FIRST_NAME, ACCOUNT_HERMAN_FIST_NAME);
Expand Down Expand Up @@ -364,7 +362,7 @@ public void test100AddHrAccountHerman() throws Exception {
public void test105AddHrAccountLemonhead() throws Exception {
final String TEST_NAME = "test105AddHrAccountLemonhead";
displayTestTitle(TEST_NAME);
Task task = taskManager.createTaskInstance(TestTrafo.class.getName() + "." + TEST_NAME);
Task task = taskManager.createTaskInstance(TestOrgSync.class.getName() + "." + TEST_NAME);

DummyAccount newAccount = new DummyAccount(ACCOUNT_LEMONHEAD_USERNAME);
newAccount.addAttributeValue(DUMMY_ACCOUNT_ATTRIBUTE_HR_FIRST_NAME, ACCOUNT_LEMONHEAD_FIST_NAME);
Expand Down Expand Up @@ -409,7 +407,7 @@ public void test105AddHrAccountLemonhead() throws Exception {
public void test106AddHrAccountSharptooth() throws Exception {
final String TEST_NAME = "test106AddHrAccountSharptooth";
displayTestTitle(TEST_NAME);
Task task = taskManager.createTaskInstance(TestTrafo.class.getName() + "." + TEST_NAME);
Task task = taskManager.createTaskInstance(TestOrgSync.class.getName() + "." + TEST_NAME);

DummyAccount newAccount = new DummyAccount(ACCOUNT_SHARPTOOTH_USERNAME);
newAccount.addAttributeValue(DUMMY_ACCOUNT_ATTRIBUTE_HR_FIRST_NAME, ACCOUNT_SHARPTOOTH_FIST_NAME);
Expand Down Expand Up @@ -453,7 +451,7 @@ public void test106AddHrAccountSharptooth() throws Exception {
public void test107AddHrAccountRedskull() throws Exception {
final String TEST_NAME = "test107AddHrAccountRedskull";
displayTestTitle(TEST_NAME);
Task task = taskManager.createTaskInstance(TestTrafo.class.getName() + "." + TEST_NAME);
Task task = taskManager.createTaskInstance(TestOrgSync.class.getName() + "." + TEST_NAME);

DummyAccount newAccount = new DummyAccount(ACCOUNT_REDSKULL_USERNAME);
newAccount.addAttributeValue(DUMMY_ACCOUNT_ATTRIBUTE_HR_FIRST_NAME, ACCOUNT_REDSKULL_FIST_NAME);
Expand Down Expand Up @@ -537,7 +535,7 @@ public void test108RedskullGoesVegetarian() throws Exception {
public void test109HrDeleteRedskull() throws Exception {
final String TEST_NAME = "test109HrDeleteRedskull";
displayTestTitle(TEST_NAME);
Task task = taskManager.createTaskInstance(TestTrafo.class.getName() + "." + TEST_NAME);
Task task = taskManager.createTaskInstance(TestOrgSync.class.getName() + "." + TEST_NAME);

// WHEN
displayWhen(TEST_NAME);
Expand Down Expand Up @@ -567,7 +565,7 @@ public void test109HrDeleteRedskull() throws Exception {
public void test110AddHrAccountGuybrush() throws Exception {
final String TEST_NAME = "test110AddHrAccountGuybrush";
displayTestTitle(TEST_NAME);
Task task = taskManager.createTaskInstance(TestTrafo.class.getName() + "." + TEST_NAME);
Task task = taskManager.createTaskInstance(TestOrgSync.class.getName() + "." + TEST_NAME);

DummyAccount newAccount = new DummyAccount(ACCOUNT_GUYBRUSH_USERNAME);
newAccount.addAttributeValue(DUMMY_ACCOUNT_ATTRIBUTE_HR_FIRST_NAME, ACCOUNT_GUYBRUSH_FIST_NAME);
Expand Down Expand Up @@ -613,7 +611,7 @@ public void test110AddHrAccountGuybrush() throws Exception {
public void test115AddHrAccountMancomb() throws Exception {
final String TEST_NAME = "test115AddHrAccountMancomb";
displayTestTitle(TEST_NAME);
Task task = taskManager.createTaskInstance(TestTrafo.class.getName() + "." + TEST_NAME);
Task task = taskManager.createTaskInstance(TestOrgSync.class.getName() + "." + TEST_NAME);

DummyAccount newAccount = new DummyAccount(ACCOUNT_MANCOMB_USERNAME);
newAccount.addAttributeValue(DUMMY_ACCOUNT_ATTRIBUTE_HR_FIRST_NAME, ACCOUNT_MANCOMB_FIST_NAME);
Expand Down Expand Up @@ -660,7 +658,7 @@ public void test115AddHrAccountMancomb() throws Exception {
public void test117AddHrAccountCobb() throws Exception {
final String TEST_NAME = "test117AddHrAccountCobb";
displayTestTitle(TEST_NAME);
Task task = taskManager.createTaskInstance(TestTrafo.class.getName() + "." + TEST_NAME);
Task task = taskManager.createTaskInstance(TestOrgSync.class.getName() + "." + TEST_NAME);

DummyAccount newAccount = new DummyAccount(ACCOUNT_COBB_USERNAME);
newAccount.addAttributeValue(DUMMY_ACCOUNT_ATTRIBUTE_HR_FIRST_NAME, ACCOUNT_COBB_FIST_NAME);
Expand Down Expand Up @@ -707,7 +705,7 @@ public void test117AddHrAccountCobb() throws Exception {
public void test130AddHrAccountLargo() throws Exception {
final String TEST_NAME = "test130AddHrAccountLargo";
displayTestTitle(TEST_NAME);
Task task = taskManager.createTaskInstance(TestTrafo.class.getName() + "." + TEST_NAME);
Task task = taskManager.createTaskInstance(TestOrgSync.class.getName() + "." + TEST_NAME);

DummyAccount newAccount = new DummyAccount(ACCOUNT_LARGO_USERNAME);
newAccount.addAttributeValue(DUMMY_ACCOUNT_ATTRIBUTE_HR_FIRST_NAME, ACCOUNT_LARGO_FIST_NAME);
Expand Down Expand Up @@ -760,7 +758,7 @@ public void test130AddHrAccountLargo() throws Exception {
public void test140AddHrAccountWally() throws Exception {
final String TEST_NAME = "test140AddHrAccountWally";
displayTestTitle(TEST_NAME);
Task task = taskManager.createTaskInstance(TestTrafo.class.getName() + "." + TEST_NAME);
Task task = taskManager.createTaskInstance(TestOrgSync.class.getName() + "." + TEST_NAME);

DummyAccount newAccount = new DummyAccount(ACCOUNT_WALLY_USERNAME);
newAccount.addAttributeValue(DUMMY_ACCOUNT_ATTRIBUTE_HR_FIRST_NAME, ACCOUNT_WALLY_FIST_NAME);
Expand Down Expand Up @@ -804,7 +802,7 @@ public void test140AddHrAccountWally() throws Exception {
public void test142AddHrAccountAugustus() throws Exception {
final String TEST_NAME = "test142AddHrAccountAugustus";
displayTestTitle(TEST_NAME);
Task task = taskManager.createTaskInstance(TestTrafo.class.getName() + "." + TEST_NAME);
Task task = taskManager.createTaskInstance(TestOrgSync.class.getName() + "." + TEST_NAME);

DummyAccount newAccount = new DummyAccount(ACCOUNT_AUGUSTUS_USERNAME);
newAccount.addAttributeValue(DUMMY_ACCOUNT_ATTRIBUTE_HR_FIRST_NAME, ACCOUNT_AUGUSTUS_FIST_NAME);
Expand Down Expand Up @@ -848,7 +846,7 @@ public void test142AddHrAccountAugustus() throws Exception {
public void test185AddHrAccountStan() throws Exception {
final String TEST_NAME = "test185AddHrAccountStan";
displayTestTitle(TEST_NAME);
Task task = taskManager.createTaskInstance(TestTrafo.class.getName() + "." + TEST_NAME);
Task task = taskManager.createTaskInstance(TestOrgSync.class.getName() + "." + TEST_NAME);

DummyAccount newAccount = new DummyAccount(ACCOUNT_STAN_USERNAME);
newAccount.addAttributeValue(DUMMY_ACCOUNT_ATTRIBUTE_HR_FIRST_NAME, ACCOUNT_STAN_FIST_NAME);
Expand Down Expand Up @@ -894,7 +892,7 @@ public void test185AddHrAccountStan() throws Exception {
public void test186AddHrAccountCapsize() throws Exception {
final String TEST_NAME = "test186AddHrAccountCapsize";
displayTestTitle(TEST_NAME);
Task task = taskManager.createTaskInstance(TestTrafo.class.getName() + "." + TEST_NAME);
Task task = taskManager.createTaskInstance(TestOrgSync.class.getName() + "." + TEST_NAME);

DummyAccount newAccount = new DummyAccount(ACCOUNT_CAPSIZE_USERNAME);
newAccount.addAttributeValue(DUMMY_ACCOUNT_ATTRIBUTE_HR_FIRST_NAME, ACCOUNT_CAPSIZE_FIST_NAME);
Expand Down Expand Up @@ -940,7 +938,7 @@ public void test186AddHrAccountCapsize() throws Exception {
public void test187AddHrAccountRogersSr() throws Exception {
final String TEST_NAME = "test187AddHrAccountRogersSr";
displayTestTitle(TEST_NAME);
Task task = taskManager.createTaskInstance(TestTrafo.class.getName() + "." + TEST_NAME);
Task task = taskManager.createTaskInstance(TestOrgSync.class.getName() + "." + TEST_NAME);

DummyAccount newAccount = new DummyAccount(ACCOUNT_ROGERSSR_USERNAME);
newAccount.addAttributeValue(DUMMY_ACCOUNT_ATTRIBUTE_HR_FIRST_NAME, ACCOUNT_ROGERSSR_FIST_NAME);
Expand Down Expand Up @@ -987,7 +985,7 @@ public void test187AddHrAccountRogersSr() throws Exception {
public void test190AddHrAccountTeleke() throws Exception {
final String TEST_NAME = "test190AddHrAccountTeleke";
displayTestTitle(TEST_NAME);
Task task = taskManager.createTaskInstance(TestTrafo.class.getName() + "." + TEST_NAME);
Task task = taskManager.createTaskInstance(TestOrgSync.class.getName() + "." + TEST_NAME);

DummyAccount newAccount = new DummyAccount(ACCOUNT_TELEKE_USERNAME);
newAccount.addAttributeValue(DUMMY_ACCOUNT_ATTRIBUTE_HR_FIRST_NAME, ACCOUNT_TELEKE_FIST_NAME);
Expand Down

0 comments on commit 4c71016

Please sign in to comment.