From 47bcdfa259b216a50cee13c03c245a51dca8e0d9 Mon Sep 17 00:00:00 2001
From: Jose Ignacio Recuerda Cambil <ignaciorecuerda@users.noreply.github.com>
Date: Mon, 4 Mar 2019 15:18:30 +0100
Subject: [PATCH] TSK-799: Move integration test to taskana-rest-spring-test

---
 rest/pom.xml                                  |  2 +-
 rest/taskana-rest-spring-example/pom.xml      | 29 +++++++++++++++++
 .../src/test/java/.gitkeep                    |  0
 .../src/test/resources/.gitkeep               |  0
 .../src/test/resources/application.properties | 32 -------------------
 rest/taskana-rest-spring-test/pom.xml         | 11 ++-----
 .../pro/taskana/HistoryPluginLoaderTest.java  |  0
 .../taskana/jobs/AsyncUpdateJobIntTest.java   |  0
 .../test/java/pro/taskana/ldap/LdapTest.java  |  0
 .../AccessIdValidationControllerIntTest.java} |  3 +-
 .../rest/ClassificationControllerIntTest.java |  0
 ...sificationDefinitionControllerIntTest.java |  0
 .../rest/GenenalExceptionHandlingTest.java    |  0
 .../taskana/rest/TaskControllerIntTest.java   |  0
 .../rest/TaskanaEngineControllerIntTest.java  |  0
 .../rest/TestSchemaNameCustomizable.java      |  0
 ...WorkbasketAccessItemControllerIntTest.java |  0
 .../rest/WorkbasketControllerIntTest.java     |  0
 ...WorkbasketDefinitionControllerIntTest.java |  0
 .../pom.xml                                   | 24 ++++++++++++++
 20 files changed, 58 insertions(+), 43 deletions(-)
 delete mode 100644 rest/taskana-rest-spring-example/src/test/java/.gitkeep
 delete mode 100644 rest/taskana-rest-spring-example/src/test/resources/.gitkeep
 delete mode 100644 rest/taskana-rest-spring-example/src/test/resources/application.properties
 rename rest/{taskana-rest-spring-example => taskana-rest-spring-test}/src/test/java/pro/taskana/HistoryPluginLoaderTest.java (100%)
 rename rest/{taskana-rest-spring-example => taskana-rest-spring-test}/src/test/java/pro/taskana/jobs/AsyncUpdateJobIntTest.java (100%)
 rename rest/{taskana-rest-spring-example => taskana-rest-spring-test}/src/test/java/pro/taskana/ldap/LdapTest.java (100%)
 rename rest/{taskana-rest-spring-example/src/test/java/pro/taskana/rest/AccessIdValidationControllerTest.java => taskana-rest-spring-test/src/test/java/pro/taskana/rest/AccessIdValidationControllerIntTest.java} (98%)
 rename rest/{taskana-rest-spring-example => taskana-rest-spring-test}/src/test/java/pro/taskana/rest/ClassificationControllerIntTest.java (100%)
 rename rest/{taskana-rest-spring-example => taskana-rest-spring-test}/src/test/java/pro/taskana/rest/ClassificationDefinitionControllerIntTest.java (100%)
 rename rest/{taskana-rest-spring-example => taskana-rest-spring-test}/src/test/java/pro/taskana/rest/GenenalExceptionHandlingTest.java (100%)
 rename rest/{taskana-rest-spring-example => taskana-rest-spring-test}/src/test/java/pro/taskana/rest/TaskControllerIntTest.java (100%)
 rename rest/{taskana-rest-spring-example => taskana-rest-spring-test}/src/test/java/pro/taskana/rest/TaskanaEngineControllerIntTest.java (100%)
 rename rest/{taskana-rest-spring-example => taskana-rest-spring-test}/src/test/java/pro/taskana/rest/TestSchemaNameCustomizable.java (100%)
 rename rest/{taskana-rest-spring-example => taskana-rest-spring-test}/src/test/java/pro/taskana/rest/WorkbasketAccessItemControllerIntTest.java (100%)
 rename rest/{taskana-rest-spring-example => taskana-rest-spring-test}/src/test/java/pro/taskana/rest/WorkbasketControllerIntTest.java (100%)
 rename rest/{taskana-rest-spring-example => taskana-rest-spring-test}/src/test/java/pro/taskana/rest/WorkbasketDefinitionControllerIntTest.java (100%)

diff --git a/rest/pom.xml b/rest/pom.xml
index 72468792f..e79ab2dc1 100644
--- a/rest/pom.xml
+++ b/rest/pom.xml
@@ -16,8 +16,8 @@
 		<module>taskana-rest-spring</module>
 		<module>../web</module>
 		<module>taskana-rest-spring-base</module>
