Skip to content

Commit ce5be9e

Browse files
committed
improve nyi handling
1 parent ad037b9 commit ce5be9e

31 files changed

+333
-8
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@ private static void verify(final File dataFile, final String saxDataLines)
8989
fail("Canonical file not found for input: " + dataFile.getAbsolutePath() + ": " + saxDataLines);
9090
}
9191

92-
final File nyiFile = new File(canonicalFile.getParentFile(), canonicalFile.getName() + ".nyi");
92+
final File nyiFile = new File(canonicalFile.getParentFile(),
93+
dataFile.getName() + ".canonical-sax-cust.nyi");
9394
if (nyiFile.exists()) {
9495
try {
9596
assertEquals(getCanonical(canonicalFile), saxDataLines, dataFile.toString());

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@ private static void test(final File dataFile, final String dataLines) throws Exc
7676
fail("Canonical file not found for input: " + dataFile.getAbsolutePath() + ": " + dataLines);
7777
}
7878

79-
final File nyiFile = new File(canonicalFile.getParentFile(), canonicalFile.getName() + ".nyi");
79+
final File nyiFile = new File(canonicalFile.getParentFile(),
80+
dataFile.getName() + ".canonical-frg.nyi");
8081
if (nyiFile.exists()) {
8182
try {
8283
assertEquals(getCanonical(canonicalFile), dataLines, dataFile.toString());

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ private static void test(final File dataFile, final String dataLines) throws Exc
7474
fail("Canonical file not found for input: " + dataFile.getAbsolutePath() + ": " + dataLines);
7575
}
7676

77-
final File nyiFile = new File(canonicalFile.getParentFile(), canonicalFile.getName() + ".nyi");
77+
final File nyiFile = new File(canonicalFile.getParentFile(),
78+
dataFile.getName() + ".canonical-domhtml.nyi");
7879
if (nyiFile.exists()) {
7980
try {
8081
assertEquals(getCanonical(canonicalFile), dataLines, dataFile.toString());

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ private static void verify(final File dataFile, final String domDataLines)
102102
fail("Canonical file not found for input: " + dataFile.getAbsolutePath() + ": " + domDataLines);
103103
}
104104

105-
final File nyiFile = new File(canonicalFile.getParentFile(), canonicalFile.getName() + ".nyi");
105+
final File nyiFile = new File(canonicalFile.getParentFile(),
106+
dataFile.getName() + ".canonical-dom.nyi");
106107
if (nyiFile.exists()) {
107108
try {
108109
assertEquals(getCanonical(canonicalFile), domDataLines, dataFile.toString());

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ private static void test(final File dataFile, final String dataLines) throws Exc
6868
fail("Canonical file not found for input: " + dataFile.getAbsolutePath() + ": " + dataLines);
6969
}
7070

71-
final File nyiFile = new File(canonicalFile.getParentFile(), canonicalFile.getName() + ".nyi");
71+
final File nyiFile = new File(canonicalFile.getParentFile(),
72+
dataFile.getName() + ".canonical-html.nyi");
7273
if (nyiFile.exists()) {
7374
try {
7475
assertEquals(getCanonical(canonicalFile), dataLines, dataFile.toString());

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@ private static void verify(final File dataFile, final String saxDataLines)
9696
fail("Canonical file not found for input: " + dataFile.getAbsolutePath() + ": " + saxDataLines);
9797
}
9898

99-
final File nyiFile = new File(canonicalFile.getParentFile(), canonicalFile.getName() + ".nyi");
99+
final File nyiFile = new File(canonicalFile.getParentFile(),
100+
dataFile.getName() + ".canonical-sax.nyi");
100101
if (nyiFile.exists()) {
101102
try {
102103
assertEquals(getCanonical(canonicalFile), saxDataLines, dataFile.toString());

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ private static void test(final File dataFile, final String dataLines) throws Exc
6969
fail("Canonical file not found for input: " + dataFile.getAbsolutePath() + ": " + dataLines);
7070
}
7171

72-
final File nyiFile = new File(canonicalFile.getParentFile(), canonicalFile.getName() + ".nyi");
72+
final File nyiFile = new File(canonicalFile.getParentFile(),
73+
dataFile.getName() + ".canonical.nyi");
7374
if (nyiFile.exists()) {
7475
try {
7576
assertEquals(getCanonical(canonicalFile), dataLines, dataFile.toString());

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ public void runTest(final File dataFile) throws Exception {
6262
fail("Canonical file not found for input: " + dataFile.getAbsolutePath() + ": " + domDataLines);
6363
}
6464

65-
final File nyiFile = new File(canonicalFile.getParentFile(), canonicalFile.getName() + ".nyi");
65+
final File nyiFile = new File(canonicalFile.getParentFile(),
66+
dataFile.getName() + ".canonical-xni.nyi");
6667
if (nyiFile.exists()) {
6768
try {
6869
assertEquals(getCanonical(canonicalFile), domDataLines, dataFile.toString());
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<html>
2+
<body>
3+
<p>Heading</h2>
4+
<p>delim 1</p>
5+
Heading</h1>
6+
<p>delim 2</p>
7+
</body>
8+
</html>
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
(html
2+
(head
3+
)head
4+
(body
5+
"\n
6+
(p
7+
"Heading\n
8+
)p
9+
(p
10+
"delim 1
11+
)p
12+
"\nHeading\n
13+
(p
14+
"delim 2
15+
)p
16+
"\n\n
17+
)body
18+
)html

0 commit comments

Comments
 (0)