Repository: ant Updated Branches: refs/heads/master 6c032e687 -> 97ac9bc7c
the assertion used to be conditional Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/97ac9bc7 Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/97ac9bc7 Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/97ac9bc7 Branch: refs/heads/master Commit: 97ac9bc7c0b183d81ddd966edaa02896216f2b3b Parents: 6c032e6 Author: Stefan Bodewig <bode...@apache.org> Authored: Sat Apr 14 19:54:05 2018 +0200 Committer: Stefan Bodewig <bode...@apache.org> Committed: Sat Apr 14 19:56:46 2018 +0200 ---------------------------------------------------------------------- .../junit/org/apache/tools/ant/types/RedirectorElementTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/97ac9bc7/src/tests/junit/org/apache/tools/ant/types/RedirectorElementTest.java ---------------------------------------------------------------------- diff --git a/src/tests/junit/org/apache/tools/ant/types/RedirectorElementTest.java b/src/tests/junit/org/apache/tools/ant/types/RedirectorElementTest.java index db1c4f8..ee97275 100644 --- a/src/tests/junit/org/apache/tools/ant/types/RedirectorElementTest.java +++ b/src/tests/junit/org/apache/tools/ant/types/RedirectorElementTest.java @@ -75,8 +75,9 @@ public class RedirectorElementTest { @Test public void testLogInputString() { buildRule.executeTarget("testLogInputString"); - assertThat(buildRule.getFullLog(), both(containsString("testLogInputString can-cat")) - .and(containsString("Using input string"))); + if (buildRule.getLog().contains("testLogInputString can-cat")) { + assertThat(buildRule.getFullLog(), containsString("Using input string")); + } } @Test
