Minor refactoring of TestBrokenResources

Evolveum · Dec 13, 2016 · ab1f0c6 · ab1f0c6
1 parent cfa3b35
commit ab1f0c6
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 24 deletions.
diff --git a/...intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestBrokenResources.java b/...intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestBrokenResources.java
@@ -106,15 +106,7 @@ public class TestBrokenResources extends AbstractConfiguredModelIntegrationTest
 	private static final String BROKEN_CSV_TARGET_FILE_NAME = TEST_TARGET_DIR + "/" + BROKEN_CSV_FILE_NAME;
 
 	protected static final Trace LOGGER = TraceManager.getTrace(TestBrokenResources.class);
-
-	protected static DummyResource dummyResource;
-	protected static DummyResourceContoller dummyResourceCtl;
-	protected ResourceType resourceDummyType;
-	protected PrismObject<ResourceType> resourceDummy;
-
-	protected static DummyResource dummyResourceUnaccessible;
-	protected static DummyResourceContoller dummyResourceUnaccessibleCtl;
-
+
 	protected UserType userTypeJack;
 
 	@Override
@@ -132,17 +124,9 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti
 
 		repoAddObjectFromFile(CONNECTOR_DUMMY_NOJARS_FILE, initResult);
 
-		dummyResourceCtl = DummyResourceContoller.create(null);
-		dummyResourceCtl.extendSchemaPirate();
-		dummyResource = dummyResourceCtl.getDummyResource();
-		resourceDummy = importAndGetObjectFromFile(ResourceType.class, RESOURCE_DUMMY_FILE, RESOURCE_DUMMY_OID, initTask, initResult);
-		resourceDummyType = resourceDummy.asObjectable();
-		dummyResourceCtl.setResource(resourceDummy);
-
-		dummyResourceUnaccessibleCtl = DummyResourceContoller.create(RESOURCE_DUMMY_UNACCESSIBLE_NAME);
-		dummyResourceUnaccessibleCtl.extendSchemaPirate();
-		dummyResourceUnaccessible = dummyResourceUnaccessibleCtl.getDummyResource();
-		dummyResourceUnaccessible.setBreakMode(BreakMode.NETWORK);
+		initDummyResourcePirate(null, RESOURCE_DUMMY_FILE, RESOURCE_DUMMY_OID, initTask, initResult);
+		initDummyResourcePirate(RESOURCE_DUMMY_UNACCESSIBLE_NAME, null, null, initTask, initResult);
+		getDummyResource(RESOURCE_DUMMY_UNACCESSIBLE_NAME).setBreakMode(BreakMode.NETWORK);
 
 		importObjectFromFile(RESOURCE_CSVFILE_BROKEN_FILENAME, initResult);
 		importObjectFromFile(RESOURCE_CSVFILE_NOTFOUND_FILENAME, initResult);
@@ -733,7 +717,7 @@ private void testAssignTwoResoures(final String TEST_NAME, String badResourceOid
 			assertEquals("Expected partial error in result", OperationResultStatus.PARTIAL_ERROR, result.getStatus());
 		} 
 
-        DummyAccount jackDummyAccount = dummyResource.getAccountByUsername(USER_JACK_USERNAME);
+        DummyAccount jackDummyAccount = getDummyResource().getAccountByUsername(USER_JACK_USERNAME);
         assertNotNull("No jack dummy account", jackDummyAccount);
 	}
 

diff --git a/...del-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java b/...del-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
@@ -294,6 +294,11 @@ protected DummyResourceContoller initDummyResource(String name, File resourceFil
 		return dummyResourceCollection.initDummyResource(name, resourceFile, resourceOid, controllerInitLambda, task, result);
 	}
 
+	protected DummyResourceContoller initDummyResourcePirate(String name, File resourceFile, String resourceOid, 
+			Task task, OperationResult result) throws Exception {
+		return initDummyResource(name, resourceFile, resourceOid, controller -> controller.extendSchemaPirate(), task, result);
+	}
+
 	protected DummyResourceContoller getDummyResourceController(String name) {
 		return dummyResourceCollection.get(name);
 	}

diff --git a/model/model-test/src/main/java/com/evolveum/midpoint/model/test/DummyResourceCollection.java b/model/model-test/src/main/java/com/evolveum/midpoint/model/test/DummyResourceCollection.java
@@ -54,9 +54,13 @@ public DummyResourceContoller initDummyResource(String name, File resourceFile,
 		} else {
 			controller.extendSchemaPirate();
 		}
-		modelService.importObjectsFromFile(resourceFile, null, task, result);
-		PrismObject<ResourceType> resource = modelService.getObject(ResourceType.class, resourceOid, null, task, result);
-		controller.setResource(resource);
+		if (resourceFile != null) {
+			modelService.importObjectsFromFile(resourceFile, null, task, result);
+		}
+		if (resourceOid != null) {
+			PrismObject<ResourceType> resource = modelService.getObject(ResourceType.class, resourceOid, null, task, result);
+			controller.setResource(resource);
+		}
 		map.put(name, controller);
 		return controller;
 	}