+		<module>taskana-rest-spring-test</module>
 		<module>taskana-rest-spring-example</module>
 		<module>taskana-rest-spring-wildfly-example</module>
-		<module>taskana-rest-spring-test</module>
 	</modules>
 </project>
diff --git a/rest/taskana-rest-spring-example/pom.xml b/rest/taskana-rest-spring-example/pom.xml
index 2789f8e2c..7b5401e28 100644
--- a/rest/taskana-rest-spring-example/pom.xml
+++ b/rest/taskana-rest-spring-example/pom.xml
@@ -137,6 +137,35 @@
 		</dependency>
 	</dependencies>
 
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-documentation-to-static-folder</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>
+								${project.build.outputDirectory}/static/docs/rest
+							</outputDirectory>
+							<resources>
+								<resource>
+									<directory>
+										../taskana-rest-spring-test/target/generated-docs
+									</directory>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
 	<!--
 	  this repository is needed to fetch com.ibm.db2.jcc
 	-->
diff --git a/rest/taskana-rest-spring-example/src/test/java/.gitkeep b/rest/taskana-rest-spring-example/src/test/java/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/rest/taskana-rest-spring-example/src/test/resources/.gitkeep b/rest/taskana-rest-spring-example/src/test/resources/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/rest/taskana-rest-spring-example/src/test/resources/application.properties b/rest/taskana-rest-spring-example/src/test/resources/application.properties
deleted file mode 100644
index 7d96c3b42..000000000
--- a/rest/taskana-rest-spring-example/src/test/resources/application.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-logging.level.pro.taskana=INFO
-### logging.level.org.springframework=DEBUG
-######## Taskana DB #######
-datasource.url=jdbc:h2:mem:taskana;IGNORECASE=TRUE;LOCK_MODE=0
-datasource.driverClassName=org.h2.Driver
-datasource.username=sa
-datasource.password=sa
-taskana.schemaName=TASKANA
-
-####### control LDAP usage
-taskana.ldap.useLdap=false
-####### properties to connect to LDAP
-taskana.ldap.serverUrl=ldap://localhost:10389
-taskana.ldap.bindDn=uid=admin,ou=system
-taskana.ldap.bindPassword=secret
-taskana.ldap.baseDn=o=TaskanaTest
-####### properties that control search for users and groups
-taskana.ldap.userSearchBase=ou=people
-taskana.ldap.userSearchFilterName=objectclass
-taskana.ldap.userSearchFilterValue=person
-taskana.ldap.userFirstnameAttribute=givenName
-taskana.ldap.userLastnameAttribute=sn
-taskana.ldap.userIdAttribute=uid
-taskana.ldap.groupSearchBase=ou=groups
-taskana.ldap.groupSearchFilterName=objectclass
-taskana.ldap.groupSearchFilterValue=groupOfUniqueNames
-taskana.ldap.groupNameAttribute=cn
-taskana.ldap.minSearchForLength=3
-taskana.ldap.maxNumberOfReturnedAccessIds=50
-
-####### JobScheduler cron expression that specifies when the JobSchedler runs
-taskana.jobscheduler.async.cron=0/5 * * * * *
diff --git a/rest/taskana-rest-spring-test/pom.xml b/rest/taskana-rest-spring-test/pom.xml
index ec3caa1d8..da28457e7 100644
--- a/rest/taskana-rest-spring-test/pom.xml
+++ b/rest/taskana-rest-spring-test/pom.xml
@@ -13,7 +13,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>jar</packaging>
 	<artifactId>taskana-rest-spring-test</artifactId>
-	<version>1.0.8-SNAPSHOT</version>
+	<version>1.1.1-SNAPSHOT</version>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -57,7 +57,7 @@
 		<dependency>
 			<groupId>pro.taskana.simplehistory</groupId>
 			<artifactId>taskana-simplehistory-provider</artifactId>
-			<version>0.0.6</version>
+			<version>0.0.9</version>
 		</dependency>
 
 		<!-- Tests -->
@@ -134,14 +134,9 @@
 						</goals>
 						<configuration>
 							<outputDirectory>
-								${project.build.outputDirectory}/static/docs/rest
+								${project.build.directory}/generated-docs
 							</outputDirectory>
 							<resources>
-								<resource>
-									<directory>
-										${project.build.directory}/generated-docs
-									</directory>
-								</resource>
 								<resource>
 									<directory>${project.basedir}/src/js</directory>
 								</resource>
