Skip to content

Commit

Permalink
additional refactorings for unit test framework
Browse files Browse the repository at this point in the history
  • Loading branch information
@chenson42
chenson42 committed Jan 12, 2012
1 parent 2645483 commit f3ee8b5
Show file tree
Hide file tree
Showing 51 changed files with 206 additions and 345 deletions.
2 changes: 1 addition & 1 deletion symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/ClientSymmetricEngine.java
View file
Expand Up @@ -78,7 +78,7 @@ public static BasicDataSource createBasicDataSource(Log log, TypedProperties pro
password = securityService.decrypt(password.substring(SecurityConstants.PREFIX_ENC
.length()));
}
dataSource.setUsername(password);
dataSource.setPassword(password);
dataSource.setInitialSize(properties.getInt(ParameterConstants.DBPOOL_INITIAL_SIZE, 5));
dataSource.setMaxActive(properties.getInt(ParameterConstants.DBPOOL_MAX_ACTIVE, 20));
dataSource.setMaxWait(properties.getInt(ParameterConstants.DBPOOL_MAX_WAIT, 5000));
Expand Down
7 changes: 4 additions & 3 deletions ...tric-client/src/main/java/org/jumpmind/symmetric/db/AbstractEmbeddedSymmetricDialect.java
View file
Expand Up @@ -22,6 +22,7 @@

import org.jumpmind.db.model.Table;
import org.jumpmind.db.platform.IDatabasePlatform;
import org.jumpmind.log.Log;
import org.jumpmind.symmetric.model.Channel;
import org.jumpmind.symmetric.model.Node;
import org.jumpmind.symmetric.model.Trigger;
Expand All @@ -31,9 +32,9 @@

