Merge branch 'develop' into stable

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

@@ -0,0 +1,54 @@
+package com.inteligr8.alfresco.activiti;
+
+import java.util.Arrays;
+import java.util.UUID;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
+
+import com.inteligr8.alfresco.activiti.model.AppVersion;
+import com.inteligr8.alfresco.activiti.model.CreateProcessInstance;
+import com.inteligr8.alfresco.activiti.model.ProcessInstance;
+import com.inteligr8.alfresco.activiti.model.User;
+import com.inteligr8.alfresco.activiti.model.Variable;
+
+public abstract class ConnectionClientIT extends ConditionalIT {
+	
+	public abstract ApsPublicRestApi getClient();
+	
+	@Test
+	@EnabledIf("hostExists")
+	public void testAppVersion() {
+		AppVersion obj = this.getClient().getAppVersionApi().get();
+		
+		Assertions.assertNotNull(obj);
+		Assertions.assertEquals("1", obj.getMajorVersion());
+		Assertions.assertEquals("bpmSuite", obj.getType());
+	}
+	
+	@Test
+	@EnabledIf("hostExists")
+	public void testProfile() {
+		User obj = this.getClient().getProfileApi().get();
+		
+		Assertions.assertNotNull(obj);
+		Assertions.assertEquals("admin@app.activiti.com", obj.getEmail());
+	}
+	
+	@Test
+	@EnabledIf("hostExists")
+	public void testStartProcess() {
+		CreateProcessInstance request = new CreateProcessInstance();
+		request.setProcessDefinitionKey("qcDocument");
+		request.setVariables(Arrays.asList(new Variable("acsNodeId", null, null, UUID.randomUUID().toString())));
+		
+		ProcessInstance response = this.getClient().getProcessInstancesApi().create(request);
+		
+		Assertions.assertNotNull(response);
+		Assertions.assertNotNull(response.getId());
+		Assertions.assertNotNull(response.getId().length() > 0);
+		Assertions.assertEquals("qcDocument", response.getProcessDefinitionKey());
+	}
+
+}

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

@@ -1,47 +1,28 @@
 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;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
-import com.inteligr8.alfresco.activiti.model.AppVersion;
-import com.inteligr8.alfresco.activiti.model.User;
 import com.inteligr8.rs.ClientConfiguration;
 
 @TestPropertySource(locations = {"/local.properties"})
 @SpringJUnitConfig(classes = {ApsClientConfiguration.class, ApsPublicRestApiCxfImpl.class, ApsClientCxfImpl.class})
-public class ConnectionCxfClientIT extends ConditionalIT {
+public class ConnectionCxfClientIT extends ConnectionClientIT {
 	
 	@Autowired
 	@Qualifier("aps.api.cxf")
 	private ApsPublicRestApi client;
 	
+	@Override
+	public ApsPublicRestApi getClient() {
+		return this.client;
+	}
+	
 	@Override
 	public ClientConfiguration getConfiguration() {
 		return this.client.getConfig();
 	}
 
-	@Test
-	@EnabledIf("hostExists")
-	public void testAppVersion() {
-		AppVersion obj = this.client.getAppVersionApi().get();
-		
-		Assertions.assertNotNull(obj);
-		Assertions.assertEquals("1", obj.getMajorVersion());
-		Assertions.assertEquals("bpmSuite", obj.getType());
-	}
-	
-	@Test
-	@EnabledIf("hostExists")
-	public void testProfile() {
-		User obj = this.client.getProfileApi().get();
-		
-		Assertions.assertNotNull(obj);
-		Assertions.assertEquals("admin@app.activiti.com", obj.getEmail());
-	}
-
 }

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

@@ -1,47 +1,27 @@
 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;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
-import com.inteligr8.alfresco.activiti.model.AppVersion;
-import com.inteligr8.alfresco.activiti.model.User;
 import com.inteligr8.rs.ClientConfiguration;
 
 @TestPropertySource(locations = {"/local.properties"})
 @SpringJUnitConfig(classes = {ApsClientConfiguration.class, ApsPublicRestApiCxfImpl.class, ApsClientJerseyImpl.class})
-public class ConnectionJerseyClientIT extends ConditionalIT {
+public class ConnectionJerseyClientIT extends ConnectionClientIT {
 	
 	@Autowired
 	@Qualifier("aps.api.jersey")
 	private ApsPublicRestApi client;
 	
+	public ApsPublicRestApi getClient() {
+		return this.client;
+	}
+	
 	@Override
 	public ClientConfiguration getConfiguration() {
 		return this.client.getConfig();
 	}
 
-	@Test
-	@EnabledIf("hostExists")
-	public void testAppVersion() {
-		AppVersion obj = this.client.getAppVersionApi().get();
-		
-		Assertions.assertNotNull(obj);
-		Assertions.assertEquals("1", obj.getMajorVersion());
-		Assertions.assertEquals("bpmSuite", obj.getType());
-	}
-	
-	@Test
-	@EnabledIf("hostExists")
-	public void testProfile() {
-		User obj = this.client.getProfileApi().get();
-		
-		Assertions.assertNotNull(obj);
-		Assertions.assertEquals("admin@app.activiti.com", obj.getEmail());
-	}
-
 }

src/test/resources/local-oauth.properties

@@ -0,0 +1,5 @@
+process.service.baseUrl=http://localhost:8080/activiti-app
+process.service.security.oauth.tokenUrl=http://auth.example.org:8080/auth/realms/alfresco/protocol/openid-connect/token
+process.service.security.oauth.clientId=alfresco
+process.service.security.oauth.grantUsername=admin
+process.service.security.oauth.grantPassword=admin