Revision: 811
http://jwebunit.svn.sourceforge.net/jwebunit/?rev=811&view=rev
Author: henryju
Date: 2009-08-05 14:01:57 +0000 (Wed, 05 Aug 2009)
Log Message:
-----------
[2832635] Code fix based on Findbugs analysis (thanks fantayeneh for the patch).
Modified Paths:
--------------
trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/junit/WebTester.java
trunk/jwebunit-htmlunit-plugin/src/main/java/net/sourceforge/jwebunit/htmlunit/HtmlUnitTestingEngineImpl.java
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-06-05 15:14:01 UTC (rev 810)
+++
trunk/jwebunit-core/src/main/java/net/sourceforge/jwebunit/junit/WebTester.java
2009-08-05 14:01:57 UTC (rev 811)
@@ -3418,10 +3418,10 @@
// read and compare bytes pair-wise
InputStream i1 = f1.openStream();
InputStream i2 = f2.openStream();
- if (f1 == null) {
+ if (i1 == null) {
throw new IOException(f1.toString() + " can't be opened.");
}
- if (f2 == null) {
+ if (i2 == null) {
throw new IOException(f2.toString() + " can't be opened.");
}
int b1, b2;
Modified:
trunk/jwebunit-htmlunit-plugin/src/main/java/net/sourceforge/jwebunit/htmlunit/HtmlUnitTestingEngineImpl.java
===================================================================
---
trunk/jwebunit-htmlunit-plugin/src/main/java/net/sourceforge/jwebunit/htmlunit/HtmlUnitTestingEngineImpl.java
2009-06-05 15:14:01 UTC (rev 810)
+++
trunk/jwebunit-htmlunit-plugin/src/main/java/net/sourceforge/jwebunit/htmlunit/HtmlUnitTestingEngineImpl.java
2009-08-05 14:01:57 UTC (rev 811)
@@ -85,8 +85,8 @@
import com.gargoylesoftware.htmlunit.html.HtmlTable;
import com.gargoylesoftware.htmlunit.html.HtmlTableCell;
import com.gargoylesoftware.htmlunit.html.HtmlTableRow;
-import com.gargoylesoftware.htmlunit.html.HtmlTextArea;
import com.gargoylesoftware.htmlunit.html.HtmlTableRow.CellIterator;
+import com.gargoylesoftware.htmlunit.html.HtmlTextArea;
import com.gargoylesoftware.htmlunit.xml.XmlPage;
/**
@@ -277,8 +277,7 @@
} else {
Date now = Calendar.getInstance().getTime();
// Convert milli-second to second
- Long second = new Long(
- (expire.getTime() - now.getTime()) / 1000);
+ Long second = Long.valueOf((expire.getTime() - now.getTime())
/ 1000);
c.setMaxAge(second.intValue());
}
c.setPath(cookie.getPath());
@@ -896,11 +895,8 @@
// Deal with custom request header
Map<String, String> requestHeaders =
getTestContext().getRequestHeaders();
- for (String nextRequestHeaderName : requestHeaders.keySet()) {
- String nextRequestHeaderValue = (String) requestHeaders
- .get(nextRequestHeaderName);
-
- wc.addRequestHeader(nextRequestHeaderName, nextRequestHeaderValue);
+ for (Map.Entry<String, String> requestHeader :
requestHeaders.entrySet()) {
+ wc.addRequestHeader(requestHeader.getKey(),
requestHeader.getValue());
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
JWebUnit-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jwebunit-development
