Skip to content

Commit

Permalink
use yyyy-MM-dd HH:mm:ss.0 date format and #.00 decimal format, in ord…
Browse files Browse the repository at this point in the history 
…er to work across different databases
  • Loading branch information
@erilong
erilong committed Dec 14, 2007
1 parent d4e97e8 commit a9cf1e6
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 19 deletions.
25 changes: 21 additions & 4 deletions symmetric/src/test/java/org/jumpmind/symmetric/load/AbstractDataLoaderTest.java
View file
Expand Up @@ -25,6 +25,10 @@
import java.io.IOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Map;

import org.apache.commons.lang.StringUtils;
Expand Down Expand Up @@ -106,8 +110,19 @@ protected void assertEquals(String[] name, String[] expected, Map<String, Object
} else {
Assert.assertNotNull(results, "Expected non-empty results");
for (int i = 0; i < expected.length; i++) {
String result = results.get(name[i]) != null ? results.get(name[i]).toString() : null;
Assert.assertEquals(result, expected[i], name[i]);
Object resultObj = results.get(name[i]);
String resultValue = null;
if (resultObj instanceof BigDecimal && expected[i].indexOf(".") != -1) {
DecimalFormat df = new DecimalFormat("#.00");
resultValue = df.format(resultObj);
} else if (resultObj instanceof Date) {
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.0");
resultValue = df.format(resultObj);
} else if (resultObj != null) {
resultValue = resultObj.toString();
}

Assert.assertEquals(resultValue, expected[i], name[i]);
}
}
}
Expand All @@ -129,7 +144,7 @@ protected String getWhere(String[] columns) {
}

