db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r602190 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DriverTest.java
Date Fri, 07 Dec 2007 19:31:47 GMT
Author: djd
Date: Fri Dec  7 11:31:46 2007
New Revision: 602190

URL: http://svn.apache.org/viewvc?rev=602190&view=rev
Log:
Make jdbc.DriverTest fixtures non-static as is the norm.

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DriverTest.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DriverTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DriverTest.java?rev=602190&r1=602189&r2=602190&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DriverTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DriverTest.java
Fri Dec  7 11:31:46 2007
@@ -89,7 +89,7 @@
         return suite;
     }
     
-    public static Test baseSuite(String name) {
+    private static Test baseSuite(String name) {
         
         TestSuite suite = new TestSuite("DriverTest");
         setBaseProps(suite, new DriverTest("testDriverCompliantVersion"));
@@ -114,8 +114,6 @@
         dbprops.setProperty("derby.debug.true", "AuthenticationTrace");
         dbprops.setProperty("derby.user.APP", "xxxx");
         dbprops.setProperty("derby.user.testuser", "testpass");
-        String dbName = TestConfiguration.getCurrent().getDefaultDatabaseName();
-        dbprops.setProperty("derby.database.users." + dbName, "testuser,APP");
         test = new DatabasePropertyTestSetup (test, dbprops, true);
         suite.addTest(test);
     }
@@ -197,7 +195,7 @@
      * driver.get*Version
      * @throws Exception
      */
-    public static void testDriverCompliantVersion() throws Exception 
+    public void testDriverCompliantVersion() throws Exception 
     {   
         String dbName = TestConfiguration.getCurrent().getDefaultDatabaseName();
         String url = TestConfiguration.getCurrent().getJDBCUrl(dbName);
@@ -228,7 +226,7 @@
      * 
      * @throws SQLException, Exception
      */
-    public static void testAcceptsURL() throws SQLException, Exception {
+    public void testAcceptsURL() throws SQLException, Exception {
         String dbName = TestConfiguration.getCurrent().getDefaultDatabaseName();
         String orgurl = TestConfiguration.getCurrent().getJDBCUrl(dbName);
 
@@ -287,7 +285,7 @@
      * argument to connect
      * DERBY-530. Only valid for embedded driver and client. 
      */
-    public static void testEmbeddedAttributes() throws SQLException
+    public void testEmbeddedAttributes() throws SQLException
     {
         // JCC can't take embedded attributes in info or as normal url 
         // attributes, so not tested here.
@@ -367,7 +365,7 @@
      * as info argument to connect.
      * DERBY-530. 
      */
-    public static void testClientAttributes() throws SQLException
+    public void testClientAttributes() throws SQLException
     {
         if (!usingDerbyNetClient())
             return;
@@ -423,7 +421,7 @@
     /**
      * Tests client URLs to see connection is successful or the correct exception is thrown.
      */
-    public static void testClientURL() throws SQLException {
+    public void testClientURL() throws SQLException {
         if (!usingDerbyNetClient())
             return;
         
@@ -503,7 +501,7 @@
      * 
      * @throws SQLException
      */
-    public static void testDbNameWithSpaces() throws SQLException {
+    public void testDbNameWithSpaces() throws SQLException {
         
         Properties info = null;
         String url = null;



Mime
View raw message