Commit 91ca3db3 authored by Brian Long's avatar Brian Long
Browse files

fixed junit conditional

parent 432f24c9

pom.xml

+6 −0
Original line number Diff line number Diff line
@@ -102,6 +102,12 @@ 
			<version>${spring.version}</version>

			<scope>test</scope>

		</dependency>

		<dependency>

			<groupId>org.apache.httpcomponents</groupId>

			<artifactId>httpclient</artifactId>

			<version>4.5.9</version>

			<scope>test</scope>

		</dependency>

	</dependencies>

	

	<build>

src/test/java/com/inteligr8/alfresco/acs/ConnectionCxfClientIT.java

+14 −12
Original line number Diff line number Diff line 
package com.inteligr8.alfresco.acs;



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.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;
@@ -26,7 +28,7 @@ public class ConnectionCxfClientIT { 
	private AcsClient client;

	

	@Test

	//@EnabledIf("hostExists")

	@EnabledIf("hostExists")

	public void testDiscovery() {

		DiscoveryApi api = this.client.getDiscoveryApi();

		RepositoryInfo repoInfo = api.getRepositoryInformation().getEntry().getRepository();
@@ -39,17 +41,17 @@ public class ConnectionCxfClientIT { 
	public boolean hostExists() {

		URI uri = this.client.getTarget().getUri();

		

		HttpRequest request = HttpRequest.newBuilder(uri)

				.GET()

		HttpUriRequest request = RequestBuilder.get()

				.setUri(uri)

				.build();

		

		HttpClient client = HttpClient.newBuilder()

				.followRedirects(Redirect.ALWAYS)

		HttpClient client = HttpClientBuilder.create()

				.setRedirectStrategy(DefaultRedirectStrategy.INSTANCE)

				.build();

		

		try {

			HttpResponse<?> response = client.send(request, BodyHandlers.discarding());

			return response.statusCode() < 300;

			HttpResponse response = client.execute(request);

			return response.getStatusLine().getStatusCode() < 300;

		} catch (Exception e) {

			return false;

		}

src/test/java/com/inteligr8/alfresco/acs/ConnectionJerseyClientIT.java

+12 −11
Original line number Diff line number Diff line 
package com.inteligr8.alfresco.acs;



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.Test;

import org.springframework.beans.factory.annotation.Autowired;
@@ -39,17 +40,17 @@ public class ConnectionJerseyClientIT { 
	public boolean hostExists() {

		URI uri = this.client.getTarget().getUri();

		

		HttpRequest request = HttpRequest.newBuilder(uri)

				.GET()

		HttpUriRequest request = RequestBuilder.get()

				.setUri(uri)

				.build();

		

		HttpClient client = HttpClient.newBuilder()

				.followRedirects(Redirect.ALWAYS)

		HttpClient client = HttpClientBuilder.create()

				.setRedirectStrategy(DefaultRedirectStrategy.INSTANCE)

				.build();

		

		try {

			HttpResponse<?> response = client.send(request, BodyHandlers.discarding());

			return response.statusCode() < 300;

			HttpResponse response = client.execute(request);

			return response.getStatusLine().getStatusCode() < 300;

		} catch (Exception e) {

			return false;

		}