Revision: 818
http://jwebunit.svn.sourceforge.net/jwebunit/?rev=818&view=rev
Author: henryju
Date: 2009-12-15 13:22:43 +0000 (Tue, 15 Dec 2009)
Log Message:
-----------
Additional fixes based on findbugs report.
Modified Paths:
--------------
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/ExpectedTableAssertionsHtmlTest.java
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/ExpectedTableAssertionsXHtmlTest.java
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/TableAssertionsTest.java
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/WebAssertionsTest.java
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/util/ParamsServlet.java
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/util/ResponseServlet.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/ExpectedTableAssertionsHtmlTest.java
===================================================================
---
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/ExpectedTableAssertionsHtmlTest.java
2009-12-15 13:05:33 UTC (rev 817)
+++
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/ExpectedTableAssertionsHtmlTest.java
2009-12-15 13:22:43 UTC (rev 818)
@@ -65,7 +65,7 @@
cells[2][3] = new Cell("40%", 1, 1);
Table table = new Table(cells);
assertPass("assertTableRowsEqual", new Object[] { "myTable",
- new Integer(0), table });
+ Integer.valueOf(0), table });
assertFail("assertTableEquals", new Object[] { "myTable", table });
}
Modified:
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/ExpectedTableAssertionsXHtmlTest.java
===================================================================
---
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/ExpectedTableAssertionsXHtmlTest.java
2009-12-15 13:05:33 UTC (rev 817)
+++
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/ExpectedTableAssertionsXHtmlTest.java
2009-12-15 13:22:43 UTC (rev 818)
@@ -63,7 +63,7 @@
cells[2][2]=new Cell("0.003",1,1);
cells[2][3]=new Cell("40%",1,1);
Table table = new Table(cells);
- assertPass("assertTableRowsEqual", new Object[]{"myTable", new
Integer(0), table});
+ assertPass("assertTableRowsEqual", new Object[]{"myTable",
Integer.valueOf(0), table});
assertFail("assertTableEquals", new Object[]{"myTable", table});
}
Modified:
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/TableAssertionsTest.java
===================================================================
---
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/TableAssertionsTest.java
2009-12-15 13:05:33 UTC (rev 817)
+++
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/TableAssertionsTest.java
2009-12-15 13:22:43 UTC (rev 818)
@@ -88,7 +88,7 @@
public void testAssertTableRowCountEquals() throws Throwable {
assertPassFail("assertTableRowCountEquals", new Object[] {
"tree", new Integer(3)}, new Object[] {
- "tree", new Integer(4)});
+ "tree", Integer.valueOf(4)});
}
public void testAssertTableEqualsExtraColumn() throws Throwable {
@@ -129,7 +129,7 @@
public void testAssertTableRowsEquals() throws Throwable {
assertPass("assertTableRowsEqual", new Object[] {
"testTable",
- new Integer(1),
+ Integer.valueOf(1),
new String[][] { { "table text row 2" },
{ "table text row 3", "row 3
col 1" } } });
}
@@ -137,7 +137,7 @@
public void testAssertTableRowsEqualsTooManyExpected() throws Throwable
{
assertFail("assertTableRowsEqual", new Object[] {
"testTable",
- new Integer(2),
+ Integer.valueOf(2),
new String[][] { { "table text row 3", "row 3
col 1" },
{ "unexpected" } } });
}
@@ -189,7 +189,7 @@
public void testAssertTableRowsMatch() throws Throwable {
assertPass("assertTableRowsMatch",
new Object[]{"testTable",
- new Integer(1),
+ Integer.valueOf(1),
new String[][]{{"table text row 2"},
{"table text row 3", "row 3 col
1"}}});
}
@@ -197,7 +197,7 @@
public void testAssertTableRowsMatchTooManyExpected() throws Throwable {
assertFail("assertTableRowsMatch",
new Object[]{"testTable",
- new Integer(2),
+ Integer.valueOf(2),
new String[][]{{"table text row 3", "row 3 col
1"},
{"unexpected", ""}}});
}
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
2009-12-15 13:05:33 UTC (rev 817)
+++
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/WebAssertionsTest.java
2009-12-15 13:22:43 UTC (rev 818)
@@ -68,16 +68,16 @@
public void testAssertLinkPresentWithTextN() throws Throwable {
assertPass("assertLinkPresentWithText", new Object[] { "test
link",
- new Integer(0) });
+ Integer.valueOf(0) });
assertFail("assertLinkPresentWithText", new Object[] { "test
link",
- new Integer(1) });
+ Integer.valueOf(1) });
}
public void testAssertLinkNotPresentWithTextN() throws Throwable {
assertPass("assertLinkNotPresentWithText", new Object[] { "test
link",
new Integer(1) });
assertFail("assertLinkNotPresentWithText", new Object[] { "test
link",
- new Integer(0) });
+ Integer.valueOf(0) });
}
public void testAssertLinkPresent() throws Throwable {
Modified:
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/util/ParamsServlet.java
===================================================================
---
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/util/ParamsServlet.java
2009-12-15 13:05:33 UTC (rev 817)
+++
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/util/ParamsServlet.java
2009-12-15 13:22:43 UTC (rev 818)
@@ -72,9 +72,6 @@
} else {
String fieldName = item.getFieldName();
String fileName = item.getName();
- String contentType = item.getContentType();
- boolean isInMemory = item.isInMemory();
- long sizeInBytes = item.getSize();
out.write(" " + fieldName + "=" + fileName
+ "{" + new String(item.get()) + "}");
Modified:
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/util/ResponseServlet.java
===================================================================
---
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/util/ResponseServlet.java
2009-12-15 13:05:33 UTC (rev 817)
+++
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/util/ResponseServlet.java
2009-12-15 13:22:43 UTC (rev 818)
@@ -38,8 +38,13 @@
if (request.getParameter("timeout") != null &&
request.getParameter("timeout").length() > 0) {
int seconds = Integer.parseInt(request.getParameter("timeout"));
long start = System.currentTimeMillis();
- while (System.currentTimeMillis() < start + (seconds * 1000))
- ; // wait
+ while (System.currentTimeMillis() < start + (seconds * 1000)) {
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ continue;
+ }
+ }
}
// lets set some headers
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
2009-12-15 13:05:33 UTC (rev 817)
+++
trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/junit/WebTester.java
2009-12-15 13:22:43 UTC (rev 818)
@@ -2758,7 +2758,7 @@
if (value != null) // stop at first correct value found
break;
if (field == null)
- throw new RuntimeException("unexpected null field " +
field);
+ throw new RuntimeException("unexpected null field");
if ("input".equals(field.getName())) {
if (field.getAttribute("type") != null) {
@@ -2822,7 +2822,7 @@
// find the first element that we can change
for (IElement field : fields) {
if (field == null)
- throw new RuntimeException("unexpected null field " +
field);
+ throw new RuntimeException("unexpected null field");
if ("input".equals(field.getName())) {
if (field.getAttribute("type") != null) {
@@ -3435,12 +3435,6 @@
// read and compare bytes pair-wise
InputStream i1 = f1.openStream();
InputStream i2 = f2.openStream();
- if (i1 == null) {
- throw new IOException(f1.toString() + " can't be opened.");
- }
- if (i2 == null) {
- throw new IOException(f2.toString() + " can't be opened.");
- }
int b1, b2;
do {
b1 = i1.read();
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Return on Information:
Google Enterprise Search pays you back
Get the facts.
http://p.sf.net/sfu/google-dev2dev
_______________________________________________
JWebUnit-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jwebunit-development
