You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/05/14 19:48:11 UTC
[maven-doxia-sitetools] branch remove-default-skin updated (c7a948b -> 8fc5f34)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch remove-default-skin
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git
from c7a948b Remove default (bundled) skin
new 33ce080 Move to Fluido 1.11.0
new 170303b Don't verify head anymore because we care about the content (body) only
new 8fc5f34 Update content verification
The 3 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.
Summary of changes:
.../src/main/resources/default-site.xml | 2 +-
.../maven/doxia/siterenderer/AptVerifier.java | 8 +-
.../doxia/siterenderer/AttributesVerifier.java | 7 +-
.../siterenderer/DefaultSiteRendererTest.java | 29 ++----
.../maven/doxia/siterenderer/EntitiesVerifier.java | 48 +---------
.../maven/doxia/siterenderer/FaqVerifier.java | 7 +-
.../maven/doxia/siterenderer/HeadVerifier.java | 105 ---------------------
.../doxia/siterenderer/JavascriptVerifier.java | 28 +++---
.../maven/doxia/siterenderer/MiscVerifier.java | 8 +-
.../doxia/siterenderer/MultipleBlockVerifier.java | 8 +-
.../doxia/siterenderer/NestedItemsVerifier.java | 8 +-
11 files changed, 52 insertions(+), 206 deletions(-)
delete mode 100644 doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/HeadVerifier.java
[maven-doxia-sitetools] 02/03: Don't verify head anymore because we care about the content (body) only
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch remove-default-skin
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git
commit 170303b9dc72f5f8758eb997c9021475553cd740
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat May 14 21:07:37 2022 +0200
Don't verify head anymore because we care about the content (body) only
---
.../siterenderer/DefaultSiteRendererTest.java | 10 --
.../maven/doxia/siterenderer/HeadVerifier.java | 105 ---------------------
2 files changed, 115 deletions(-)
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 45f02b3..d00572d 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
@@ -257,7 +257,6 @@ public class DefaultSiteRendererTest
// Verify specific pages
// ----------------------------------------------------------------------
// TODO Make these run!
- //verifyHeadPage();
verifyCdcPage();
//verifyNestedItemsPage();
//verifyMultipleBlock();
@@ -356,15 +355,6 @@ public class DefaultSiteRendererTest
return siteRenderingContext;
}
- /**
- * @throws Exception if something goes wrong.
- */
- public void verifyHeadPage()
- throws Exception
- {
- new HeadVerifier().verify( "target/output/head.html" );
- }
-
/**
* @throws Exception if something goes wrong.
*/
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
deleted file mode 100644
index 54677c5..0000000
--- a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/HeadVerifier.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package org.apache.maven.doxia.siterenderer;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import com.gargoylesoftware.htmlunit.html.HtmlBase;
-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.HtmlTitle;
-
-import java.util.Iterator;
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
-/**
- * Verify correct rendering of <code>site/xdoc/head.xml</code>.
- *
- * @author ltheussl
- */
-public class HeadVerifier
- extends AbstractVerifier
-{
-
- /** {@inheritDoc} */
- public void verify( String file )
- throws Exception
- {
- HtmlPage page = htmlPage( file );
- assertNotNull( page );
-
- HtmlElement html = page.getDocumentElement();
- assertNotNull( html );
-
- assertEquals( "en", html.getAttribute( "lang" ) );
-
- List<HtmlElement> heads = html.getElementsByTagName( "head" );
- assertEquals( 1, heads.size() );
- HtmlElement head = heads.get( 0 );
- assertNotNull( head );
-
- Iterator<HtmlElement> elementIterator = head.getHtmlElementDescendants().iterator();
-
- // ----------------------------------------------------------------------
- //
- // ----------------------------------------------------------------------
-
- HtmlMeta meta = (HtmlMeta) elementIterator.next();
- assertEquals( "UTF-8", meta.getAttribute( "charset" ) );
-
- // Skip viewport
- elementIterator.next();
-
- meta = (HtmlMeta) elementIterator.next();
- assertEquals( "generator", meta.getAttribute( "name" ), "Unexpected meta entry found generated resource " + file );
- String generator = meta.getAttribute("content");
- assertEquals("Apache Maven Doxia Site Renderer", generator, "Unexpected value found for generator meta entry in generated resource " + file );
-
- meta = (HtmlMeta) elementIterator.next();
- assertEquals( "author", meta.getAttribute( "name" ) );
- assertEquals( "John Doe", meta.getAttribute( "content" ).trim() );
-
- HtmlTitle title = (HtmlTitle) elementIterator.next();
- assertNotNull( title );
-
- HtmlLink link = (HtmlLink) elementIterator.next();
- assertNotNull( link );
- link = (HtmlLink) elementIterator.next();
- assertNotNull( link );
- link = (HtmlLink) elementIterator.next();
- assertNotNull( link );
- link = (HtmlLink) elementIterator.next();
- assertNotNull( link );
-
- meta = (HtmlMeta) elementIterator.next();
- assertEquals( "description", meta.getAttribute( "name" ) );
- assertEquals( "Free Web tutorials", meta.getAttribute( "content" ) );
-
- meta = (HtmlMeta) elementIterator.next();
- assertEquals( "keywords", meta.getAttribute( "name" ) );
- assertEquals( "HTML,CSS,XML,JavaScript", meta.getAttribute( "content" ) );
-
- HtmlBase base = (HtmlBase) elementIterator.next();
- assertEquals( "http://maven.apache.org/", base.getAttribute( "href" ) );
- }
-}
[maven-doxia-sitetools] 03/03: Update content verification
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch remove-default-skin
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git
commit 8fc5f34b32e811cb12ac84edbf6f8abcff449c33
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat May 14 21:47:23 2022 +0200
Update content verification
---
.../maven/doxia/siterenderer/AptVerifier.java | 8 ++--
.../doxia/siterenderer/AttributesVerifier.java | 7 ++--
.../siterenderer/DefaultSiteRendererTest.java | 19 ++++-----
.../maven/doxia/siterenderer/EntitiesVerifier.java | 48 ++--------------------
.../maven/doxia/siterenderer/FaqVerifier.java | 7 ++--
.../doxia/siterenderer/JavascriptVerifier.java | 28 ++++++-------
.../maven/doxia/siterenderer/MiscVerifier.java | 8 ++--
.../doxia/siterenderer/MultipleBlockVerifier.java | 8 ++--
.../doxia/siterenderer/NestedItemsVerifier.java | 8 ++--
9 files changed, 51 insertions(+), 90 deletions(-)
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 97c843a..1fa6bc7 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
@@ -22,11 +22,11 @@ package org.apache.maven.doxia.siterenderer;
import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
import com.gargoylesoftware.htmlunit.html.HtmlBold;
import com.gargoylesoftware.htmlunit.html.HtmlCode;
-import com.gargoylesoftware.htmlunit.html.HtmlDivision;
import com.gargoylesoftware.htmlunit.html.HtmlElement;
import com.gargoylesoftware.htmlunit.html.HtmlHeading2;
import com.gargoylesoftware.htmlunit.html.HtmlHeading3;
import com.gargoylesoftware.htmlunit.html.HtmlItalic;
+import com.gargoylesoftware.htmlunit.html.HtmlMain;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import com.gargoylesoftware.htmlunit.html.HtmlParagraph;
import com.gargoylesoftware.htmlunit.html.HtmlSection;
@@ -53,10 +53,10 @@ public class AptVerifier
HtmlElement element = page.getHtmlElementById( "contentBox" );
assertNotNull( element );
- HtmlDivision division = (HtmlDivision) element;
- assertNotNull( division );
+ HtmlMain main = (HtmlMain) element;
+ assertNotNull( main );
- Iterator<HtmlElement> elementIterator = division.getHtmlElementDescendants().iterator();
+ Iterator<HtmlElement> elementIterator = main.getHtmlElementDescendants().iterator();
// ----------------------------------------------------------------------
//
diff --git a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AttributesVerifier.java b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AttributesVerifier.java
index d326c18..d368c35 100644
--- a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AttributesVerifier.java
+++ b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AttributesVerifier.java
@@ -27,6 +27,7 @@ import com.gargoylesoftware.htmlunit.html.HtmlHeading2;
import com.gargoylesoftware.htmlunit.html.HtmlHeading3;
import com.gargoylesoftware.htmlunit.html.HtmlImage;
import com.gargoylesoftware.htmlunit.html.HtmlItalic;
+import com.gargoylesoftware.htmlunit.html.HtmlMain;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import com.gargoylesoftware.htmlunit.html.HtmlParagraph;
import com.gargoylesoftware.htmlunit.html.HtmlPreformattedText;
@@ -65,10 +66,10 @@ public class AttributesVerifier
HtmlElement element = page.getHtmlElementById( "contentBox" );
assertNotNull( element );
- HtmlDivision division = (HtmlDivision) element;
- assertNotNull( division );
+ HtmlMain main = (HtmlMain) element;
+ assertNotNull( main );
- Iterator<HtmlElement> elementIterator = division.getHtmlElementDescendants().iterator();
+ Iterator<HtmlElement> elementIterator = main.getHtmlElementDescendants().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 d00572d..c7f83fd 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
@@ -127,7 +127,7 @@ public class DefaultSiteRendererTest
IOUtil.close( jarOS );
}
- skinIS = new ByteArrayInputStream( "<main>$bodyContent</main>".getBytes( StandardCharsets.UTF_8 ) );
+ skinIS = new ByteArrayInputStream( "<main id=\"contentBox\">$bodyContent</main>".getBytes( StandardCharsets.UTF_8 ) );
jarOS = new JarOutputStream( new FileOutputStream( minimalSkinJar ) );
try
{
@@ -256,17 +256,16 @@ public class DefaultSiteRendererTest
// ----------------------------------------------------------------------
// Verify specific pages
// ----------------------------------------------------------------------
- // TODO Make these run!
verifyCdcPage();
- //verifyNestedItemsPage();
- //verifyMultipleBlock();
+ verifyNestedItemsPage();
+ verifyMultipleBlock();
verifyMacro();
- //verifyEntitiesPage();
- //verifyJavascriptPage();
- //verifyFaqPage();
- //verifyAttributes();
- //verifyMisc();
- //verifyApt();
+ verifyEntitiesPage();
+ verifyJavascriptPage();
+ verifyFaqPage();
+ verifyAttributes();
+ verifyMisc();
+ verifyApt();
verifyExtensionInFilename();
verifyNewlines();
diff --git a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java
index a335910..a6b378c 100644
--- a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java
+++ b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java
@@ -25,7 +25,7 @@ import com.gargoylesoftware.htmlunit.html.HtmlElement;
import com.gargoylesoftware.htmlunit.html.HtmlHeading2;
import com.gargoylesoftware.htmlunit.html.HtmlHeading3;
import com.gargoylesoftware.htmlunit.html.HtmlHeading4;
-import com.gargoylesoftware.htmlunit.html.HtmlMeta;
+import com.gargoylesoftware.htmlunit.html.HtmlMain;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import com.gargoylesoftware.htmlunit.html.HtmlParagraph;
import com.gargoylesoftware.htmlunit.html.HtmlPreformattedText;
@@ -36,7 +36,6 @@ import java.util.Iterator;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Verify the <code>site/xdoc/entityTest.xml</code>
@@ -53,51 +52,12 @@ public class EntitiesVerifier
HtmlPage page = htmlPage( file );
assertNotNull( page );
- HtmlMeta author = (HtmlMeta) page.getElementsByName( "author" ).get( 0 );
- assertNotNull( author );
- assertTrue( author.toString().indexOf( "Ligature \u00C6" ) > 0 );
- assertEquals( "Ligature \u00C6", author.getContentAttribute() );
-
- author = (HtmlMeta) page.getElementsByName( "author" ).get( 1 );
- assertNotNull( author );
- assertTrue( author.toString().indexOf( "Ampersand &" ) > 0 );
- assertEquals( "Ampersand &", author.getContentAttribute() );
-
- author = (HtmlMeta) page.getElementsByName( "author" ).get( 2 );
- assertNotNull( author );
- assertTrue( author.toString().indexOf( "Less than <" ) > 0 );
- assertEquals( "Less than <", author.getContentAttribute() );
-
- author = (HtmlMeta) page.getElementsByName( "author" ).get( 3 );
- assertNotNull( author );
- assertTrue( author.toString().indexOf( "Greater than >" ) > 0 );
- assertEquals( "Greater than >", author.getContentAttribute() );
-
- author = (HtmlMeta) page.getElementsByName( "author" ).get( 4 );
- assertNotNull( author );
- assertEquals( "Apostrophe '", author.getContentAttribute() );
-
- author = (HtmlMeta) page.getElementsByName( "author" ).get( 5 );
- assertNotNull( author );
- assertTrue( author.toString().indexOf( "Quote "" ) > 0 );
- assertEquals( "Quote \"", author.getContentAttribute() );
-
- author = (HtmlMeta) page.getElementsByName( "author" ).get( 6 );
- assertNotNull( author );
- assertTrue( author.toString().indexOf( "test@email.com" ) > 0 );
- assertEquals( "test@email.com", author.getContentAttribute() );
-
- author = (HtmlMeta) page.getElementsByName( "author" ).get( 7 );
- assertNotNull( author );
- assertTrue( author.toString().indexOf( "test\u00A9email.com" ) > 0 );
- assertEquals( "test\u00A9email.com", author.getContentAttribute() );
-
HtmlElement element = page.getHtmlElementById( "contentBox" );
assertNotNull( element );
- HtmlDivision division = (HtmlDivision) element;
- assertNotNull( division );
+ HtmlMain main = (HtmlMain) element;
+ assertNotNull( main );
- Iterator<HtmlElement> elementIterator = division.getHtmlElementDescendants().iterator();
+ Iterator<HtmlElement> elementIterator = main.getHtmlElementDescendants().iterator();
// ----------------------------------------------------------------------
//
diff --git a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/FaqVerifier.java b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/FaqVerifier.java
index 58e3807..47b2ffe 100644
--- a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/FaqVerifier.java
+++ b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/FaqVerifier.java
@@ -27,6 +27,7 @@ import com.gargoylesoftware.htmlunit.html.HtmlDivision;
import com.gargoylesoftware.htmlunit.html.HtmlElement;
import com.gargoylesoftware.htmlunit.html.HtmlHeading2;
import com.gargoylesoftware.htmlunit.html.HtmlListItem;
+import com.gargoylesoftware.htmlunit.html.HtmlMain;
import com.gargoylesoftware.htmlunit.html.HtmlOrderedList;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import com.gargoylesoftware.htmlunit.html.HtmlParagraph;
@@ -55,10 +56,10 @@ public class FaqVerifier
HtmlElement element = page.getHtmlElementById( "contentBox" );
assertNotNull( element );
- HtmlDivision division = (HtmlDivision) element;
- assertNotNull( division );
+ HtmlMain main = (HtmlMain) element;
+ assertNotNull( main );
- Iterator<HtmlElement> elementIterator = division.getHtmlElementDescendants().iterator();
+ Iterator<HtmlElement> elementIterator = main.getHtmlElementDescendants().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 44c5976..68abe49 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
@@ -22,9 +22,9 @@ package org.apache.maven.doxia.siterenderer;
import com.gargoylesoftware.htmlunit.CollectingAlertHandler;
import com.gargoylesoftware.htmlunit.WebClient;
import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
-import com.gargoylesoftware.htmlunit.html.HtmlDivision;
import com.gargoylesoftware.htmlunit.html.HtmlElement;
import com.gargoylesoftware.htmlunit.html.HtmlHeading2;
+import com.gargoylesoftware.htmlunit.html.HtmlMain;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import com.gargoylesoftware.htmlunit.html.HtmlParagraph;
import com.gargoylesoftware.htmlunit.html.HtmlScript;
@@ -67,39 +67,39 @@ public class JavascriptVerifier
// HtmlUnit
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();
-
+ HtmlMain main = (HtmlMain) element;
+ assertNotNull( main );
+
+ Iterator<HtmlElement> elementIterator = main.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" ) );
diff --git a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/MiscVerifier.java b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/MiscVerifier.java
index 1afee17..62c4fba 100644
--- a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/MiscVerifier.java
+++ b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/MiscVerifier.java
@@ -19,8 +19,8 @@ package org.apache.maven.doxia.siterenderer;
* under the License.
*/
-import com.gargoylesoftware.htmlunit.html.HtmlDivision;
import com.gargoylesoftware.htmlunit.html.HtmlElement;
+import com.gargoylesoftware.htmlunit.html.HtmlMain;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import com.gargoylesoftware.htmlunit.html.HtmlParameter;
import com.gargoylesoftware.htmlunit.html.HtmlUnknownElement;
@@ -47,10 +47,10 @@ public class MiscVerifier
HtmlElement element = page.getHtmlElementById( "contentBox" );
assertNotNull( element );
- HtmlDivision division = (HtmlDivision) element;
- assertNotNull( division );
+ HtmlMain main = (HtmlMain) element;
+ assertNotNull( main );
- Iterator<HtmlElement> elementIterator = division.getHtmlElementDescendants().iterator();
+ Iterator<HtmlElement> elementIterator = main.getHtmlElementDescendants().iterator();
// ----------------------------------------------------------------------
//
diff --git a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/MultipleBlockVerifier.java b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/MultipleBlockVerifier.java
index 6857382..8c60100 100644
--- a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/MultipleBlockVerifier.java
+++ b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/MultipleBlockVerifier.java
@@ -20,10 +20,10 @@ package org.apache.maven.doxia.siterenderer;
*/
import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
-import com.gargoylesoftware.htmlunit.html.HtmlDivision;
import com.gargoylesoftware.htmlunit.html.HtmlElement;
import com.gargoylesoftware.htmlunit.html.HtmlHeading2;
import com.gargoylesoftware.htmlunit.html.HtmlListItem;
+import com.gargoylesoftware.htmlunit.html.HtmlMain;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import com.gargoylesoftware.htmlunit.html.HtmlParagraph;
import com.gargoylesoftware.htmlunit.html.HtmlSection;
@@ -51,10 +51,10 @@ public class MultipleBlockVerifier
HtmlElement element = page.getHtmlElementById( "contentBox" );
assertNotNull( element );
- HtmlDivision division = (HtmlDivision) element;
- assertNotNull( division );
+ HtmlMain main = (HtmlMain) element;
+ assertNotNull( main );
- Iterator<HtmlElement> elementIterator = division.getHtmlElementDescendants().iterator();
+ Iterator<HtmlElement> elementIterator = main.getHtmlElementDescendants().iterator();
// ----------------------------------------------------------------------
// Verify link
diff --git a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/NestedItemsVerifier.java b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/NestedItemsVerifier.java
index 6e5cca7..79ec098 100644
--- a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/NestedItemsVerifier.java
+++ b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/NestedItemsVerifier.java
@@ -25,11 +25,11 @@ import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
import com.gargoylesoftware.htmlunit.html.HtmlDefinitionDescription;
import com.gargoylesoftware.htmlunit.html.HtmlDefinitionList;
import com.gargoylesoftware.htmlunit.html.HtmlDefinitionTerm;
-import com.gargoylesoftware.htmlunit.html.HtmlDivision;
import com.gargoylesoftware.htmlunit.html.HtmlElement;
import com.gargoylesoftware.htmlunit.html.HtmlHeading2;
import com.gargoylesoftware.htmlunit.html.HtmlHeading4;
import com.gargoylesoftware.htmlunit.html.HtmlListItem;
+import com.gargoylesoftware.htmlunit.html.HtmlMain;
import com.gargoylesoftware.htmlunit.html.HtmlOrderedList;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import com.gargoylesoftware.htmlunit.html.HtmlParagraph;
@@ -56,10 +56,10 @@ public class NestedItemsVerifier
HtmlElement element = page.getHtmlElementById( "contentBox" );
assertNotNull( element );
- HtmlDivision division = (HtmlDivision) element;
- assertNotNull( division );
+ HtmlMain main = (HtmlMain) element;
+ assertNotNull( main );
- Iterator<HtmlElement> elementIterator = division.getHtmlElementDescendants().iterator();
+ Iterator<HtmlElement> elementIterator = main.getHtmlElementDescendants().iterator();
// ----------------------------------------------------------------------
// Verify link
[maven-doxia-sitetools] 01/03: Move to Fluido 1.11.0
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch remove-default-skin
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git
commit 33ce080adff37c72f368b69d71361997cf122e20
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat May 14 21:07:08 2022 +0200
Move to Fluido 1.11.0
---
doxia-integration-tools/src/main/resources/default-site.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doxia-integration-tools/src/main/resources/default-site.xml b/doxia-integration-tools/src/main/resources/default-site.xml
index b368b69..cc0c102 100644
--- a/doxia-integration-tools/src/main/resources/default-site.xml
+++ b/doxia-integration-tools/src/main/resources/default-site.xml
@@ -25,7 +25,7 @@ under the License.
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
- <version>1.11.0-SNAPSHOT</version>
+ <version>1.11.0</version>
</skin>
<body>
<links>