Added compatibility warning in case Random Execution Order was specified

pesse · pesse · commit d9eb0a78e39a · 2019-04-05T00:17:24.000+02:00
Also refactored it all into one function
diff --git a/src/main/java/org/utplsql/cli/RunCommand.java b/src/main/java/org/utplsql/cli/RunCommand.java
@@ -7,6 +7,7 @@
 import org.slf4j.LoggerFactory;
 import org.utplsql.api.*;
 import org.utplsql.api.compatibility.CompatibilityProxy;
+import org.utplsql.api.compatibility.OptionalFeatures;
 import org.utplsql.api.db.DefaultDatabaseInformation;
 import org.utplsql.api.exception.DatabaseNotCompatibleException;
 import org.utplsql.api.exception.OracleCreateStatmenetStuckException;
@@ -174,11 +175,7 @@ public int doRun() throws OracleCreateStatmenetStuckException {
             initDatabase(dataSource);
             reporterList = initReporters(dataSource);
 
-            // Output a message if --failureExitCode is set but database framework is not capable of
-            String msg = RunCommandChecker.getCheckFailOnErrorMessage(failureExitCode, compatibilityProxy.getUtPlsqlVersion());
-            if (msg != null) {
-                System.out.println(msg);
-            }
+            checkForCompatibility(compatibilityProxy.getUtPlsqlVersion());
 
             ExecutorService executorService = Executors.newFixedThreadPool(1 + reporterList.size());
 
@@ -240,6 +237,27 @@ public int run() {
         return Cli.DEFAULT_ERROR_CODE;
     }
 
+    private void checkForCompatibility( Version utPlSqlVersion ) {
+        if (!OptionalFeatures.FAIL_ON_ERROR.isAvailableFor(utPlSqlVersion) && failureExitCode != 1 ) {
+            System.out.println("You specified option `--failure-exit-code` but your database framework version (" +
+                    utPlSqlVersion.getNormalizedString() + ") is not able to " +
+                    "redirect failureCodes. Please upgrade to a newer version if you want to use that feature.");
+        }
+
+        if ( !OptionalFeatures.RANDOM_EXECUTION_ORDER.isAvailableFor(utPlSqlVersion) && randomTestOrder ) {
+            System.out.println("You specified option `-random` but your database framework version (" +
+                    utPlSqlVersion.getNormalizedString() + ") is not able to " +
+                    "redirect failureCodes. Please upgrade to a newer version if you want to use that feature.");
+        }
+
+        if ( !OptionalFeatures.RANDOM_EXECUTION_ORDER.isAvailableFor(utPlSqlVersion) && randomTestOrderSeed != null ) {
+            System.out.println("You specified option `-seed` but your database framework version (" +
+                    utPlSqlVersion.getNormalizedString() + ") is not able to " +
+                    "redirect failureCodes. Please upgrade to a newer version if you want to use that feature.");
+        }
+
+    }
+
     TestRunner newTestRunner( List<Reporter> reporterList) {
 
         final File baseDir = new File("").getAbsoluteFile();
diff --git a/src/main/java/org/utplsql/cli/RunCommandChecker.java b/src/main/java/org/utplsql/cli/RunCommandChecker.java
@@ -27,18 +27,4 @@ static void checkOracleI18nExists(Connection con) throws SQLException {
             System.out.println("Download from http://www.oracle.com/technetwork/database/enterprise-edition/jdbc-112010-090769.html");
         }
     }
-
-    /** Returns a warning message if failureExitCode is specified but database version is too low
-     *
-     * @param failureExitCode
-     * @param databaseVersion
-     */
-    static String getCheckFailOnErrorMessage(int failureExitCode, Version databaseVersion) {
-        if ( failureExitCode != 1 && !OptionalFeatures.FAIL_ON_ERROR.isAvailableFor(databaseVersion)) {
-            return "Your database framework version (" + databaseVersion.getNormalizedString() + ") is not able to " +
-                    "redirect failureCodes. Please upgrade to a newer version if you want to use that feature.";
-        }
-
-        return null;
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -27,18 +27,4 @@ static void checkOracleI18nExists(Connection con) throws SQLException {`
`27`	`27`	`System.out.println("Download from http://www.oracle.com/technetwork/database/enterprise-edition/jdbc-112010-090769.html");`
`28`	`28`	`}`
`29`	`29`	`}`
`30`		`-`
`31`		`- /** Returns a warning message if failureExitCode is specified but database version is too low`
`32`		`- *`
`33`		`- * @param failureExitCode`
`34`		`- * @param databaseVersion`
`35`		`- */`
`36`		`- static String getCheckFailOnErrorMessage(int failureExitCode, Version databaseVersion) {`
`37`		`- if ( failureExitCode != 1 && !OptionalFeatures.FAIL_ON_ERROR.isAvailableFor(databaseVersion)) {`
`38`		`- return "Your database framework version (" + databaseVersion.getNormalizedString() + ") is not able to " +`
`39`		`- "redirect failureCodes. Please upgrade to a newer version if you want to use that feature.";`
`40`		`- }`
`41`		`-`
`42`		`- return null;`
`43`		`- }`
`44`	`30`	`}`