From 08a5436f90708170af8e1ddc8c0ee95f57e0d712 Mon Sep 17 00:00:00 2001 From: Richard Richter Date: Fri, 12 Jun 2020 00:38:19 +0200 Subject: [PATCH] TestAsyncUpdate*: move of resource file constants to subclasses --- .../provisioning/impl/async/TestAsyncUpdate.java | 8 ++------ .../impl/async/TestAsyncUpdateCaching.java | 9 ++++----- .../impl/async/TestAsyncUpdateCachingAmqp.java | 7 +++---- .../async/TestAsyncUpdateCachingIndexOnly.java | 15 ++++++++------- .../impl/async/TestAsyncUpdateNoCaching.java | 5 ++--- 5 files changed, 19 insertions(+), 25 deletions(-) diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/async/TestAsyncUpdate.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/async/TestAsyncUpdate.java index e0558417fe9..75c4339dccf 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/async/TestAsyncUpdate.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/async/TestAsyncUpdate.java @@ -62,10 +62,6 @@ public abstract class TestAsyncUpdate extends AbstractProvisioningIntegrationTes protected static final File TEST_DIR = new File("src/test/resources/async/"); - static final File RESOURCE_ASYNC_CACHING_FILE = new File(TEST_DIR, "resource-async-caching.xml"); - static final File RESOURCE_ASYNC_CACHING_INDEX_ONLY_FILE = new File(TEST_DIR, "resource-async-caching-index-only.xml"); - static final File RESOURCE_ASYNC_NO_CACHING_FILE = new File(TEST_DIR, "resource-async-no-caching.xml"); - static final File RESOURCE_ASYNC_CACHING_AMQP_FILE = new File(TEST_DIR, "resource-async-caching-amqp.xml"); private static final String RESOURCE_ASYNC_OID = "fb04d113-ebf8-41b4-b13b-990a597d110b"; private static final File CHANGE_100 = new File(TEST_DIR, "change-100-banderson-first-occurrence.xml"); @@ -135,8 +131,8 @@ public void test003Connection() throws Exception { OperationResult result = getTestOperationResult(); // Check that there is a schema, but no capabilities before test (pre-condition) - ResourceType resourceBefore = repositoryService.getObject(ResourceType.class, RESOURCE_ASYNC_OID, - null, result).asObjectable(); + ResourceType resourceBefore = repositoryService.getObject( + ResourceType.class, RESOURCE_ASYNC_OID, null, result).asObjectable(); ResourceTypeUtil.getResourceXsdSchema(resourceBefore); diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/async/TestAsyncUpdateCaching.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/async/TestAsyncUpdateCaching.java index c45a13a51d1..c7eaf105cd2 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/async/TestAsyncUpdateCaching.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/async/TestAsyncUpdateCaching.java @@ -7,18 +7,17 @@ package com.evolveum.midpoint.provisioning.impl.async; -import org.jetbrains.annotations.NotNull; +import static java.util.Collections.singletonList; import java.io.File; import java.util.List; -import static java.util.Collections.singletonList; +import org.jetbrains.annotations.NotNull; -/** - * - */ public class TestAsyncUpdateCaching extends TestAsyncUpdate { + static final File RESOURCE_ASYNC_CACHING_FILE = new File(TEST_DIR, "resource-async-caching.xml"); + @Override protected File getResourceFile() { return RESOURCE_ASYNC_CACHING_FILE; diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/async/TestAsyncUpdateCachingAmqp.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/async/TestAsyncUpdateCachingAmqp.java index 71f08e2fced..5a86c7e404a 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/async/TestAsyncUpdateCachingAmqp.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/async/TestAsyncUpdateCachingAmqp.java @@ -21,15 +21,14 @@ import java.util.Map; import java.util.concurrent.TimeoutException; -/** - * - */ public class TestAsyncUpdateCachingAmqp extends TestAsyncUpdateCaching { - private final EmbeddedBroker embeddedBroker = new EmbeddedBroker(); + private static final File RESOURCE_ASYNC_CACHING_AMQP_FILE = new File(TEST_DIR, "resource-async-caching-amqp.xml"); private static final String QUEUE_NAME = "testQueue"; + private final EmbeddedBroker embeddedBroker = new EmbeddedBroker(); + @Override public void initSystem(Task initTask, OperationResult initResult) throws Exception { super.initSystem(initTask, initResult); diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/async/TestAsyncUpdateCachingIndexOnly.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/async/TestAsyncUpdateCachingIndexOnly.java index d02e1de22e8..cfec8db10b2 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/async/TestAsyncUpdateCachingIndexOnly.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/async/TestAsyncUpdateCachingIndexOnly.java @@ -7,19 +7,20 @@ package com.evolveum.midpoint.provisioning.impl.async; -import com.evolveum.midpoint.repo.sql.SqlRepositoryServiceImpl; -import com.evolveum.midpoint.schema.result.OperationResult; -import com.evolveum.midpoint.task.api.Task; +import java.io.File; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import java.io.File; +import com.evolveum.midpoint.repo.sql.SqlRepositoryServiceImpl; +import com.evolveum.midpoint.schema.result.OperationResult; +import com.evolveum.midpoint.task.api.Task; -/** - * - */ public class TestAsyncUpdateCachingIndexOnly extends TestAsyncUpdateCaching { + static final File RESOURCE_ASYNC_CACHING_INDEX_ONLY_FILE = + new File(TEST_DIR, "resource-async-caching-index-only.xml"); + @Autowired @Qualifier("sqlRepositoryServiceImpl") private SqlRepositoryServiceImpl sqlRepositoryService; diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/async/TestAsyncUpdateNoCaching.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/async/TestAsyncUpdateNoCaching.java index 2d157802f3f..94b5ffcecb9 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/async/TestAsyncUpdateNoCaching.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/async/TestAsyncUpdateNoCaching.java @@ -20,11 +20,10 @@ import java.util.Arrays; import java.util.List; -/** - * - */ public class TestAsyncUpdateNoCaching extends TestAsyncUpdate { + static final File RESOURCE_ASYNC_NO_CACHING_FILE = new File(TEST_DIR, "resource-async-no-caching.xml"); + protected static DummyResource dummyResource; protected static DummyResourceContoller dummyResourceCtl;