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 20:01:35 UTC

[maven-doxia-sitetools] 03/04: Don't verify head anymore because we care about the content (body) only

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 171bb34036d69d714d8c571cdfdf8d265b9c0da7
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" ) );
-    }
-}