Fixing intests

Evolveum · Apr 24, 2017 · 3fb880d · 3fb880d
1 parent 3c65122
commit 3fb880d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/...del-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java b/...del-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
@@ -1132,7 +1132,7 @@ public void test131ModifyUserJackAssignAccount() throws Exception {
         TestUtil.assertSuccess("executeChanges result", result);
         XMLGregorianCalendar endTime = clock.currentTimeXMLGregorianCalendar();
         assertShadowFetchOperationCountIncrement(0);
-        assertPrismObjectCloneIncrement(65);
+        assertPrismObjectCloneIncrement(64);
 
 		PrismObject<UserType> userJack = getUser(USER_JACK_OID);
 		display("User after change execution", userJack);

diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestResources.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestResources.java
@@ -478,7 +478,7 @@ public void test107SearchResourcesIterativeNoFetchReadOnly() throws Exception {
         assertFalse("Empty search return", resources.isEmpty());
         assertEquals("Unexpected number of resources found", 2, resources.size());
 
-        assertPrismObjectCloneIncrement(4);
+        assertPrismObjectCloneIncrement(2);
 
         assertResourceSchemaFetchIncrement(0);
         assertResourceSchemaParseCountIncrement(0);
@@ -510,7 +510,7 @@ public void test110GetResourceDummy() throws Exception {
         result.computeStatus();
         TestUtil.assertSuccess("getObject result", result);
 
-        assertPrismObjectCloneIncrement(5);
+        assertPrismObjectCloneIncrement(4);
 
         assertResourceDummy(resource, true);
 
@@ -548,7 +548,7 @@ public void test112GetResourceDummyReadOnly() throws Exception {
         result.computeStatus();
         TestUtil.assertSuccess("getObject result", result);
 
-        assertPrismObjectCloneIncrement(2);
+        assertPrismObjectCloneIncrement(1);
 
         assertResourceDummy(resource, true);
 
@@ -811,7 +811,7 @@ public void test752GetResourceDummy() throws Exception {
         result.computeStatus();
         TestUtil.assertSuccess(result);
 
-        assertPrismObjectCloneIncrement(2);
+        assertPrismObjectCloneIncrement(1);
 
         assertResourceDummy(resource, true);
 
@@ -876,7 +876,7 @@ public void test800GetResourceDummy() throws Exception {
         result.computeStatus();
         TestUtil.assertSuccess(result);
 
-        assertPrismObjectCloneIncrement(2);
+        assertPrismObjectCloneIncrement(1);
 
         assertResourceDummy(resource, true);
 

diff --git a/...model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSchemalessResource.java b/...model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSchemalessResource.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.
@@ -56,9 +56,10 @@ public TestSchemalessResource() throws JAXBException {
 	 */
 	@Test
     public void test001GetObject() throws Exception {
-        TestUtil.displayTestTile(this, "test001GetObject");
+		final String TEST_NAME = "test001GetObject";
+        TestUtil.displayTestTile(this, TEST_NAME);
 
-        Task task = taskManager.createTaskInstance(TestRbac.class.getName() + ".test001GetObject");
+        Task task = createTask(TEST_NAME);
         OperationResult result = task.getResult();
 
         // WHEN
@@ -70,19 +71,23 @@ public void test001GetObject() throws Exception {
 
 	@Test
     public void test002TestConnection() throws Exception {
-        TestUtil.displayTestTile(this, "test002TestConnection");
+		final String TEST_NAME = "test002TestConnection";
+		TestUtil.displayTestTile(this, TEST_NAME);
 
-        Task task = taskManager.createTaskInstance(TestRbac.class.getName() + ".test002TestConnection");
+        Task task = createTask(TEST_NAME);
 
         // WHEN
         OperationResult testResult = modelService.testResource(RESOURCE_DUMMY_SCHEMALESS_OID, task);
 
         // THEN
 		display("Test result", testResult);
-		assertTestResourceSuccess(testResult, ConnectorTestOperation.CONNECTOR_INITIALIZATION);
-		assertTestResourceSuccess(testResult, ConnectorTestOperation.CONNECTOR_CONFIGURATION);
-		assertTestResourceSuccess(testResult, ConnectorTestOperation.CONNECTOR_CONNECTION);
+		OperationResult connectorResult = assertSingleConnectorTestResult(testResult);
+		assertTestResourceSuccess(connectorResult, ConnectorTestOperation.CONNECTOR_INITIALIZATION);
+		assertTestResourceSuccess(connectorResult, ConnectorTestOperation.CONNECTOR_CONFIGURATION);
+		assertTestResourceSuccess(connectorResult, ConnectorTestOperation.CONNECTOR_CONNECTION);
+		assertSuccess(connectorResult);
 		assertTestResourceFailure(testResult, ConnectorTestOperation.RESOURCE_SCHEMA);
+		assertFailure(testResult);
 
 	}