Skip to content

Commit 2a0657b

Browse files
rbrirbri
committed
time to remove IE (issue #735)
1 parent a33890b commit 2a0657b

19 files changed

Lines changed: 73 additions & 169 deletions

‎src/test/java/org/htmlunit/javascript/ArgumentsTest.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,7 @@ public void passedCountDifferentFromDeclared() throws Exception {
100100
* @throws Exception if the test fails
101101
*/
102102
@Test
103-
@Alerts(DEFAULT = {"2", "world", "undefined", "undefined"},
104-
IE = {"2", "hi", "undefined", "you"})
103+
@Alerts({"2", "world", "undefined", "undefined"})
105104
public void readOnlyWhenAccessedThroughFunction() throws Exception {
106105
final String html
107106
= "<html><head>\n"
@@ -151,8 +150,7 @@ public void writableWithinFunction() throws Exception {
151150
* @throws Exception if the test fails
152151
*/
153152
@Test
154-
@Alerts(DEFAULT = "false",
155-
IE = "true")
153+
@Alerts("false")
156154
public void argumentsEqualsFnArguments() throws Exception {
157155
final String html = "<html><body>\n"
158156
+ "<script>\n"

‎src/test/java/org/htmlunit/javascript/host/ActiveXObject2Test.java‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@ public class ActiveXObject2Test extends WebDriverTestCase {
3535
* @throws Exception if the test fails
3636
*/
3737
@Test
38-
@Alerts(DEFAULT = {"undefined", "undefined", "NaN", "false", "No", "No", "No", "No"},
39-
IE = {"undefined", "\\nfunction\\sActiveXObject()\\s{\\n\\s\\s\\s\\s[native\\scode]\\n}\\n",
40-
"NaN", "false", "No", "No", "Yes", "Yes"})
38+
@Alerts({"undefined", "undefined", "NaN", "false", "No", "No", "No", "No"})
4139
public void browserDetection() throws Exception {
4240
final String html = "<html>\n"
4341
+ "<head>\n"
@@ -64,8 +62,7 @@ public void browserDetection() throws Exception {
6462
* @throws Exception if the test fails
6563
*/
6664
@Test
67-
@Alerts(DEFAULT = "exception",
68-
IE = "object")
65+
@Alerts("exception")
6966
public void xmlDocument() throws Exception {
7067
final String html = "<html>\n"
7168
+ " <head>\n"
@@ -88,8 +85,7 @@ public void xmlDocument() throws Exception {
8885
* @throws Exception if the test fails
8986
*/
9087
@Test
91-
@Alerts(DEFAULT = "ActiveXObject undefined",
92-
IE = "exception")
88+
@Alerts("ActiveXObject undefined")
9389
public void activex() throws Exception {
9490
final String html = "<html>\n"
9591
+ "<head>\n"

‎src/test/java/org/htmlunit/javascript/host/ApplicationCacheTest.java‎

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ public class ApplicationCacheTest extends WebDriverTestCase {
3535
* @throws Exception if the test fails
3636
*/
3737
@Test
38-
@Alerts(DEFAULT = "undefined",
39-
IE = "[object ApplicationCache]")
38+
@Alerts("undefined")
4039
public void scriptableToString() throws Exception {
4140
final String html = HtmlPageTest.STANDARDS_MODE_PREFIX_
4241
+ "<html><head>\n"
@@ -56,8 +55,7 @@ public void scriptableToString() throws Exception {
5655
* @throws Exception if the test fails
5756
*/
5857
@Test
59-
@Alerts(DEFAULT = "no applicationCache",
60-
IE = "function(e){}")
58+
@Alerts("no applicationCache")
6159
public void onchecking() throws Exception {
6260
eventHandler("onchecking");
6361
}
@@ -66,8 +64,7 @@ public void onchecking() throws Exception {
6664
* @throws Exception if the test fails
6765
*/
6866
@Test
69-
@Alerts(DEFAULT = "no applicationCache",
70-
IE = "function(e){}")
67+
@Alerts("no applicationCache")
7168
public void onerror() throws Exception {
7269
eventHandler("onerror");
7370
}
@@ -76,8 +73,7 @@ public void onerror() throws Exception {
7673
* @throws Exception if the test fails
7774
*/
7875
@Test
79-
@Alerts(DEFAULT = "no applicationCache",
80-
IE = "function(e){}")
76+
@Alerts("no applicationCache")
8177
public void onnoupdate() throws Exception {
8278
eventHandler("onnoupdate");
8379
}
@@ -86,8 +82,7 @@ public void onnoupdate() throws Exception {
8682
* @throws Exception if the test fails
8783
*/
8884
@Test
89-
@Alerts(DEFAULT = "no applicationCache",
90-
IE = "function(e){}")
85+
@Alerts("no applicationCache")
9186
public void ondownloading() throws Exception {
9287
eventHandler("ondownloading");
9388
}
@@ -96,8 +91,7 @@ public void ondownloading() throws Exception {
9691
* @throws Exception if the test fails
9792
*/
9893
@Test
99-
@Alerts(DEFAULT = "no applicationCache",
100-
IE = "function(e){}")
94+
@Alerts("no applicationCache")
10195
public void onprogress() throws Exception {
10296
eventHandler("onprogress");
10397
}
@@ -106,8 +100,7 @@ public void onprogress() throws Exception {
106100
* @throws Exception if the test fails
107101
*/
108102
@Test
109-
@Alerts(DEFAULT = "no applicationCache",
110-
IE = "function(e){}")
103+
@Alerts("no applicationCache")
111104
public void onupdateready() throws Exception {
112105
eventHandler("onupdateready");
113106
}
@@ -116,8 +109,7 @@ public void onupdateready() throws Exception {
116109
* @throws Exception if the test fails
117110
*/
118111
@Test
119-
@Alerts(DEFAULT = "no applicationCache",
120-
IE = "function(e){}")
112+
@Alerts("no applicationCache")
121113
public void oncached() throws Exception {
122114
eventHandler("oncached");
123115
}
@@ -149,8 +141,7 @@ private void eventHandler(final String handler) throws Exception {
149141
* @throws Exception if the test fails
150142
*/
151143
@Test
152-
@Alerts(DEFAULT = "no applicationCache",
153-
IE = {"false", "false", "false", "true", "true"})
144+
@Alerts("no applicationCache")
154145
public void eventListener() throws Exception {
155146
final String html = HtmlPageTest.STANDARDS_MODE_PREFIX_
156147
+ "<html><head>\n"

‎src/test/java/org/htmlunit/javascript/host/dom/AttrTest.java‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,7 @@ public void isId() throws Exception {
140140
* @throws Exception if the test fails
141141
*/
142142
@Test
143-
@Alerts(DEFAULT = {"undefined", "undefined", "undefined", "undefined", "undefined"},
144-
IE = {"false", "true", "false", "true", "true"})
143+
@Alerts({"undefined", "undefined", "undefined", "undefined", "undefined"})
145144
public void expando() throws Exception {
146145
final String html
147146
= "<html><head><script>\n"
@@ -167,8 +166,7 @@ public void expando() throws Exception {
167166
* @throws Exception if the test fails
168167
*/
169168
@Test
170-
@Alerts(DEFAULT = "undefined",
171-
IE = "false")
169+
@Alerts("undefined")
172170
public void expandoEvent() throws Exception {
173171
final String html
174172
= "<html><head><script>\n"
@@ -286,8 +284,7 @@ public void html_baseName() throws Exception {
286284
* @throws Exception if the test fails
287285
*/
288286
@Test
289-
@Alerts(DEFAULT = {"[object Attr]", "§§URL§§"},
290-
IE = {"[object Attr]", "undefined"})
287+
@Alerts({"[object Attr]", "§§URL§§"})
291288
public void html_baseURI() throws Exception {
292289
html("baseURI");
293290
}
@@ -305,8 +302,7 @@ public void html_namespaceURI() throws Exception {
305302
* @throws Exception if the test fails
306303
*/
307304
@Test
308-
@Alerts(DEFAULT = {"[object Attr]", "testattr"},
309-
IE = {"[object Attr]", "testAttr"})
305+
@Alerts({"[object Attr]", "testattr"})
310306
public void html_localName() throws Exception {
311307
html("localName");
312308
}
@@ -355,8 +351,7 @@ public void xml_baseName() throws Exception {
355351
* @throws Exception if the test fails
356352
*/
357353
@Test
358-
@Alerts(DEFAULT = {"[object Attr]", "§§URL§§foo.xml"},
359-
IE = {"[object Attr]", "undefined"})
354+
@Alerts({"[object Attr]", "§§URL§§foo.xml"})
360355
public void xml_baseURI() throws Exception {
361356
expandExpectedAlertsVariables(URL_FIRST);
362357
xml("baseURI");

‎src/test/java/org/htmlunit/javascript/host/event/AnimationEventTest.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ public class AnimationEventTest extends WebDriverTestCase {
4444
* @throws Exception if the test fails
4545
*/
4646
@Test
47-
@Alerts(DEFAULT = {"[object AnimationEvent]", "animationstart", "false", "false", "false"},
48-
IE = "exception")
47+
@Alerts({"[object AnimationEvent]", "animationstart", "false", "false", "false"})
4948
public void create_ctor() throws Exception {
5049
final String html = HtmlPageTest.STANDARDS_MODE_PREFIX_
5150
+ "<html><head><script>\n"
@@ -69,8 +68,7 @@ public void create_ctor() throws Exception {
6968
@Test
7069
@Alerts(DEFAULT = {"[object AnimationEvent]", "", "false", "false", "false"},
7170
FF = "exception",
72-
FF_ESR = "exception",
73-
IE = {"[object AnimationEvent]", "", "false", "false", "undefined"})
71+
FF_ESR = "exception")
7472
public void create_createEvent() throws Exception {
7573
final String html = HtmlPageTest.STANDARDS_MODE_PREFIX_
7674
+ "<html><head><script>\n"

‎src/test/java/org/htmlunit/javascript/host/event/AudioProcessingEventTest.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,7 @@ public void create_ctor() throws Exception {
6666
@Test
6767
@Alerts(DEFAULT = {"[object AudioProcessingEvent]", "audioprocessing", "false", "false", "false"},
6868
FF = "exception",
69-
FF_ESR = "exception",
70-
IE = "exception")
69+
FF_ESR = "exception")
7170
// audioCtx.createBuffer is missing
7271
@HtmlUnitNYI(CHROME = "exception",
7372
EDGE = "exception")
@@ -143,8 +142,7 @@ public void create_createEvent() throws Exception {
143142
* @throws Exception if the test fails
144143
*/
145144
@Test
146-
@Alerts(DEFAULT = "true",
147-
IE = "false")
145+
@Alerts("true")
148146
public void inWindow() throws Exception {
149147
final String html
150148
= "<html>\n"

‎src/test/java/org/htmlunit/javascript/host/event/BeforeInstallPromptEventTest.java‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ public class BeforeInstallPromptEventTest extends WebDriverTestCase {
4444
@Test
4545
@Alerts(DEFAULT = {"[object BeforeInstallPromptEvent]", "before", "false", "false", "false"},
4646
FF = "exception",
47-
FF_ESR = "exception",
48-
IE = "exception")
47+
FF_ESR = "exception")
4948
public void create_ctor() throws Exception {
5049
final String html = HtmlPageTest.STANDARDS_MODE_PREFIX_
5150
+ "<html><head><script>\n"
@@ -93,8 +92,7 @@ public void create_ctorWithoutType() throws Exception {
9392
@Test
9493
@Alerts(DEFAULT = {"[object BeforeInstallPromptEvent]", "42", "false", "false", "false"},
9594
FF = "exception",
96-
FF_ESR = "exception",
97-
IE = "exception")
95+
FF_ESR = "exception")
9896
public void create_ctorNumericType() throws Exception {
9997
final String html = HtmlPageTest.STANDARDS_MODE_PREFIX_
10098
+ "<html><head><script>\n"
@@ -118,8 +116,7 @@ public void create_ctorNumericType() throws Exception {
118116
@Test
119117
@Alerts(DEFAULT = {"[object BeforeInstallPromptEvent]", "null", "false", "false", "false"},
120118
FF = "exception",
121-
FF_ESR = "exception",
122-
IE = "exception")
119+
FF_ESR = "exception")
123120
public void create_ctorNullType() throws Exception {
124121
final String html = HtmlPageTest.STANDARDS_MODE_PREFIX_
125122
+ "<html><head><script>\n"
@@ -165,8 +162,7 @@ public void create_ctorUnknownType() throws Exception {
165162
@Test
166163
@Alerts(DEFAULT = {"[object BeforeInstallPromptEvent]", "HtmlUnitEvent", "false", "false", "false"},
167164
FF = "exception",
168-
FF_ESR = "exception",
169-
IE = "exception")
165+
FF_ESR = "exception")
170166
public void create_ctorArbitraryType() throws Exception {
171167
final String html = HtmlPageTest.STANDARDS_MODE_PREFIX_
172168
+ "<html><head><script>\n"
@@ -190,8 +186,7 @@ public void create_ctorArbitraryType() throws Exception {
190186
@Test
191187
@Alerts(DEFAULT = {"[object BeforeInstallPromptEvent]", "click", "false", "false", "false"},
192188
FF = "exception",
193-
FF_ESR = "exception",
194-
IE = "exception")
189+
FF_ESR = "exception")
195190
public void create_ctorAllDetails() throws Exception {
196191
final String html = HtmlPageTest.STANDARDS_MODE_PREFIX_
197192
+ "<html><head><script>\n"
@@ -216,8 +211,7 @@ public void create_ctorAllDetails() throws Exception {
216211
@Test
217212
@Alerts(DEFAULT = "true",
218213
FF = "false",
219-
FF_ESR = "false",
220-
IE = "false")
214+
FF_ESR = "false")
221215
public void inWindow() throws Exception {
222216
final String html
223217
= "<html>\n"

‎src/test/java/org/htmlunit/javascript/host/event/BeforeUnloadEvent2Test.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,7 @@ public void returnString() throws Exception {
7272
* @throws Exception if the test fails
7373
*/
7474
@Test
75-
@Alerts(DEFAULT = "Second",
76-
IE = "First")
75+
@Alerts("Second")
7776
public void returnNull() throws Exception {
7877
onbeforeunload("return null");
7978
}

‎src/test/java/org/htmlunit/javascript/host/event/BeforeUnloadEventTest.java‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,7 @@ public void create_ctor() throws Exception {
6767
* @throws Exception if the test fails
6868
*/
6969
@Test
70-
@Alerts(DEFAULT = {"[object BeforeUnloadEvent]", "", "false", "false", "false", ""},
71-
IE = "exception")
70+
@Alerts({"[object BeforeUnloadEvent]", "", "false", "false", "false", ""})
7271
public void create_createEvent() throws Exception {
7372
final String html = HtmlPageTest.STANDARDS_MODE_PREFIX_
7473
+ "<html><head><script>\n"
@@ -90,8 +89,7 @@ public void create_createEvent() throws Exception {
9089
* @throws Exception if the test fails
9190
*/
9291
@Test
93-
@Alerts(DEFAULT = {"[object BeforeUnloadEvent]", "beforeunload", "true", "false", "false", ""},
94-
IE = "exception")
92+
@Alerts({"[object BeforeUnloadEvent]", "beforeunload", "true", "false", "false", ""})
9593
public void initEvent() throws Exception {
9694
final String html = HtmlPageTest.STANDARDS_MODE_PREFIX_
9795
+ "<html><head><script>\n"
@@ -114,8 +112,7 @@ public void initEvent() throws Exception {
114112
* @throws Exception if the test fails
115113
*/
116114
@Test
117-
@Alerts(DEFAULT = {"[object BeforeUnloadEvent]", "beforeunload", "true", "false", "false", ""},
118-
IE = "exception")
115+
@Alerts({"[object BeforeUnloadEvent]", "beforeunload", "true", "false", "false", ""})
119116
public void dispatchEvent() throws Exception {
120117
final String html = HtmlPageTest.STANDARDS_MODE_PREFIX_
121118
+ "<html><head><script>\n"
@@ -139,8 +136,7 @@ public void dispatchEvent() throws Exception {
139136
* @throws Exception if the test fails
140137
*/
141138
@Test
142-
@Alerts(DEFAULT = {"[object Event]", "beforeunload", "true", "false", "false", "true"},
143-
IE = {"[object Event]", "beforeunload", "true", "false", "undefined", "undefined"})
139+
@Alerts({"[object Event]", "beforeunload", "true", "false", "false", "true"})
144140
public void dispatchEvent_event() throws Exception {
145141
final String html = HtmlPageTest.STANDARDS_MODE_PREFIX_
146142
+ "<html><head><script>\n"

‎src/test/java/org/htmlunit/javascript/host/event/BlobEventTest.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,7 @@ public void create_ctorArbitraryType() throws Exception {
174174
* @throws Exception if the test fails
175175
*/
176176
@Test
177-
@Alerts(DEFAULT = {"[object BlobEvent]", "blob", "false", "false", "false", "[object Blob]"},
178-
IE = "exception")
177+
@Alerts({"[object BlobEvent]", "blob", "false", "false", "false", "[object Blob]"})
179178
public void create_ctorAllDetails() throws Exception {
180179
final String html = HtmlPageTest.STANDARDS_MODE_PREFIX_
181180
+ "<html><head><script>\n"
@@ -248,8 +247,7 @@ public void create_ctorAllDetailsWrongData() throws Exception {
248247
* @throws Exception if the test fails
249248
*/
250249
@Test
251-
@Alerts(DEFAULT = "true",
252-
IE = "false")
250+
@Alerts("true")
253251
public void inWindow() throws Exception {
254252
final String html
255253
= "<html>\n"

0 commit comments

Comments
 (0)