Browse Source

assert -> assertTrue in two testcases I had missed.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269863 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 24 years ago
parent
commit
e90e60c110
2 changed files with 14 additions and 14 deletions
  1. +2
    -2
      src/testcases/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunnerTest.java
  2. +12
    -12
      src/testcases/org/apache/tools/ant/util/regexp/RegexpMatcherTest.java

+ 2
- 2
src/testcases/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunnerTest.java View File

@@ -90,7 +90,7 @@ public class JUnitTestRunnerTest extends TestCase {
runner.run();
String error = runner.getFormatter().getError();
assertEquals(error, JUnitTestRunner.ERRORS, runner.getRetCode());
assert(error, error.indexOf("thrown on purpose") != -1);
assertTrue(error, error.indexOf("thrown on purpose") != -1);
}

// check that something which is not a testcase generates no errors
@@ -108,7 +108,7 @@ public class JUnitTestRunnerTest extends TestCase {
String error = runner.getFormatter().getError();
assertEquals(error, JUnitTestRunner.FAILURES, runner.getRetCode());
//@fixme as of now does not report the original stacktrace.
//assert(error, error.indexOf("thrown on purpose") != -1);
//assertTrue(error, error.indexOf("thrown on purpose") != -1);
}
protected TestRunner createRunner(Class clazz){


+ 12
- 12
src/testcases/org/apache/tools/ant/util/regexp/RegexpMatcherTest.java View File

@@ -156,37 +156,37 @@ public abstract class RegexpMatcherTest extends TestCase {

protected void doStartTest1(String text) {
reg.setPattern("^starttest");
assert("^starttest in default mode", !reg.matches(text));
assert("^starttest in single line mode",
assertTrue("^starttest in default mode", !reg.matches(text));
assertTrue("^starttest in single line mode",
!reg.matches(text, RegexpMatcher.MATCH_SINGLELINE));
assert("^starttest in multi line mode",
assertTrue("^starttest in multi line mode",
reg.matches(text, RegexpMatcher.MATCH_MULTILINE));
}

protected void doStartTest2(String text) {
reg.setPattern("^Line1");
assert("^Line1 in default mode", reg.matches(text));
assert("^Line1 in single line mode",
assertTrue("^Line1 in default mode", reg.matches(text));
assertTrue("^Line1 in single line mode",
reg.matches(text, RegexpMatcher.MATCH_SINGLELINE));
assert("^Line1 in multi line mode",
assertTrue("^Line1 in multi line mode",
reg.matches(text, RegexpMatcher.MATCH_MULTILINE));
}

protected void doEndTest1(String text) {
reg.setPattern("endtest$");
assert("endtest$ in default mode", !reg.matches(text));
assert("endtest$ in single line mode",
assertTrue("endtest$ in default mode", !reg.matches(text));
assertTrue("endtest$ in single line mode",
!reg.matches(text, RegexpMatcher.MATCH_SINGLELINE));
assert("endtest$ in multi line mode",
assertTrue("endtest$ in multi line mode",
reg.matches(text, RegexpMatcher.MATCH_MULTILINE));
}

protected void doEndTest2(String text) {
reg.setPattern("Line4$");
assert("Line4$ in default mode", reg.matches(text));
assert("Line4$ in single line mode",
assertTrue("Line4$ in default mode", reg.matches(text));
assertTrue("Line4$ in single line mode",
reg.matches(text, RegexpMatcher.MATCH_SINGLELINE));
assert("Line4$ in multi line mode",
assertTrue("Line4$ in multi line mode",
reg.matches(text, RegexpMatcher.MATCH_MULTILINE));
}



Loading…
Cancel
Save