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

fixed junit conditional

Browse Source
This commit is contained in:
Brian Long 2021-06-04 09:13:59 -04:00
parent 432f24c9d0
commit 91ca3db3d1
3 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@ -102,6 +102,12 @@
<version>${spring.version}</version> <version>${spring.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.9</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>

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

@ -1,14 +1,16 @@
package com.inteligr8.alfresco.acs; package com.inteligr8.alfresco.acs;
import java.net.URI; import java.net.URI;
import java.net.http.HttpClient;
import java.net.http.HttpClient.Redirect;
import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
import java.net.http.HttpResponse.BodyHandlers;
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;
@ -26,7 +28,7 @@ public class ConnectionCxfClientIT {
private AcsClient client; private AcsClient client;
@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();
@ -39,17 +41,17 @@ public class ConnectionCxfClientIT {
public boolean hostExists() { public boolean hostExists() {
URI uri = this.client.getTarget().getUri(); URI uri = this.client.getTarget().getUri();
HttpRequest request = HttpRequest.newBuilder(uri) HttpUriRequest request = RequestBuilder.get()
.GET() .setUri(uri)
.build(); .build();
HttpClient client = HttpClient.newBuilder() HttpClient client = HttpClientBuilder.create()
.followRedirects(Redirect.ALWAYS) .setRedirectStrategy(DefaultRedirectStrategy.INSTANCE)
.build(); .build();
try { try {
HttpResponse<?> response = client.send(request, BodyHandlers.discarding()); HttpResponse response = client.execute(request);
return response.statusCode() < 300; return response.getStatusLine().getStatusCode() < 300;
} catch (Exception e) { } catch (Exception e) {
return false; return false;
} }

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

@ -1,12 +1,13 @@
package com.inteligr8.alfresco.acs; package com.inteligr8.alfresco.acs;
import java.net.URI; import java.net.URI;
import java.net.http.HttpClient;
import java.net.http.HttpClient.Redirect;
import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
import java.net.http.HttpResponse.BodyHandlers;
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.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -39,17 +40,17 @@ public class ConnectionJerseyClientIT {
public boolean hostExists() { public boolean hostExists() {
URI uri = this.client.getTarget().getUri(); URI uri = this.client.getTarget().getUri();
HttpRequest request = HttpRequest.newBuilder(uri) HttpUriRequest request = RequestBuilder.get()
.GET() .setUri(uri)
.build(); .build();
HttpClient client = HttpClient.newBuilder() HttpClient client = HttpClientBuilder.create()
.followRedirects(Redirect.ALWAYS) .setRedirectStrategy(DefaultRedirectStrategy.INSTANCE)
.build(); .build();
try { try {
HttpResponse<?> response = client.send(request, BodyHandlers.discarding()); HttpResponse response = client.execute(request);
return response.statusCode() < 300; return response.getStatusLine().getStatusCode() < 300;
} catch (Exception e) { } catch (Exception e) {
return false; return false;
} }