db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r1495471 - in /db/derby/code/trunk/java/testing: ./ org/apache/derbyTesting/functionTests/tests/jdbc4/ org/apache/derbyTesting/functionTests/tests/store/ org/apache/derbyTesting/functionTests/tests/tools/ org/apache/derbyTesting/functionTes...
Date Fri, 21 Jun 2013 15:12:31 GMT
Author: rhillegas
Date: Fri Jun 21 15:12:31 2013
New Revision: 1495471

URL: http://svn.apache.org/r1495471
Log:
DERBY-6213: Remove more references to EmbeddedSimpleDataSource; tests passed cleanly on derby-6213-25-aa-remove-reflective-references-to-EmbeddedSimpleDataSource.diff.

Modified:
    db/derby/code/trunk/java/testing/README.htm
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/JDBC4FromJDBC3DataSourceTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/StoreScriptsTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ij2Test.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ij3Test.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/HarnessJavaTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/SecurityCheck.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBCClient.java

Modified: db/derby/code/trunk/java/testing/README.htm
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/README.htm?rev=1495471&r1=1495470&r2=1495471&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/README.htm (original)
+++ db/derby/code/trunk/java/testing/README.htm Fri Jun 21 15:12:31 2013
@@ -358,51 +358,6 @@ org.apache.derbyTesting.functionTests.ha
 output directory will not be emptied out before testing is begun,
 although individual test files and result files will be cleaned out
 and overwritten.&nbsp; </p>
-<p>To run a suite with J2ME/CDC/Foundation: </p>
-<table border="1" cellpadding="2" cellspacing="2">
-  <tbody>
-    <tr>
-      <td>
-      <p><font size="2">(note that the command below has carriage
-returns for formatting reasons):<br>
-syntax:<br>
-      </font>&nbsp; <font size="2">&lt;java&gt;
--Xbootclasspath/a:$jardir/&lt;jdbc_jar&gt;
--Dbootcp=$jardir/&lt;jdbc_jar&gt; <br>
--Dij.dataSource=org.apache.derby.jdbc.EmbeddedSimpleDataSource <br>
--Djvmflags="-Dij.dataSource=org.apache.derby.jdbc.EmbeddedSimpleDataSource"
-      <br>
-org.apache.derbyTesting.functionTests.harness.RunSuite&nbsp;
-&lt;testsuite&gt;</font><br>
-      <font size="2">where </font> </p>
-      <ul>
-        <li>
-          <p style="margin-bottom: 0in;">&nbsp;&nbsp; <font size="2">&lt;java&gt;
-is the jvm with any jvm flags. For testing with CDC/Foundation Profile
-using j9 jvm from IBM, this will be 'j9 -jcl:foun11'. </font> </p>
-        </li>
-        <li>
-          <p style="margin-bottom: 0in;">&nbsp;&nbsp; <font size="2">&lt;jdbc_jar&gt;
-is the jar file which implements the JDBC API for CDC/Foundation
-Profile (JSR169). </font> </p>
-        </li>
-        <li>
-          <p>&nbsp;&nbsp; <font size="2">&lt;testsuite&gt; is
one of
-the suites under org/apache/derbyTesting/suites</font> </p>
-        </li>
-      </ul>
-      <p><font size="2">for example for running&nbsp; the suite
-derbyall:<br>
-      </font>&nbsp;&nbsp; <font size="2">j9 -jcl:foun11
--Xbootclasspath/a:$jardir/jdbc.jar -Dbootcp=$jardir/jdbc.jar <br>
--Dij.dataSource=org.apache.derby.jdbc.EmbeddedSimpleDataSource <br>
--Djvmflags="-Dij.dataSource=org.apache.derby.jdbc.EmbeddedSimpleDataSource"
-      <br>
-org.apache.derbyTesting.functionTests.harness.RunSuite derbyall</font></p>
-      </td>
-    </tr>
-  </tbody>
-</table>
 <p>The suites provided are: </p>
 <ul>
   <li>

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/JDBC4FromJDBC3DataSourceTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/JDBC4FromJDBC3DataSourceTest.java?rev=1495471&r1=1495470&r2=1495471&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/JDBC4FromJDBC3DataSourceTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/JDBC4FromJDBC3DataSourceTest.java
Fri Jun 21 15:12:31 2013
@@ -44,8 +44,7 @@ import org.apache.derbyTesting.junit.Tes
  * </p>
  *
  * <p>
