fix blank boilerplate bug, renovate bot update (#147)

randymo · web-flow · commit 2103e49efbce · 2022-07-29T09:43:45.000-04:00
diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## AMP HTML Validator 1.0.34
+- fix bug that failed to parse with blank amp4email-boilerplate
+- upgrade maven-assembly-plugin from 3.4.1 to 3.4.2
+- upgrade protobuf-java from 3.21.2 to 3.21.4
+- upgrade spotbugs-maven-plugin from 4.7.1.0 to 4.7.1.1
+
 ## AMP HTML Validator 1.0.33
 - upgrade exec-maven-plugin from 3.0.0 to 3.1.0
 - update junit-jupiter-api from 5.8.2 to 5.9.0
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>dev.amp</groupId>
     <artifactId>validator-java</artifactId>
     <name>AMP validator Java API</name>
-    <version>1.0.33</version>
+    <version>1.0.34</version>
     <description>A Java validator for the AMP Html format.</description>
     <packaging>jar</packaging>
     <url>https://github.com/ampproject/validator-java</url>
@@ -66,7 +66,7 @@
         <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
 
         <os-maven-plugin.version>1.7.0</os-maven-plugin.version>
-        <protobuf.version>3.21.2</protobuf.version>
+        <protobuf.version>3.21.4</protobuf.version>
         <maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
         <jdk.version>11</jdk.version>
         <encoding>UTF-8</encoding>
@@ -262,7 +262,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>3.4.2</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -326,7 +326,7 @@
             <plugin>
                 <groupId>com.github.spotbugs</groupId>
                 <artifactId>spotbugs-maven-plugin</artifactId>
-                <version>4.7.1.0</version>
+                <version>4.7.1.1</version>
                 <dependencies>
                     <dependency>
                         <groupId>com.github.spotbugs</groupId>
diff --git a/src/main/java/dev/amp/validator/AMPHtmlHandler.java b/src/main/java/dev/amp/validator/AMPHtmlHandler.java
@@ -196,8 +196,6 @@ public void endElement(final String uri, final String localName, final String qN
             try {
                 if (charactersBuilder != null) {
                     cdata(charactersBuilder.toString());
-                } else {
-                    cdata("");
                 }
             } catch (TagValidationException | CssValidationException | IOException e) {
                 /** ignore */
diff --git a/src/test/java/dev/amp/validator/parser/AMPHtmlParserTest.java b/src/test/java/dev/amp/validator/parser/AMPHtmlParserTest.java
@@ -976,6 +976,21 @@ public void testPseudoClassFunctionNot() {
         }
     }
 
+    @Test
+    public void testCSSBlankBoilerplate() {
+        try {
+            String inputHtml =
+                    readFile(
+                            "test-cases/css/testCSSBlankBoilerplate.html");
+            final int maxNode = 10000;
+            ValidatorProtos.ValidationResult result =
+                    ampHtmlParser.parse(inputHtml, ValidatorProtos.HtmlFormat.Code.AMP4EMAIL, ExitCondition.FULL_PARSING, maxNode);
+            Assert.assertEquals(result.getErrorsCount(), 0, "Expecting to have 0 error");
+        } catch (final IOException ex) {
+            ex.printStackTrace();
+        }
+    }
+
     // TODO: debugging indicates the CSS is tokenized before the length check. Should validate length before.
     @Test
     public void testStylesheetTooLong() {
diff --git a/src/test/resources/test-cases/css/testCSSBlankBoilerplate.html b/src/test/resources/test-cases/css/testCSSBlankBoilerplate.html
@@ -0,0 +1,23 @@
+<!--
+     AMP_SELECTORS_PASS
+-->
+<!doctype html>
+<html data-css-strict ⚡4email>
+<head>
+    <meta charset="utf-8">
+    <script async src="https://cdn.ampproject.org/v0.js"></script>
+    <script async custom-element="amp-selector" src="https://cdn.ampproject.org/v0/amp-selector-0.1.js"></script>
+    <style amp4email-boilerplate></style>
+</head>
+<body>
+<amp-selector class="tabs-with-flex" role="tablist" keyboard-select-mode="focus">
+    <div id="tab1" role="tab" aria-controls="tabpanel1" option selected>Tab one</div>
+    <div id="tabpanel1" role="tabpanel" aria-labelledby="tab1">Tab one content... </div>
+    <div id="tab2" role="tab" aria-controls="tabpanel2" option>Tab two</div>
+    <div id="tabpanel2" role="tabpanel" aria-labelledby="tab2">Tab two content... </div>
+    <div id="tab3" role="tab" aria-controls="tabpanel3" option>Tab three</div>
+    <div id="tabpanel3" role="tabpanel" aria-labelledby="tab3">Tab three content... </div>
+</amp-selector>
+Hello, AMP4EMAIL world.
+</body>
+</html>

Original file line number	Diff line number	Diff line change
`@@ -196,8 +196,6 @@ public void endElement(final String uri, final String localName, final String qN`
`196`	`196`	`try {`
`197`	`197`	`if (charactersBuilder != null) {`
`198`	`198`	`cdata(charactersBuilder.toString());`
`199`		`- } else {`
`200`		`- cdata("");`
`201`	`199`	`}`
`202`	`200`	`} catch (TagValidationException \| CssValidationException \| IOException e) {`
`203`	`201`	`/** ignore */`