Revision: 772
http://jwebunit.svn.sourceforge.net/jwebunit/?rev=772&view=rev
Author: jevonwright
Date: 2008-11-27 04:34:06 +0000 (Thu, 27 Nov 2008)
Log Message:
-----------
issue 2352851: adding assertTitleNotSame(...) method
cleaning up some regexp matching methods
Modified Paths:
--------------
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/HelloWorldTest.java
trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/junit/WebTester.java
Modified:
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/HelloWorldTest.java
===================================================================
---
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/HelloWorldTest.java
2008-11-24 03:09:49 UTC (rev 771)
+++
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/HelloWorldTest.java
2008-11-27 04:34:06 UTC (rev 772)
@@ -30,6 +30,7 @@
public void testTitle() {
assertTitleEquals("Hello, World!");
+ assertTitleNotSame("Goodbye, World!");
}
}
\ No newline at end of file
Modified:
trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/junit/WebTester.java
===================================================================
---
trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/junit/WebTester.java
2008-11-24 03:09:49 UTC (rev 771)
+++
trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/junit/WebTester.java
2008-11-27 04:34:06 UTC (rev 772)
@@ -318,14 +318,7 @@
* @param regexp Pattern to compare against
*/
public void assertHeaderMatches(String name, String regexp) {
- RE re = null;
- try {
- re = new RE(regexp, RE.MATCH_SINGLELINE);
- } catch (RESyntaxException e) {
- Assert.fail(e.toString());
- }
- Assert.assertTrue("Unable to match [" + regexp + "] in header [" +
name + "]",
- re.match( getTestingEngine().getHeader(name) ));
+ assertMatch("Unable to match [" + regexp + "] in header [" + name +
"]", regexp, getTestingEngine().getHeader(name));
}
/**
@@ -357,6 +350,17 @@
public void assertTitleEquals(String title) {
Assert.assertEquals(title, getTestingEngine().getPageTitle());
}
+
+ /**
+ * Assert title of current html page in conversation is not
+ * equal to another value.
+ *
+ * @param title
+ * unexpected title value
+ */
+ public void assertTitleNotSame(String title) {
+ Assert.assertNotSame(title, getTestingEngine().getPageTitle());
+ }
/**
* Assert title of current html page in conversation matches an expected
regexp.
@@ -364,14 +368,7 @@
* @param regexp expected title regexp
*/
public void assertTitleMatch(String regexp) {
- RE re = null;
- try {
- re = new RE(regexp, RE.MATCH_SINGLELINE);
- } catch (RESyntaxException e) {
- Assert.fail(e.toString());
- }
- Assert.assertTrue("Unable to match [" + regexp + "] in title", re
- .match(getTestingEngine().getPageTitle()));
+ assertMatch("Unable to match [" + regexp + "] in title", regexp,
getTestingEngine().getPageTitle());
}
/**
@@ -421,7 +418,7 @@
* @param text
*/
public void assertTextPresent(String text) {
- if (!(getTestingEngine().getPageText().indexOf(text) >= 0))
+ if (!(getTestingEngine().getPageText().contains(text)))
Assert.fail("Expected text not found in current page: [" + text
+ "]\n Page content was: ["
+ getTestingEngine().getPageText() + "]");
@@ -509,7 +506,7 @@
* @param text
*/
public void assertTextNotPresent(String text) {
- if (getTestingEngine().getPageText().indexOf(text) >= 0)
+ if (getTestingEngine().getPageText().contains(text))
Assert.fail("Text found in response when not expected: [" + text
+ "]");
}
@@ -520,10 +517,8 @@
* @param regexp
*/
public void assertNoMatch(String regexp) {
- RE re = getRE(regexp);
- if (re.match(getTestingEngine().getPageText()))
- Assert.fail("Regexp matched in response when not expected: ["
- + regexp + "]");
+ assertNotMatch("Regexp matched in response when not expected: [" +
regexp + "]",
+ getTestingEngine().getPageText());
}
/**
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
JWebUnit-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jwebunit-development
