Refactored Tests to divide into Unit- and Integration-Tests

pesse · Samuel Nitsche · commit 9ab4d0f18eb7 · 2018-01-29T15:35:12.000+01:00
Integration-Tests are run in verify-scope, not in test. All tests which
require database being setup are now declared as Integration-tests
diff --git a/.travis.yml b/.travis.yml
@@ -44,7 +44,7 @@ before_script:
   - cp .travis/settings.xml $MAVEN_CFG/settings.xml
 
 script:
-  - mvn test -B
+  - mvn verify -B
 
 before_deploy:
   - if [ ! -z "$TRAVIS_TAG" ]; then VERSION=$(tr -d "/v/" <<<$TRAVIS_TAG); mvn org.codehaus.mojo:versions-maven-plugin:2.1:set -DnewVersion=${VERSION}; fi
diff --git a/pom.xml b/pom.xml
@@ -66,6 +66,31 @@
         <version>0.0.6</version>
       </extension>
     </extensions>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.19.1</version>
+        <configuration>
+          <excludes>
+            <exclude>**/*IT.java</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <version>2.19.1</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>integration-test</goal>
+              <goal>verify</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
   </build>
 
   <distributionManagement>
diff --git a/src/test/java/org/utplsql/api/CompatibilityIT.java b/src/test/java/org/utplsql/api/CompatibilityIT.java
@@ -1,6 +1,7 @@
 package org.utplsql.api;
 
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.utplsql.api.compatibility.CompatibilityProxy;
@@ -9,7 +10,7 @@
 import java.sql.Connection;
 import java.sql.SQLException;
 
-public class CompatibilityTest {
+public class CompatibilityIT {
 
     @Rule
     public final DatabaseRule db = new DatabaseRule();
diff --git a/src/test/java/org/utplsql/api/DBHelperIT.java b/src/test/java/org/utplsql/api/DBHelperIT.java
@@ -7,7 +7,7 @@
 
 import java.sql.SQLException;
 
-public class DBHelperTest {
+public class DBHelperIT {
 
     @Rule
     public final DatabaseRule db = new DatabaseRule();
diff --git a/src/test/java/org/utplsql/api/FileMapperIT.java b/src/test/java/org/utplsql/api/FileMapperIT.java
@@ -9,7 +9,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class FileMapperTest {
+public class FileMapperIT {
 
     @Rule
     public final DatabaseRule db = new DatabaseRule();
diff --git a/src/test/java/org/utplsql/api/OutputBufferIT.java b/src/test/java/org/utplsql/api/OutputBufferIT.java
@@ -19,7 +19,7 @@
 /**
  * Created by Vinicius on 13/04/2017.
  */
-public class OutputBufferTest {
+public class OutputBufferIT {
 
     @Rule
     public final DatabaseRule db = new DatabaseRule();
diff --git a/src/test/java/org/utplsql/api/TestRunnerIT.java b/src/test/java/org/utplsql/api/TestRunnerIT.java
@@ -14,7 +14,7 @@
 /**
  * Created by Vinicius on 13/04/2017.
  */
-public class TestRunnerTest {
+public class TestRunnerIT {
 
     @Rule
     public final DatabaseRule db = new DatabaseRule();
diff --git a/src/test/java/org/utplsql/api/rules/DatabaseRule.java b/src/test/java/org/utplsql/api/rules/DatabaseRule.java
@@ -1,6 +1,7 @@
 package org.utplsql.api.rules;
 
 import org.junit.rules.ExternalResource;
+import org.utplsql.api.EnvironmentVariableUtil;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -18,11 +19,13 @@ public class DatabaseRule extends ExternalResource {
     private static String sPass;
 
     static {
-        sUrl  = System.getenv("DB_URL")  != null ? System.getenv("DB_URL")  : "192.168.99.100:1521:XE";
-        sUser = System.getenv("DB_USER") != null ? System.getenv("DB_USER") : "app";
-        sPass = System.getenv("DB_PASS") != null ? System.getenv("DB_PASS") : "app";
+        sUrl  = EnvironmentVariableUtil.getEnvValue("DB_URL", "192.168.99.100:1521:XE");
+        sUser = EnvironmentVariableUtil.getEnvValue("DB_USER", "app");
+        sPass = EnvironmentVariableUtil.getEnvValue("DB_PASS", "app");
     }
 
+
+
     private List<Connection> connectionList;
 
     public DatabaseRule() {
diff --git a/src/test/java/org/utplsql/api/testRunner/TestRunnerStatementProviderIT.java b/src/test/java/org/utplsql/api/testRunner/TestRunnerStatementProviderIT.java
@@ -9,7 +9,7 @@
 
 import java.sql.SQLException;
 
-public class TestRunnerStatementProviderTest {
+public class TestRunnerStatementProviderIT {
 
     @Rule
     public final DatabaseRule db = new DatabaseRule();
