Repository: ant Updated Branches: refs/heads/master 11ae95a3c -> 60f1c012a
avoid AIOBE Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/60f1c012 Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/60f1c012 Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/60f1c012 Branch: refs/heads/master Commit: 60f1c012a2700dab6da37bf4e021a4dd9cebd706 Parents: 11ae95a Author: Stefan Bodewig <bode...@apache.org> Authored: Mon Apr 23 09:29:46 2018 +0200 Committer: Stefan Bodewig <bode...@apache.org> Committed: Mon Apr 23 09:35:30 2018 +0200 ---------------------------------------------------------------------- .../junit/org/apache/tools/ant/taskdefs/optional/sos/SOSTest.java | 2 +- .../org/apache/tools/ant/taskdefs/optional/vss/MSVSSTest.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/60f1c012/src/tests/junit/org/apache/tools/ant/taskdefs/optional/sos/SOSTest.java ---------------------------------------------------------------------- diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/sos/SOSTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/sos/SOSTest.java index e5e7bf7..7d2376e 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/sos/SOSTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/sos/SOSTest.java @@ -335,10 +335,10 @@ public class SOSTest { */ private void checkCommandLines(String[] sTestCmdLine, String[] sGeneratedCmdLine) { int length = sTestCmdLine.length; + assertEquals("number of arguments doesn't match", length, sGeneratedCmdLine.length); for (int i = 0; i < length; i++) { assertEquals("arg # " + String.valueOf(i), sTestCmdLine[i], sGeneratedCmdLine[i]); } - assertEquals("extra args", sTestCmdLine.length, sGeneratedCmdLine.length); } } http://git-wip-us.apache.org/repos/asf/ant/blob/60f1c012/src/tests/junit/org/apache/tools/ant/taskdefs/optional/vss/MSVSSTest.java ---------------------------------------------------------------------- diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/vss/MSVSSTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/vss/MSVSSTest.java index e313f3b..fa67122 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/vss/MSVSSTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/vss/MSVSSTest.java @@ -39,6 +39,7 @@ import org.junit.rules.ExpectedException; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; /** * Testcase to ensure that command line generation and required attributes are correct. @@ -449,6 +450,7 @@ public class MSVSSTest implements MSVSSConstants { genIndex++; continue; } + assertTrue("missing arg " + sTestCmdLine[testIndex], genIndex < genLength); assertEquals("arg # " + testIndex, sTestCmdLine[testIndex], sGeneratedCmdLine[genIndex]); testIndex++;
