From 285506b79c7347515039371c5c401ececff5de6f Mon Sep 17 00:00:00 2001
From: "Brian M. Long" <brian@inteligr8.com>
Date: Thu, 7 Apr 2022 23:40:32 -0400
Subject: [PATCH] fixed testing support

---
 pom.xml                                       | 118 ++++++++++++++++++
 .../services/javax.ws.rs.client.ClientBuilder |   1 +
 .../alfresco/acs/ConnectionCxfClientIT.java   |  32 -----
 .../services/javax.ws.rs.client.ClientBuilder |   1 +
 4 files changed, 120 insertions(+), 32 deletions(-)
 create mode 100644 src/test/cxf/META-INF/services/javax.ws.rs.client.ClientBuilder
 create mode 100644 src/test/jersey/META-INF/services/javax.ws.rs.client.ClientBuilder

diff --git a/pom.xml b/pom.xml
index d86f989..1bc02ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,6 +17,7 @@
 		<acs.baseUrl>https://api-explorer.alfresco.com/api-explorer</acs.baseUrl>
 		<acs.platform.tag>acs7</acs.platform.tag>
 		<swagger.basePackage>com.inteligr8.alfresco.acs</swagger.basePackage>
+		<it.directory>src/test/none</it.directory>
 
 		<junit.version>5.7.2</junit.version>
 		<spring.version>5.2.14.RELEASE</spring.version>
@@ -124,6 +125,21 @@
 							</sources>
 						</configuration>
 					</execution>
+					<execution>
+						<id>add-services</id>
+						<phase>process-test-resources</phase>
+						<goals>
+							<goal>add-test-resource</goal>
+						</goals>
+						<configuration>
+							<resources>
+								<resource>
+									<directory>${it.directory}</directory>
+									<filtering>false</filtering>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
 				</executions>
 			</plugin>
 			<plugin>
@@ -142,6 +158,12 @@
 						<version>${junit.version}</version>
 					</dependency>
 				</dependencies>
+				<configuration>
+					<excludes>
+						<exclude>**/*Jersey*</exclude>
+						<exclude>**/*Cxf*</exclude>
+					</excludes>
+				</configuration>
 			</plugin>
 			<plugin>
 				<artifactId>maven-failsafe-plugin</artifactId>
@@ -153,6 +175,12 @@
 						<version>${junit.version}</version>
 					</dependency>
 				</dependencies>
+				<configuration>
+					<excludes>
+						<exclude>**/*Jersey*</exclude>
+						<exclude>**/*Cxf*</exclude>
+					</excludes>
+				</configuration>
 			</plugin>
 			<plugin>
 				<artifactId>maven-javadoc-plugin</artifactId>
@@ -171,6 +199,96 @@
 	</build>
 
 	<profiles>
+		<profile>
+			<id>it-jersey</id>
+			<properties>
+				<it.directory>src/test/jersey</it.directory>
+			</properties>
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-surefire-plugin</artifactId>
+						<version>3.0.0-M5</version>
+						<dependencies>
+							<dependency>
+								<groupId>org.junit.jupiter</groupId>
+								<artifactId>junit-jupiter-engine</artifactId>
+								<version>${junit.version}</version>
+							</dependency>
+						</dependencies>
+						<configuration>
+							<includes>
+								<include>**/*Jersey*</include>
+							</includes>
+							<excludes>
+								<exclude>**/*IT.java</exclude>
+							</excludes>
+						</configuration>
+					</plugin>
+					<plugin>
+						<artifactId>maven-failsafe-plugin</artifactId>
+						<version>3.0.0-M5</version>
+						<dependencies>
+							<dependency>
+								<groupId>org.junit.jupiter</groupId>
+								<artifactId>junit-jupiter-engine</artifactId>
+								<version>${junit.version}</version>
+							</dependency>
+						</dependencies>
+						<configuration>
+							<includes>
+								<include>**/*Jersey*IT.java</include>
+							</includes>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>it-cxf</id>
+			<properties>
+				<it.directory>src/test/cxf</it.directory>
+			</properties>
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-surefire-plugin</artifactId>
+						<version>3.0.0-M5</version>
+						<dependencies>
+							<dependency>
+								<groupId>org.junit.jupiter</groupId>
+								<artifactId>junit-jupiter-engine</artifactId>
+								<version>${junit.version}</version>
+							</dependency>
+						</dependencies>
+						<configuration>
+							<includes>
+								<include>**/*Cxf*</include>
+							</includes>
+							<excludes>
+								<exclude>**/*IT.java</exclude>
+							</excludes>
+						</configuration>
+					</plugin>
+					<plugin>
+						<artifactId>maven-failsafe-plugin</artifactId>
+						<version>3.0.0-M5</version>
+						<dependencies>
+							<dependency>
+								<groupId>org.junit.jupiter</groupId>
+								<artifactId>junit-jupiter-engine</artifactId>
+								<version>${junit.version}</version>
+							</dependency>
+						</dependencies>
+						<configuration>
+							<includes>
+								<include>**/*Cxf*IT.java</include>
+							</includes>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 		<!-- Implement when descriptor is available -->
 		<profile>
 			<id>swagger-codegen</id>
