From ef6e5120a9814d65a16fd74a8d2ac1667c5f8cf5 Mon Sep 17 00:00:00 2001 From: James Roseborough Date: Tue, 6 Jul 2010 14:45:27 +0000 Subject: [PATCH] Ignore line end diffs on unit tests --- test/junit/org/luaj/vm2/ScriptDrivenTest.java | 6 ++++-- test/junit/org/luaj/vm2/vm1/Luajvm1CompatibilityTest.java | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/test/junit/org/luaj/vm2/ScriptDrivenTest.java b/test/junit/org/luaj/vm2/ScriptDrivenTest.java index cda05103..b10bfcc3 100644 --- a/test/junit/org/luaj/vm2/ScriptDrivenTest.java +++ b/test/junit/org/luaj/vm2/ScriptDrivenTest.java @@ -86,8 +86,10 @@ public class ScriptDrivenTest extends TestCase { chunk.call(LuaValue.valueOf(platform.toString())); ps.flush(); - final String actualOutput = new String(output.toByteArray()); - final String expectedOutput = getExpectedOutput(testName); + String actualOutput = new String(output.toByteArray()); + String expectedOutput = getExpectedOutput(testName); + actualOutput = actualOutput.replaceAll("\r\n", "\n"); + expectedOutput = expectedOutput.replaceAll("\r\n", "\n"); assertEquals(expectedOutput, actualOutput); } finally { diff --git a/test/junit/org/luaj/vm2/vm1/Luajvm1CompatibilityTest.java b/test/junit/org/luaj/vm2/vm1/Luajvm1CompatibilityTest.java index 0075d6b5..84669daa 100644 --- a/test/junit/org/luaj/vm2/vm1/Luajvm1CompatibilityTest.java +++ b/test/junit/org/luaj/vm2/vm1/Luajvm1CompatibilityTest.java @@ -53,6 +53,8 @@ public class Luajvm1CompatibilityTest extends TestCase { jarpath = "jar:"+zip.toExternalForm()+"!/"; String lua = luaRun(test); String luaj20 = luaj20Run(test); + lua = lua.replaceAll("\r\n", "\n"); + luaj20 = luaj20.replaceAll("\r\n", "\n"); assertEquals( lua, luaj20 ); } catch ( Exception ioe ) { fail( ioe.toString() );