From e2b6ed6177cfc0a8e185593b85f0b3c69f26c8b4 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Sat, 5 Jun 2021 17:28:38 -0400 Subject: [PATCH] fixed junit conditional execution --- .../alfresco/activiti/ArrayResponseUnitTest.java | 11 +++++++++++ .../inteligr8/alfresco/activiti/ConditionalIT.java | 12 +++--------- .../alfresco/activiti/ConnectionCxfClientIT.java | 12 +++++++++--- .../alfresco/activiti/ConnectionJerseyClientIT.java | 12 +++++++++--- 4 files changed, 32 insertions(+), 15 deletions(-) diff --git a/src/test/java/com/inteligr8/alfresco/activiti/ArrayResponseUnitTest.java b/src/test/java/com/inteligr8/alfresco/activiti/ArrayResponseUnitTest.java index 2966658..118c370 100644 --- a/src/test/java/com/inteligr8/alfresco/activiti/ArrayResponseUnitTest.java +++ b/src/test/java/com/inteligr8/alfresco/activiti/ArrayResponseUnitTest.java @@ -6,14 +6,25 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIf; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.test.context.TestPropertySource; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import com.inteligr8.alfresco.activiti.model.Tenant; +@TestPropertySource(locations = {"/local.properties"}) +@SpringJUnitConfig(classes = {ApsClientConfiguration.class, ApsClient.class, ApsClientJerseyImpl.class}) public class ArrayResponseUnitTest extends ConditionalIT { @Autowired + @Qualifier("apsClient.jersey") private ApsClient client; + @Override + public ApsClientConfiguration getConfiguration() { + return this.client.getConfig(); + } + @Test @EnabledIf("hostExists") public void testTenants() { diff --git a/src/test/java/com/inteligr8/alfresco/activiti/ConditionalIT.java b/src/test/java/com/inteligr8/alfresco/activiti/ConditionalIT.java index 8c54b7b..13de883 100644 --- a/src/test/java/com/inteligr8/alfresco/activiti/ConditionalIT.java +++ b/src/test/java/com/inteligr8/alfresco/activiti/ConditionalIT.java @@ -6,19 +6,13 @@ import org.apache.http.client.methods.HttpUriRequest; import org.apache.http.client.methods.RequestBuilder; import org.apache.http.impl.client.DefaultRedirectStrategy; import org.apache.http.impl.client.HttpClientBuilder; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.TestPropertySource; -@TestPropertySource(locations = {"/local.properties"}) -@ContextConfiguration(classes = {ApsClientConfiguration.class, ApsClient.class}) -public class ConditionalIT { +public abstract class ConditionalIT { - @Autowired - private ApsClient client; + public abstract ApsClientConfiguration getConfiguration(); public boolean hostExists() { - String uri = this.client.getConfig().getBaseUrl(); + String uri = this.getConfiguration().getBaseUrl(); HttpUriRequest request = RequestBuilder.get() .setUri(uri) diff --git a/src/test/java/com/inteligr8/alfresco/activiti/ConnectionCxfClientIT.java b/src/test/java/com/inteligr8/alfresco/activiti/ConnectionCxfClientIT.java index 1586eb8..65fe3f7 100644 --- a/src/test/java/com/inteligr8/alfresco/activiti/ConnectionCxfClientIT.java +++ b/src/test/java/com/inteligr8/alfresco/activiti/ConnectionCxfClientIT.java @@ -2,6 +2,7 @@ package com.inteligr8.alfresco.activiti; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledIf; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.test.context.TestPropertySource; @@ -12,14 +13,19 @@ import com.inteligr8.alfresco.activiti.model.User; @TestPropertySource(locations = {"/local.properties"}) @SpringJUnitConfig(classes = {ApsClientConfiguration.class, ApsClient.class, ApsClientCxfImpl.class}) -public class ConnectionCxfClientIT { +public class ConnectionCxfClientIT extends ConditionalIT { @Autowired @Qualifier("apsClient.cxf") private ApsClient client; + @Override + public ApsClientConfiguration getConfiguration() { + return this.client.getConfig(); + } + @Test - //@EnabledIf("hostExists") + @EnabledIf("hostExists") public void testAppVersion() { AppVersion obj = this.client.getAppVersionApi().get(); @@ -29,7 +35,7 @@ public class ConnectionCxfClientIT { } @Test - //@EnabledIf("hostExists") + @EnabledIf("hostExists") public void testProfile() { User obj = this.client.getProfileApi().get(); diff --git a/src/test/java/com/inteligr8/alfresco/activiti/ConnectionJerseyClientIT.java b/src/test/java/com/inteligr8/alfresco/activiti/ConnectionJerseyClientIT.java index 6115986..16d92a2 100644 --- a/src/test/java/com/inteligr8/alfresco/activiti/ConnectionJerseyClientIT.java +++ b/src/test/java/com/inteligr8/alfresco/activiti/ConnectionJerseyClientIT.java @@ -2,6 +2,7 @@ package com.inteligr8.alfresco.activiti; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledIf; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.test.context.TestPropertySource; @@ -12,14 +13,19 @@ import com.inteligr8.alfresco.activiti.model.User; @TestPropertySource(locations = {"/local.properties"}) @SpringJUnitConfig(classes = {ApsClientConfiguration.class, ApsClient.class, ApsClientJerseyImpl.class}) -public class ConnectionJerseyClientIT { +public class ConnectionJerseyClientIT extends ConditionalIT { @Autowired @Qualifier("apsClient.jersey") private ApsClient client; + @Override + public ApsClientConfiguration getConfiguration() { + return this.client.getConfig(); + } + @Test - //@EnabledIf("hostExists") + @EnabledIf("hostExists") public void testAppVersion() { AppVersion obj = this.client.getAppVersionApi().get(); @@ -29,7 +35,7 @@ public class ConnectionJerseyClientIT { } @Test - //@EnabledIf("hostExists") + @EnabledIf("hostExists") public void testProfile() { User obj = this.client.getProfileApi().get();