Adapt tests for the new vnu-jar version

XhmikosR · XhmikosR · commit 4ca74550fdfb · 2022-10-01T21:56:07.000+03:00
diff --git a/test/checkstyle_test.js b/test/checkstyle_test.js
@@ -24,7 +24,7 @@ describe('checkstyle reporter', () => {
       '\t\t<error line="1" column="16" severity="error" message="Start tag seen without seeing a doctype first. Expected “&lt;!DOCTYPE html&gt;”." source="htmllint.ValidationError" />',
       '\t\t<error line="9" column="96" severity="error" message="Attribute “unknownattr” not allowed on element “img” at this point." source="htmllint.ValidationError" />',
       '\t\t<error line="9" column="96" severity="error" message="An “img” element must have an “alt” attribute, except under certain conditions. For details, consult guidance on providing text alternatives for images." source="htmllint.ValidationError" />',
-      '\t\t<error line="11" column="19" severity="error" message="The “clear” attribute on the “br” element is obsolete. Use CSS instead." source="htmllint.ValidationError" />',
+      '\t\t<error line="11" column="17" severity="error" message="The “clear” attribute on the “br” element is obsolete. Use CSS instead." source="htmllint.ValidationError" />',
       '\t</file>',
       '</checkstyle>'
     ].join('\n');
diff --git a/test/fixtures/invalid-encoding.html b/test/fixtures/invalid-encoding.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="es" xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <title>P�gina de Ejemplo</title>
 </head>
 <body>
diff --git a/test/fixtures/invalid.html b/test/fixtures/invalid.html
@@ -8,7 +8,7 @@
 
 <img id="project-icon" src="images/transparent_1x1.png" class="ui-state-default" unknownAttr="">
 
-<br clear="both" />
+<br clear="both">
 
 </body>
 </html>
diff --git a/test/fixtures/invalid.php b/test/fixtures/invalid.php
@@ -9,7 +9,7 @@
 
 <img id="project-icon" src="images/transparent_1x1.png" class="ui-state-default" unknownAttr="">
 
-<br clear="both" />
+<br clear="both">
 
 </body>
 </html>
diff --git a/test/fixtures/valid.html b/test/fixtures/valid.html
@@ -10,7 +10,7 @@
 
 <img id="project-icon" src="images/transparent_1x1.png" class="ui-state-default" alt="default">
 
-<br style="clear:both" />
+<br style="clear:both">
 
 </body>
 </html>
diff --git a/test/helpers/expected_results.js b/test/helpers/expected_results.js
@@ -29,7 +29,7 @@ module.exports = {
     },
     {
       lastLine: 11,
-      lastColumn: 19,
+      lastColumn: 17,
       type: 'error',
       message: 'The “clear” attribute on the “br” element is obsolete. Use CSS instead.',
       file
@@ -67,7 +67,7 @@ module.exports = {
       },
       {
         lastLine: 11,
-        lastColumn: 19,
+        lastColumn: 17,
         type: 'error',
         message: 'The \'clear\' attribute on the \'br\' element is obsolete. Use CSS instead.',
         file
diff --git a/test/html_test.js b/test/html_test.js
@@ -74,14 +74,14 @@ describe('htmllint', () => {
         type: 'error',
         message: 'Internal encoding declaration “iso-8859-1” disagrees with the actual encoding of the document (“utf-8”).',
         lastLine: 4,
-        lastColumn: 74
+        lastColumn: 72
       },
       {
         file: path.normalize('test/fixtures/invalid-encoding.html'),
         type: 'error',
         message: 'Bad value “text/html; charset=iso-8859-1” for attribute “content” on element “meta”: “charset=” must be followed by “utf-8”.',
         lastLine: 4,
-        lastColumn: 74
+        lastColumn: 72
       }];
 
       run(options, expected, '', done);
diff --git a/test/junit_test.js b/test/junit_test.js
@@ -30,7 +30,7 @@ describe('junit reporter', () => {
       '1 line 1, char 16: Start tag seen without seeing a doctype first. Expected “&lt;!DOCTYPE html&gt;”.',
       '2 line 9, char 96: Attribute “unknownattr” not allowed on element “img” at this point.',
       '3 line 9, char 96: An “img” element must have an “alt” attribute, except under certain conditions. For details, consult guidance on providing text alternatives for images.',
-      '4 line 11, char 19: The “clear” attribute on the “br” element is obsolete. Use CSS instead.',
+      '4 line 11, char 17: The “clear” attribute on the “br” element is obsolete. Use CSS instead.',
       '</error>',
       '</testcase>',
       '</testsuite>'
diff --git a/test/reporters_test.js b/test/reporters_test.js
@@ -30,7 +30,7 @@ describe('reporters', () => {
         `${invalidHtml} [L1:C16] Start tag seen without seeing a doctype first. Expected “<!DOCTYPE html>”.`,
         `${invalidHtml} [L9:C96] Attribute “unknownattr” not allowed on element “img” at this point.`,
         `${invalidHtml} [L9:C96] An “img” element must have an “alt” attribute, except under certain conditions. For details, consult guidance on providing text alternatives for images.`,
-        `${invalidHtml} [L11:C19] The “clear” attribute on the “br” element is obsolete. Use CSS instead.`
+        `${invalidHtml} [L11:C17] The “clear” attribute on the “br” element is obsolete. Use CSS instead.`
       ].join('\n');
       const actual = stripAnsi(reporter(result));
 
