Revision: 828
http://jwebunit.svn.sourceforge.net/jwebunit/?rev=828&view=rev
Author: jevonwright
Date: 2010-03-15 22:57:34 +0000 (Mon, 15 Mar 2010)
Log Message:
-----------
fixing a bug in assertNoMatch(), where the regexp wasn't actually being
evaluated
fixing broken HTML in WebAssertionsTest/testPage.html
Modified Paths:
--------------
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/WebAssertionsTest.java
trunk/jwebunit-commons-tests/src/main/resources/testcases/WebAssertionsTest/testPage.html
trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/junit/WebTester.java
Modified:
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/WebAssertionsTest.java
===================================================================
---
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/WebAssertionsTest.java
2010-03-10 06:45:14 UTC (rev 827)
+++
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/WebAssertionsTest.java
2010-03-15 22:57:34 UTC (rev 828)
@@ -4,6 +4,7 @@
******************************************************************************/
package net.sourceforge.jwebunit.tests;
+import junit.framework.AssertionFailedError;
import junit.framework.Test;
import junit.framework.TestSuite;
import net.sourceforge.jwebunit.tests.util.JettySetup;
@@ -56,6 +57,21 @@
assertNoMatch("no.*text");
//assertPassFail("assertNoMatch", "no.*text", "This (is)* a .* page.");
}
+
+ /**
+ * Check that {...@link #assertNoMatch(String)} can actually fail.
+ */
+ public void testAssertNoMatchFails() throws Throwable {
+ boolean failed = false;
+ try {
+ // 'Span Text' definitely exists in the source page text
+ assertNoMatch("Span Text");
+ failed = true; // should not get this far
+ } catch (AssertionFailedError e) {
+ // expected
+ }
+ assertFalse("assertNoMatch() did not throw expected failure", failed);
+ }
public void testAssertLinkPresentWithText() throws Throwable {
assertPassFail("assertLinkPresentWithText", "test link", "no
such link");
Modified:
trunk/jwebunit-commons-tests/src/main/resources/testcases/WebAssertionsTest/testPage.html
===================================================================
---
trunk/jwebunit-commons-tests/src/main/resources/testcases/WebAssertionsTest/testPage.html
2010-03-10 06:45:14 UTC (rev 827)
+++
trunk/jwebunit-commons-tests/src/main/resources/testcases/WebAssertionsTest/testPage.html
2010-03-15 22:57:34 UTC (rev 828)
@@ -6,10 +6,10 @@
<form name="form1" method=GET action="TargetPage"><table
summary="testTable">
<tr ID="row1"><td>table text</td></tr>
<tr><td>This is a test. This is only a test. If this
were an actual test....</td></tr>
- <tr><td>table text row 3</td><td>row 3 col 1</td>
+ <tr><td>table text row 3</td><td>row 3 col
1</td></table>
<a id="test_link_id" href="someurl.html">test link</a>
<a href="somepage.html"><img height="22" width="22"
alt="New User" src="firstimage.gif">
- <img src="graphic.jpg"alt="New User" /></a>
+ <img src="graphic.jpg" alt="New User" /></a>
<input type="text" name="testInputElement"
value="testValue"/>
<input type="submit" name="submitButton"
value="buttonLabel"/>
<input type="checkbox" name="checkboxselected" CHECKED>
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
2010-03-10 06:45:14 UTC (rev 827)
+++
trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/junit/WebTester.java
2010-03-15 22:57:34 UTC (rev 828)
@@ -537,7 +537,8 @@
* @param regexp
*/
public void assertNoMatch(String regexp) {
- assertNotMatch("Regexp matched in response when not expected: [" +
regexp + "]",
+ assertNotMatch("Regexp matched in response when not expected: [" +
regexp + "]",
+ regexp,
getTestingEngine().getPageText());
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
JWebUnit-development mailing list
JWebUnit-development@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jwebunit-development
