fix function not bug, update dependencies (#130)

randymo · web-flow · commit eb2446b63c47 · 2022-05-26T10:51:35.000-04:00
* fix function not bug, update dependencies

* forgot to update version in pom
diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## AMP HTML Validator 1.0.31
+- upgrade protobuf-java from 3.20.1 to 3.21.0
+- upgrade jackson-databind from 2.13.2.2 to 2.13.3
+- upgrade jackson-core from 2.13.3 to 2.13.2
+- upgrade testng from 7.5 to 7.6.0
+- fix bug for pseudo class function :not in css
+
 ## AMP HTML Validator 1.0.30
 - upgrade protobuf-java from 3.16.1 to 3.20.1
 - upgrade exec-maven-plugin from 1.6.0 to 3.0.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.30</version>
+    <version>1.0.31</version>
     <description>A Java validator for the AMP Html format.</description>
     <packaging>jar</packaging>
     <url>https://github.com/ampproject/validator-java</url>
@@ -66,16 +66,16 @@
         <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.20.1</protobuf.version>
+        <protobuf.version>3.21.0</protobuf.version>
         <maven-surefire-plugin.version>3.0.0-M6</maven-surefire-plugin.version>
         <jdk.version>11</jdk.version>
         <main.basedir>${project.basedir}</main.basedir>
 
         <checkstyle.maxAllowedViolations>10</checkstyle.maxAllowedViolations>
 
         <com.puppycrawl.checkstyle.version>10.2</com.puppycrawl.checkstyle.version>
-        <fasterxml.jackson.version>2.13.2</fasterxml.jackson.version>
-        <fasterxml.jackson.databind.version>2.13.2.2</fasterxml.jackson.databind.version>
+        <fasterxml.jackson.version>2.13.3</fasterxml.jackson.version>
+        <fasterxml.jackson.databind.version>2.13.3</fasterxml.jackson.databind.version>
         <mockito.version>1.10.19</mockito.version>
     </properties>
 
@@ -649,7 +649,7 @@
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
-            <version>7.5</version>
+            <version>7.6.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/src/main/java/dev/amp/validator/css/CssTokenUtil.java b/src/main/java/dev/amp/validator/css/CssTokenUtil.java
@@ -90,6 +90,7 @@ private CssTokenUtil() {
 
         // TODO : check this
         KIND_TO_TOKENTYPE.put(SACParserCSS3Constants.FUNCTION, TokenType.FUNCTION_TOKEN);
+        KIND_TO_TOKENTYPE.put(SACParserCSS3Constants.FUNCTION_NOT, TokenType.FUNCTION_TOKEN);
         KIND_TO_TOKENTYPE.put(SACParserCSS3Constants.IDENT, TokenType.IDENT);
 
         // TODO : verify uri and url are interchangeable for validation
diff --git a/src/test/java/dev/amp/validator/parser/AMPHtmlParserTest.java b/src/test/java/dev/amp/validator/parser/AMPHtmlParserTest.java
@@ -960,6 +960,22 @@ public void testEqualsDelimiter() {
         }
     }
 
+    @Test
+    public void testPseudoClassFunctionNot() {
+        try {
+            String inputHtml =
+                    readFile(
+                            "test-cases/css/testPseudoClassFunctionNot.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");
+            Assert.assertTrue(result.getStatus() == ValidatorProtos.ValidationResult.Status.PASS);
+        } 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/testPseudoClassFunctionNot.html b/src/test/resources/test-cases/css/testPseudoClassFunctionNot.html
@@ -0,0 +1,18 @@
+<!--
+  verify delims are parsed correctly
+-->
+<!doctype html>
+<html data-css-strict amp4email>
+<head>
+    <meta charset="utf-8">
+    <script async src="https://cdn.ampproject.org/v0.js"></script>
+    <style amp4email-boilerplate>body{visibility:hidden}</style>
+    <style amp-custom>
+        amp-accordion section:not([expanded]) .upArrow   {
+            display: none;
+        }
+    </style>
+</head>
+<body>
+</body>
+</html>