diff --git a/src/test/cxf/META-INF/services/javax.ws.rs.client.ClientBuilder b/src/test/cxf/META-INF/services/javax.ws.rs.client.ClientBuilder
new file mode 100644
index 0000000..018e11f
--- /dev/null
+++ b/src/test/cxf/META-INF/services/javax.ws.rs.client.ClientBuilder
@@ -0,0 +1 @@
+org.apache.cxf.jaxrs.client.spec.ClientBuilderImpl
\ No newline at end of file
diff --git a/src/test/java/com/inteligr8/alfresco/acs/ConnectionCxfClientIT.java b/src/test/java/com/inteligr8/alfresco/acs/ConnectionCxfClientIT.java
index 31379e7..1f9ca9b 100644
--- a/src/test/java/com/inteligr8/alfresco/acs/ConnectionCxfClientIT.java
+++ b/src/test/java/com/inteligr8/alfresco/acs/ConnectionCxfClientIT.java
@@ -1,21 +1,10 @@
 package com.inteligr8.alfresco.acs;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-
-import org.junit.jupiter.api.Test;
 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.acs.api.NodeBodyCreateMultipart;
-import com.inteligr8.alfresco.acs.model.NodeBodyCreate;
-import com.inteligr8.alfresco.acs.model.RequestQuery;
-import com.inteligr8.alfresco.acs.model.RequestQuery.LanguageEnum;
-import com.inteligr8.alfresco.acs.model.ResultNode;
-import com.inteligr8.alfresco.acs.model.ResultSetPaging;
-import com.inteligr8.alfresco.acs.model.SearchRequest;
 import com.inteligr8.rs.ClientConfiguration;
 
 @TestPropertySource(locations = {"/local.properties"})
@@ -36,25 +25,4 @@ public class ConnectionCxfClientIT extends ConnectionClientIT {
 		return this.client.getConfig();
 	}
 	
-	@Test
-	public void uploadFile() throws IOException {
-		RequestQuery query = new RequestQuery();
-		query.setLanguage(LanguageEnum.AFTS);
-		query.setQuery("=@cm:name:'Shared'");
-		
-		SearchRequest searchRequest = new SearchRequest();
-		searchRequest.setQuery(query);
-		
-		ResultSetPaging paging = this.client.getSearchApi().search(searchRequest);
-		ResultNode folderNode = paging.getList().getEntries().iterator().next().getEntry();
-		String folderNodeId = folderNode.getId();
-		
-		NodeBodyCreate nodeBody = new NodeBodyCreate().nodeType("cm:content").name("TestFolder");
-		
-		ByteArrayInputStream istream = new ByteArrayInputStream("This is a test".getBytes());
-		NodeBodyCreateMultipart body = NodeBodyCreateMultipart.from(nodeBody, "test.txt", istream, true, null, null);
-		
-		this.client.getNodesExtApi().createNode(folderNodeId, body);
-	}
-	
 }
diff --git a/src/test/jersey/META-INF/services/javax.ws.rs.client.ClientBuilder b/src/test/jersey/META-INF/services/javax.ws.rs.client.ClientBuilder
new file mode 100644
index 0000000..48b9fa5
--- /dev/null
+++ b/src/test/jersey/META-INF/services/javax.ws.rs.client.ClientBuilder
@@ -0,0 +1 @@
+org.glassfish.jersey.client.JerseyClientBuilder
\ No newline at end of file