Introducing optional features

for better Compatibility tracking

Author: pesse

src/main/java/org/utplsql/api/compatibility/CompatibilityProxy.java

@@ -49,7 +49,7 @@ private void doCompatibilityCheckWithDatabase( Connection conn ) throws SQLExcep
     {
         databaseVersion = DBHelper.getDatabaseFrameworkVersion(conn);
 
-        if (frameworkHasCompatibilityCheck()) {
+        if (OptionalFeatures.FRAMEWORK_COMPATIBILITY_CHECK.isAvailableFor(databaseVersion)) {
             try {
                 compatible = versionCompatibilityCheck(conn, UTPLSQL_COMPATIBILITY_VERSION, null);
             } catch (SQLException e) {
@@ -115,18 +115,6 @@ private boolean versionCompatibilityCheckPre303( String requested )
             return false;
     }
 
-    /** Checks if framework has the compatibility check, which is since 3.0.3
-     *
-     * @return Whether framework is >= 3.0.3 or not
-     */
-    private boolean frameworkHasCompatibilityCheck()
-    {
-        if ( databaseVersion.getMajor() >= 3 && databaseVersion.getMinor() >= 0 && databaseVersion.getBugfix() >= 3 ) // Compatibility check is included since 3.0.3
-            return true;
-        else
-            return false;
-    }
-
     /** Checks if actual API-version is compatible with utPLSQL database version and throws a DatabaseNotCompatibleException if not
      * Throws a DatabaseNotCompatibleException if version compatibility can not be checked.
      *

src/main/java/org/utplsql/api/compatibility/OptionalFeatures.java

@@ -0,0 +1,35 @@
+package org.utplsql.api.compatibility;
+
+import org.utplsql.api.Version;
+import org.utplsql.api.exception.InvalidVersionException;
+
+public enum OptionalFeatures {
+
+    FAIL_ON_ERROR("3.0.3", null),
+    FRAMEWORK_COMPATIBILITY_CHECK("3.0.3", null);
+
+    private Version minVersion;
+    private Version maxVersion;
+
+    OptionalFeatures( String minVersion, String maxVersion )
+    {
+        if ( minVersion != null )
+            this.minVersion = new Version(minVersion);
+        if ( maxVersion != null)
+            this.maxVersion = new Version(maxVersion);
+    }
+
+    public boolean isAvailableFor(Version version ) {
+
+        try {
+            if ((minVersion == null || version.isGreaterOrEqualThan(minVersion)) &&
+                    (maxVersion == null || maxVersion.isGreaterOrEqualThan(version))
+                    )
+                return true;
+            else
+                return false;
+        } catch ( InvalidVersionException e ) {
+            return false; // We have no optional features for invalid versions
+        }
+    }
+}

src/main/java/org/utplsql/api/testRunner/TestRunnerStatementProvider.java

@@ -3,6 +3,8 @@
 import org.utplsql.api.DBHelper;
 import org.utplsql.api.TestRunnerOptions;
 import org.utplsql.api.Version;
+import org.utplsql.api.compatibility.OptionalFeatures;
+import org.utplsql.api.exception.InvalidVersionException;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -21,13 +23,16 @@ public class TestRunnerStatementProvider {
      * @return TestRunnerStatment compatible with the database framework
      * @throws SQLException
      */
-    public static TestRunnerStatement getCompatibleTestRunnerStatement(Version databaseVersion, TestRunnerOptions options, Connection conn ) throws SQLException
-    {
+    public static TestRunnerStatement getCompatibleTestRunnerStatement(Version databaseVersion, TestRunnerOptions options, Connection conn ) throws SQLException {
         AbstractTestRunnerStatement stmt = null;
 
-        if ( databaseVersion.getMajor() == 3 && databaseVersion.getMinor() == 0 && databaseVersion.getBugfix() <= 2 )
-            stmt = new Pre303TestRunnerStatement(options, conn);
-        else
+        try {
+            if (new Version("3.0.2").isGreaterOrEqualThan(databaseVersion))
+                stmt = new Pre303TestRunnerStatement(options, conn);
+
+        } catch ( InvalidVersionException e ) {}
+
+        if ( stmt == null )
             stmt = new ActualTestRunnerStatement(options, conn);
 
         return stmt;