Skip to content

Commit 1c5a2cb

Browse files
committed
Merge pull request #395 from hazendaz/master
Correct Flakey Script Runner Unit Tests
2 parents 97d330c + a219bf4 commit 1c5a2cb

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

src/test/java/org/apache/ibatis/jdbc/ScriptRunnerTest.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,10 @@ public void testLogging() throws Exception {
183183
Reader reader = new StringReader("select userid from account where userid = 'j2ee';");
184184
runner.runScript(reader);
185185

186-
assertEquals("select userid from account where userid = 'j2ee'\n\nUSERID\t\nj2ee\t\n", sw.toString());
186+
assertEquals(
187+
"select userid from account where userid = 'j2ee'" + System.getProperty("line.separator")
188+
+ System.getProperty("line.separator") + "USERID\t" + System.getProperty("line.separator")
189+
+ "j2ee\t" + System.getProperty("line.separator"), sw.toString());
187190
}
188191

189192
@Test
@@ -202,7 +205,10 @@ public void testLoggingFullScipt() throws Exception {
202205
Reader reader = new StringReader("select userid from account where userid = 'j2ee';");
203206
runner.runScript(reader);
204207

205-
assertEquals("select userid from account where userid = 'j2ee';\n\nUSERID\t\nj2ee\t\n", sw.toString());
208+
assertEquals(
209+
"select userid from account where userid = 'j2ee';" + System.getProperty("line.separator")
210+
+ System.getProperty("line.separator") + "USERID\t" + System.getProperty("line.separator")
211+
+ "j2ee\t" + System.getProperty("line.separator"), sw.toString());
206212
}
207213

208214
private void runJPetStoreScripts(ScriptRunner runner) throws IOException, SQLException {

0 commit comments

Comments
 (0)