Commit de7da4d1 authored by Brian Long's avatar Brian Long
Browse files

fixed junit testing conditionals

parent e3cb51f9

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

0 → 100644
+33 −0
Original line number Diff line number Diff line 
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;

		}

	}



}

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

+6 −27
Original line number Diff line number Diff line 
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;

		}

	}

}

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

+8 −28
Original line number Diff line number Diff line 
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;

		}

	}

}