Revert "SDK-357 - Follow maven recommended best practices for unit an…

…d integration tests (#307)"

This reverts commit 76fb2be.

integration-tests/.gitignore

@@ -0,0 +1,12 @@
+*.iml
+target/
+.idea/
+*~
+/openmrs-sdk.bat
+
+*.class
+
+/.settings
+/.project
+/.classpath
+.DS_Store

integration-tests/pom.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.openmrs.maven</groupId>
+        <artifactId>openmrs-sdk</artifactId>
+        <version>6.1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>openmrs-sdk-integration-tests</artifactId>
+
+    <name>OpenMRS SDK Integration Tests</name>
+    <description>Set of integration tests for OpenMRS SDK Maven Plugin</description>
+    <url>https://wiki.openmrs.org/display/docs/OpenMRS+SDK</url>
+
+    <dependencies>
+        <!-- openmrs sdk maven plugin -->
+        <dependency>
+            <groupId>org.openmrs.maven.plugins</groupId>
+            <artifactId>openmrs-sdk-maven-plugin</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+        <!--testing-->
+        <dependency>
+            <groupId>org.apache.maven.shared</groupId>
+            <artifactId>maven-verifier</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-library</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.semver4j</groupId>
+            <artifactId>semver4j</artifactId>
+        </dependency>
+    </dependencies>
+</project>

maven-plugin/src/test/java/org/openmrs/maven/plugins/AbstractSdkIT.java → integration-tests/src/test/java/org/openmrs/maven/plugins/AbstractSdkIntegrationTest.java

@@ -1,6 +1,7 @@
 package org.openmrs.maven.plugins;
 
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.maven.it.VerificationException;
 import org.apache.maven.it.Verifier;
@@ -47,7 +48,7 @@
 
 
 @RunWith(BlockJUnit4ClassRunner.class)
-public abstract class AbstractSdkIT {
+public abstract class AbstractSdkIntegrationTest {
 
     /**
      * contains name of directory in project's target dir, where integration tests are conducted

maven-plugin/src/test/java/org/openmrs/maven/plugins/AddDependencyIT.java → integration-tests/src/test/java/org/openmrs/maven/plugins/AddDependencyTest.java

@@ -4,11 +4,13 @@
 import org.openmrs.maven.plugins.model.DistroProperties;
 import org.openmrs.maven.plugins.utility.DistroHelper;
 
+import java.io.File;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-public class AddDependencyIT extends AbstractSdkIT {
+public class AddDependencyTest extends AbstractSdkIntegrationTest {
 
     @Test
     public void shouldAddOmodDependency() throws Exception {

maven-plugin/src/test/java/org/openmrs/maven/plugins/AddExclusionIT.java → integration-tests/src/test/java/org/openmrs/maven/plugins/AddExclusionIntegrationTest.java

@@ -12,7 +12,7 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-public class AddExclusionIT extends AbstractSdkIT {
+public class AddExclusionIntegrationTest extends AbstractSdkIntegrationTest {
 
     public DistroProperties getDistroProperties() {
         return DistroHelper.getDistroPropertiesFromFile(distroFile);

maven-plugin/src/test/java/org/openmrs/maven/plugins/BuildDistroIT.java → integration-tests/src/test/java/org/openmrs/maven/plugins/BuildDistroIntegrationTest.java

@@ -2,7 +2,7 @@
 
 import org.junit.Test;
 
-public class BuildDistroIT extends AbstractSdkIT {
+public class BuildDistroIntegrationTest extends AbstractSdkIntegrationTest {
 
     @Test
     public void testBuildDistroFromDistroFile() throws Exception {

maven-plugin/src/test/java/org/openmrs/maven/plugins/BuildIT.java → integration-tests/src/test/java/org/openmrs/maven/plugins/BuildIntegrationTest.java

@@ -8,7 +8,7 @@
 
 import java.io.File;
 
-public class BuildIT extends AbstractSdkIT {
+public class BuildIntegrationTest extends AbstractSdkIntegrationTest {
 
 	private String serverId;
 

maven-plugin/src/test/java/org/openmrs/maven/plugins/CloneIT.java → integration-tests/src/test/java/org/openmrs/maven/plugins/CloneIntegrationTest.java

@@ -11,7 +11,7 @@
 import static org.hamcrest.CoreMatchers.hasItem;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-public class CloneIT extends AbstractSdkIT {
+public class CloneIntegrationTest extends AbstractSdkIntegrationTest {
 
     @Test
     public void clone_shouldCloneRepository() throws Exception {

maven-plugin/src/test/java/org/openmrs/maven/plugins/CreateProjectIT.java → integration-tests/src/test/java/org/openmrs/maven/plugins/CreateProjectIntegrationTest.java

@@ -5,7 +5,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-public class CreateProjectIT extends AbstractSdkIT {
+public class CreateProjectIntegrationTest extends AbstractSdkIntegrationTest {
 
     Model model;
 

maven-plugin/src/test/java/org/openmrs/maven/plugins/DeployIT.java → integration-tests/src/test/java/org/openmrs/maven/plugins/DeployIntegrationTest.java

@@ -1,5 +1,6 @@
 package org.openmrs.maven.plugins;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.openmrs.maven.plugins.model.Artifact;
@@ -15,7 +16,7 @@
 import static org.openmrs.maven.plugins.SdkMatchers.hasUserOwa;
 import static org.openmrs.maven.plugins.SdkMatchers.serverHasVersion;
 
-public class DeployIT extends AbstractSdkIT {
+public class DeployIntegrationTest extends AbstractSdkIntegrationTest {
 
     private static String testServerId;
 

maven-plugin/src/test/java/org/openmrs/maven/plugins/FetchIT.java → integration-tests/src/test/java/org/openmrs/maven/plugins/FetchIntegrationTest.java

@@ -5,7 +5,7 @@
 
 import java.io.File;
 
-public class FetchIT extends AbstractSdkIT {
+public class FetchIntegrationTest extends AbstractSdkIntegrationTest{
 
     private final static String FETCH_DIRECTORY_NAME = "fetch";
 

maven-plugin/src/test/java/org/openmrs/maven/plugins/PullIT.java → integration-tests/src/test/java/org/openmrs/maven/plugins/PullIntegrationTest.java

@@ -11,7 +11,7 @@
 
 import java.io.File;
 
-public class PullIT extends AbstractSdkIT {
+public class PullIntegrationTest extends AbstractSdkIntegrationTest {
 
     private static final String OPENMRS_MODULE_IDGEN = "openmrs-module-idgen";
     private static final String PULL_GOAL = "pull";

maven-plugin/src/test/java/org/openmrs/maven/plugins/RemoveDependencyIT.java → integration-tests/src/test/java/org/openmrs/maven/plugins/RemoveDependencyTest.java

@@ -8,7 +8,7 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-public class RemoveDependencyIT extends AbstractSdkIT {
+public class RemoveDependencyTest extends AbstractSdkIntegrationTest {
 
     @Test
     public void shouldRemoveExistingDependency() throws Exception {

maven-plugin/src/test/java/org/openmrs/maven/plugins/ResetIT.java → integration-tests/src/test/java/org/openmrs/maven/plugins/ResetIntegrationTest.java

@@ -1,10 +1,17 @@
 package org.openmrs.maven.plugins;
 
+import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.MatcherAssert.assertThat;
 
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.UUID;
+
+import org.apache.commons.io.FileUtils;
 import org.junit.Test;
 
-public class ResetIT extends AbstractSdkIT {
+public class ResetIntegrationTest extends AbstractSdkIntegrationTest {
 
 	@Test
 	public void reset_shouldResetExistingServer() throws Exception {

maven-plugin/src/test/java/org/openmrs/maven/plugins/SetupIT.java → integration-tests/src/test/java/org/openmrs/maven/plugins/SetupIntegrationTest.java

@@ -27,7 +27,7 @@
 import static org.openmrs.maven.plugins.SdkMatchers.serverHasDebugPort;
 import static org.openmrs.maven.plugins.SdkMatchers.serverHasVersion;
 
-public class SetupIT extends AbstractSdkIT {
+public class SetupIntegrationTest extends AbstractSdkIntegrationTest {
 
     @Test
     public void setup_shouldInstallRefapp2_3_1() throws Exception{

pom.xml

@@ -22,6 +22,7 @@
         <module>tomcat7-maven-plugin</module>
         <module>tomcat9-maven-plugin</module>
         <module>maven-plugin</module>
+        <module>integration-tests</module>
     </modules>
 
     <licenses>
@@ -529,10 +530,6 @@
                     <artifactId>maven-gpg-plugin</artifactId>
                     <version>3.1.0</version>
                 </plugin>
-                <!--
-                    The surefire plugin will execute any tests all classes whose name starts with Test,
-                    or ends with Test, Tests or TestCase.  Unit tests should follow this convention.
-                -->
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
@@ -546,39 +543,14 @@
     </build>
 
     <profiles>
-        <!--
-            The failsafe plugin will execute any tests that start with IT or ends with IT or ITCase
-            These are much slower to execute than unit tests, so they are only executed with the given profile
-            when full testing is desired.  Integration Tests should follow this convention
-        -->
-        <profile>
-            <id>integration-tests</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <version>3.1.2</version>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
         <profile>
             <id>release</id>
             <build>
                 <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-source-plugin</artifactId>
-                        <version>3.2.1</version>
+                        <version>3.3.0</version>
                         <executions>
                             <execution>
                                 <id>attach-sources</id>
@@ -591,7 +563,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>3.4.1</version>
+                        <version>3.5.0</version>
                         <executions>
                             <execution>
                                 <id>attach-javadocs</id>