inteligr8/acs-public-rest-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed junit testing conditionals

Browse Source
This commit is contained in:
Brian Long 2021-06-05 17:26:53 -04:00
parent e3cb51f910
commit de7da4d1c2
3 changed files with 47 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/test/java/com/inteligr8/alfresco/acs/ConditionalIT.java Normal file
View File

@ -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;
}
}
}

33
src/test/java/com/inteligr8/alfresco/acs/ConnectionCxfClientIT.java
View File

@ -1,13 +1,5 @@
package com.inteligr8.alfresco.acs; 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.Assertions;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIf; import org.junit.jupiter.api.condition.EnabledIf;
@ -21,12 +13,17 @@ import com.inteligr8.alfresco.acs.model.RepositoryInfo;
@TestPropertySource(locations = {"/local.properties"}) @TestPropertySource(locations = {"/local.properties"})
@SpringJUnitConfig(classes = {AcsClientConfiguration.class, AcsClient.class, AcsClientCxfImpl.class}) @SpringJUnitConfig(classes = {AcsClientConfiguration.class, AcsClient.class, AcsClientCxfImpl.class})
public class ConnectionCxfClientIT { public class ConnectionCxfClientIT extends ConditionalIT {
@Autowired @Autowired
@Qualifier("acsClient.cxf") @Qualifier("acsClient.cxf")
private AcsClient client; private AcsClient client;
@Override
public AcsClientConfiguration getConfiguration() {
return this.client.getConfig();
}
@Test @Test
@EnabledIf("hostExists") @EnabledIf("hostExists")
public void testDiscovery() { public void testDiscovery() {
@ -38,22 +35,4 @@ public class ConnectionCxfClientIT {
Assertions.assertEquals("6", repoInfo.getVersion().getMajor()); 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;
}
}
} }

36
src/test/java/com/inteligr8/alfresco/acs/ConnectionJerseyClientIT.java
View File

@ -1,15 +1,8 @@
package com.inteligr8.alfresco.acs; 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.Assertions;
import org.junit.jupiter.api.Test; 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.Autowired;
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.TestPropertySource;
@ -20,14 +13,19 @@ import com.inteligr8.alfresco.acs.model.RepositoryInfo;
@TestPropertySource(locations = {"/local.properties"}) @TestPropertySource(locations = {"/local.properties"})
@SpringJUnitConfig(classes = {AcsClientConfiguration.class, AcsClient.class, AcsClientJerseyImpl.class}) @SpringJUnitConfig(classes = {AcsClientConfiguration.class, AcsClient.class, AcsClientJerseyImpl.class})
public class ConnectionJerseyClientIT { public class ConnectionJerseyClientIT extends ConditionalIT {
@Autowired @Autowired
@Qualifier("acsClient.jersey") @Qualifier("acsClient.jersey")
private AcsClient client; private AcsClient client;
@Override
public AcsClientConfiguration getConfiguration() {
return this.client.getConfig();
}
@Test @Test
//@EnabledIf("hostExists") @EnabledIf("hostExists")
public void testDiscovery() { public void testDiscovery() {
DiscoveryApi api = this.client.getDiscoveryApi(); DiscoveryApi api = this.client.getDiscoveryApi();
RepositoryInfo repoInfo = api.getRepositoryInformation().getEntry().getRepository(); RepositoryInfo repoInfo = api.getRepositoryInformation().getEntry().getRepository();
@ -37,22 +35,4 @@ public class ConnectionJerseyClientIT {
Assertions.assertEquals("6", repoInfo.getVersion().getMajor()); 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;
}
}
} }