Update ParameterizedSuite to work with Junit 4.7

JumpMind · Jan 13, 2010 · 837b5c1 · 837b5c1
1 parent 276071c
commit 837b5c1
Show file tree

Hide file tree

Showing 32 changed files with 110 additions and 238 deletions.
diff --git a/symmetric/pom.xml b/symmetric/pom.xml
@@ -445,7 +445,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.4</version>
+            <version>4.7</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -497,14 +497,8 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
-            <version>2.5.6</version>
+            <version>${springframework.version}</version>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>junit</groupId>
-                    <artifactId>junit</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>javax.annotation</groupId>

diff --git a/symmetric/src/test/java/org/jumpmind/symmetric/config/ParameterFilterTest.java b/symmetric/src/test/java/org/jumpmind/symmetric/config/ParameterFilterTest.java
@@ -11,10 +11,6 @@ public class ParameterFilterTest extends AbstractDatabaseTest {
     public ParameterFilterTest() throws Exception {
     }
 
-    public ParameterFilterTest(String db) {
-        super(db);
-    }
-
     @Test
     public void testParameterFilter() {
         IParameterService service = find(Constants.PARAMETER_SERVICE);

diff --git a/symmetric/src/test/java/org/jumpmind/symmetric/extract/DataExtractorTest.java b/symmetric/src/test/java/org/jumpmind/symmetric/extract/DataExtractorTest.java
@@ -73,10 +73,6 @@ public DataExtractorTest() throws Exception {
         super();
     }
 
-    public DataExtractorTest(String dbName) {
-        super(dbName);
-    }
-
     @Before
     public void setUp() {
         dataExtractor = (IDataExtractor) find(Constants.DATA_EXTRACTOR);

diff --git a/symmetric/src/test/java/org/jumpmind/symmetric/integrate/XmlPublisherFilterTest.java b/symmetric/src/test/java/org/jumpmind/symmetric/integrate/XmlPublisherFilterTest.java
@@ -45,10 +45,6 @@ public XmlPublisherFilterTest() throws Exception {
         super();
     }
 
-    public XmlPublisherFilterTest(String dbName) {
-        super(dbName);
-    }
-
     @Before
     public void setUp() {
         ctx = new DataLoaderContext();

diff --git a/symmetric/src/test/java/org/jumpmind/symmetric/load/AbstractDataLoaderTest.java b/symmetric/src/test/java/org/jumpmind/symmetric/load/AbstractDataLoaderTest.java
@@ -69,10 +69,6 @@ public AbstractDataLoaderTest() throws Exception {
         super();
     }
 
-    public AbstractDataLoaderTest(String dbType) {
-        super(dbType);
-    }
-
     protected MockTransportManager getTransportManager() {
         if (transportManager == null) {
             transportManager = new MockTransportManager();

diff --git a/symmetric/src/test/java/org/jumpmind/symmetric/load/AdditiveDataLoaderFilterTest.java b/symmetric/src/test/java/org/jumpmind/symmetric/load/AdditiveDataLoaderFilterTest.java
@@ -44,10 +44,6 @@ public AdditiveDataLoaderFilterTest() throws Exception {
         super();
     }
 
-    public AdditiveDataLoaderFilterTest(String dbName) {
-        super(dbName);
-    }
-
     @Before
     public void setUp() {
 

diff --git a/symmetric/src/test/java/org/jumpmind/symmetric/load/DataLoaderTest.java b/symmetric/src/test/java/org/jumpmind/symmetric/load/DataLoaderTest.java
@@ -53,10 +53,6 @@ public class DataLoaderTest extends AbstractDataLoaderTest {
     public DataLoaderTest() throws Exception {
     }
 
-    public DataLoaderTest(String db) {
-        super(db);
-    }
-
     @Test
     public void testInsertExisting() throws Exception {
         String[] values = { getNextId(), "string2", "string not null2", "char2", "char not null2",

diff --git a/symmetric/src/test/java/org/jumpmind/symmetric/service/impl/AcknowledgeServiceTest.java b/symmetric/src/test/java/org/jumpmind/symmetric/service/impl/AcknowledgeServiceTest.java
@@ -51,10 +51,6 @@ public AcknowledgeServiceTest() throws Exception {
         super();
     }
 
-    public AcknowledgeServiceTest(String dbName) {
-        super(dbName);
-    }
-
     @Before
     public void setUp() {
         ackService = (IAcknowledgeService) find(Constants.ACKNOWLEDGE_SERVICE);

diff --git a/symmetric/src/test/java/org/jumpmind/symmetric/service/impl/ClusterServiceTest.java b/symmetric/src/test/java/org/jumpmind/symmetric/service/impl/ClusterServiceTest.java
@@ -32,10 +32,6 @@ public ClusterServiceTest() throws Exception {
         super();
     }
 
-    public ClusterServiceTest(String dbName) {
-        super(dbName);
-    }
-
     @Test
     public void testLock() throws Exception {
         final IClusterService service = (IClusterService) find(Constants.CLUSTER_SERVICE);

diff --git a/symmetric/src/test/java/org/jumpmind/symmetric/service/impl/ConfigurationServiceTest.java b/symmetric/src/test/java/org/jumpmind/symmetric/service/impl/ConfigurationServiceTest.java
@@ -42,10 +42,6 @@ public ConfigurationServiceTest() throws Exception {
         super();
     }
 
-    public ConfigurationServiceTest(String dbName) {
-        super(dbName);
-    }
-
     @Before
     public void setUp() {
         configurationService = (IConfigurationService) find(Constants.CONFIG_SERVICE);

diff --git a/symmetric/src/test/java/org/jumpmind/symmetric/service/impl/DataExtractorServiceTest.java b/symmetric/src/test/java/org/jumpmind/symmetric/service/impl/DataExtractorServiceTest.java
@@ -52,10 +52,6 @@ public DataExtractorServiceTest() throws Exception {
         super();
     }
 
-    public DataExtractorServiceTest(String dbName) {
-        super(dbName);
-    }
-
     @Before
     public void setUp() {
         dataExtractorService = (IDataExtractorService) find(Constants.DATAEXTRACTOR_SERVICE);

diff --git a/symmetric/src/test/java/org/jumpmind/symmetric/service/impl/DataLoaderServiceTest.java b/symmetric/src/test/java/org/jumpmind/symmetric/service/impl/DataLoaderServiceTest.java
@@ -51,10 +51,6 @@ public DataLoaderServiceTest() throws Exception {
         super();
     }
 
-    public DataLoaderServiceTest(String dbType) {
-        super(dbType);
-    }
-
     protected Level setLoggingLevelForTest(Level level) {
         Level old = Logger.getLogger(DataLoaderService.class).getLevel();
         Logger.getLogger(DataLoaderService.class).setLevel(level);

diff --git a/symmetric/src/test/java/org/jumpmind/symmetric/service/impl/DataServiceTest.java b/symmetric/src/test/java/org/jumpmind/symmetric/service/impl/DataServiceTest.java
@@ -17,10 +17,6 @@ public DataServiceTest() throws Exception {
         super();
     }
 
-    public DataServiceTest(String dbType) {
-        super(dbType);
-    }
-
     @Test
     public void testGetHeartbeatListeners() throws Exception {
         DataService ds = new DataService();

diff --git a/symmetric/src/test/java/org/jumpmind/symmetric/service/impl/NodeServiceTest.java b/symmetric/src/test/java/org/jumpmind/symmetric/service/impl/NodeServiceTest.java
@@ -46,10 +46,6 @@ public NodeServiceTest() throws Exception {
         super();
     }
 
-    public NodeServiceTest(String dbName) {
-        super(dbName);
-    }
-
     @Before
     public void setUp() {
         nodeService = (INodeService) find(Constants.NODE_SERVICE);

diff --git a/symmetric/src/test/java/org/jumpmind/symmetric/service/impl/OutgoingBatchServiceTest.java b/symmetric/src/test/java/org/jumpmind/symmetric/service/impl/OutgoingBatchServiceTest.java
@@ -59,11 +59,7 @@ public class OutgoingBatchServiceTest extends AbstractDatabaseTest {
     public OutgoingBatchServiceTest() throws Exception {
         super();
     }
-
-    public OutgoingBatchServiceTest(String dbName) {
-        super(dbName);
-    }
-
+
     @Before
     public void setUp() {
         batchService = (IOutgoingBatchService) find(Constants.OUTGOING_BATCH_SERVICE);

diff --git a/symmetric/src/test/java/org/jumpmind/symmetric/service/impl/ParameterServiceTest.java b/symmetric/src/test/java/org/jumpmind/symmetric/service/impl/ParameterServiceTest.java
@@ -12,10 +12,6 @@ public ParameterServiceTest() throws Exception {
         super();
     }
 
-    public ParameterServiceTest(String dbName) {
-        super(dbName);
-    }
-
     @Test
     public void testParameterGetFromDefaults() {
         Assert.assertEquals("Unexpected default table prefix found.", getParameterService().getString(

diff --git a/symmetric/src/test/java/org/jumpmind/symmetric/service/impl/PurgeServiceTest.java b/symmetric/src/test/java/org/jumpmind/symmetric/service/impl/PurgeServiceTest.java
@@ -38,11 +38,7 @@ public class PurgeServiceTest extends AbstractDatabaseTest {
     public PurgeServiceTest() throws Exception {
         super();
     }
-
-    public PurgeServiceTest(String dbName) {
-        super(dbName);
-    }
-
+
     @Test
     public void testThatPurgeExecutes() {
         IPurgeService service = find(Constants.PURGE_SERVICE);

diff --git a/symmetric/src/test/java/org/jumpmind/symmetric/service/impl/RegistrationServiceTest.java b/symmetric/src/test/java/org/jumpmind/symmetric/service/impl/RegistrationServiceTest.java
@@ -48,10 +48,6 @@ public RegistrationServiceTest() throws Exception {
         super();
     }
 
-    public RegistrationServiceTest(String dbName) {
-        super(dbName);
-    }
-
     @Before
     public void setUp() {
         nodeService = find(Constants.NODE_SERVICE);

diff --git a/symmetric/src/test/java/org/jumpmind/symmetric/service/impl/RouterServiceTest.java b/symmetric/src/test/java/org/jumpmind/symmetric/service/impl/RouterServiceTest.java
@@ -29,10 +29,6 @@ public class RouterServiceTest extends AbstractDatabaseTest {
     final static Node NODE_GROUP_NODE_2 = new Node("00002",TestConstants.TEST_CLIENT_NODE_GROUP);
     final static Node NODE_GROUP_NODE_3 = new Node("00003",TestConstants.TEST_CLIENT_NODE_GROUP);
 
-    public RouterServiceTest(String dbName) {
-        super(dbName);
-    }
-
     public RouterServiceTest() throws Exception {
     }
 

diff --git a/symmetric/src/test/java/org/jumpmind/symmetric/service/impl/StatisticServiceTest.java b/symmetric/src/test/java/org/jumpmind/symmetric/service/impl/StatisticServiceTest.java
@@ -27,10 +27,6 @@ public StatisticServiceTest() throws Exception {
         super();
     }
 
-    public StatisticServiceTest(String dbName) {
-        super(dbName);
-    }
-
     @Before
     public void setUp() {
         statisticService = AppUtils.find(Constants.STATISTIC_SERVICE, getSymmetricEngine());

diff --git a/symmetric/src/test/java/org/jumpmind/symmetric/service/impl/TriggerRouterServiceTest.java b/symmetric/src/test/java/org/jumpmind/symmetric/service/impl/TriggerRouterServiceTest.java
@@ -89,10 +89,6 @@ public TriggerRouterServiceTest() throws Exception {
         super();
     }
 
-    public TriggerRouterServiceTest(String dbName) {
-        super(dbName);
-    }
-
     @Test
     public void testSchemaSync() throws Exception {
         ITriggerRouterService service = getTriggerRouterService();

diff --git a/symmetric/src/test/java/org/jumpmind/symmetric/test/AbstractDatabaseTest.java b/symmetric/src/test/java/org/jumpmind/symmetric/test/AbstractDatabaseTest.java
@@ -47,16 +47,16 @@ public class AbstractDatabaseTest {
 
     private String database = TestSetupUtil.getRootDbTypes(DatabaseTestSuite.DEFAULT_TEST_PREFIX)[0];
 
-    static boolean standalone = false;
-
-    public AbstractDatabaseTest(String dbName) {
-        this.database = dbName;
+    static boolean standalone = true;
+   
+    public void init(String database) {
+        this.database = database;
     }
 
     public AbstractDatabaseTest() throws Exception {
-        if (!standalone) {
+        if (standalone) {
             logger.info("Running test in standalone mode against " + database);
-            standalone = true;
+            standalone = false;
             TestSetupUtil.setup(DatabaseTestSuite.DEFAULT_TEST_PREFIX, TestConstants.TEST_CONTINUOUS_SETUP_SCRIPT,
                     null, database);
         }

diff --git a/symmetric/src/test/java/org/jumpmind/symmetric/test/AbstractIntegrationTest.java b/symmetric/src/test/java/org/jumpmind/symmetric/test/AbstractIntegrationTest.java
@@ -39,21 +39,20 @@ public class AbstractIntegrationTest {
     protected String root;
     protected JdbcTemplate rootJdbcTemplate;
     protected JdbcTemplate clientJdbcTemplate;
-    protected static boolean standalone = false;
+    protected static boolean standalone = true;
 
-    public AbstractIntegrationTest(String client, String root) {
+    public void init(String client, String root) {
         this.client = client;
         this.root = root;
     }
 
     public AbstractIntegrationTest() throws Exception {
-        if (!standalone) {
+        if (standalone) {
             String[] databases = TestSetupUtil.lookupDatabasePairs(DatabaseTestSuite.DEFAULT_TEST_PREFIX).iterator()
                     .next();
             logger.info("Running test in standalone mode with databases " + databases[0] + " and " + databases[1]);
-            this.root = databases[1];
-            this.client = databases[0];
-            standalone = true;
+            init(databases[0],databases[1]);
+            standalone = false;
             TestSetupUtil.setup(DatabaseTestSuite.DEFAULT_TEST_PREFIX, TestConstants.TEST_ROOT_DOMAIN_SETUP_SCRIPT,
                     databases[0], databases[1]);
         }

diff --git a/symmetric/src/test/java/org/jumpmind/symmetric/test/CleanupTest.java b/symmetric/src/test/java/org/jumpmind/symmetric/test/CleanupTest.java
@@ -29,15 +29,18 @@ public class CleanupTest {
     String client;
     String root;
 
-    public CleanupTest(String client, String root) throws Exception {
+    public CleanupTest() throws Exception {
+    }
+
+    public void init(String client, String root) {
         this.client = client;
         this.root = root;
     }
-
-    public CleanupTest(String client) throws Exception {
-        this.client = null;
-    }
 
+    public void init(String database) {
+        this.root = database;
+    }
+
     @Test
     public void cleanup() throws Exception {
         TestSetupUtil.cleanup();

diff --git a/symmetric/src/test/java/org/jumpmind/symmetric/test/CrossCatalogSyncTest.java b/symmetric/src/test/java/org/jumpmind/symmetric/test/CrossCatalogSyncTest.java
@@ -28,10 +28,6 @@
 
 public class CrossCatalogSyncTest extends AbstractDatabaseTest {
 
-    public CrossCatalogSyncTest(String db) {
-        super(db);
-    }
-
     public CrossCatalogSyncTest() throws Exception {
         super();
     }

diff --git a/symmetric/src/test/java/org/jumpmind/symmetric/test/DatabaseTestSuite.java b/symmetric/src/test/java/org/jumpmind/symmetric/test/DatabaseTestSuite.java
@@ -53,22 +53,28 @@
         OutgoingBatchServiceTest.class, ParameterServiceTest.class, PurgeServiceTest.class,
         RegistrationServiceTest.class, StatisticServiceTest.class, XmlPublisherFilterTest.class,
         AdditiveDataLoaderFilterTest.class, DataServiceTest.class, CleanupTest.class })
-public class DatabaseTestSuite extends AbstractDatabaseTest {
+public class DatabaseTestSuite {
 
+    String database;
+
     public static final String DEFAULT_TEST_PREFIX = "test";
 
+    public DatabaseTestSuite() throws Exception {
+    }
+
+    public void init(String database) {
+        this.database = database;
+    }
+
     @Parameters
     public static Collection<String[]> lookupDatabases() {
         return TestSetupUtil.lookupDatabases(DEFAULT_TEST_PREFIX);
     }
 
-    public DatabaseTestSuite(String dbName) {
-        super(dbName);
-    }
-
     @Test
     public void setup() throws Exception {
-        TestSetupUtil.setup(DEFAULT_TEST_PREFIX, TestConstants.TEST_CONTINUOUS_SETUP_SCRIPT, null, getDatabase());
+        AbstractDatabaseTest.standalone = false;
+        TestSetupUtil.setup(DEFAULT_TEST_PREFIX, TestConstants.TEST_CONTINUOUS_SETUP_SCRIPT, null, database);
     }
 
 }
diff --git a/symmetric/src/test/java/org/jumpmind/symmetric/test/FunkyDataTypesTest.java b/symmetric/src/test/java/org/jumpmind/symmetric/test/FunkyDataTypesTest.java
@@ -32,10 +32,6 @@ public class FunkyDataTypesTest extends AbstractDatabaseTest {
     static final Log logger = LogFactory.getLog(FunkyDataTypesTest.class);
     static final String TABLE_NAME = "TEST_ORACLE_DATES";
 
-    public FunkyDataTypesTest(String dbName) {
-        super(dbName);
-    }
-
     public FunkyDataTypesTest() throws Exception {
         super();
     }

diff --git a/symmetric/src/test/java/org/jumpmind/symmetric/test/IntegrationTestSuite.java b/symmetric/src/test/java/org/jumpmind/symmetric/test/IntegrationTestSuite.java
@@ -39,14 +39,15 @@ public static Collection<String[]> lookupClientServerDatabases() {
 
     String root;
     String client;
-
-    public IntegrationTestSuite(String client, String root) {
+    
+    public void init(String client, String root) {
         this.client = client;
         this.root = root;
     }
 
     @Test
     public void setup() throws Exception {
+        AbstractIntegrationTest.standalone = false;
         TestSetupUtil.setup(TEST_PREFIX, TestConstants.TEST_ROOT_DOMAIN_SETUP_SCRIPT, client, root);
     }