abstract public class AbstractEmbeddedSymmetricDialect extends AbstractSymmetricDialect implements ISymmetricDialect {

public AbstractEmbeddedSymmetricDialect(IParameterService parameterService,
IDatabasePlatform platform) {
super(parameterService, platform);
public AbstractEmbeddedSymmetricDialect(Log log,
IParameterService parameterService, IDatabasePlatform platform) {
super(log, parameterService, platform);
}

/**
Expand Down
30 changes: 15 additions & 15 deletions ...symmetric-client/src/main/java/org/jumpmind/symmetric/db/JdbcSymmetricDialectFactory.java
View file
Expand Up @@ -79,39 +79,39 @@ public ISymmetricDialect create() {
AbstractSymmetricDialect dialect = null;

if (platform instanceof MySqlPlatform) {
dialect = new MySqlSymmetricDialect(parameterService, platform);
dialect = new MySqlSymmetricDialect(log, parameterService, platform);
} else if (platform instanceof OraclePlatform) {
dialect = new OracleSymmetricDialect(parameterService, platform);
dialect = new OracleSymmetricDialect(log, parameterService, platform);
} else if (platform instanceof MsSqlPlatform) {
dialect = new MsSqlSymmetricDialect(parameterService, platform);
dialect = new MsSqlSymmetricDialect(log, parameterService, platform);
} else if (platform instanceof GreenplumPlatform) {
dialect = new GreenplumSymmetricDialect(parameterService, platform);
dialect = new GreenplumSymmetricDialect(log, parameterService, platform);
} else if (platform instanceof PostgreSqlPlatform) {
dialect = new PostgreSqlSymmetricDialect(parameterService, platform);
dialect = new PostgreSqlSymmetricDialect(log, parameterService, platform);
} else if (platform instanceof DerbyPlatform) {
dialect = new DerbySymmetricDialect(parameterService, platform);
dialect = new DerbySymmetricDialect(log, parameterService, platform);
} else if (platform instanceof H2Platform) {
dialect = new H2SymmetricDialect(parameterService, platform);
dialect = new H2SymmetricDialect(log, parameterService, platform);
} else if (platform instanceof HsqlDbPlatform) {
dialect = new HsqlDbSymmetricDialect(parameterService, platform);
dialect = new HsqlDbSymmetricDialect(log, parameterService, platform);
} else if (platform instanceof HsqlDb2Platform) {
dialect = new HsqlDb2SymmetricDialect(parameterService, platform);
dialect = new HsqlDb2SymmetricDialect(log, parameterService, platform);
} else if (platform instanceof InformixPlatform) {
dialect = new InformixSymmetricDialect(parameterService, platform);
dialect = new InformixSymmetricDialect(log, parameterService, platform);
} else if (platform instanceof Db2Platform) {
int dbMajorVersion = platform.getSqlTemplate().getDatabaseMajorVersion();
int dbMinorVersion = platform.getSqlTemplate().getDatabaseMinorVersion();
if (dbMajorVersion < 9 || (dbMajorVersion == 9 && dbMinorVersion < 5)) {
dialect = new Db2SymmetricDialect(parameterService, platform);
dialect = new Db2SymmetricDialect(log, parameterService, platform);
} else {
dialect = new Db2v9SymmetricDialect(parameterService, platform);
dialect = new Db2v9SymmetricDialect(log, parameterService, platform);
}
} else if (platform instanceof FirebirdPlatform) {
dialect = new FirebirdSymmetricDialect(parameterService, platform);
dialect = new FirebirdSymmetricDialect(log, parameterService, platform);
} else if (platform instanceof SybasePlatform) {
dialect = new SybaseSymmetricDialect(parameterService, platform);
dialect = new SybaseSymmetricDialect(log, parameterService, platform);
} else if (platform instanceof InterbasePlatform) {
dialect = new InterbaseSymmetricDialect(parameterService, platform);
dialect = new InterbaseSymmetricDialect(log, parameterService, platform);
} else {
throw new DbNotSupportedException();
}
Expand Down
5 changes: 3 additions & 2 deletions ...ric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/db2/Db2SymmetricDialect.java
View file
Expand Up @@ -24,6 +24,7 @@
import org.jumpmind.db.platform.IDatabasePlatform;
import org.jumpmind.db.sql.ISqlTransaction;
import org.jumpmind.db.util.BinaryEncoding;
import org.jumpmind.log.Log;
import org.jumpmind.symmetric.db.AbstractSymmetricDialect;
import org.jumpmind.symmetric.db.ISymmetricDialect;
import org.jumpmind.symmetric.model.Trigger;
Expand All @@ -34,8 +35,8 @@
*/
public class Db2SymmetricDialect extends AbstractSymmetricDialect implements ISymmetricDialect {

public Db2SymmetricDialect(IParameterService parameterService, IDatabasePlatform platform) {
super(parameterService, platform);
public Db2SymmetricDialect(Log log, IParameterService parameterService, IDatabasePlatform platform) {
super(log, parameterService, platform);
this.triggerText = new Db2TriggerText();
}

Expand Down
5 changes: 3 additions & 2 deletions ...c/symmetric-client/src/main/java/org/jumpmind/symmetric/db/db2/Db2v9SymmetricDialect.java
View file
Expand Up @@ -24,6 +24,7 @@
import org.jumpmind.db.platform.IDatabasePlatform;
import org.jumpmind.db.sql.ISqlTransaction;
import org.jumpmind.db.sql.SqlScript;
import org.jumpmind.log.Log;
import org.jumpmind.symmetric.db.ISymmetricDialect;
import org.jumpmind.symmetric.service.IParameterService;
import org.springframework.jdbc.core.JdbcTemplate;
Expand All @@ -34,8 +35,8 @@ public class Db2v9SymmetricDialect extends Db2SymmetricDialect implements ISymme

static final String SYNC_TRIGGERS_DISABLED_NODE_VARIABLE = "sync_node_disabled";

public Db2v9SymmetricDialect(IParameterService parameterService, IDatabasePlatform platform) {
super(parameterService, platform);
public Db2v9SymmetricDialect(Log log, IParameterService parameterService, IDatabasePlatform platform) {
super(log, parameterService, platform);
}

@Override
Expand Down
5 changes: 3 additions & 2 deletions ...symmetric-client/src/main/java/org/jumpmind/symmetric/db/derby/DerbySymmetricDialect.java
View file
Expand Up @@ -24,15 +24,16 @@
import org.jumpmind.db.platform.IDatabasePlatform;
import org.jumpmind.db.sql.ISqlTransaction;
import org.jumpmind.db.util.BinaryEncoding;
import org.jumpmind.log.Log;
import org.jumpmind.symmetric.db.AbstractSymmetricDialect;
import org.jumpmind.symmetric.db.ISymmetricDialect;
import org.jumpmind.symmetric.model.Trigger;
import org.jumpmind.symmetric.service.IParameterService;

public class DerbySymmetricDialect extends AbstractSymmetricDialect implements ISymmetricDialect {

public DerbySymmetricDialect(IParameterService parameterService, IDatabasePlatform platform) {
super(parameterService, platform);
public DerbySymmetricDialect(Log log, IParameterService parameterService, IDatabasePlatform platform) {
super(log, parameterService, platform);
this.triggerText = new DerbyTriggerText();
}

Expand Down
5 changes: 3 additions & 2 deletions ...ric-client/src/main/java/org/jumpmind/symmetric/db/firebird/FirebirdSymmetricDialect.java
View file
Expand Up @@ -22,6 +22,7 @@
import org.jumpmind.db.platform.IDatabasePlatform;
import org.jumpmind.db.sql.ISqlTransaction;
import org.jumpmind.db.util.BinaryEncoding;
import org.jumpmind.log.Log;
import org.jumpmind.symmetric.db.AbstractSymmetricDialect;
import org.jumpmind.symmetric.db.ISymmetricDialect;
import org.jumpmind.symmetric.model.Trigger;
Expand All @@ -37,8 +38,8 @@ public class FirebirdSymmetricDialect extends AbstractSymmetricDialect implement

static final String SYNC_TRIGGERS_DISABLED_NODE_VARIABLE = "sync_node_disabled";

public FirebirdSymmetricDialect(IParameterService parameterService, IDatabasePlatform platform) {
super(parameterService, platform);
public FirebirdSymmetricDialect(Log log, IParameterService parameterService, IDatabasePlatform platform) {
super(log, parameterService, platform);
this.triggerText = new FirebirdTriggerText();
}

Expand Down
5 changes: 3 additions & 2 deletions ...etric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/h2/H2SymmetricDialect.java
View file
Expand Up @@ -23,6 +23,7 @@
import org.jumpmind.db.platform.IDatabasePlatform;
import org.jumpmind.db.sql.ISqlTransaction;
import org.jumpmind.db.util.BinaryEncoding;
import org.jumpmind.log.Log;
import org.jumpmind.symmetric.common.ParameterConstants;
import org.jumpmind.symmetric.db.AbstractEmbeddedSymmetricDialect;
import org.jumpmind.symmetric.db.ISymmetricDialect;
Expand All @@ -35,8 +36,8 @@
*/
public class H2SymmetricDialect extends AbstractEmbeddedSymmetricDialect implements ISymmetricDialect {

public H2SymmetricDialect(IParameterService parameterService, IDatabasePlatform platform) {
super(parameterService, platform);
public H2SymmetricDialect(Log log, IParameterService parameterService, IDatabasePlatform platform) {
super(log, parameterService, platform);
this.triggerText = new H2TriggerText();
}

Expand Down
5 changes: 3 additions & 2 deletions ...mmetric-client/src/main/java/org/jumpmind/symmetric/db/hsqldb/HsqlDbSymmetricDialect.java
View file
Expand Up @@ -24,6 +24,7 @@
import org.jumpmind.db.platform.IDatabasePlatform;
import org.jumpmind.db.sql.ISqlTransaction;
import org.jumpmind.db.util.BinaryEncoding;
import org.jumpmind.log.Log;
import org.jumpmind.symmetric.common.ParameterConstants;
import org.jumpmind.symmetric.db.AbstractEmbeddedSymmetricDialect;
import org.jumpmind.symmetric.db.ISymmetricDialect;
Expand All @@ -37,8 +38,8 @@ public class HsqlDbSymmetricDialect extends AbstractEmbeddedSymmetricDialect imp

private boolean enforceStrictSize = true;

public HsqlDbSymmetricDialect(IParameterService parameterService, IDatabasePlatform platform) {
super(parameterService, platform);
public HsqlDbSymmetricDialect(Log log, IParameterService parameterService, IDatabasePlatform platform) {
super(log, parameterService, platform);
this.triggerText = new HsqlDbTriggerText();

platform.getSqlTemplate().update("SET WRITE_DELAY 100 MILLIS");
Expand Down
5 changes: 3 additions & 2 deletions ...etric-client/src/main/java/org/jumpmind/symmetric/db/hsqldb2/HsqlDb2SymmetricDialect.java
View file
Expand Up @@ -24,6 +24,7 @@
import org.jumpmind.db.platform.IDatabasePlatform;
import org.jumpmind.db.sql.ISqlTransaction;
import org.jumpmind.db.util.BinaryEncoding;
import org.jumpmind.log.Log;
import org.jumpmind.symmetric.common.ParameterConstants;
import org.jumpmind.symmetric.db.AbstractSymmetricDialect;
import org.jumpmind.symmetric.db.ISymmetricDialect;
Expand All @@ -33,8 +34,8 @@

public class HsqlDb2SymmetricDialect extends AbstractSymmetricDialect implements ISymmetricDialect {

public HsqlDb2SymmetricDialect(IParameterService parameterService, IDatabasePlatform platform) {
super(parameterService, platform);
public HsqlDb2SymmetricDialect(Log log, IParameterService parameterService, IDatabasePlatform platform) {
super(log, parameterService, platform);
this.triggerText = new HsqlDb2TriggerText();
platform.getSqlTemplate().update("SET DATABASE DEFAULT TABLE TYPE CACHED");
}
Expand Down
5 changes: 3 additions & 2 deletions ...ric-client/src/main/java/org/jumpmind/symmetric/db/informix/InformixSymmetricDialect.java
View file
Expand Up @@ -22,15 +22,16 @@

import org.jumpmind.db.platform.IDatabasePlatform;
import org.jumpmind.db.sql.ISqlTransaction;
import org.jumpmind.log.Log;
import org.jumpmind.symmetric.db.AbstractSymmetricDialect;
import org.jumpmind.symmetric.db.ISymmetricDialect;
import org.jumpmind.symmetric.model.Trigger;
import org.jumpmind.symmetric.service.IParameterService;

public class InformixSymmetricDialect extends AbstractSymmetricDialect implements ISymmetricDialect {

public InformixSymmetricDialect(IParameterService parameterService, IDatabasePlatform platform) {
super(parameterService, platform);
public InformixSymmetricDialect(Log log, IParameterService parameterService, IDatabasePlatform platform) {
super(log, parameterService, platform);
this.triggerText = new InformixTriggerText();
}

Expand Down
5 changes: 3 additions & 2 deletions ...c-client/src/main/java/org/jumpmind/symmetric/db/interbase/InterbaseSymmetricDialect.java
View file
Expand Up @@ -26,6 +26,7 @@
import org.jumpmind.db.sql.ISqlTransaction;
import org.jumpmind.db.sql.mapper.StringMapper;
import org.jumpmind.db.util.BinaryEncoding;
import org.jumpmind.log.Log;
import org.jumpmind.symmetric.db.AbstractSymmetricDialect;
import org.jumpmind.symmetric.db.ISymmetricDialect;
import org.jumpmind.symmetric.db.SequenceIdentifier;
Expand All @@ -48,8 +49,8 @@ public class InterbaseSymmetricDialect extends AbstractSymmetricDialect implemen

static final String SYNC_TRIGGERS_DISABLED_NODE_VARIABLE = "sync_node_disabled";

public InterbaseSymmetricDialect(IParameterService parameterService, IDatabasePlatform platform) {
super(parameterService, platform);
public InterbaseSymmetricDialect(Log log, IParameterService parameterService, IDatabasePlatform platform) {
super(log, parameterService, platform);
this.triggerText = new InterbaseTriggerText();
}

Expand Down
5 changes: 3 additions & 2 deletions ...symmetric-client/src/main/java/org/jumpmind/symmetric/db/mssql/MsSqlSymmetricDialect.java
View file
Expand Up @@ -34,6 +34,7 @@
import org.jumpmind.db.sql.jdbc.JdbcSqlTemplate;
import org.jumpmind.db.sql.jdbc.JdbcSqlTransaction;
import org.jumpmind.db.util.BinaryEncoding;
import org.jumpmind.log.Log;
import org.jumpmind.symmetric.common.ParameterConstants;
import org.jumpmind.symmetric.db.AbstractSymmetricDialect;
import org.jumpmind.symmetric.db.ISymmetricDialect;
Expand All @@ -50,8 +51,8 @@
*/
public class MsSqlSymmetricDialect extends AbstractSymmetricDialect implements ISymmetricDialect {

public MsSqlSymmetricDialect(IParameterService parameterService, IDatabasePlatform platform) {
super(parameterService, platform);
public MsSqlSymmetricDialect(Log log, IParameterService parameterService, IDatabasePlatform platform) {
super(log, parameterService, platform);
this.triggerText = new MsSqlTriggerText();
}

Expand Down
5 changes: 3 additions & 2 deletions ...symmetric-client/src/main/java/org/jumpmind/symmetric/db/mysql/MySqlSymmetricDialect.java
View file
Expand Up @@ -29,6 +29,7 @@
import org.jumpmind.db.sql.SqlException;
import org.jumpmind.db.sql.jdbc.JdbcSqlTransaction;
import org.jumpmind.db.util.BinaryEncoding;
import org.jumpmind.log.Log;
import org.jumpmind.symmetric.Version;
import org.jumpmind.symmetric.common.ParameterConstants;
import org.jumpmind.symmetric.db.AbstractSymmetricDialect;
Expand All @@ -47,8 +48,8 @@ public class MySqlSymmetricDialect extends AbstractSymmetricDialect implements I

private String functionTemplateKeySuffix = null;

public MySqlSymmetricDialect(IParameterService parameterService, IDatabasePlatform platform) {
super(parameterService, platform);
public MySqlSymmetricDialect(Log log, IParameterService parameterService, IDatabasePlatform platform) {
super(log, parameterService, platform);
this.triggerText = new MySqlTriggerText();
this.parameterService = parameterService;
}
Expand Down
5 changes: 3 additions & 2 deletions ...mmetric-client/src/main/java/org/jumpmind/symmetric/db/oracle/OracleSymmetricDialect.java
View file
Expand Up @@ -30,6 +30,7 @@
import org.jumpmind.db.platform.IDatabasePlatform;
import org.jumpmind.db.sql.ISqlTransaction;
import org.jumpmind.db.util.BinaryEncoding;
import org.jumpmind.log.Log;
import org.jumpmind.symmetric.common.ParameterConstants;
import org.jumpmind.symmetric.db.AbstractSymmetricDialect;
import org.jumpmind.symmetric.db.ISymmetricDialect;
Expand All @@ -55,8 +56,8 @@ public class OracleSymmetricDialect extends AbstractSymmetricDialect implements

String selectTransactionsSql = "select min(start_time) from gv$transaction";

public OracleSymmetricDialect(IParameterService parameterService, IDatabasePlatform platform) {
super(parameterService, platform);
public OracleSymmetricDialect(Log log, IParameterService parameterService, IDatabasePlatform platform) {
super(log, parameterService, platform);
this.triggerText = new OracleTriggerText();
try {
areDatabaseTransactionsPendingSince(System.currentTimeMillis());
Expand Down
5 changes: 3 additions & 2 deletions ...-client/src/main/java/org/jumpmind/symmetric/db/postgresql/GreenplumSymmetricDialect.java
View file
@@ -1,12 +1,13 @@
package org.jumpmind.symmetric.db.postgresql;

import org.jumpmind.db.platform.IDatabasePlatform;
import org.jumpmind.log.Log;
import org.jumpmind.symmetric.service.IParameterService;

public class GreenplumSymmetricDialect extends PostgreSqlSymmetricDialect {

public GreenplumSymmetricDialect(IParameterService parameterService, IDatabasePlatform platform) {
super(parameterService, platform);
public GreenplumSymmetricDialect(Log log, IParameterService parameterService, IDatabasePlatform platform) {
super(log, parameterService, platform);
this.triggerText = new GreenplumTriggerText();
}

Expand Down
5 changes: 3 additions & 2 deletions ...client/src/main/java/org/jumpmind/symmetric/db/postgresql/PostgreSqlSymmetricDialect.java
View file
Expand Up @@ -23,6 +23,7 @@
import org.jumpmind.db.platform.IDatabasePlatform;
import org.jumpmind.db.sql.ISqlTransaction;
import org.jumpmind.db.util.BinaryEncoding;
import org.jumpmind.log.Log;
import org.jumpmind.symmetric.SymmetricException;
import org.jumpmind.symmetric.common.ParameterConstants;
import org.jumpmind.symmetric.db.AbstractSymmetricDialect;
Expand All @@ -46,8 +47,8 @@ public class PostgreSqlSymmetricDialect extends AbstractSymmetricDialect impleme

private String transactionIdExpression = "null";

public PostgreSqlSymmetricDialect(IParameterService parameterService, IDatabasePlatform platform) {
super(parameterService, platform);
public PostgreSqlSymmetricDialect(Log log, IParameterService parameterService, IDatabasePlatform platform) {
super(log, parameterService, platform);
this.triggerText = new PostgreSqlTriggerText();
}

Expand Down
5 changes: 3 additions & 2 deletions ...mmetric-client/src/main/java/org/jumpmind/symmetric/db/sybase/SybaseSymmetricDialect.java
View file
Expand Up @@ -35,6 +35,7 @@
import org.jumpmind.db.sql.jdbc.JdbcSqlTemplate;
import org.jumpmind.db.sql.jdbc.JdbcSqlTransaction;
import org.jumpmind.db.util.BinaryEncoding;
import org.jumpmind.log.Log;
import org.jumpmind.symmetric.common.ParameterConstants;
import org.jumpmind.symmetric.db.AbstractSymmetricDialect;
import org.jumpmind.symmetric.db.ISymmetricDialect;
Expand All @@ -51,8 +52,8 @@
*/
public class SybaseSymmetricDialect extends AbstractSymmetricDialect implements ISymmetricDialect {

public SybaseSymmetricDialect(IParameterService parameterService, IDatabasePlatform platform) {
super(parameterService, platform);
public SybaseSymmetricDialect(Log log, IParameterService parameterService, IDatabasePlatform platform) {
super(log, parameterService, platform);
this.triggerText = new SybaseTriggerText();
}

Expand Down
2 changes: 1 addition & 1 deletion symmetric/symmetric-client/src/test/java/org/jumpmind/symmetric/test/TestSetupUtil.java
View file
Expand Up @@ -29,7 +29,7 @@ public class TestSetupUtil {
public static ISymmetricEngine prepareForServiceTests() {
if (engine == null) {
removeEmbededdedDatabases();
EnvironmentSpecificProperties properties = new EnvironmentSpecificProperties(
EnvironmentSpecificProperties properties = new EnvironmentSpecificProperties(new URL[] {getResource("/test-db.properties"), getResource("/symmetric-test.properties")},
"test.root", new String[] { "root" });
properties.setProperty(ParameterConstants.AUTO_CONFIGURE_REG_SVR_SQL_SCRIPT,
"/test-services-setup.sql");
Expand Down

0 comments on commit f3ee8b5

Please sign in to comment.