Skip to content

Commit 735b9c2

Browse files
committed
dart-lang#2398. Update TouchEvent tests to not fail on platforms where it is not defined
1 parent 86b355a commit 735b9c2

18 files changed

+131
-47
lines changed

LibTest/html/Element/onTouchCancel_A01_t01.dart

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,18 @@ main() {
1313
var type = 'touchcancel';
1414
var x = document.body;
1515
if (x != null) {
16+
var event;
17+
try {
18+
event = new TouchEvent(type);
19+
} catch (_) {
20+
// TouchEvent is not present in Safari and Firefox. Nothing to test.
21+
return;
22+
}
1623
asyncStart();
17-
x.onTouchCancel.listen((e) {
24+
x.onTouchLeave.listen((e) {
1825
Expect.equals(type, e.type);
1926
asyncEnd();
2027
});
21-
22-
var event = new TouchEvent(type);
2328
x.dispatchEvent(event);
2429
} else {
2530
Expect.fail("Body is null");

LibTest/html/Element/onTouchEnd_A01_t01.dart

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,18 @@ main() {
1313
var type = 'touchend';
1414
var x = document.body;
1515
if (x != null) {
16+
var event;
17+
try {
18+
event = new TouchEvent(type);
19+
} catch (_) {
20+
// TouchEvent is not present in Safari and Firefox. Nothing to test.
21+
return;
22+
}
1623
asyncStart();
17-
x.onTouchEnd.listen((e) {
24+
x.onTouchLeave.listen((e) {
1825
Expect.equals(type, e.type);
1926
asyncEnd();
2027
});
21-
22-
var event = new TouchEvent(type);
2328
x.dispatchEvent(event);
2429
} else {
2530
Expect.fail("Body is null");

LibTest/html/Element/onTouchEnter_A01_t01.dart

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,18 @@ main() {
1313
var type = 'touchenter';
1414
var x = document.body;
1515
if (x != null) {
16+
var event;
17+
try {
18+
event = new TouchEvent(type);
19+
} catch (_) {
20+
// TouchEvent is not present in Safari and Firefox. Nothing to test.
21+
return;
22+
}
1623
asyncStart();
17-
x.onTouchEnter.listen((e) {
24+
x.onTouchLeave.listen((e) {
1825
Expect.equals(type, e.type);
1926
asyncEnd();
2027
});
21-
22-
var event = new TouchEvent(type);
2328
x.dispatchEvent(event);
2429
} else {
2530
Expect.fail("Body is null");

LibTest/html/Element/onTouchLeave_A01_t01.dart

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,18 @@ main() {
1313
var type = 'touchleave';
1414
var x = document.body;
1515
if (x != null) {
16+
var event;
17+
try {
18+
event = new TouchEvent(type);
19+
} catch (_) {
20+
// TouchEvent is not present in Safari and Firefox. Nothing to test.
21+
return;
22+
}
1623
asyncStart();
1724
x.onTouchLeave.listen((e) {
1825
Expect.equals(type, e.type);
1926
asyncEnd();
2027
});
21-
22-
var event = new TouchEvent(type);
2328
x.dispatchEvent(event);
2429
} else {
2530
Expect.fail("Body is null");

LibTest/html/Element/onTouchMove_A01_t01.dart

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,18 @@ main() {
1313
var type = 'touchmove';
1414
var x = document.body;
1515
if (x != null) {
16+
var event;
17+
try {
18+
event = new TouchEvent(type);
19+
} catch (_) {
20+
// TouchEvent is not present in Safari and Firefox. Nothing to test.
21+
return;
22+
}
1623
asyncStart();
17-
x.onTouchMove.listen((e) {
24+
x.onTouchLeave.listen((e) {
1825
Expect.equals(type, e.type);
1926
asyncEnd();
2027
});
21-
22-
var event = new TouchEvent(type);
2328
x.dispatchEvent(event);
2429
} else {
2530
Expect.fail("Body is null");

LibTest/html/Element/onTouchStart_A01_t01.dart

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,18 @@ main() {
1313
var type = 'touchstart';
1414
var x = document.body;
1515
if (x != null) {
16+
var event;
17+
try {
18+
event = new TouchEvent(type);
19+
} catch (_) {
20+
// TouchEvent is not present in Safari and Firefox. Nothing to test.
21+
return;
22+
}
1623
asyncStart();
17-
x.onTouchStart.listen((e) {
24+
x.onTouchLeave.listen((e) {
1825
Expect.equals(type, e.type);
1926
asyncEnd();
2027
});
21-
22-
var event = new TouchEvent(type);
2328
x.dispatchEvent(event);
2429
} else {
2530
Expect.fail("Body is null");

LibTest/html/Element/touchCancelEvent_A01_t01.dart

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,18 @@ main() {
1414
var type = 'touchcancel';
1515
var x = document.body;
1616
if (x != null) {
17+
var event;
18+
try {
19+
event = new TouchEvent(type);
20+
} catch (_) {
21+
// TouchEvent is not present in Safari and Firefox. Nothing to test.
22+
return;
23+
}
1724
asyncStart();
1825
Element.touchCancelEvent.forElement(x).listen((e) {
1926
Expect.equals(type, e.type);
2027
asyncEnd();
2128
});
22-
23-
var event = new TouchEvent(type);
2429
x.dispatchEvent(event);
2530
} else {
2631
Expect.fail("Body is null");

LibTest/html/Element/touchEndEvent_A01_t01.dart

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,18 @@ main() {
1414
var type = 'touchend';
1515
var x = document.body;
1616
if (x != null) {
17+
var event;
18+
try {
19+
event = new TouchEvent(type);
20+
} catch (_) {
21+
// TouchEvent is not present in Safari and Firefox. Nothing to test.
22+
return;
23+
}
1724
asyncStart();
1825
Element.touchEndEvent.forElement(x).listen((e) {
1926
Expect.equals(type, e.type);
2027
asyncEnd();
2128
});
22-
23-
var event = new TouchEvent(type);
2429
x.dispatchEvent(event);
2530
} else {
2631
Expect.fail("Body is null");

LibTest/html/Element/touchEnterEvent_A01_t01.dart

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,18 @@ main() {
1414
var type = 'touchenter';
1515
var x = document.body;
1616
if (x != null) {
17+
var event;
18+
try {
19+
event = new TouchEvent(type);
20+
} catch (_) {
21+
// TouchEvent is not present in Safari and Firefox. Nothing to test.
22+
return;
23+
}
1724
asyncStart();
1825
Element.touchEnterEvent.forElement(x).listen((e) {
1926
Expect.equals(type, e.type);
2027
asyncEnd();
2128
});
22-
23-
var event = new TouchEvent(type);
2429
x.dispatchEvent(event);
2530
} else {
2631
Expect.fail("Body is null");

LibTest/html/Element/touchLeaveEvent_A01_t01.dart

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,18 @@ main() {
1414
var type = 'touchleave';
1515
var x = document.body;
1616
if (x != null) {
17+
var event;
18+
try {
19+
event = new TouchEvent(type);
20+
} catch (_) {
21+
// TouchEvent is not present in Safari and Firefox. Nothing to test.
22+
return;
23+
}
1724
asyncStart();
1825
Element.touchLeaveEvent.forElement(x).listen((e) {
1926
Expect.equals(type, e.type);
2027
asyncEnd();
2128
});
22-
23-
var event = new TouchEvent(type);
2429
x.dispatchEvent(event);
2530
} else {
2631
Expect.fail("Body is null");

LibTest/html/Element/touchMoveEvent_A01_t01.dart

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,18 @@ main() {
1414
var type = 'touchmove';
1515
var x = document.body;
1616
if (x != null) {
17+
var event;
18+
try {
19+
event = new TouchEvent(type);
20+
} catch (_) {
21+
// TouchEvent is not present in Safari and Firefox. Nothing to test.
22+
return;
23+
}
1724
asyncStart();
1825
Element.touchMoveEvent.forElement(x).listen((e) {
1926
Expect.equals(type, e.type);
2027
asyncEnd();
2128
});
22-
23-
var event = new TouchEvent(type);
2429
x.dispatchEvent(event);
2530
} else {
2631
Expect.fail("Body is null");

LibTest/html/Element/touchStartEvent_A01_t01.dart

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,18 @@ main() {
1414
var type = 'touchstart';
1515
var x = document.body;
1616
if (x != null) {
17+
var event;
18+
try {
19+
event = new TouchEvent(type);
20+
} catch (_) {
21+
// TouchEvent is not present in Safari and Firefox. Nothing to test.
22+
return;
23+
}
1724
asyncStart();
1825
Element.touchStartEvent.forElement(x).listen((e) {
1926
Expect.equals(type, e.type);
2027
asyncEnd();
2128
});
22-
23-
var event = new TouchEvent(type);
2429
x.dispatchEvent(event);
2530
} else {
2631
Expect.fail("Body is null");

LibTest/html/IFrameElement/onTouchCancel_A01_t01.dart

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,17 @@ import "../../../Utils/expect.dart";
1212
main() {
1313
var type = 'touchcancel';
1414
var x = new IFrameElement();
15-
15+
var event;
16+
try {
17+
event = new TouchEvent(type);
18+
} catch (_) {
19+
// TouchEvent is not present in Safari and Firefox. Nothing to test.
20+
return;
21+
}
1622
asyncStart();
1723
x.onTouchCancel.listen((e) {
1824
Expect.equals(type, e.type);
1925
asyncEnd();
2026
});
21-
22-
var event = new TouchEvent(type);
2327
x.dispatchEvent(event);
2428
}

LibTest/html/IFrameElement/onTouchEnd_A01_t01.dart

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,17 @@ import "../../../Utils/expect.dart";
1212
main() {
1313
var type = 'touchend';
1414
var x = new IFrameElement();
15-
15+
var event;
16+
try {
17+
event = new TouchEvent(type);
18+
} catch (_) {
19+
// TouchEvent is not present in Safari and Firefox. Nothing to test.
20+
return;
21+
}
1622
asyncStart();
1723
x.onTouchEnd.listen((e) {
1824
Expect.equals(type, e.type);
1925
asyncEnd();
2026
});
21-
22-
var event = new TouchEvent(type);
2327
x.dispatchEvent(event);
2428
}

LibTest/html/IFrameElement/onTouchEnter_A01_t01.dart

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,17 @@ import "../../../Utils/expect.dart";
1212
main() {
1313
var type = 'touchenter';
1414
var x = new IFrameElement();
15-
15+
var event;
16+
try {
17+
event = new TouchEvent(type);
18+
} catch (_) {
19+
// TouchEvent is not present in Safari and Firefox. Nothing to test.
20+
return;
21+
}
1622
asyncStart();
1723
x.onTouchEnter.listen((e) {
1824
Expect.equals(type, e.type);
1925
asyncEnd();
2026
});
21-
22-
var event = new TouchEvent(type);
2327
x.dispatchEvent(event);
2428
}

LibTest/html/IFrameElement/onTouchLeave_A01_t01.dart

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,17 @@ import "../../../Utils/expect.dart";
1212
main() {
1313
var type = 'touchleave';
1414
var x = new IFrameElement();
15-
15+
var event;
16+
try {
17+
event = new TouchEvent(type);
18+
} catch (_) {
19+
// TouchEvent is not present in Safari and Firefox. Nothing to test.
20+
return;
21+
}
1622
asyncStart();
1723
x.onTouchLeave.listen((e) {
1824
Expect.equals(type, e.type);
1925
asyncEnd();
2026
});
21-
22-
var event = new TouchEvent(type);
2327
x.dispatchEvent(event);
2428
}

LibTest/html/IFrameElement/onTouchMove_A01_t01.dart

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,17 @@ import "../../../Utils/expect.dart";
1212
main() {
1313
var type = 'touchmove';
1414
var x = new IFrameElement();
15-
15+
var event;
16+
try {
17+
event = new TouchEvent(type);
18+
} catch (_) {
19+
// TouchEvent is not present in Safari and Firefox. Nothing to test.
20+
return;
21+
}
1622
asyncStart();
1723
x.onTouchMove.listen((e) {
1824
Expect.equals(type, e.type);
1925
asyncEnd();
2026
});
21-
22-
var event = new TouchEvent(type);
2327
x.dispatchEvent(event);
2428
}

LibTest/html/IFrameElement/onTouchStart_A01_t01.dart

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,17 @@ import "../../../Utils/expect.dart";
1212
main() {
1313
var type = 'touchstart';
1414
var x = new IFrameElement();
15-
15+
var event;
16+
try {
17+
event = new TouchEvent(type);
18+
} catch (_) {
19+
// TouchEvent is not present in Safari and Firefox. Nothing to test.
20+
return;
21+
}
1622
asyncStart();
1723
x.onTouchStart.listen((e) {
1824
Expect.equals(type, e.type);
1925
asyncEnd();
2026
});
21-
22-
var event = new TouchEvent(type);
2327
x.dispatchEvent(event);
2428
}

0 commit comments

Comments
 (0)