Repository: zest-qi4j Updated Branches: refs/heads/develop a7481df44 -> bbeb69e4b
Fixing Windows specific test failures. Project: http://git-wip-us.apache.org/repos/asf/zest-qi4j/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-qi4j/commit/bbeb69e4 Tree: http://git-wip-us.apache.org/repos/asf/zest-qi4j/tree/bbeb69e4 Diff: http://git-wip-us.apache.org/repos/asf/zest-qi4j/diff/bbeb69e4 Branch: refs/heads/develop Commit: bbeb69e4b4def74f48dada4f5a87b1694282fe01 Parents: a7481df Author: Niclas Hedhman <[email protected]> Authored: Mon Jul 6 16:18:19 2015 +0300 Committer: Niclas Hedhman <[email protected]> Committed: Mon Jul 6 16:18:19 2015 +0300 ---------------------------------------------------------------------- .../src/test/java/org/qi4j/library/metrics/MetricsTest.java | 4 +++- .../rest/src/test/java/org/qi4j/library/rest/admin/RestTest.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/bbeb69e4/libraries/metrics/src/test/java/org/qi4j/library/metrics/MetricsTest.java ---------------------------------------------------------------------- diff --git a/libraries/metrics/src/test/java/org/qi4j/library/metrics/MetricsTest.java b/libraries/metrics/src/test/java/org/qi4j/library/metrics/MetricsTest.java index a34b2ab..9b4f1cc 100644 --- a/libraries/metrics/src/test/java/org/qi4j/library/metrics/MetricsTest.java +++ b/libraries/metrics/src/test/java/org/qi4j/library/metrics/MetricsTest.java @@ -78,6 +78,7 @@ public class MetricsTest extends AbstractQi4jTest { Country underTest = module.newTransient( Country1.class ); String result = runTest( underTest ); + result = result.replace( "\r", "" ); assertTrue( lastLine( result, 1 ).contains( "=====================" ) ); System.out.println( "---END TEST---" ); } @@ -87,6 +88,7 @@ public class MetricsTest extends AbstractQi4jTest { Country underTest = module.newTransient( Country2.class ); String result = runTest( underTest ); + result = result.replace( "\r", "" ); assertThat( lastLine( result, 34 ), equalTo( "org.qi4j.library.metrics.Country.SomeApplication:" ) ); assertThat( lastLine( result, 33 ).trim(), equalTo( "name() [TimingCapture]:" ) ); assertThat( lastLine( result, 16 ).trim(), equalTo( "updateName() [TimingCapture]:" ) ); @@ -103,7 +105,7 @@ public class MetricsTest extends AbstractQi4jTest { Country underTest = module.newTransient( Country3.class ); String result = runTest( underTest ); - System.out.println( result ); + result = result.replace( "\r", "" ); assertThat( lastLine( result, 17 ), equalTo( "org.qi4j.library.metrics.Country.SomeApplication:" ) ); assertThat( lastLine( result, 16 ).trim(), equalTo( "updateName() [TimingCapture]:" ) ); assertTrue( lastLine( result, 5 ).contains( "75% <=" ) ); http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/bbeb69e4/libraries/rest/src/test/java/org/qi4j/library/rest/admin/RestTest.java ---------------------------------------------------------------------- diff --git a/libraries/rest/src/test/java/org/qi4j/library/rest/admin/RestTest.java b/libraries/rest/src/test/java/org/qi4j/library/rest/admin/RestTest.java index cc3f7a9..8e6c586 100644 --- a/libraries/rest/src/test/java/org/qi4j/library/rest/admin/RestTest.java +++ b/libraries/rest/src/test/java/org/qi4j/library/rest/admin/RestTest.java @@ -187,7 +187,7 @@ public class RestTest throws Exception { final RestTester restTester = module.newObject( RestTester.class ); - final String result = restTester.getEntities(); + final String result = restTester.getEntities().replace( "\r", "" ); assertThat( "Returned RDF", result, anyOf(
