You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2021/08/22 20:21:14 UTC
[maven-javadoc-plugin] branch MJAVADOC-680 updated: Fix unittest
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MJAVADOC-680
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
The following commit(s) were added to refs/heads/MJAVADOC-680 by this push:
new 124939b Fix unittest
124939b is described below
commit 124939b1b3125284ba2cedbf543b1bc197031575
Author: rfscholte <rf...@apache.org>
AuthorDate: Sun Aug 22 22:21:02 2021 +0200
Fix unittest
---
.../MJAVADOC-580_detectLinks/verify.groovy | 2 +-
.../maven/plugins/javadoc/JavadocReportTest.java | 51 ++++++++++++----------
2 files changed, 30 insertions(+), 23 deletions(-)
diff --git a/src/it/projects/MJAVADOC-580_detectLinks/verify.groovy b/src/it/projects/MJAVADOC-580_detectLinks/verify.groovy
index f3541f6..6fa229a 100644
--- a/src/it/projects/MJAVADOC-580_detectLinks/verify.groovy
+++ b/src/it/projects/MJAVADOC-580_detectLinks/verify.groovy
@@ -19,7 +19,7 @@
def javaVersion = System.getProperty( 'java.specification.version' )
-if ( javaVersion.startsWith('1.') || Integer.parseInt(javaVersion) < 16 )
+if ( javaVersion.startsWith('1.') || Integer.parseInt(javaVersion) < 16 )
{
def buildLog = new File(basedir,'build.log')
assert buildLog.readLines().any{ it ==~ /\[DEBUG\] Found Java API link: .*\/javase\/\d+\/docs\/api\// }
diff --git a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
index 7ade1a6..3dc5ffd 100644
--- a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
+++ b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
@@ -257,35 +257,42 @@ public class JavadocReportTest
Path generatedFile = apidocs.resolve( appHtml );
assertThat( generatedFile ).exists();
- // only test when URL can be reached
-
- String url = Objects.requireNonNull( mojo.getDefaultJavadocApiLink() ).getUrl();
- HttpURLConnection connection = (HttpURLConnection) new URL( url ).openConnection();
- connection.setRequestMethod( "HEAD" );
- try
+ if ( JavaVersion.JAVA_SPECIFICATION_VERSION.isBefore( "16" ) )
{
- if ( connection.getResponseCode() == HttpURLConnection.HTTP_OK )
+ String url = Objects.requireNonNull( mojo.getDefaultJavadocApiLink() ).getUrl();
+ HttpURLConnection connection = (HttpURLConnection) new URL( url ).openConnection();
+ connection.setRequestMethod( "HEAD" );
+ try
{
- try
+ // only test when URL can be reached
+ if ( connection.getResponseCode() == HttpURLConnection.HTTP_OK )
{
- assumeThat( connection.getURL().toString(), is( url ) );
-
- // https://bugs.openjdk.java.net/browse/JDK-8216497
- MatcherAssert.assertThat( url + " available, but " + appHtml + " is missing link to java.lang.Object",
- new String( Files.readAllBytes(generatedFile), StandardCharsets.UTF_8 ),
- anyOf( containsString( "/docs/api/java/lang/Object.html" ),
- containsString( "/docs/api/java.base/java/lang/Object.html" ) ) );
- }
- catch ( AssumptionViolatedException e )
- {
- LOGGER.warn( "ignoring defaultAPI check: {}", e.getMessage() );
+ try
+ {
+ assumeThat( connection.getURL().toString(), is( url ) );
+
+ // https://bugs.openjdk.java.net/browse/JDK-8216497
+ MatcherAssert.assertThat( url + " available, but " + appHtml + " is missing link to java.lang.Object",
+ new String( Files.readAllBytes(generatedFile), StandardCharsets.UTF_8 ),
+ anyOf( containsString( "/docs/api/java/lang/Object.html" ),
+ containsString( "/docs/api/java.base/java/lang/Object.html" ) ) );
+ }
+ catch ( AssumptionViolatedException e )
+ {
+ LOGGER.warn( "ignoring defaultAPI check: {}", e.getMessage() );
+ }
}
}
+ catch (Exception e)
+ {
+ LOGGER.error("error connecting to javadoc URL: {}", url);
+ throw e;
+ }
}
- catch (Exception e)
+ else
{
- LOGGER.error("error connecting to javadoc URL: {}", url);
- throw e;
+ MatcherAssert.assertThat( new String( Files.readAllBytes(generatedFile), StandardCharsets.UTF_8 ),
+ containsString( "/docs/api/java.base/java/lang/Object.html" ) );
}
assertThat( apidocs.resolve( "def/configuration/AppSample.html" )).exists();