db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tfisc...@apache.org
Subject svn commit: r1234261 - in /db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque: ./ avalon/ generated/dataobject/ generated/peer/ map/ om/ sql/ util/
Date Sat, 21 Jan 2012 03:46:28 GMT
Author: tfischer
Date: Sat Jan 21 03:46:27 2012
New Revision: 1234261

URL: http://svn.apache.org/viewvc?rev=1234261&view=rev
Log:
- Rename BaseRuntimeTestCase to BaseDatabaseTestCase
- remove constructors taking names for JUnit tests

Added:
    db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BaseDatabaseTestCase.java
      - copied, changed from r1231667, db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BaseRuntimeTestCase.java
Removed:
    db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BaseRuntimeTestCase.java
Modified:
    db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BeanTestConditional.java
    db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/DataTest.java
    db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/DocsTest.java
    db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/InitShutdownTest.java
    db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/JndiConfigurationTest.java
    db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/ManagerTestConditional.java
    db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/avalon/AvalonMapBuildersTest.java
    db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/ForeignKeyGetterTest.java
    db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DateTest.java
    db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DeleteTest.java
    db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/FillerTest.java
    db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/map/DatabaseMapTest.java
    db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/om/OMByNameMethodsTest.java
    db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/sql/SkipSqlTest.java
    db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/BasePeerTest.java
    db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/CopyTestConditional.java
    db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/LargeSelectTest.java
    db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/SummaryHelperTest.java