diff --git a/rest/taskana-rest-spring-example/src/test/java/pro/taskana/HistoryPluginLoaderTest.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/HistoryPluginLoaderTest.java
similarity index 100%
rename from rest/taskana-rest-spring-example/src/test/java/pro/taskana/HistoryPluginLoaderTest.java
rename to rest/taskana-rest-spring-test/src/test/java/pro/taskana/HistoryPluginLoaderTest.java
diff --git a/rest/taskana-rest-spring-example/src/test/java/pro/taskana/jobs/AsyncUpdateJobIntTest.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/jobs/AsyncUpdateJobIntTest.java
similarity index 100%
rename from rest/taskana-rest-spring-example/src/test/java/pro/taskana/jobs/AsyncUpdateJobIntTest.java
rename to rest/taskana-rest-spring-test/src/test/java/pro/taskana/jobs/AsyncUpdateJobIntTest.java
diff --git a/rest/taskana-rest-spring-example/src/test/java/pro/taskana/ldap/LdapTest.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/ldap/LdapTest.java
similarity index 100%
rename from rest/taskana-rest-spring-example/src/test/java/pro/taskana/ldap/LdapTest.java
rename to rest/taskana-rest-spring-test/src/test/java/pro/taskana/ldap/LdapTest.java
diff --git a/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/AccessIdValidationControllerTest.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/AccessIdValidationControllerIntTest.java
similarity index 98%
rename from rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/AccessIdValidationControllerTest.java
rename to rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/AccessIdValidationControllerIntTest.java
index a7a2a9a3d..33b43c58b 100644
--- a/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/AccessIdValidationControllerTest.java
+++ b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/AccessIdValidationControllerIntTest.java
@@ -36,12 +36,11 @@ import pro.taskana.rest.resource.AccessIdResource;
 
 /**
  * Test AccessIdValidation.
- *
  */
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = RestConfiguration.class, webEnvironment = WebEnvironment.RANDOM_PORT, properties = {
     "devMode=true"})
-public class AccessIdValidationControllerTest {
+public class AccessIdValidationControllerIntTest {
 
     @LocalServerPort
     int port;
diff --git a/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/ClassificationControllerIntTest.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/ClassificationControllerIntTest.java
similarity index 100%
rename from rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/ClassificationControllerIntTest.java
rename to rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/ClassificationControllerIntTest.java
diff --git a/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/ClassificationDefinitionControllerIntTest.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/ClassificationDefinitionControllerIntTest.java
similarity index 100%
rename from rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/ClassificationDefinitionControllerIntTest.java
rename to rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/ClassificationDefinitionControllerIntTest.java
diff --git a/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/GenenalExceptionHandlingTest.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/GenenalExceptionHandlingTest.java
similarity index 100%
rename from rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/GenenalExceptionHandlingTest.java
rename to rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/GenenalExceptionHandlingTest.java
diff --git a/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/TaskControllerIntTest.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/TaskControllerIntTest.java
similarity index 100%
rename from rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/TaskControllerIntTest.java
rename to rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/TaskControllerIntTest.java
diff --git a/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/TaskanaEngineControllerIntTest.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/TaskanaEngineControllerIntTest.java
similarity index 100%
rename from rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/TaskanaEngineControllerIntTest.java
rename to rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/TaskanaEngineControllerIntTest.java
diff --git a/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/TestSchemaNameCustomizable.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/TestSchemaNameCustomizable.java
similarity index 100%
rename from rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/TestSchemaNameCustomizable.java
rename to rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/TestSchemaNameCustomizable.java
diff --git a/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/WorkbasketAccessItemControllerIntTest.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/WorkbasketAccessItemControllerIntTest.java
similarity index 100%
rename from rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/WorkbasketAccessItemControllerIntTest.java
rename to rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/WorkbasketAccessItemControllerIntTest.java
diff --git a/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/WorkbasketControllerIntTest.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/WorkbasketControllerIntTest.java
similarity index 100%
rename from rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/WorkbasketControllerIntTest.java
rename to rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/WorkbasketControllerIntTest.java
diff --git a/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/WorkbasketDefinitionControllerIntTest.java b/rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/WorkbasketDefinitionControllerIntTest.java
similarity index 100%
rename from rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/WorkbasketDefinitionControllerIntTest.java
rename to rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/WorkbasketDefinitionControllerIntTest.java
diff --git a/rest/taskana-rest-spring-wildfly-example/pom.xml b/rest/taskana-rest-spring-wildfly-example/pom.xml
index 752ca0b72..83ecaaf72 100644
--- a/rest/taskana-rest-spring-wildfly-example/pom.xml
+++ b/rest/taskana-rest-spring-wildfly-example/pom.xml
@@ -273,6 +273,30 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-documentation-to-static-folder</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>
+								${project.build.outputDirectory}/static/docs/rest
+							</outputDirectory>
+							<resources>
+								<resource>
+									<directory>
+										../taskana-rest-spring-test/target/generated-docs
+									</directory>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 </project>
\ No newline at end of file