You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2020/02/19 18:52:58 UTC
[maven-doxia-sitetools] branch warn3 created (now ccb4d47)
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a change to branch warn3
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git.
at ccb4d47 fix some warnings
This branch includes the following new commits:
new ccb4d47 fix some warnings
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-doxia-sitetools] 01/01: fix some warnings
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch warn3
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git
commit ccb4d477a8e93199eb4b08fdc2c6c079a2911620
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Wed Feb 19 13:52:36 2020 -0500
fix some warnings
---
.../maven/doxia/siterenderer/AbstractVerifier.java | 9 +--
.../maven/doxia/siterenderer/AptVerifier.java | 1 -
.../siterenderer/DefaultSiteRendererTest.java | 16 +++--
.../maven/doxia/siterenderer/HeadVerifier.java | 1 -
.../doxia/siterenderer/JavascriptVerifier.java | 83 +++++++++++-----------
5 files changed, 58 insertions(+), 52 deletions(-)
diff --git a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AbstractVerifier.java b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AbstractVerifier.java
index 7b42cb5..4c3cfde 100644
--- a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AbstractVerifier.java
+++ b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AbstractVerifier.java
@@ -51,10 +51,11 @@ public abstract class AbstractVerifier
assertTrue( file.exists() );
// HtmlUnit
- WebClient webClient = new WebClient();
- webClient.getOptions().setCssEnabled( false );
-
- return (HtmlPage) webClient.getPage( file.toURI().toURL() );
+ try (WebClient webClient = new WebClient()) {
+ webClient.getOptions().setCssEnabled( false );
+
+ return (HtmlPage) webClient.getPage( file.toURI().toURL() );
+ }
}
/**
diff --git a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AptVerifier.java b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AptVerifier.java
index 25b8f80..b8369ae 100644
--- a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AptVerifier.java
+++ b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AptVerifier.java
@@ -30,7 +30,6 @@ import com.gargoylesoftware.htmlunit.html.HtmlItalic;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import com.gargoylesoftware.htmlunit.html.HtmlParagraph;
import com.gargoylesoftware.htmlunit.html.HtmlSection;
-import com.gargoylesoftware.htmlunit.html.HtmlTeletype;
import java.util.Iterator;
diff --git a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
index fe4b1df..707e43b 100644
--- a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
+++ b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
@@ -34,6 +34,7 @@ import java.io.OutputStream;
import java.io.Reader;
import java.io.StringWriter;
import java.io.Writer;
+import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -233,7 +234,10 @@ public class DefaultSiteRendererTest
renderer.mergeDocumentIntoSite( writer, sink, siteRenderingContext );
String renderResult = writer.toString();
- String expectedResult = IOUtils.toString( getClass().getResourceAsStream( "velocity-toolmanager.expected.txt" ) );
+ String expectedResult =
+ IOUtils.toString(
+ getClass().getResourceAsStream("velocity-toolmanager.expected.txt"),
+ StandardCharsets.UTF_8);
expectedResult = StringUtils.unifyLineSeparators( expectedResult );
assertEquals( expectedResult, renderResult );
}
@@ -261,8 +265,8 @@ public class DefaultSiteRendererTest
renderer.mergeDocumentIntoSite( writer, sink, siteRenderingContext );
String renderResult = writer.toString();
- String expectedResult = IOUtils.toString( getClass().getResourceAsStream( "velocity-toolmanager.expected.txt" ) );
- expectedResult = StringUtils.unifyLineSeparators( expectedResult );
+ InputStream in = getClass().getResourceAsStream( "velocity-toolmanager.expected.txt" );
+ String expectedResult = StringUtils.unifyLineSeparators( IOUtils.toString( in, StandardCharsets.UTF_8 ) );
assertEquals( expectedResult, renderResult );
}
@@ -290,8 +294,10 @@ public class DefaultSiteRendererTest
SiteRendererSink sink = new SiteRendererSink( context );
renderer.mergeDocumentIntoSite( writer, sink, siteRenderingContext );
String renderResult = writer.toString();
- String expectedResult = IOUtils.toString( getClass().getResourceAsStream( "velocity-toolmanager.expected.txt" ) );
- expectedResult = StringUtils.unifyLineSeparators( expectedResult );
+ String expectedResult = StringUtils.unifyLineSeparators(
+ IOUtils.toString(
+ getClass().getResourceAsStream("velocity-toolmanager.expected.txt"),
+ StandardCharsets.UTF_8));
assertEquals( expectedResult, renderResult );
}
diff --git a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/HeadVerifier.java b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/HeadVerifier.java
index 7240814..babd6e1 100644
--- a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/HeadVerifier.java
+++ b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/HeadVerifier.java
@@ -24,7 +24,6 @@ import com.gargoylesoftware.htmlunit.html.HtmlElement;
import com.gargoylesoftware.htmlunit.html.HtmlLink;
import com.gargoylesoftware.htmlunit.html.HtmlMeta;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import com.gargoylesoftware.htmlunit.html.HtmlStyle;
import com.gargoylesoftware.htmlunit.html.HtmlTitle;
import java.util.Iterator;
diff --git a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/JavascriptVerifier.java b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/JavascriptVerifier.java
index 23efb59..e2bd86e 100644
--- a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/JavascriptVerifier.java
+++ b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/JavascriptVerifier.java
@@ -60,46 +60,47 @@ public class JavascriptVerifier
assertTrue( jsTest.exists() );
// HtmlUnit
- WebClient webClient = new WebClient();
- webClient.getOptions().setCssEnabled( false );
-
- final List<String> collectedAlerts = new ArrayList<String>( 4 );
- webClient.setAlertHandler( new CollectingAlertHandler( collectedAlerts ) );
-
- HtmlPage page = (HtmlPage) webClient.getPage( jsTest.toURI().toURL() );
- assertNotNull( page );
-
- HtmlElement element = page.getHtmlElementById( "contentBox" );
- assertNotNull( element );
- HtmlDivision division = (HtmlDivision) element;
- assertNotNull( division );
-
- Iterator<HtmlElement> elementIterator = division.getHtmlElementDescendants().iterator();
-
- // ----------------------------------------------------------------------
- //
- // ----------------------------------------------------------------------
-
- HtmlSection section = (HtmlSection) elementIterator.next();
- assertNotNull( section );
-
- HtmlHeading2 h2 = (HtmlHeading2) elementIterator.next();
- assertNotNull( h2 );
- assertEquals( "Test", h2.asText().trim() );
-
- HtmlAnchor a = (HtmlAnchor) elementIterator.next();
- assertNotNull( a );
- assertEquals( "Test", a.getAttribute( "name" ) );
-
- HtmlParagraph p = (HtmlParagraph) elementIterator.next();
- assertNotNull( p );
- assertEquals( "You should see a JavaScript alert...", p.asText().trim() );
-
- HtmlScript script = (HtmlScript) elementIterator.next();
- assertNotNull( script );
- assertEquals( "text/javascript", script.getAttribute( "type" ) );
- assertEquals( "", script.asText().trim() );
- final List<String> expectedAlerts = Collections.singletonList( "Hello!" );
- assertEquals( expectedAlerts, collectedAlerts );
+ try (WebClient webClient = new WebClient()) {
+ webClient.getOptions().setCssEnabled( false );
+
+ final List<String> collectedAlerts = new ArrayList<String>( 4 );
+ webClient.setAlertHandler( new CollectingAlertHandler( collectedAlerts ) );
+
+ HtmlPage page = (HtmlPage) webClient.getPage( jsTest.toURI().toURL() );
+ assertNotNull( page );
+
+ HtmlElement element = page.getHtmlElementById( "contentBox" );
+ assertNotNull( element );
+ HtmlDivision division = (HtmlDivision) element;
+ assertNotNull( division );
+
+ Iterator<HtmlElement> elementIterator = division.getHtmlElementDescendants().iterator();
+
+ // ----------------------------------------------------------------------
+ //
+ // ----------------------------------------------------------------------
+
+ HtmlSection section = (HtmlSection) elementIterator.next();
+ assertNotNull( section );
+
+ HtmlHeading2 h2 = (HtmlHeading2) elementIterator.next();
+ assertNotNull( h2 );
+ assertEquals( "Test", h2.asText().trim() );
+
+ HtmlAnchor a = (HtmlAnchor) elementIterator.next();
+ assertNotNull( a );
+ assertEquals( "Test", a.getAttribute( "name" ) );
+
+ HtmlParagraph p = (HtmlParagraph) elementIterator.next();
+ assertNotNull( p );
+ assertEquals( "You should see a JavaScript alert...", p.asText().trim() );
+
+ HtmlScript script = (HtmlScript) elementIterator.next();
+ assertNotNull( script );
+ assertEquals( "text/javascript", script.getAttribute( "type" ) );
+ assertEquals( "", script.asText().trim() );
+ List<String> expectedAlerts = Collections.singletonList( "Hello!" );
+ assertEquals( expectedAlerts, collectedAlerts );
+ }
}
}