From 7f7e20e2eefcb49fae9d87996a664615a6f89883 Mon Sep 17 00:00:00 2001 From: "Anna.Kozlova" Date: Wed, 30 Jan 2019 19:13:53 +0100 Subject: [PATCH] junit patterns: accept whitespaces in hamcrest matchers (IDEA-205843) --- .../com/intellij/execution/junit/JUnitExpectedPatternsTest.java | 2 +- plugins/junit_rt/src/com/intellij/junit4/ExpectedPatterns.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/junit/test/com/intellij/execution/junit/JUnitExpectedPatternsTest.java b/plugins/junit/test/com/intellij/execution/junit/JUnitExpectedPatternsTest.java index 1a0d696fe3fc..5e842b9ae9ce 100644 --- a/plugins/junit/test/com/intellij/execution/junit/JUnitExpectedPatternsTest.java +++ b/plugins/junit/test/com/intellij/execution/junit/JUnitExpectedPatternsTest.java @@ -41,7 +41,7 @@ public class JUnitExpectedPatternsTest { public void testHamcrestAssertThatWithReason() { Assert.assertNotNull(createNotification("reason\n" + "Expected: is \"aaa\\naa\"\n" + - " but: was \"bbb\\nbb\"")); + " but: was \"bbb\\nbb\"")); } @Test diff --git a/plugins/junit_rt/src/com/intellij/junit4/ExpectedPatterns.java b/plugins/junit_rt/src/com/intellij/junit4/ExpectedPatterns.java index c9a073e7732a..6b5f26267863 100644 --- a/plugins/junit_rt/src/com/intellij/junit4/ExpectedPatterns.java +++ b/plugins/junit_rt/src/com/intellij/junit4/ExpectedPatterns.java @@ -26,7 +26,7 @@ public class ExpectedPatterns extends AbstractExpectedPatterns { private static final String[] PATTERN_STRINGS = new String[]{ "\nexpected: is \"(.*)\"\n\\s*got: \"(.*)\"\n", - "\nexpected: is \"(.*)\"\n\\s*but: was \"(.*)\"", + "\nexpected: is \"(.*)\"\n\\s*but:\\s*was \"(.*)\"", "\nexpected: (.*)\n\\s*got: (.*)", "expected same:<(.*)> was not:<(.*)>", "\nexpected: \"(.*)\"\n\\s*but: was \"(.*)\"",