From 53fbce4a16d74d73d6ea76a350cca68d902f6618 Mon Sep 17 00:00:00 2001 From: chenson42 Date: Tue, 22 Apr 2008 22:22:43 +0000 Subject: [PATCH] Fixed unit test so that multiple runs won't invalidate the results --- .../java/org/jumpmind/symmetric/db/DbTriggerTest.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/symmetric/src/test/java/org/jumpmind/symmetric/db/DbTriggerTest.java b/symmetric/src/test/java/org/jumpmind/symmetric/db/DbTriggerTest.java index 7efc461c07..18f12fb462 100644 --- a/symmetric/src/test/java/org/jumpmind/symmetric/db/DbTriggerTest.java +++ b/symmetric/src/test/java/org/jumpmind/symmetric/db/DbTriggerTest.java @@ -25,6 +25,7 @@ import java.sql.SQLException; import java.sql.Statement; import java.sql.Types; +import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -138,6 +139,7 @@ public void validateTestTableTriggers() throws Exception { assert match : "Received " + csvString + ", Expected the string to end with " + EXPECTED_INSERT1_CSV_ENDSWITH; } + @SuppressWarnings("unchecked") @Test(groups = "continuous", dependsOnMethods = "validateTestTableTriggers") public void testInitialLoadSql() throws Exception { IConfigurationService service = (IConfigurationService) getSymmetricEngine().getApplicationContext().getBean( @@ -145,10 +147,10 @@ public void testInitialLoadSql() throws Exception { service.getTriggerFor(TEST_TRIGGERS_TABLE, TestConstants.TEST_ROOT_NODE_GROUP); String sql = getDbDialect(getSymmetricEngine()).createInitalLoadSqlFor(new Node("1", null, "1.0"), service.getTriggerFor(TEST_TRIGGERS_TABLE, TestConstants.TEST_ROOT_NODE_GROUP)); - String csvString = (String) getJdbcTemplate(getSymmetricEngine()).queryForObject(sql, String.class); - boolean match = false; - match = csvString.endsWith(EXPECTED_INSERT1_CSV_ENDSWITH); - assert match : "Received " + csvString + ", Expected the string to end with " + EXPECTED_INSERT1_CSV_ENDSWITH; + List csvStrings = getJdbcTemplate(getSymmetricEngine()).queryForList(sql, String.class); + Assert.assertTrue(csvStrings.size() > 0); + String csvString = csvStrings.get(0); + Assert.assertTrue(csvString.endsWith(EXPECTED_INSERT1_CSV_ENDSWITH), "Received " + csvString + ", Expected the string to end with " + EXPECTED_INSERT1_CSV_ENDSWITH); } @Test(groups = "continuous", dependsOnMethods = "testInitialLoadSql")