jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rve...@apache.org
Subject svn commit: r1492858 - /jena/Experimental/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/AbstractJenaDriverTests.java
Date Thu, 13 Jun 2013 20:48:17 GMT
Author: rvesse
Date: Thu Jun 13 20:48:17 2013
New Revision: 1492858

URL: http://svn.apache.org/r1492858
Log:
Tweak to tests

Modified:
    jena/Experimental/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/AbstractJenaDriverTests.java

Modified: jena/Experimental/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/AbstractJenaDriverTests.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/AbstractJenaDriverTests.java?rev=1492858&r1=1492857&r2=1492858&view=diff
==============================================================================
--- jena/Experimental/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/AbstractJenaDriverTests.java
(original)
+++ jena/Experimental/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/AbstractJenaDriverTests.java
Thu Jun 13 20:48:17 2013
@@ -60,7 +60,7 @@ public abstract class AbstractJenaDriver
      * Method which derived classes must implement to return an instance of
      * their driver implementation.
      */
-    protected abstract JenaDriver getDriver();
+    protected abstract JenaDriver getDriver() throws SQLException;
 
     /**
      * Method which derived classes must implement to provide a connection URL
@@ -71,8 +71,9 @@ public abstract class AbstractJenaDriver
      * </p>
      * 
      * @return Connection URL or null
+     * @throws SQLException 
      */
-    protected abstract String getConnectionUrl();
+    protected abstract String getConnectionUrl() throws SQLException;
 
     /**
      * Method which derives classes must implement to provide a connection URL
@@ -363,6 +364,7 @@ public abstract class AbstractJenaDriver
 
             String url = this.getConnectionUrl();
             Assume.assumeNotNull(url);
+            Assume.assumeFalse(url.contains(JenaDriver.PARAM_CONFIG + "="));
             url = url + "&" + JenaDriver.PARAM_PRE_PROCESSOR + "=" + Echo.class.getCanonicalName()
+ "&"
                     + JenaDriver.PARAM_CONFIG + "=" + f.getAbsolutePath();
             JenaDriver driver = this.getDriver();
@@ -402,6 +404,7 @@ public abstract class AbstractJenaDriver
 
             String url = this.getConnectionUrl();
             Assume.assumeNotNull(url);
+            Assume.assumeFalse(url.contains(JenaDriver.PARAM_CONFIG + "="));
             url = url + "&" + JenaDriver.PARAM_PRE_PROCESSOR + "=" + Echo.class.getCanonicalName()
+ "&test=url&"
                     + JenaDriver.PARAM_CONFIG + "=" + f.getAbsolutePath();
             JenaDriver driver = this.getDriver();
@@ -441,6 +444,7 @@ public abstract class AbstractJenaDriver
 
             String url = this.getConnectionUrl();
             Assume.assumeNotNull(url);
+            Assume.assumeFalse(url.contains(JenaDriver.PARAM_CONFIG + "="));
             url = url + "&" + JenaDriver.PARAM_PRE_PROCESSOR + "=" + Echo.class.getCanonicalName()
+ "&test=url&"
                     + JenaDriver.PARAM_CONFIG + "=" + f.getAbsolutePath();
             JenaDriver driver = this.getDriver();
@@ -485,6 +489,7 @@ public abstract class AbstractJenaDriver
 
             String url = this.getConnectionUrl();
             Assume.assumeNotNull(url);
+            Assume.assumeFalse(url.contains(JenaDriver.PARAM_CONFIG + "="));
             url = url + "&" + JenaDriver.PARAM_PRE_PROCESSOR + "=" + Echo.class.getCanonicalName()
+ "&"
                     + JenaDriver.PARAM_CONFIG + "=" + f1.getAbsolutePath();
             JenaDriver driver = this.getDriver();



Mime
View raw message