SDK-357 - Follow maven recommended best practices for unit and integr…

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

@@ -1,7 +1,6 @@
 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;
@@ -48,7 +47,7 @@
 
 
 @RunWith(BlockJUnit4ClassRunner.class)
-public abstract class AbstractSdkIntegrationTest {
+public abstract class AbstractSdkIT {
 
     /**
      * contains name of directory in project's target dir, where integration tests are conducted

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

@@ -4,13 +4,11 @@
 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 AddDependencyTest extends AbstractSdkIntegrationTest {
+public class AddDependencyIT extends AbstractSdkIT {
 
     @Test
     public void shouldAddOmodDependency() throws Exception {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,17 +1,10 @@
 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 ResetIntegrationTest extends AbstractSdkIntegrationTest {
+public class ResetIT extends AbstractSdkIT {
 
 	@Test
 	public void reset_shouldResetExistingServer() throws Exception {

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

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

pom.xml

@@ -22,7 +22,6 @@
         <module>tomcat7-maven-plugin</module>
         <module>tomcat9-maven-plugin</module>
         <module>maven-plugin</module>
-        <module>integration-tests</module>
     </modules>
 
     <licenses>
@@ -530,6 +529,10 @@
                     <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>
@@ -543,14 +546,39 @@
     </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.3.0</version>
+                        <version>3.2.1</version>
                         <executions>
                             <execution>
                                 <id>attach-sources</id>
@@ -563,7 +591,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>3.5.0</version>
+                        <version>3.4.1</version>
                         <executions>
                             <execution>
                                 <id>attach-javadocs</id>