protected String translateExpectedString(String value, boolean isRequired) {
if (value == null && isRequired) {
if (isRequired && (value == null || (value.equals("") && getDbDialect().isEmptyStringNulled()))) {
return TableTemplate.REQUIRED_FIELD_NULL_SUBSTITUTE;
} else if (value != null && value.equals("") && getDbDialect().isEmptyStringNulled()) {
return null;
Expand All @@ -138,7 +153,9 @@ protected String translateExpectedString(String value, boolean isRequired) {
}

protected String translateExpectedCharString(String value, int size, boolean isRequired) {
value = translateExpectedString(value, isRequired);
if (isRequired && value == null) {
value = TableTemplate.REQUIRED_FIELD_NULL_SUBSTITUTE;
}
if (value != null && getDbDialect().isCharSpacePadded()) {
return StringUtils.rightPad(value, size);
} else if (value != null && getDbDialect().isCharSpaceTrimmed()) {
Expand Down
12 changes: 6 additions & 6 deletions symmetric/src/test/java/org/jumpmind/symmetric/load/DataLoaderTest.java
View file
Expand Up @@ -49,16 +49,16 @@ public class DataLoaderTest extends AbstractDataLoaderTest {
@Test(groups="continuous")
public void testInsertExisting() throws Exception {
String[] values = { INSERT_EXISTING_ID, "string2", "string not null2", "char2", "char not null2",
"2007-01-02", "2007-02-03 04:05:06.0", "0", "47", "67.89" };
"2007-01-02 00:00:00.0", "2007-02-03 04:05:06.0", "0", "47", "67.89" };
massageExpectectedResultsForDialect(values);
testSimple(CsvConstants.INSERT, values, values);
}

@Test(groups="continuous")
public void testUpdateNotExisting() throws Exception {
String[] values = { UPDATE_NOT_EXISTING_ID, "it's /a/ string", "it's -not- null",
"You're a \"character\"", "Where are you?", "2007-12-31", "2007-12-31 23:59:59.0", "1", "13",
"9.95", UPDATE_NOT_EXISTING_ID };
"You're a \"character\"", "Where are you?", "2007-12-31 00:00:00.0", "2007-12-31 23:59:59.0",
"1", "13", "9.95", UPDATE_NOT_EXISTING_ID };
String[] expectedValues = (String[]) ArrayUtils.subarray(values, 0, values.length - 1);
massageExpectectedResultsForDialect(expectedValues);
testSimple(CsvConstants.UPDATE, values, expectedValues);
Expand Down Expand Up @@ -136,7 +136,7 @@ public void testDeleteNotExisting() throws Exception {
public void testColumnNotExisting() throws Exception {
String[] columns = (String[]) ArrayUtils.add(TEST_COLUMNS, "Unknown_Column");
String[] values = { getNextId(), "testColumnNotExisting", "string not null", "char", "char not null",
"2007-01-02", "2007-02-03 04:05:06.0", "0", "47", "67.89", "i do not exist!" };
"2007-01-02 00:00:00.0", "2007-02-03 04:05:06.0", "0", "47", "67.89", "i do not exist!" };
String[] expectedValues = (String[]) ArrayUtils.subarray(values, 0, values.length - 1);

ByteArrayOutputStream out = new ByteArrayOutputStream();
Expand All @@ -161,7 +161,7 @@ public void testTableNotExisting() throws Exception {
String[] columns= { "id", "name" };
String[] badValues = { "1", "testTableNotExisting" };
String[] values = { getNextId(), "testTableNotExisting", "This row should load", "char",
"char not null", "2007-01-02", "2007-02-03 04:05:06.0", "0", "0", "12.10"};
"char not null", "2007-01-02 00:00:00.0", "2007-02-03 04:05:06.0", "0", "0", "12.10"};

ByteArrayOutputStream out = new ByteArrayOutputStream();
CsvWriter writer = getWriter(out);
Expand Down Expand Up @@ -200,7 +200,7 @@ public void testBenchmark() throws Exception {
dataLoader.close();
double totalSeconds = (System.currentTimeMillis() - startTime) / 1000.0;
// TODO: this used to run in 1 second; can we do some optimization?
Assert.assertTrue(totalSeconds <= 3.0, "DataLoader running in " + totalSeconds + " is too slow");
Assert.assertTrue(totalSeconds <= 4.0, "DataLoader running in " + totalSeconds + " is too slow");
}

protected void load(ByteArrayOutputStream out) throws Exception {
Expand Down
18 changes: 9 additions & 9 deletions symmetric/src/test/java/org/jumpmind/symmetric/service/impl/DataLoaderServiceTest.java
View file
Expand Up @@ -135,7 +135,7 @@ public void testStatistics() throws Exception {
@Test(groups = "continuous")
public void testSkippingResentBatch() throws Exception {
String[] values = { getNextId(), "resend string", "resend string not null", "resend char",
"resend char not null", "2007-01-25", "2007-01-25 01:01:01.0", "0", "7", "10.10" };
"resend char not null", "2007-01-25 00:00:00.0", "2007-01-25 01:01:01.0", "0", "7", "10.10" };
getNextBatchId();
for (int i = 0; i < 7; i++) {
batchId--;
Expand All @@ -162,8 +162,8 @@ public void testSkippingResentBatch() throws Exception {

@Test(groups = "continuous")
public void testErrorWhileSkip() throws Exception {
String[] values = { getNextId(), "string2", "string not null2", "char2", "char not null2", "2007-01-02",
"2007-02-03 04:05:06.0", "0", "47", "67.89" };
String[] values = { getNextId(), "string2", "string not null2", "char2", "char not null2",
"2007-01-02 00:00:00.0", "2007-02-03 04:05:06.0", "0", "47", "67.89" };

testSimple(CsvConstants.INSERT, values, values);
Assert.assertEquals(findIncomingBatchStatus(batchId, TestConstants.TEST_CLIENT_EXTERNAL_ID),
Expand Down Expand Up @@ -223,8 +223,8 @@ public void testErrorWhileParsing() throws Exception {
@Test(groups = "continuous")
public void testErrorThenSuccessBatch() throws Exception {
String[] values = { getNextId(), "This string is too large and will cause the statement to fail",
"string not null2", "char2", "char not null2", "2007-01-02", "2007-02-03 04:05:06.0", "0", "47",
"67.89" };
"string not null2", "char2", "char not null2", "2007-01-02 00:00:00.0",
"2007-02-03 04:05:06.0", "0", "47", "67.89" };
getNextBatchId();
int retries = 3;
for (int i = 0; i < retries; i++) {
Expand Down Expand Up @@ -257,11 +257,11 @@ public void testErrorThenSuccessBatch() throws Exception {

@Test(groups = "continuous")
public void testMultipleBatch() throws Exception {
String[] values = { getNextId(), "string", "string not null2", "char2", "char not null2", "2007-01-02",
"2007-02-03 04:05:06.0", "0", "47", "67.89" };
String[] values = { getNextId(), "string", "string not null2", "char2", "char not null2",
"2007-01-02 00:00:00.0", "2007-02-03 04:05:06.0", "0", "47", "67.89" };
String[] values2 = { getNextId(), "This string is too large and will cause the statement to fail",
"string not null2", "char2", "char not null2", "2007-01-02", "2007-02-03 04:05:06.0", "0", "47",
"67.89" };
"string not null2", "char2", "char not null2", "2007-01-02 00:00:00.0",
"2007-02-03 04:05:06.0", "0", "47", "67.89" };

ByteArrayOutputStream out = new ByteArrayOutputStream();
CsvWriter writer = getWriter(out);
Expand Down

0 comments on commit a9cf1e6

Please sign in to comment.