fixed junit conditional execution
This commit is contained in:
parent
8f1300b097
commit
e2b6ed6177
@ -6,14 +6,25 @@ 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;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
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;
|
import com.inteligr8.alfresco.activiti.model.Tenant;
|
||||||
|
|
||||||
|
@TestPropertySource(locations = {"/local.properties"})
|
||||||
|
@SpringJUnitConfig(classes = {ApsClientConfiguration.class, ApsClient.class, ApsClientJerseyImpl.class})
|
||||||
public class ArrayResponseUnitTest extends ConditionalIT {
|
public class ArrayResponseUnitTest extends ConditionalIT {
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
|
@Qualifier("apsClient.jersey")
|
||||||
private ApsClient client;
|
private ApsClient client;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ApsClientConfiguration getConfiguration() {
|
||||||
|
return this.client.getConfig();
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@EnabledIf("hostExists")
|
@EnabledIf("hostExists")
|
||||||
public void testTenants() {
|
public void testTenants() {
|
||||||
|
@ -6,19 +6,13 @@ import org.apache.http.client.methods.HttpUriRequest;
|
|||||||
import org.apache.http.client.methods.RequestBuilder;
|
import org.apache.http.client.methods.RequestBuilder;
|
||||||
import org.apache.http.impl.client.DefaultRedirectStrategy;
|
import org.apache.http.impl.client.DefaultRedirectStrategy;
|
||||||
import org.apache.http.impl.client.HttpClientBuilder;
|
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"})
|
public abstract class ConditionalIT {
|
||||||
@ContextConfiguration(classes = {ApsClientConfiguration.class, ApsClient.class})
|
|
||||||
public class ConditionalIT {
|
|
||||||
|
|
||||||
@Autowired
|
public abstract ApsClientConfiguration getConfiguration();
|
||||||
private ApsClient client;
|
|
||||||
|
|
||||||
public boolean hostExists() {
|
public boolean hostExists() {
|
||||||
String uri = this.client.getConfig().getBaseUrl();
|
String uri = this.getConfiguration().getBaseUrl();
|
||||||
|
|
||||||
HttpUriRequest request = RequestBuilder.get()
|
HttpUriRequest request = RequestBuilder.get()
|
||||||
.setUri(uri)
|
.setUri(uri)
|
||||||
|
@ -2,6 +2,7 @@ package com.inteligr8.alfresco.activiti;
|
|||||||
|
|
||||||
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;
|
||||||
@ -12,14 +13,19 @@ import com.inteligr8.alfresco.activiti.model.User;
|
|||||||
|
|
||||||
@TestPropertySource(locations = {"/local.properties"})
|
@TestPropertySource(locations = {"/local.properties"})
|
||||||
@SpringJUnitConfig(classes = {ApsClientConfiguration.class, ApsClient.class, ApsClientCxfImpl.class})
|
@SpringJUnitConfig(classes = {ApsClientConfiguration.class, ApsClient.class, ApsClientCxfImpl.class})
|
||||||
public class ConnectionCxfClientIT {
|
public class ConnectionCxfClientIT extends ConditionalIT {
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
@Qualifier("apsClient.cxf")
|
@Qualifier("apsClient.cxf")
|
||||||
private ApsClient client;
|
private ApsClient client;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ApsClientConfiguration getConfiguration() {
|
||||||
|
return this.client.getConfig();
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
//@EnabledIf("hostExists")
|
@EnabledIf("hostExists")
|
||||||
public void testAppVersion() {
|
public void testAppVersion() {
|
||||||
AppVersion obj = this.client.getAppVersionApi().get();
|
AppVersion obj = this.client.getAppVersionApi().get();
|
||||||
|
|
||||||
@ -29,7 +35,7 @@ public class ConnectionCxfClientIT {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
//@EnabledIf("hostExists")
|
@EnabledIf("hostExists")
|
||||||
public void testProfile() {
|
public void testProfile() {
|
||||||
User obj = this.client.getProfileApi().get();
|
User obj = this.client.getProfileApi().get();
|
||||||
|
|
||||||
|
@ -2,6 +2,7 @@ package com.inteligr8.alfresco.activiti;
|
|||||||
|
|
||||||
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;
|
||||||
@ -12,14 +13,19 @@ import com.inteligr8.alfresco.activiti.model.User;
|
|||||||
|
|
||||||
@TestPropertySource(locations = {"/local.properties"})
|
@TestPropertySource(locations = {"/local.properties"})
|
||||||
@SpringJUnitConfig(classes = {ApsClientConfiguration.class, ApsClient.class, ApsClientJerseyImpl.class})
|
@SpringJUnitConfig(classes = {ApsClientConfiguration.class, ApsClient.class, ApsClientJerseyImpl.class})
|
||||||
public class ConnectionJerseyClientIT {
|
public class ConnectionJerseyClientIT extends ConditionalIT {
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
@Qualifier("apsClient.jersey")
|
@Qualifier("apsClient.jersey")
|
||||||
private ApsClient client;
|
private ApsClient client;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ApsClientConfiguration getConfiguration() {
|
||||||
|
return this.client.getConfig();
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
//@EnabledIf("hostExists")
|
@EnabledIf("hostExists")
|
||||||
public void testAppVersion() {
|
public void testAppVersion() {
|
||||||
AppVersion obj = this.client.getAppVersionApi().get();
|
AppVersion obj = this.client.getAppVersionApi().get();
|
||||||
|
|
||||||
@ -29,7 +35,7 @@ public class ConnectionJerseyClientIT {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
//@EnabledIf("hostExists")
|
@EnabledIf("hostExists")
|
||||||
public void testProfile() {
|
public void testProfile() {
|
||||||
User obj = this.client.getProfileApi().get();
|
User obj = this.client.getProfileApi().get();
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user