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

fixed junit conditional execution

parent 8f1300b0

src/test/java/com/inteligr8/alfresco/activiti/ArrayResponseUnitTest.java

+11 −0
Original line number Diff line number Diff line
@@ -6,14 +6,25 @@ 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;

import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;



import com.inteligr8.alfresco.activiti.model.Tenant;



@TestPropertySource(locations = {"/local.properties"})

@SpringJUnitConfig(classes = {ApsClientConfiguration.class, ApsClient.class, ApsClientJerseyImpl.class})

public class ArrayResponseUnitTest extends ConditionalIT {

	

	@Autowired

	@Qualifier("apsClient.jersey")

	private ApsClient client;

	

	@Override

	public ApsClientConfiguration getConfiguration() {

		return this.client.getConfig();

	}

	

	@Test

	@EnabledIf("hostExists")

	public void testTenants() {

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

+3 −9
Original line number Diff line number Diff line
@@ -6,19 +6,13 @@ 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.springframework.beans.factory.annotation.Autowired;

import org.springframework.test.context.ContextConfiguration;

import org.springframework.test.context.TestPropertySource;



@TestPropertySource(locations = {"/local.properties"})

@ContextConfiguration(classes = {ApsClientConfiguration.class, ApsClient.class})

public class ConditionalIT {

public abstract class ConditionalIT {

	

	@Autowired

	private ApsClient client;

	public abstract ApsClientConfiguration getConfiguration();

	

	public boolean hostExists() {

		String uri = this.client.getConfig().getBaseUrl();

		String uri = this.getConfiguration().getBaseUrl();

		

		HttpUriRequest request = RequestBuilder.get()

				.setUri(uri)

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

+9 −3
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ package com.inteligr8.alfresco.activiti; 


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;
@@ -12,14 +13,19 @@ import com.inteligr8.alfresco.activiti.model.User; 


@TestPropertySource(locations = {"/local.properties"})

@SpringJUnitConfig(classes = {ApsClientConfiguration.class, ApsClient.class, ApsClientCxfImpl.class})

public class ConnectionCxfClientIT {

public class ConnectionCxfClientIT extends ConditionalIT {

	

	@Autowired

	@Qualifier("apsClient.cxf")

	private ApsClient client;

	

	@Override

	public ApsClientConfiguration getConfiguration() {

		return this.client.getConfig();

	}

	

	@Test

	//@EnabledIf("hostExists")

	@EnabledIf("hostExists")

	public void testAppVersion() {

		AppVersion obj = this.client.getAppVersionApi().get();
@@ -29,7 +35,7 @@ public class ConnectionCxfClientIT { 
	}

	

	@Test

	//@EnabledIf("hostExists")

	@EnabledIf("hostExists")

	public void testProfile() {

		User obj = this.client.getProfileApi().get();

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

+9 −3
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ package com.inteligr8.alfresco.activiti; 


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;
@@ -12,14 +13,19 @@ import com.inteligr8.alfresco.activiti.model.User; 


@TestPropertySource(locations = {"/local.properties"})

@SpringJUnitConfig(classes = {ApsClientConfiguration.class, ApsClient.class, ApsClientJerseyImpl.class})

public class ConnectionJerseyClientIT {

public class ConnectionJerseyClientIT extends ConditionalIT {

	

	@Autowired

	@Qualifier("apsClient.jersey")

	private ApsClient client;

	

	@Override

	public ApsClientConfiguration getConfiguration() {

		return this.client.getConfig();

	}

	

	@Test

	//@EnabledIf("hostExists")

	@EnabledIf("hostExists")

	public void testAppVersion() {

		AppVersion obj = this.client.getAppVersionApi().get();
@@ -29,7 +35,7 @@ public class ConnectionJerseyClientIT { 
	}

	

	@Test

	//@EnabledIf("hostExists")

	@EnabledIf("hostExists")

	public void testProfile() {

		User obj = this.client.getProfileApi().get();