- * Note that after DERBY-5868 and DERBY-5880, all the data sources (except
- * EmbeddedSimpleDataSource for JSR-169) implement all JDBC 4.0 methods.
+ * Note that after DERBY-5868 and DERBY-5880, all the data sources implement all JDBC 4.0
methods.
  * </p>
  *
  * <p>

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/StoreScriptsTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/StoreScriptsTest.java?rev=1495471&r1=1495470&r2=1495471&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/StoreScriptsTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/StoreScriptsTest.java
Fri Jun 21 15:12:31 2013
@@ -127,15 +127,6 @@ public class StoreScriptsTest extends Sc
     public static Test suite() {        
         Properties props = new Properties();
 
-        // When running on JSR-169 platforms, we need to use a data source
-        // instead of a JDBC URL since DriverManager isn't available.
-        if (JDBC.vmSupportsJSR169()) {
-            props.setProperty("ij.dataSource",
-                              "org.apache.derby.jdbc.EmbeddedSimpleDataSource");
-            props.setProperty("ij.dataSource.databaseName", "wombat");
-            props.setProperty("ij.dataSource.createDatabase", "create");
-        }
-
         props.setProperty("derby.infolog.append", "true");  
         props.setProperty("ij.protocol", "jdbc:derby:");
         props.setProperty("ij.database", "wombat;create=true");

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ij2Test.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ij2Test.java?rev=1495471&r1=1495470&r2=1495471&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ij2Test.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ij2Test.java
Fri Jun 21 15:12:31 2013
@@ -43,15 +43,6 @@ public class ij2Test extends ScriptTestC
     public static Test suite() {        
         Properties props = new Properties();
 
-        // When running on JSR-169 platforms, we need to use a data source
-        // instead of a JDBC URL since DriverManager isn't available.
-        if (JDBC.vmSupportsJSR169()) {
-            props.setProperty("ij.dataSource",
-                              "org.apache.derby.jdbc.EmbeddedSimpleDataSource");
-            props.setProperty("ij.dataSource.databaseName", "wombat");
-            props.setProperty("ij.dataSource.createDatabase", "create");
-        }
-
         props.setProperty("derby.infolog.append", "true");  
         props.setProperty("ij.protocol", "jdbc:derby:");
         props.setProperty("ij.database", "wombat;create=true");

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ij3Test.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ij3Test.java?rev=1495471&r1=1495470&r2=1495471&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ij3Test.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ij3Test.java
Fri Jun 21 15:12:31 2013
@@ -43,15 +43,6 @@ public class ij3Test extends ScriptTestC
         props.setProperty("ij.showNoConnectionsAtStart", "true");
         props.setProperty("ij.showNoCountForSelect", "true");
 
-        // When running on JSR-169 platforms, we need to use a data source
-        // instead of a JDBC URL since DriverManager isn't available.
-        if (JDBC.vmSupportsJSR169()) {
-            props.setProperty("ij.dataSource",
-                              "org.apache.derby.jdbc.EmbeddedSimpleDataSource");
-            props.setProperty("ij.dataSource.databaseName", "wombat");
-            props.setProperty("ij.dataSource.createDatabase", "create");
-        }
-
         Test test = new SystemPropertyTestSetup(new ij3Test("ij3"), props);
         test = new CleanDatabaseTestSetup(test);   
         

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/HarnessJavaTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/HarnessJavaTest.java?rev=1495471&r1=1495470&r2=1495471&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/HarnessJavaTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/HarnessJavaTest.java
Fri Jun 21 15:12:31 2013
@@ -113,20 +113,6 @@ public abstract class HarnessJavaTest ex
                         "ij.database", 
                         config.getJDBCUrl());
                 }
-                else if (JDBC.vmSupportsJSR169())
-                {
-                    // Use a data source and set its database name.
-                    // The database will be created by the CleanDatabaseTestSetup
-                    // used for each individual fixture/test.
-                    
-                    newValues.setProperty(
-                        "ij.dataSource", 
-                        "org.apache.derby.jdbc.EmbeddedSimpleDataSource");
-                    
-                    newValues.setProperty(
-                        "ij.dataSource.databaseName",
-                        config.getDefaultDatabaseName());
-                }
                 super.setUp();
             }
         };

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/SecurityCheck.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/SecurityCheck.java?rev=1495471&r1=1495470&r2=1495471&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/SecurityCheck.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/SecurityCheck.java
Fri Jun 21 15:12:31 2013
@@ -46,7 +46,6 @@ public class SecurityCheck {
 	{
 		"org.apache.derby.jdbc.EmbeddedDriver",
 		"org.apache.derby.jdbc.EmbeddedDataSource",
-		"org.apache.derby.jdbc.EmbeddedSimpleDataSource",
 		"org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource",
 		"org.apache.derby.jdbc.EmbeddedXADataSource",
 		"org.apache.derby.authentication.UserAuthenticator",

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBCClient.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBCClient.java?rev=1495471&r1=1495470&r2=1495471&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBCClient.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBCClient.java Fri Jun
21 15:12:31 2013
@@ -61,17 +61,6 @@ public final class JDBCClient {
             "jdbc:derby:");
     
     /**
-     * The embedded JDBC client for JSR 169
-     */
-    private static final JDBCClient EMBEDDED_169 = new JDBCClient(
-            "Embedded_169", 
-            null, // No driver
-            "org.apache.derby.jdbc.EmbeddedSimpleDataSource", 
-            null, // No connection pooling
-            null, // No XA
-            null); // No JDBC URLs
-    
-    /**
      * Return the default embedded client for this JVM.
      */
     static JDBCClient getDefaultEmbedded()
@@ -80,8 +69,6 @@ public final class JDBCClient {
             return EMBEDDED_40;
         if (JDBC.vmSupportsJDBC3())
             return EMBEDDED_30;
-        if (JDBC.vmSupportsJSR169())
-            return EMBEDDED_169;
         
         Assert.fail("Unknown JVM environment");
         return null;



Mime
View raw message