From de7da4d1c25b1a58ad7637ee98f177b0651255a0 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Sat, 5 Jun 2021 17:26:53 -0400 Subject: [PATCH] fixed junit testing conditionals --- .../inteligr8/alfresco/acs/ConditionalIT.java | 33 +++++++++++++++++ .../alfresco/acs/ConnectionCxfClientIT.java | 33 ++++------------- .../acs/ConnectionJerseyClientIT.java | 36 +++++-------------- 3 files changed, 47 insertions(+), 55 deletions(-) create mode 100644 src/test/java/com/inteligr8/alfresco/acs/ConditionalIT.java diff --git a/src/test/java/com/inteligr8/alfresco/acs/ConditionalIT.java b/src/test/java/com/inteligr8/alfresco/acs/ConditionalIT.java new file mode 100644 index 0000000..b75c2ed --- /dev/null +++ b/src/test/java/com/inteligr8/alfresco/acs/ConditionalIT.java @@ -0,0 +1,33 @@ +package com.inteligr8.alfresco.acs; + +import org.apache.http.HttpResponse; +import org.apache.http.client.HttpClient; +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; + +public abstract class ConditionalIT { + + public abstract AcsClientConfiguration getConfiguration(); + + public boolean hostExists() { + String uri = this.getConfiguration().getBaseUrl(); + + HttpUriRequest request = RequestBuilder.get() + .setUri(uri) + .build(); + + HttpClient client = HttpClientBuilder.create() + .setRedirectStrategy(DefaultRedirectStrategy.INSTANCE) + .build(); + + try { + HttpResponse response = client.execute(request); + return response.getStatusLine().getStatusCode() < 300; + } catch (Exception e) { + return false; + } + } + +} diff --git a/src/test/java/com/inteligr8/alfresco/acs/ConnectionCxfClientIT.java b/src/test/java/com/inteligr8/alfresco/acs/ConnectionCxfClientIT.java index 5e8d31f..5115f42 100644 --- a/src/test/java/com/inteligr8/alfresco/acs/ConnectionCxfClientIT.java +++ b/src/test/java/com/inteligr8/alfresco/acs/ConnectionCxfClientIT.java @@ -1,13 +1,5 @@ package com.inteligr8.alfresco.acs; -import java.net.URI; - -import org.apache.http.HttpResponse; -import org.apache.http.client.HttpClient; -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.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIf; @@ -21,12 +13,17 @@ import com.inteligr8.alfresco.acs.model.RepositoryInfo; @TestPropertySource(locations = {"/local.properties"}) @SpringJUnitConfig(classes = {AcsClientConfiguration.class, AcsClient.class, AcsClientCxfImpl.class}) -public class ConnectionCxfClientIT { +public class ConnectionCxfClientIT extends ConditionalIT { @Autowired @Qualifier("acsClient.cxf") private AcsClient client; + @Override + public AcsClientConfiguration getConfiguration() { + return this.client.getConfig(); + } + @Test @EnabledIf("hostExists") public void testDiscovery() { @@ -38,22 +35,4 @@ public class ConnectionCxfClientIT { Assertions.assertEquals("6", repoInfo.getVersion().getMajor()); } - public boolean hostExists() { - URI uri = this.client.getTarget().getUri(); - - HttpUriRequest request = RequestBuilder.get() - .setUri(uri) - .build(); - - HttpClient client = HttpClientBuilder.create() - .setRedirectStrategy(DefaultRedirectStrategy.INSTANCE) - .build(); - - try { - HttpResponse response = client.execute(request); - return response.getStatusLine().getStatusCode() < 300; - } catch (Exception e) { - return false; - } - } } diff --git a/src/test/java/com/inteligr8/alfresco/acs/ConnectionJerseyClientIT.java b/src/test/java/com/inteligr8/alfresco/acs/ConnectionJerseyClientIT.java index 0059f4b..5ccee13 100644 --- a/src/test/java/com/inteligr8/alfresco/acs/ConnectionJerseyClientIT.java +++ b/src/test/java/com/inteligr8/alfresco/acs/ConnectionJerseyClientIT.java @@ -1,15 +1,8 @@ package com.inteligr8.alfresco.acs; -import java.net.URI; - -import org.apache.http.HttpResponse; -import org.apache.http.client.HttpClient; -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.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; @@ -20,14 +13,19 @@ import com.inteligr8.alfresco.acs.model.RepositoryInfo; @TestPropertySource(locations = {"/local.properties"}) @SpringJUnitConfig(classes = {AcsClientConfiguration.class, AcsClient.class, AcsClientJerseyImpl.class}) -public class ConnectionJerseyClientIT { +public class ConnectionJerseyClientIT extends ConditionalIT { @Autowired @Qualifier("acsClient.jersey") private AcsClient client; + @Override + public AcsClientConfiguration getConfiguration() { + return this.client.getConfig(); + } + @Test - //@EnabledIf("hostExists") + @EnabledIf("hostExists") public void testDiscovery() { DiscoveryApi api = this.client.getDiscoveryApi(); RepositoryInfo repoInfo = api.getRepositoryInformation().getEntry().getRepository(); @@ -37,22 +35,4 @@ public class ConnectionJerseyClientIT { Assertions.assertEquals("6", repoInfo.getVersion().getMajor()); } - public boolean hostExists() { - URI uri = this.client.getTarget().getUri(); - - HttpUriRequest request = RequestBuilder.get() - .setUri(uri) - .build(); - - HttpClient client = HttpClientBuilder.create() - .setRedirectStrategy(DefaultRedirectStrategy.INSTANCE) - .build(); - - try { - HttpResponse response = client.execute(request); - return response.getStatusLine().getStatusCode() < 300; - } catch (Exception e) { - return false; - } - } }