Copied: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BaseDatabaseTestCase.java
(from r1231667, db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BaseRuntimeTestCase.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BaseDatabaseTestCase.java?p2=db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BaseDatabaseTestCase.java&p1=db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BaseRuntimeTestCase.java&r1=1231667&r2=1234261&rev=1234261&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BaseRuntimeTestCase.java
(original)
+++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BaseDatabaseTestCase.java
Sat Jan 21 03:46:27 2012
@@ -35,26 +35,17 @@ import org.apache.torque.test.BookPeer;
 import org.apache.torque.util.BasePeer;
 
 /**
- * Base functionality to be extended by all Torque test cases.  Test
- * case implementations are used to automate unit testing via JUnit.
+ * Base functionality for Test cases which use standard database setup.
  *
  * @author <a href="mailto:seade@backstagetech.com.au">Scott Eade</a>
  * @version $Id$
  */
-public abstract class BaseRuntimeTestCase extends TestCase
+public abstract class BaseDatabaseTestCase extends TestCase
 {
     /** The system property containing the path to the configuration file. */
     public static final String CONFIG_FILE_SYSTEM_PROPERTY
             = "torque.configuration.file";
 
-    /**
-     * Creates a new instance.
-     */
-    public BaseRuntimeTestCase(String name)
-    {
-        super(name);
-    }
-
     protected static DB defaultAdapter;
 
     /**
@@ -63,7 +54,7 @@ public abstract class BaseRuntimeTestCas
      */
     public void setUp() throws Exception
     {
-        synchronized (BaseRuntimeTestCase.class)
+        synchronized (BaseDatabaseTestCase.class)
         {
             if (!Torque.isInit())
             {

Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BeanTestConditional.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BeanTestConditional.java?rev=1234261&r1=1234260&r2=1234261&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BeanTestConditional.java
(original)
+++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BeanTestConditional.java
Sat Jan 21 03:46:27 2012
@@ -38,7 +38,7 @@ import org.apache.torque.util.Criteria;
  * @author <a href="mailto:fischer@seitenbau.de">Thomas Fischer</a>
  * @version $Id$
  */
-public class BeanTestConditional extends BaseRuntimeTestCase
+public class BeanTestConditional extends BaseDatabaseTestCase
 {
     public static final String AUTHOR_1_NAME = "Joshua Bloch";
 
@@ -53,14 +53,6 @@ public class BeanTestConditional extends
     public static final String AUTHOR_2_NAME = "W. Stevens";
 
     /**
-     * Creates a new instance.
-     */
-    public BeanTestConditional(String name)
-    {
-        super(name);
-    }
-
-    /**
      * tests the creation of beans from objects and vice versa
      */
     public void testCreateBeans() throws Exception

Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/DataTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/DataTest.java?rev=1234261&r1=1234260&r2=1234261&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/DataTest.java (original)
+++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/DataTest.java Sat
Jan 21 03:46:27 2012
@@ -109,19 +109,11 @@ import org.apache.torque.util.Transactio
  * @author <a href="mailto:tv@apache.org">Thomas Vandahl</a>
  * @version $Id$
  */
-public class DataTest extends BaseRuntimeTestCase
+public class DataTest extends BaseDatabaseTestCase
 {
     private static Log log = LogFactory.getLog(DataTest.class);
 
     /**
-     * Creates a new instance.
-     */
-    public DataTest(String name)
-    {
-        super(name);
-    }
-
-    /**
      * test whether we can connect to the database at all
      * @throws Exception if no connection can be established
      */

Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/DocsTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/DocsTest.java?rev=1234261&r1=1234260&r2=1234261&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/DocsTest.java (original)
+++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/DocsTest.java Sat
Jan 21 03:46:27 2012
@@ -41,7 +41,7 @@ import org.apache.torque.util.BasePeer;
  * @author <a href="mailto:fischer@seitenbau.de">Thomas Fischer</a>
  * @version $Id$
  */
-public class DocsTest extends BaseRuntimeTestCase
+public class DocsTest extends BaseDatabaseTestCase
 {
     public static final String AUTHOR_1_NAME = "Joshua Bloch";
 
@@ -63,14 +63,6 @@ public class DocsTest extends BaseRuntim
 
     private static Log log = LogFactory.getLog(DocsTest.class);
 
-    /**
-     * Creates a new instance.
-     */
-    public DocsTest(String name)
-    {
-        super(name);
-    }
-
     public void setUp() throws Exception
     {
         super.setUp();

Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/InitShutdownTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/InitShutdownTest.java?rev=1234261&r1=1234260&r2=1234261&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/InitShutdownTest.java
(original)
+++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/InitShutdownTest.java
Sat Jan 21 03:46:27 2012
@@ -42,14 +42,6 @@ import org.apache.torque.test.RequiredPI
  */
 public class InitShutdownTest extends TestCase
 {
-    /**
-     * Creates a new instance.
-     */
-    public InitShutdownTest(String name)
-    {
-        super(name);
-    }
-
     public void testInitFromScratch() throws TorqueException
     {
         // Torque can already be initialized if the test is run in eclipse
@@ -114,7 +106,7 @@ public class InitShutdownTest extends Te
     private void initTorque()  throws TorqueException
     {
         Torque.init(System.getProperty(
-                BaseRuntimeTestCase.CONFIG_FILE_SYSTEM_PROPERTY));
+                BaseDatabaseTestCase.CONFIG_FILE_SYSTEM_PROPERTY));
     }
 
     private void checkTorqueInitialisationWithOIntegerPk() throws TorqueException

Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/JndiConfigurationTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/JndiConfigurationTest.java?rev=1234261&r1=1234260&r2=1234261&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/JndiConfigurationTest.java
(original)
+++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/JndiConfigurationTest.java
Sat Jan 21 03:46:27 2012
@@ -69,14 +69,6 @@ public class JndiConfigurationTest exten
     protected static final String JNDI_PATH
             = JNDI_SUBCONTEXT + "/" + "jndiTestDataSource";
 
-    /**
-     * Creates a new instance.
-     */
-    public JndiConfigurationTest(String name)
-    {
-        super(name);
-    }
-
     public void setUp()
     {
         // super.setUp() initializes torque, but here we want to
@@ -471,7 +463,7 @@ public class JndiConfigurationTest exten
     {
         Configuration configuration = new PropertiesConfiguration(
                 System.getProperty(
-                        BaseRuntimeTestCase.CONFIG_FILE_SYSTEM_PROPERTY));
+                        BaseDatabaseTestCase.CONFIG_FILE_SYSTEM_PROPERTY));
         return configuration;
     }
 

Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/ManagerTestConditional.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/ManagerTestConditional.java?rev=1234261&r1=1234260&r2=1234261&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/ManagerTestConditional.java
(original)
+++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/ManagerTestConditional.java
Sat Jan 21 03:46:27 2012
@@ -29,17 +29,9 @@ import org.apache.torque.test.IfcTable;
  * @author <a href="mailto:tv@apache.org">Thomas Vandahl</a>
  * @version $Id:$
  */
-public class ManagerTestConditional extends BaseRuntimeTestCase
+public class ManagerTestConditional extends BaseDatabaseTestCase
 {
     /**
-     * Creates a new instance.
-     */
-    public ManagerTestConditional(String name)
-    {
-        super(name);
-    }
-
-    /**
      * Tests whether managers and caching work
      * @throws Exception if the test fails
      */

Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/avalon/AvalonMapBuildersTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/avalon/AvalonMapBuildersTest.java?rev=1234261&r1=1234260&r2=1234261&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/avalon/AvalonMapBuildersTest.java
(original)
+++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/avalon/AvalonMapBuildersTest.java
Sat Jan 21 03:46:27 2012
@@ -20,7 +20,7 @@ package org.apache.torque.avalon;
 
 import org.apache.avalon.framework.component.ComponentException;
 import org.apache.fulcrum.testcontainer.BaseUnitTest;
-import org.apache.torque.BaseRuntimeTestCase;
+import org.apache.torque.BaseDatabaseTestCase;
 import org.apache.torque.TorqueException;
 import org.apache.torque.map.DatabaseMap;
 import org.apache.torque.test.AuthorPeer;
@@ -45,7 +45,7 @@ public class AvalonMapBuildersTest exten
     {
         super( name );
 
-        // trigger ststic constructor before Torque initialization
+        // trigger static constructor before Torque initialization
         String testDB = AuthorPeer.DATABASE_NAME;
 
         // store old instance for comparison
@@ -58,7 +58,7 @@ public class AvalonMapBuildersTest exten
         if (!org.apache.torque.Torque.isInit())
         {
             org.apache.torque.Torque.init(System.getProperty(
-                    BaseRuntimeTestCase.CONFIG_FILE_SYSTEM_PROPERTY));
+                    BaseDatabaseTestCase.CONFIG_FILE_SYSTEM_PROPERTY));
         }
         setConfigurationFileName("src/test/resources/TestComponentConfig.xml");
         setRoleFileName("src/test/resources/TestRoleConfig.xml");

Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/ForeignKeyGetterTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/ForeignKeyGetterTest.java?rev=1234261&r1=1234260&r2=1234261&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/ForeignKeyGetterTest.java
(original)
+++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/ForeignKeyGetterTest.java
Sat Jan 21 03:46:27 2012
@@ -36,14 +36,6 @@ import org.apache.torque.test.PIntegerFk
 public class ForeignKeyGetterTest extends TestCase
 {
     /**
-     * Creates a new instance.
-     */
-    public ForeignKeyGetterTest(String name)
-    {
-        super(name);
-    }
-
-    /**
      * Tests that the foreign key getter returns null if the primitive foreign
      * key is 0.
      *

Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DateTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DateTest.java?rev=1234261&r1=1234260&r2=1234261&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DateTest.java
(original)
+++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DateTest.java
Sat Jan 21 03:46:27 2012
@@ -28,7 +28,7 @@ import java.util.List;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.torque.BaseRuntimeTestCase;
+import org.apache.torque.BaseDatabaseTestCase;
 import org.apache.torque.TorqueException;
 import org.apache.torque.adapter.DBMSSQL;
 import org.apache.torque.adapter.DBOracle;
@@ -46,19 +46,11 @@ import org.apache.torque.test.DateTimeTi
  * @author <a href="mailto:tv@apache.org">Thomas Vandahl</a>
  * @version $Id: DataTest.java 1213056 2011-12-11 20:31:06Z tfischer $
  */
-public class DateTest extends BaseRuntimeTestCase
+public class DateTest extends BaseDatabaseTestCase
 {
     private static Log log = LogFactory.getLog(DateTest.class);
 
     /**
-     * Creates a new instance.
-     */
-    public DateTest(String name)
-    {
-        super(name);
-    }
-
-    /**
      * Tests the date behaviour. Date fields should be truncated to the start
      * of day when saved and reloaded. Note that this does not tell
      * anything about how the field is saved in the database, which can differ

Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DeleteTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DeleteTest.java?rev=1234261&r1=1234260&r2=1234261&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DeleteTest.java
(original)
+++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DeleteTest.java
Sat Jan 21 03:46:27 2012
@@ -25,7 +25,7 @@ import java.util.List;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.torque.BaseRuntimeTestCase;
+import org.apache.torque.BaseDatabaseTestCase;
 import org.apache.torque.ForeignKeySchemaData;
 import org.apache.torque.PkSchemaData;
 import org.apache.torque.TorqueException;
@@ -45,19 +45,11 @@ import org.apache.torque.test.OIntegerPk
  *
  * @version $Id: DataTest.java 1103512 2011-05-15 19:37:41Z tfischer $
  */
-public class DeleteTest extends BaseRuntimeTestCase
+public class DeleteTest extends BaseDatabaseTestCase
 {
     private static Log log = LogFactory.getLog(DeleteTest.class);
 
     /**
-     * Creates a new instance.
-     */
-    public DeleteTest(String name)
-    {
-        super(name);
-    }
-
-    /**
      * Tests that the delete(DatabaseObject) method deletes the correct
      * Object and no related objects.
      *

Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/FillerTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/FillerTest.java?rev=1234261&r1=1234260&r2=1234261&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/FillerTest.java
(original)
+++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/FillerTest.java
Sat Jan 21 03:46:27 2012
@@ -21,7 +21,7 @@ package org.apache.torque.generated.peer
 
 import java.util.List;
 
-import org.apache.torque.BaseRuntimeTestCase;
+import org.apache.torque.BaseDatabaseTestCase;
 import org.apache.torque.ForeignKeySchemaData;
 import org.apache.torque.TorqueException;
 import org.apache.torque.criteria.Criteria;
@@ -51,20 +51,12 @@ import org.apache.torque.test.RequiredPI
  *
  * @version $Id: DataTest.java 1103512 2011-05-15 19:37:41Z tfischer $
  */
-public class FillerTest extends BaseRuntimeTestCase
+public class FillerTest extends BaseDatabaseTestCase
 {
     /** How many records are many records. */
     private int MANY = 1256;
 
     /**
-     * Creates a new instance.
-     */
-    public FillerTest(String name)
-    {
-        super(name);
-    }
-
-    /**
      * Tests the functionality for the fillers for referenced Objects.
      * The foreign key is a non-required primitive Integer  column
      * and it points to the primary key of the referenced table.

Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/map/DatabaseMapTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/map/DatabaseMapTest.java?rev=1234261&r1=1234260&r2=1234261&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/map/DatabaseMapTest.java
(original)
+++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/map/DatabaseMapTest.java
Sat Jan 21 03:46:27 2012
@@ -21,7 +21,7 @@ package org.apache.torque.map;
 
 import java.util.List;
 
-import org.apache.torque.BaseRuntimeTestCase;
+import org.apache.torque.BaseDatabaseTestCase;
 import org.apache.torque.Torque;
 import org.apache.torque.TorqueException;
 
@@ -31,7 +31,7 @@ import org.apache.torque.TorqueException
  * @author <a href="mailto:greg.monroe@dukece.com">Greg Monroe</a>
  * @version $Id
  */
-public class DatabaseMapTest extends BaseRuntimeTestCase
+public class DatabaseMapTest extends BaseDatabaseTestCase
 {
 
     public static final String TABLE_NAME1 = "NOT_USED_BEFORE_MAP_INIT";
@@ -47,11 +47,6 @@ public class DatabaseMapTest extends Bas
             "id", "one", "two", "three"
     };
 
-    public DatabaseMapTest(String name)
-    {
-        super(name);
-    }
-
     /**
      * Test initializing the default database. <p> Assumptions: <ul> A table
      * called NotUsedBeforeMapInit table exists in the default schema

Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/om/OMByNameMethodsTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/om/OMByNameMethodsTest.java?rev=1234261&r1=1234260&r2=1234261&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/om/OMByNameMethodsTest.java
(original)
+++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/om/OMByNameMethodsTest.java
Sat Jan 21 03:46:27 2012
@@ -22,7 +22,7 @@ package org.apache.torque.om;
 import java.math.BigDecimal;
 import java.util.Date;
 
-import org.apache.torque.BaseRuntimeTestCase;
+import org.apache.torque.BaseDatabaseTestCase;
 import org.apache.torque.Column;
 import org.apache.torque.TorqueException;
 import org.apache.torque.test.TypesObject;
@@ -37,27 +37,27 @@ import org.apache.torque.test.TypesPrimi
  * Depends on names and ordering in the following tables to match the static
  * fields defined in this class:
  * <P>
- * 
+ *
  * TypesObject table - which contain column definitions for all (AFAIK) Torque
  * supported column types that use Java Objects for storage. E.g. Integer and
  * not int.
  * <P>
- * 
+ *
  * TypesPrimitive table - which is the same as TypesObjects except that it uses
  * primitive types for storage.
  * <p>
- * 
+ *
  * InheritanceTest table - which contains a protected field.
  * <P>
- * 
+ *
  * @author <a href="mailto:greg.monroe@dukece.com>Greg Monroe</a>
  * @version $Id
  */
-public class OMByNameMethodsTest extends BaseRuntimeTestCase
+public class OMByNameMethodsTest extends BaseDatabaseTestCase
 {
     public static final String PROTECTED_COLUMN_NAME = "PayLoadB";
 
-    public static final String PROTECTED_COLUMN_PEER_NAME = 
+    public static final String PROTECTED_COLUMN_PEER_NAME =
         "INHERITANCE_TEST.PAYLOAD_B";
 
     public static final String PROTECTED_COLUMN_TABLE = "INHERITANCE_TEST";
@@ -208,11 +208,6 @@ public class OMByNameMethodsTest extends
         TypesPrimitivePeer.P_DOUBLE
     };
 
-    public OMByNameMethodsTest(String name)
-    {
-        super(name);
-    }
-
     /*
      * Validate that the setByName methods work using a BaseObject class type.
      * Checks the setValue against the value returned by the get<FieldName>()
@@ -390,7 +385,7 @@ public class OMByNameMethodsTest extends
      * Validate that the getBy* methods work using a BaseObject class type.
      * Checks that getValue returns the value set with a setBy call for all
      * known object and primitive types.
-     * 
+     *
      * @throws Exception
      */
     public void testGetByNameMethod() throws Exception
@@ -467,7 +462,7 @@ public class OMByNameMethodsTest extends
         catch (TorqueException e)
         {
             fail("Exception caught trying to call TypesObject.setByName() "
-                 + "method!\nWas OM generated with torque.addGetByNameMethod " 
+                 + "method!\nWas OM generated with torque.addGetByNameMethod "
                  + "property = true?\nError message was: '" + e.getMessage()
                  + "'");
         }
@@ -494,13 +489,13 @@ public class OMByNameMethodsTest extends
         catch (TorqueException e)
         {
             fail("Exception caught trying to call TypesObject.setByName() "
-                 + "method!\nWas OM generated with torque.addGetByNameMethod " 
+                 + "method!\nWas OM generated with torque.addGetByNameMethod "
                  + "property = true?\nError message was: '" + e.getMessage()
                  + "'");
         }
         for (int i = 0; i < PRIMITIVE_COLUMN_NAMES.length; i++)
         {
-            assertTrue(eMsg + PRIMITIVE_COLUMN_NAMES[i], 
+            assertTrue(eMsg + PRIMITIVE_COLUMN_NAMES[i],
                            PRIMITIVE_TEST_VALUES[i].equals(
                            primitiveTypes.getByName(PRIMITIVE_COLUMN_NAMES[i])));
         }
@@ -508,7 +503,7 @@ public class OMByNameMethodsTest extends
 
     /*
      * Validate that the setByPostion methods work using a BaseObject class type.
-     * Checks that getByPosition returns the value set with a setByPosition call 
+     * Checks that getByPosition returns the value set with a setByPosition call
      * for all known object and primitive types.
      */
     public void testSetByPositionMethod() throws Exception
@@ -527,9 +522,9 @@ public class OMByNameMethodsTest extends
         }
         catch (TorqueException e)
         {
-            fail("Exception caught trying to call TypesObject.setByName() " 
+            fail("Exception caught trying to call TypesObject.setByName() "
                  + "method!\nWas OM generated with torque.addGetByNameMethod "
-                 + "property = true?\nError message was: '" + e.getMessage() 
+                 + "property = true?\nError message was: '" + e.getMessage()
                  + "'");
         }
         String eMsg = "Did not get expected value for object column: ";
@@ -554,13 +549,13 @@ public class OMByNameMethodsTest extends
         catch (TorqueException e)
         {
             fail("Exception caught trying to call TypesPrimitive.setByName() "
-                 + "method!\nWas OM generated with torque.addGetByNameMethod " 
-                 + "property = true?\nError message was: '" + e.getMessage() 
+                 + "method!\nWas OM generated with torque.addGetByNameMethod "
+                 + "property = true?\nError message was: '" + e.getMessage()
                  + "'");
         }
         for (int i = 0; i < PRIMITIVE_COLUMN_NAMES.length; i++)
         {
-            assertTrue(eMsg + PRIMITIVE_COLUMN_NAMES[i], 
+            assertTrue(eMsg + PRIMITIVE_COLUMN_NAMES[i],
             			PRIMITIVE_TEST_VALUES[i].equals(
             			primitiveTypes.getByName(PRIMITIVE_COLUMN_NAMES[i])));
         }
@@ -611,22 +606,22 @@ public class OMByNameMethodsTest extends
         ColumnAccessByName objectTypes = new TypesObject();
         // Test that false status is returned for invalid column names.
         boolean status = objectTypes.setByName("xxxOBit", new Integer(1));
-        assertFalse("Did not get a false status from setByName with " 
+        assertFalse("Did not get a false status from setByName with "
                         + "invalid column name!", status);
 
         status = objectTypes.setByPeerName("xxxOBit", new Integer(1));
-        assertFalse("Did not get a false status from setByPeerName with " 
+        assertFalse("Did not get a false status from setByPeerName with "
                         + "invalid column name!", status);
 
         status = objectTypes.setByPosition(1000, new Integer(1));
-        assertFalse("Did not get a false status from setByPosition with " 
+        assertFalse("Did not get a false status from setByPosition with "
                         + "invalid position!", status);
     }
 
     /**
-     *  Verify that null handling (can't use them for primitives) works. 
+     *  Verify that null handling (can't use them for primitives) works.
      */
-    public void testNullHandling() throws Exception 
+    public void testNullHandling() throws Exception
     {
         ColumnAccessByName objectTypes = new TypesObject();
         ColumnAccessByName primitiveTypes = new TypesPrimitive();
@@ -642,8 +637,8 @@ public class OMByNameMethodsTest extends
         }
         assertFalse("objectTypes.setByName(\"OBit\",null) did not allow "
                         +  "a null value!", error);
-		
-		// Primitive types should not allow null values    	
+
+		// Primitive types should not allow null values
         error = false;
         try
         {

Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/sql/SkipSqlTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/sql/SkipSqlTest.java?rev=1234261&r1=1234260&r2=1234261&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/sql/SkipSqlTest.java
(original)
+++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/sql/SkipSqlTest.java
Sat Jan 21 03:46:27 2012
@@ -23,7 +23,7 @@ import java.sql.Connection;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.torque.BaseRuntimeTestCase;
+import org.apache.torque.BaseDatabaseTestCase;
 import org.apache.torque.Torque;
 
 /**
@@ -31,15 +31,10 @@ import org.apache.torque.Torque;
  *
  * @version $Id: DataTest.java 995641 2010-09-10 02:20:27Z tfischer $
  */
-public class SkipSqlTest extends BaseRuntimeTestCase
+public class SkipSqlTest extends BaseDatabaseTestCase
 {
     private static Log log = LogFactory.getLog(SkipSqlTest.class);
 
-    public SkipSqlTest(String name)
-    {
-        super(name);
-    }
-
     /**
      * Check that the skip_table (which has skipSql set to true)
      * is not present in the database.

Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/BasePeerTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/BasePeerTest.java?rev=1234261&r1=1234260&r2=1234261&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/BasePeerTest.java
(original)
+++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/BasePeerTest.java
Sat Jan 21 03:46:27 2012
@@ -1,6 +1,6 @@
 package org.apache.torque.util;
 
-import org.apache.torque.BaseRuntimeTestCase;
+import org.apache.torque.BaseDatabaseTestCase;
 import org.apache.torque.criteria.Criteria;
 import org.apache.torque.test.BookPeer;
 
@@ -9,18 +9,10 @@ import org.apache.torque.test.BookPeer;
  *
  * @version $Id: $
  */
-public class BasePeerTest extends BaseRuntimeTestCase
+public class BasePeerTest extends BaseDatabaseTestCase
 {
     private CountHelper countHelper = new CountHelper();
 
-    /**
-     * Creates a new instance.
-     */
-    public BasePeerTest(String name)
-    {
-        super(name);
-    }
-
     public void testDeleteGuessTableNameFromCriterion() throws Exception
     {
         // prepare

Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/CopyTestConditional.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/CopyTestConditional.java?rev=1234261&r1=1234260&r2=1234261&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/CopyTestConditional.java
(original)
+++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/CopyTestConditional.java
Sat Jan 21 03:46:27 2012
@@ -19,7 +19,7 @@ package org.apache.torque.util;
  * under the License.
  */
 
-import org.apache.torque.BaseRuntimeTestCase;
+import org.apache.torque.BaseDatabaseTestCase;
 import org.apache.torque.test.Author;
 import org.apache.torque.test.AuthorPeer;
 import org.apache.torque.test.Book;
@@ -30,17 +30,9 @@ import org.apache.torque.test.Book;
  * @author <a href="mailto:torque@kivus.myip.org">Rafal Maczewski</a>
  * @version $Id$
  */
-public class CopyTestConditional extends BaseRuntimeTestCase
+public class CopyTestConditional extends BaseDatabaseTestCase
 {
     /**
-     * Creates a new instance.
-     */
-    public CopyTestConditional(String name)
-    {
-        super(name);
-    }
-
-    /**
      * does some inserts.
      */
     public void testCopyObject() throws Exception

Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/LargeSelectTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/LargeSelectTest.java?rev=1234261&r1=1234260&r2=1234261&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/LargeSelectTest.java
(original)
+++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/LargeSelectTest.java
Sat Jan 21 03:46:27 2012
@@ -21,7 +21,7 @@ package org.apache.torque.util;
 
 import java.util.List;
 
-import org.apache.torque.BaseRuntimeTestCase;
+import org.apache.torque.BaseDatabaseTestCase;
 import org.apache.torque.TorqueException;
 import org.apache.torque.criteria.Criteria;
 import org.apache.torque.om.mapper.IntegerMapper;
@@ -35,7 +35,7 @@ import org.apache.torque.test.AuthorReco
  * @author <a href="mailto:seade@backstagetech.com.au">Scott Eade</a>
  * @version $Id$
  */
-public class LargeSelectTest extends BaseRuntimeTestCase
+public class LargeSelectTest extends BaseDatabaseTestCase
 {
     private static final int TEST_PAGE_SIZE = 9;
     private static final int TEST_PAGES = 9;
@@ -45,14 +45,6 @@ public class LargeSelectTest extends Bas
 
     private Criteria criteria;
 
-    /**
-     * Creates a new instance.
-     */
-    public LargeSelectTest(String name)
-    {
-        super(name);
-    }
-
     public void setUp() throws Exception
     {
         super.setUp();

Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/SummaryHelperTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/SummaryHelperTest.java?rev=1234261&r1=1234260&r2=1234261&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/SummaryHelperTest.java
(original)
+++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/SummaryHelperTest.java
Sat Jan 21 03:46:27 2012
@@ -25,7 +25,7 @@ import java.util.List;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.torque.BaseRuntimeTestCase;
+import org.apache.torque.BaseDatabaseTestCase;
 import org.apache.torque.criteria.Criteria;
 import org.apache.torque.criteria.SqlEnum;
 import org.apache.torque.test.Summarize1;
@@ -38,7 +38,7 @@ import org.apache.torque.util.functions.
  * @author <a href="mailto:greg.monroe@dukece.com">Greg Monroe</a>
  * @version $Id
  */
-public class SummaryHelperTest extends BaseRuntimeTestCase
+public class SummaryHelperTest extends BaseDatabaseTestCase
 {
     static Log logger = LogFactory.getLog( SummaryHelperTest.class );
 
@@ -54,14 +54,6 @@ public class SummaryHelperTest extends B
 
     private Criteria criteria;
 
-    /**
-     * Creates a new instance.
-     */
-    public SummaryHelperTest(String name)
-    {
-        super(name);
-    }
-
     public void setUp() throws Exception
     {
         super.setUp();



---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org


Mime
View raw message