Refactored some test stuff. Removed unused code.

JumpMind · May 27, 2010 · d259c43 · d259c43
1 parent 8bc958d
commit d259c43
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 25 deletions.
diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/db/AbstractDbDialect.java b/symmetric/src/main/java/org/jumpmind/symmetric/db/AbstractDbDialect.java
@@ -85,7 +85,6 @@
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.PreparedStatementCallback;
 import org.springframework.jdbc.support.JdbcUtils;
-import org.springframework.jdbc.support.SQLErrorCodeSQLExceptionTranslator;
 import org.springframework.jdbc.support.lob.LobHandler;
 import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.support.TransactionCallback;
@@ -119,8 +118,6 @@ abstract public class AbstractDbDialect implements IDbDialect {
 
     protected SqlTemplate sqlTemplate;
 
-    protected SQLErrorCodeSQLExceptionTranslator sqlErrorTranslator;
-
     private Map<Integer, String> _defaultSizes;
 
     protected IParameterService parameterService;
@@ -215,7 +212,6 @@ public void init(Platform pf) {
         log.info("DbDialectInUse", this.getClass().getName());
         this.jdbcTemplate = new JdbcTemplate(pf.getDataSource());
         this.platform = pf;
-        this.sqlErrorTranslator = new SQLErrorCodeSQLExceptionTranslator(pf.getDataSource());
         this.identifierQuoteString = "\"";
         jdbcTemplate.execute(new ConnectionCallback<Object>() {
             public Object doInConnection(Connection c) throws SQLException, DataAccessException {
@@ -1280,10 +1276,6 @@ public void setSqlTemplate(SqlTemplate sqlTemplate) {
         this.sqlTemplate = sqlTemplate;
     }
 
-    public SQLErrorCodeSQLExceptionTranslator getSqlErrorTranslator() {
-        return sqlErrorTranslator;
-    }
-
     public void setTablePrefix(String tablePrefix) {
         this.tablePrefix = tablePrefix;
     }

diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/db/IDbDialect.java b/symmetric/src/main/java/org/jumpmind/symmetric/db/IDbDialect.java
@@ -37,7 +37,6 @@
 import org.jumpmind.symmetric.model.TriggerRouter;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.PreparedStatementCallback;
-import org.springframework.jdbc.support.SQLErrorCodeSQLExceptionTranslator;
 import org.springframework.jdbc.support.lob.LobHandler;
 
 public interface IDbDialect {
@@ -161,8 +160,6 @@ public void removeTrigger(StringBuilder sqlBuffer, String catalogName, String sc
      */
     public void purge();
 
-    public SQLErrorCodeSQLExceptionTranslator getSqlErrorTranslator();
-
     public void disableSyncTriggers();
 
     public void disableSyncTriggers(String nodeId);

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
@@ -35,7 +35,6 @@
 import org.jumpmind.symmetric.ext.INodeGroupTestDataLoaderFilter;
 import org.jumpmind.symmetric.ext.ITestDataLoaderFilter;
 import org.jumpmind.symmetric.load.AbstractDataLoaderTest;
-import org.jumpmind.symmetric.load.csv.CsvLoader;
 import org.jumpmind.symmetric.model.IncomingBatch;
 import org.jumpmind.symmetric.model.Node;
 import org.jumpmind.symmetric.service.IParameterService;
@@ -54,13 +53,6 @@ public DataLoaderServiceTest() throws Exception {
         super();
     }
 
-    protected Level setLoggingLevelForTest(Level level) {
-        Level old = Logger.getLogger(DataLoaderService.class).getLevel();
-        Logger.getLogger(DataLoaderService.class).setLevel(level);
-        Logger.getLogger(CsvLoader.class).setLevel(level);
-        return old;
-    }
-
     @Test
     public void testIncomingBatch() throws Exception {
         String[] insertValues = new String[TEST_COLUMNS.length];

diff --git a/symmetric/src/test/java/org/jumpmind/symmetric/test/AbstractDatabaseTest.java b/symmetric/src/test/java/org/jumpmind/symmetric/test/AbstractDatabaseTest.java
@@ -41,7 +41,7 @@
 import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
 import org.springframework.transaction.support.TransactionTemplate;
 
-public class AbstractDatabaseTest {
+public class AbstractDatabaseTest extends AbstractTest {
 
     protected Log logger = LogFactory.getLog(getClass());
 
@@ -52,6 +52,11 @@ public class AbstractDatabaseTest {
     public void init(String database) {
         this.database = database;
     }
+
+    @Override
+    protected String printDatabases() {
+        return getDatabase();
+    }
 
     public AbstractDatabaseTest() throws Exception {
         if (standalone) {

diff --git a/symmetric/src/test/java/org/jumpmind/symmetric/test/AbstractIntegrationTest.java b/symmetric/src/test/java/org/jumpmind/symmetric/test/AbstractIntegrationTest.java
@@ -31,7 +31,7 @@
 import org.junit.Before;
 import org.springframework.jdbc.core.JdbcTemplate;
 
-public class AbstractIntegrationTest {
+public class AbstractIntegrationTest extends AbstractTest {
 
     protected final Log logger = LogFactory.getLog(getClass());
 
@@ -63,10 +63,10 @@ public AbstractIntegrationTest() throws Exception {
             throw e;
         }
     }
-
-    protected void logTestRunning() {
-        logger.info("Running " + new Exception().getStackTrace()[1].getMethodName() + ". "
-                + printRootAndClientDatabases());
+    
+    @Override
+    protected String printDatabases() {
+        return printRootAndClientDatabases();
     }
 
     protected ISymmetricEngine getRootEngine() {

diff --git a/symmetric/src/test/java/org/jumpmind/symmetric/test/AbstractTest.java b/symmetric/src/test/java/org/jumpmind/symmetric/test/AbstractTest.java
@@ -0,0 +1,26 @@
+package org.jumpmind.symmetric.test;
+
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.jumpmind.symmetric.load.csv.CsvLoader;
+import org.jumpmind.symmetric.service.impl.DataLoaderService;
+import org.jumpmind.symmetric.service.impl.RouterService;
+
+abstract public class AbstractTest {
+
+    protected Level setLoggingLevelForTest(Level level) {
+        Level old = Logger.getLogger(getClass()).getLevel();
+        Logger.getLogger(DataLoaderService.class).setLevel(level);
+        Logger.getLogger(RouterService.class).setLevel(level);
+        Logger.getLogger(CsvLoader.class).setLevel(level);
+        return old;
+    }
+
+    protected void logTestRunning() {
+        Logger.getLogger(getClass()).info("Running " + new Exception().getStackTrace()[1].getMethodName() + ". "
+                + printDatabases());
+    }
+
+    abstract protected String printDatabases();
+
+}
diff --git a/symmetric/src/test/java/org/jumpmind/symmetric/test/SimpleIntegrationTest.java b/symmetric/src/test/java/org/jumpmind/symmetric/test/SimpleIntegrationTest.java
@@ -35,6 +35,7 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.time.DateUtils;
 import org.apache.ddlutils.model.Table;
+import org.apache.log4j.Level;
 import org.jumpmind.symmetric.common.Constants;
 import org.jumpmind.symmetric.common.ParameterConstants;
 import org.jumpmind.symmetric.db.IDbDialect;
@@ -940,6 +941,7 @@ public void testSyncShellCommand() throws Exception {
     @Test(timeout = 120000)
     public void testSyncShellCommandError() throws Exception {
         logTestRunning();
+        Level old = setLoggingLevelForTest(Level.OFF);
         IDataService rootDataService = AppUtils.find(Constants.DATA_SERVICE, getRootEngine());
         IOutgoingBatchService rootOutgoingBatchService = AppUtils.find(Constants.OUTGOING_BATCH_SERVICE,
                 getRootEngine());
@@ -951,6 +953,7 @@ public void testSyncShellCommandError() throws Exception {
         Assert.assertEquals(1, batches.countBatches(true));
         Assert.assertFalse(testFlag);
         rootOutgoingBatchService.markAllAsSentForNode(TestConstants.TEST_CLIENT_NODE);
+        setLoggingLevelForTest(old);
     }
 
     /**