fix regression from last release - the handling of self closing svg t…

…ags was broken

src/main/java/org/htmlunit/cyberneko/HTMLScanner.java

@@ -2889,13 +2889,11 @@ else if (fByteStream != null && "BODY".equalsIgnoreCase(ename)) {
                     fByteStream = null;
                 }
                 else {
-                    final HTMLElements.Element element = htmlConfiguration_.getHtmlElements().getElement(ename);
-                    if (element.code == HTMLElements.UNKNOWN) {
-                        empty[0] = false;
-                    }
-
-                    if (fByteStream != null && element.parent != null && element.parent.length > 0) {
-                        if (element.parent[0].code == HTMLElements.BODY) {
+                    if (fByteStream != null) {
+                        final HTMLElements.Element element = htmlConfiguration_.getHtmlElements().getElement(ename);
+                        if (element.parent != null
+                                && element.parent.length > 0
+                                && element.parent[0].code == HTMLElements.BODY) {
                             fByteStream.clear();
                             fByteStream = null;
                         }

src/test/java/org/htmlunit/cyberneko/CanonicalTest.java

@@ -118,7 +118,7 @@ public void runTest(final File dataFile) throws Exception {
                 fail("Canonical file not found for input: " + dataFile.getAbsolutePath() + ": " + dataLines);
             }
 
-            final File nyiFile = new File(dataFile.getParentFile(), dataFile.getName() + ".notyetimplemented");
+            final File nyiFile = new File(canonicalFile.getParentFile(), canonicalFile.getName() + ".nyi");
             if (nyiFile.exists()) {
                 try {
                     assertEquals(getCanonical(canonicalFile), dataLines, dataFile.toString());
@@ -167,7 +167,7 @@ public void runDomTest(final File dataFile) throws Exception {
                 fail("Canonical file not found for input: " + dataFile.getAbsolutePath() + ": " + domDataLines);
             }
 
-            final File nyiFile = new File(dataFile.getParentFile(), dataFile.getName() + ".notyetimplemented-dom");
+            final File nyiFile = new File(canonicalFile.getParentFile(), canonicalFile.getName() + ".nyi");
             if (nyiFile.exists()) {
                 try {
                     assertEquals(getCanonical(canonicalFile), domDataLines, dataFile.toString());
@@ -224,7 +224,7 @@ public void runDomFragmentTest(final File dataFile) throws Exception {
                 fail("Canonical file not found for input: " + dataFile.getAbsolutePath() + ": " + domDataLines);
             }
 
-            final File nyiFile = new File(dataFile.getParentFile(), dataFile.getName() + ".notyetimplemented-dom");
+            final File nyiFile = new File(canonicalFile.getParentFile(), canonicalFile.getName() + ".nyi");
             if (nyiFile.exists()) {
                 try {
                     assertEquals(getCanonical(canonicalFile), domDataLines, dataFile.toString());
@@ -234,7 +234,7 @@ public void runDomFragmentTest(final File dataFile) throws Exception {
                     // expected
                 }
 
-                assertEquals(getCanonical(nyiFile).toLowerCase(Locale.ROOT), domDataLines, "NYI: " + dataFile);
+                assertEquals(getCanonical(nyiFile), domDataLines, "NYI: " + dataFile);
             }
             else {
                 assertEquals(getCanonical(canonicalFile), domDataLines, dataFile.toString());
@@ -273,7 +273,7 @@ public void runSaxTest(final File dataFile) throws Exception {
                 fail("Canonical file not found for input: " + dataFile.getAbsolutePath() + ": " + domDataLines);
             }
 
-            final File nyiFile = new File(dataFile.getParentFile(), dataFile.getName() + ".notyetimplemented-dom");
+            final File nyiFile = new File(canonicalFile.getParentFile(), canonicalFile.getName() + ".nyi");
             if (nyiFile.exists()) {
                 try {
                     assertEquals(getCanonical(canonicalFile), domDataLines, dataFile.toString());

src/test/resources/org/htmlunit/cyberneko/testfiles/strage-stuff/test-0002.html.canonical-frg.nyi

@@ -0,0 +1,6 @@
+(select<style
+)select<style
+"k
+(input<<
+)input<<
+"input/onfocus=alert(1)>

src/test/resources/org/htmlunit/cyberneko/testfiles/strage-stuff/test-0002.html.canonical.nyi

@@ -0,0 +1,12 @@
+(HTML
+(head
+)head
+(BODY
+(select<style
+)select<style
+"k
+(input<<
+)input<<
+"input/onfocus=alert(1)>
+)BODY
+)HTML

src/test/resources/org/htmlunit/cyberneko/testfiles/strage-stuff/test-0003.html.canonical-frg.nyi

@@ -0,0 +1,6 @@
+(select<style
+)select<style
+"W
+(xmp<script
+"alert(1)
+)xmp<script

src/test/resources/org/htmlunit/cyberneko/testfiles/strage-stuff/test-0003.html.canonical.nyi

@@ -0,0 +1,12 @@
+(HTML
+(head
+)head
+(BODY
+(select<style
+)select<style
+"W
+(xmp<script
+"alert(1)
+)xmp<script
+)BODY
+)HTML

src/test/resources/org/htmlunit/cyberneko/testfiles/strage-stuff/test-0006.html.canonical-frg.nyi

@@ -0,0 +1,6 @@
+(select<style
+)select<style
+"k
+(input<<
+)input<<
+"input/onfocus=alert(1)>

src/test/resources/org/htmlunit/cyberneko/testfiles/strage-stuff/test-0006.html.canonical.nyi

@@ -0,0 +1,12 @@
+(HTML
+(head
+)head
+(BODY
+(select<style
+)select<style
+"k
+(input<<
+)input<<
+"input/onfocus=alert(1)>
+)BODY
+)HTML

src/test/resources/org/htmlunit/cyberneko/testfiles/svg/test-svg-self-closing.html

@@ -0,0 +1 @@
+<html><body><svg><path fill='#4285F4' /><path fill='#34A853'/></svg></body></html>

src/test/resources/org/htmlunit/cyberneko/testfiles/svg/test-svg-self-closing.html.canonical

@@ -0,0 +1,14 @@
+(html
+(head
+)head
+(body
+(svg
+(path
+Afill #4285F4
+)path
+(path
+Afill #34A853
+)path
+)svg
+)body
+)html

src/test/resources/org/htmlunit/cyberneko/testfiles/unknown/test-unknown-closed.html.canonical.nyi

@@ -0,0 +1,11 @@
+(html
+(head
+)head
+(BODY
+(foo
+)foo
+(title
+"ti1234
+)title
+)BODY
+)html

src/test/resources/org/htmlunit/cyberneko/testfiles/unknown/test-unknown-element-head.html.canonical-frg.nyi

@@ -0,0 +1,14 @@
+(html
+(head
+(unknown1
+)unknown1
+(title
+"foo
+)title
+(unknown2
+)unknown2
+(unknown3
+)unknown3
+"\n
+)head
+)html