Merge pull request #86 from utPLSQL/feature/support_for_tags

pesse · web-flow · commit e59424a1d431 · 2019-07-08T16:35:17.000+02:00
Feature/support for tags
diff --git a/src/main/java/org/utplsql/api/TestRunner.java b/src/main/java/org/utplsql/api/TestRunner.java
@@ -16,6 +16,7 @@
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.*;
 
@@ -129,6 +130,16 @@ public TestRunner randomTestOrderSeed( Integer seed ) {
         return this;
     }
 
+    public TestRunner addTag( String tag ) {
+        this.options.tags.add(tag);
+        return this;
+    }
+
+    public TestRunner addTags(Collection<String> tags) {
+        this.options.tags.addAll(tags);
+        return this;
+    }
+
     public TestRunnerOptions getOptions() { return options; }
 
     private void delayedAddReporters() {
diff --git a/src/main/java/org/utplsql/api/TestRunnerOptions.java b/src/main/java/org/utplsql/api/TestRunnerOptions.java
@@ -4,7 +4,9 @@
 
 import java.nio.charset.Charset;
 import java.util.ArrayList;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Set;
 
 /**
  * Holds the various possible options of TestRunner
@@ -27,4 +29,9 @@ public class TestRunnerOptions {
     public String clientCharacterSet = Charset.defaultCharset().toString();
     public boolean randomTestOrder = false;
     public Integer randomTestOrderSeed;
+    public final Set<String> tags = new LinkedHashSet<>();
+
+    public String getTagsAsString() {
+        return String.join(",", tags);
+    }
 }
diff --git a/src/main/java/org/utplsql/api/compatibility/OptionalFeatures.java b/src/main/java/org/utplsql/api/compatibility/OptionalFeatures.java
@@ -12,7 +12,8 @@ public enum OptionalFeatures {
     FRAMEWORK_COMPATIBILITY_CHECK("3.0.3.1266", null),
     CUSTOM_REPORTERS("3.1.0.1849", null),
     CLIENT_CHARACTER_SET("3.1.2.2130", null),
-    RANDOM_EXECUTION_ORDER("3.1.7.2795", null);
+    RANDOM_EXECUTION_ORDER("3.1.7.2795", null),
+    TAGS("3.1.7.3006", null);
 
     private final Version minVersion;
     private final Version maxVersion;
diff --git a/src/main/java/org/utplsql/api/testRunner/ActualTestRunnerStatement.java b/src/main/java/org/utplsql/api/testRunner/ActualTestRunnerStatement.java
@@ -39,7 +39,8 @@ protected String getSql() {
                         "a_fail_on_errors         => " + failOnErrors + ", " +
                         "a_client_character_set   => ?, " +
                         "a_random_test_order      => " + randomExecutionOrder + ", " +
-                        "a_random_test_order_seed => ?"+
+                        "a_random_test_order_seed => ?, "+
+                        "a_tags => ?"+
                         "); " +
                         "END;";
     }
@@ -55,6 +56,12 @@ protected int createStatement() throws SQLException {
             callableStatement.setInt(++curParamIdx, options.randomTestOrderSeed);
         }
 
+        if ( options.tags.size() == 0 ) {
+            callableStatement.setNull(++curParamIdx, Types.VARCHAR);
+        } else {
+            callableStatement.setString(++curParamIdx, options.getTagsAsString());
+        }
+
         return curParamIdx;
     }
 }
diff --git a/src/test/java/org/utplsql/api/EnvironmentVariableUtilTest.java b/src/test/java/org/utplsql/api/EnvironmentVariableUtilTest.java
@@ -37,7 +37,7 @@ void testGetVariableFromProperty() {
     @Test
     void testGetVariableFromDefault() {
 
-        assertEquals("defaultValue", EnvironmentVariableUtil.getEnvValue("RANDOM" + String.valueOf(System.currentTimeMillis()), "defaultValue"));
+        assertEquals("defaultValue", EnvironmentVariableUtil.getEnvValue("RANDOM" + System.currentTimeMillis(), "defaultValue"));
     }
 
 }
diff --git a/src/test/java/org/utplsql/api/OptionalFeaturesIT.java b/src/test/java/org/utplsql/api/OptionalFeaturesIT.java
@@ -74,4 +74,15 @@ void randomExecutionOrder() throws SQLException, InvalidVersionException {
             assertFalse(available);
         }
     }
+
+    @Test
+    void tags() throws SQLException, InvalidVersionException {
+        boolean available = OptionalFeatures.TAGS.isAvailableFor(getConnection());
+
+        if (getDatabaseVersion().isGreaterOrEqualThan(Version.V3_1_7)) {
+            assertTrue(available);
+        } else {
+            assertFalse(available);
+        }
+    }
 }
diff --git a/src/test/java/org/utplsql/api/TestRunnerIT.java b/src/test/java/org/utplsql/api/TestRunnerIT.java
@@ -88,4 +88,11 @@ void runWithRandomExecutionOrder() throws SQLException {
                 .run(getConnection());
     }
 
+    @Test
+    void runWithTags() throws SQLException {
+        new TestRunner()
+                .addTag("none")
+                .run(getConnection());
+    }
+
 }
diff --git a/src/test/java/org/utplsql/api/testRunner/TestRunnerStatementProviderIT.java b/src/test/java/org/utplsql/api/testRunner/TestRunnerStatementProviderIT.java
@@ -27,6 +27,7 @@ void testGettingPre303Version() throws SQLException {
         assertThat(stmt.getSql(), not(containsString("a_client_character_set")));
         assertThat(stmt.getSql(), not(containsString("a_random_test_order")));
         assertThat(stmt.getSql(), not(containsString("a_random_test_order_seed")));
+        assertThat(stmt.getSql(), not(containsString("a_tags")));
     }
 
 
@@ -38,6 +39,7 @@ void testGettingPre312Version_from_303() throws SQLException {
         assertThat(stmt.getSql(), not(containsString("a_client_character_set")));
         assertThat(stmt.getSql(), not(containsString("a_random_test_order")));
         assertThat(stmt.getSql(), not(containsString("a_random_test_order_seed")));
+        assertThat(stmt.getSql(), not(containsString("a_tags")));
     }
 
     @Test
@@ -48,6 +50,7 @@ void testGettingPre312Version_from_311() throws SQLException {
         assertThat(stmt.getSql(), not(containsString("a_client_character_set")));
         assertThat(stmt.getSql(), not(containsString("a_random_test_order")));
         assertThat(stmt.getSql(), not(containsString("a_random_test_order_seed")));
+        assertThat(stmt.getSql(), not(containsString("a_tags")));
     }
 
     @Test
@@ -58,6 +61,7 @@ void testGettingPre317Version_from_312() throws SQLException {
         assertThat(stmt.getSql(), containsString("a_client_character_set"));
         assertThat(stmt.getSql(), not(containsString("a_random_test_order")));
         assertThat(stmt.getSql(), not(containsString("a_random_test_order_seed")));
+        assertThat(stmt.getSql(), not(containsString("a_tags")));
     }
 
     @Test
@@ -68,6 +72,7 @@ void testGettingPre317Version_from_316() throws SQLException {
         assertThat(stmt.getSql(), containsString("a_client_character_set"));
         assertThat(stmt.getSql(), not(containsString("a_random_test_order")));
         assertThat(stmt.getSql(), not(containsString("a_random_test_order_seed")));
+        assertThat(stmt.getSql(), not(containsString("a_tags")));
     }
 
     @Test
@@ -78,5 +83,6 @@ void testGettingActualVersion_from_latest() throws SQLException {
         assertThat(stmt.getSql(), containsString("a_client_character_set"));
         assertThat(stmt.getSql(), containsString("a_random_test_order"));
         assertThat(stmt.getSql(), containsString("a_random_test_order_seed"));
+        assertThat(stmt.getSql(), containsString("a_tags"));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,8 @@ protected String getSql() {`
`39`	`39`	`"a_fail_on_errors => " + failOnErrors + ", " +`
`40`	`40`	`"a_client_character_set => ?, " +`
`41`	`41`	`"a_random_test_order => " + randomExecutionOrder + ", " +`
`42`		`- "a_random_test_order_seed => ?"+`
	`42`	`+ "a_random_test_order_seed => ?, "+`
	`43`	`+ "a_tags => ?"+`
`43`	`44`	`"); " +`
`44`	`45`	`"END;";`
`45`	`46`	`}`
`@@ -55,6 +56,12 @@ protected int createStatement() throws SQLException {`
`55`	`56`	`callableStatement.setInt(++curParamIdx, options.randomTestOrderSeed);`
`56`	`57`	`}`
`57`	`58`
	`59`	`+ if ( options.tags.size() == 0 ) {`
	`60`	`+ callableStatement.setNull(++curParamIdx, Types.VARCHAR);`
	`61`	`+ } else {`
	`62`	`+ callableStatement.setString(++curParamIdx, options.getTagsAsString());`
	`63`	`+ }`
	`64`	`+`
`58`	`65`	`return curParamIdx;`
`59`	`66`	`}`
`60`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ void testGetVariableFromProperty() {`
`37`	`37`	`@Test`
`38`	`38`	`void testGetVariableFromDefault() {`
`39`	`39`
`40`		`- assertEquals("defaultValue", EnvironmentVariableUtil.getEnvValue("RANDOM" + String.valueOf(System.currentTimeMillis()), "defaultValue"));`
	`40`	`+ assertEquals("defaultValue", EnvironmentVariableUtil.getEnvValue("RANDOM" + System.currentTimeMillis(), "defaultValue"));`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,4 +74,15 @@ void randomExecutionOrder() throws SQLException, InvalidVersionException {`
`74`	`74`	`assertFalse(available);`
`75`	`75`	`}`
`76`	`76`	`}`
	`77`	`+`
	`78`	`+ @Test`
	`79`	`+ void tags() throws SQLException, InvalidVersionException {`
	`80`	`+ boolean available = OptionalFeatures.TAGS.isAvailableFor(getConnection());`
	`81`	`+`
	`82`	`+ if (getDatabaseVersion().isGreaterOrEqualThan(Version.V3_1_7)) {`
	`83`	`+ assertTrue(available);`
	`84`	`+ } else {`
	`85`	`+ assertFalse(available);`
	`86`	`+ }`
	`87`	`+ }`
`77`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,4 +88,11 @@ void runWithRandomExecutionOrder() throws SQLException {`
`88`	`88`	`.run(getConnection());`
`89`	`89`	`}`
`90`	`90`
	`91`	`+ @Test`
	`92`	`+ void runWithTags() throws SQLException {`
	`93`	`+ new TestRunner()`
	`94`	`+ .addTag("none")`
	`95`	`+ .run(getConnection());`
	`96`	`+ }`
	`97`	`+`
`91`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ void testGettingPre303Version() throws SQLException {`
`27`	`27`	`assertThat(stmt.getSql(), not(containsString("a_client_character_set")));`
`28`	`28`	`assertThat(stmt.getSql(), not(containsString("a_random_test_order")));`
`29`	`29`	`assertThat(stmt.getSql(), not(containsString("a_random_test_order_seed")));`
	`30`	`+ assertThat(stmt.getSql(), not(containsString("a_tags")));`
`30`	`31`	`}`
`31`	`32`
`32`	`33`
`@@ -38,6 +39,7 @@ void testGettingPre312Version_from_303() throws SQLException {`
`38`	`39`	`assertThat(stmt.getSql(), not(containsString("a_client_character_set")));`
`39`	`40`	`assertThat(stmt.getSql(), not(containsString("a_random_test_order")));`
`40`	`41`	`assertThat(stmt.getSql(), not(containsString("a_random_test_order_seed")));`
	`42`	`+ assertThat(stmt.getSql(), not(containsString("a_tags")));`
`41`	`43`	`}`
`42`	`44`
`43`	`45`	`@Test`
`@@ -48,6 +50,7 @@ void testGettingPre312Version_from_311() throws SQLException {`
`48`	`50`	`assertThat(stmt.getSql(), not(containsString("a_client_character_set")));`
`49`	`51`	`assertThat(stmt.getSql(), not(containsString("a_random_test_order")));`
`50`	`52`	`assertThat(stmt.getSql(), not(containsString("a_random_test_order_seed")));`
	`53`	`+ assertThat(stmt.getSql(), not(containsString("a_tags")));`
`51`	`54`	`}`
`52`	`55`
`53`	`56`	`@Test`
`@@ -58,6 +61,7 @@ void testGettingPre317Version_from_312() throws SQLException {`
`58`	`61`	`assertThat(stmt.getSql(), containsString("a_client_character_set"));`
`59`	`62`	`assertThat(stmt.getSql(), not(containsString("a_random_test_order")));`
`60`	`63`	`assertThat(stmt.getSql(), not(containsString("a_random_test_order_seed")));`
	`64`	`+ assertThat(stmt.getSql(), not(containsString("a_tags")));`
`61`	`65`	`}`
`62`	`66`
`63`	`67`	`@Test`
`@@ -68,6 +72,7 @@ void testGettingPre317Version_from_316() throws SQLException {`
`68`	`72`	`assertThat(stmt.getSql(), containsString("a_client_character_set"));`
`69`	`73`	`assertThat(stmt.getSql(), not(containsString("a_random_test_order")));`
`70`	`74`	`assertThat(stmt.getSql(), not(containsString("a_random_test_order_seed")));`
	`75`	`+ assertThat(stmt.getSql(), not(containsString("a_tags")));`
`71`	`76`	`}`
`72`	`77`
`73`	`78`	`@Test`
`@@ -78,5 +83,6 @@ void testGettingActualVersion_from_latest() throws SQLException {`
`78`	`83`	`assertThat(stmt.getSql(), containsString("a_client_character_set"));`
`79`	`84`	`assertThat(stmt.getSql(), containsString("a_random_test_order"));`
`80`	`85`	`assertThat(stmt.getSql(), containsString("a_random_test_order_seed"));`
	`86`	`+ assertThat(stmt.getSql(), containsString("a_tags"));`
`81`	`87`	`}`
`82`	`88`	`}`