Skip to content

Commit a7154f2

Browse files
committed
get rid of NotYetImplemented
1 parent f7cfffc commit a7154f2

File tree

3 files changed

+49
-8
lines changed

3 files changed

+49
-8
lines changed

src/test/java/org/htmlunit/javascript/RhinoTest.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import org.htmlunit.WebDriverTestCase;
1818
import org.htmlunit.junit.BrowserRunner;
1919
import org.htmlunit.junit.annotation.Alerts;
20-
import org.htmlunit.junit.annotation.NotYetImplemented;
20+
import org.htmlunit.junit.annotation.HtmlUnitNYI;
2121
import org.htmlunit.util.MimeType;
2222
import org.junit.Test;
2323
import org.junit.runner.RunWith;
@@ -38,7 +38,10 @@ public class RhinoTest extends WebDriverTestCase {
3838
*/
3939
@Test
4040
@Alerts({"true", "true"})
41-
@NotYetImplemented
41+
@HtmlUnitNYI(CHROME = {"false", "false"},
42+
EDGE = {"false", "false"},
43+
FF = {"false", "false"},
44+
FF_ESR = {"false", "false"})
4245
public void isStrict_GlobalThis() throws Exception {
4346
final String html = DOCTYPE_HTML
4447
+ "<html>\n"
@@ -63,7 +66,10 @@ public void isStrict_GlobalThis() throws Exception {
6366
*/
6467
@Test
6568
@Alerts("true")
66-
@NotYetImplemented
69+
@HtmlUnitNYI(CHROME = "false",
70+
EDGE = "false",
71+
FF = "false",
72+
FF_ESR = "false")
6773
public void isStrict_evalVar() throws Exception {
6874
final String html = DOCTYPE_HTML
6975
+ "<html>\n"

src/test/java/org/htmlunit/javascript/ScriptableObjectTest.java

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
import org.htmlunit.junit.BrowserRunner;
1919
import org.htmlunit.junit.annotation.Alerts;
2020
import org.htmlunit.junit.annotation.HtmlUnitNYI;
21-
import org.htmlunit.junit.annotation.NotYetImplemented;
2221
import org.junit.Test;
2322
import org.junit.runner.RunWith;
23+
import org.openqa.selenium.WebDriverException;
2424

2525
/**
2626
* Tests for general scriptable objects in the browser context.
@@ -137,7 +137,10 @@ public void ctorNotChangeableForPrimitives() throws Exception {
137137
*/
138138
@Test
139139
@Alerts({"TypeError", "true", "true"})
140-
@NotYetImplemented
140+
@HtmlUnitNYI(CHROME = "org.htmlunit.ScriptException: TypeError: Cannot set property \"constructor\" of abc",
141+
EDGE = "org.htmlunit.ScriptException: TypeError: Cannot set property \"constructor\" of abc",
142+
FF = "org.htmlunit.ScriptException: TypeError: Cannot set property \"constructor\" of abc",
143+
FF_ESR = "org.htmlunit.ScriptException: TypeError: Cannot set property \"constructor\" of abc")
141144
public void ctorNotChangeableForPrimitivesStrict() throws Exception {
142145
final String html = DOCTYPE_HTML
143146
+ "<html><body>\n"
@@ -165,7 +168,12 @@ public void ctorNotChangeableForPrimitivesStrict() throws Exception {
165168
+ "</body>\n"
166169
+ "</html>\n";
167170

168-
loadPageVerifyTitle2(html);
171+
try {
172+
loadPageVerifyTitle2(html);
173+
}
174+
catch (final WebDriverException e) {
175+
assertTrue(e.getMessage(), e.getMessage().startsWith(getExpectedAlerts()[0]));
176+
}
169177
}
170178

171179
/**

src/test/java/org/htmlunit/javascript/host/Window3Test.java

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.htmlunit.WebDriverTestCase;
3030
import org.htmlunit.junit.BrowserRunner;
3131
import org.htmlunit.junit.annotation.Alerts;
32-
import org.htmlunit.junit.annotation.NotYetImplemented;
32+
import org.htmlunit.junit.annotation.HtmlUnitNYI;
3333
import org.junit.Test;
3434
import org.junit.runner.RunWith;
3535
import org.openqa.selenium.By;
@@ -1888,7 +1888,34 @@ public void onload() throws Exception {
18881888
"window at load",
18891889
"window at load capture",
18901890
"body onload"})
1891-
@NotYetImplemented
1891+
@HtmlUnitNYI(CHROME = {"element 1 onload",
1892+
"element 2 onerror",
1893+
"document DOMContentLoaded",
1894+
"window DOMContentLoaded",
1895+
"window at load",
1896+
"window at load capture",
1897+
"body onload"},
1898+
EDGE = {"element 1 onload",
1899+
"element 2 onerror",
1900+
"document DOMContentLoaded",
1901+
"window DOMContentLoaded",
1902+
"window at load",
1903+
"window at load capture",
1904+
"body onload"},
1905+
FF = {"element 1 onload",
1906+
"element 2 onerror",
1907+
"document DOMContentLoaded",
1908+
"window DOMContentLoaded",
1909+
"window at load",
1910+
"window at load capture",
1911+
"body onload"},
1912+
FF_ESR = {"element 1 onload",
1913+
"element 2 onerror",
1914+
"document DOMContentLoaded",
1915+
"window DOMContentLoaded",
1916+
"window at load",
1917+
"window at load capture",
1918+
"body onload"})
18921919
public void onloadScript() throws Exception {
18931920
getMockWebConnection().setResponse(URL_SECOND, "");
18941921

0 commit comments

Comments
 (0)