Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1247)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/LayoutTests/fast/canvas/canvas-lineDash-input-sequence.html

Issue 2681423002: Use testharness.js instead of js-test.js in LayoutTests/fast/canvas tests. (Closed)
Patch Set: Adding exceptions to TestExpectations Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/LayoutTests/fast/canvas/canvas-lineDash-expected.txt ('k') | third_party/WebKit/LayoutTests/fast/canvas/canvas-lineDash-input-sequence-expected.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/LayoutTests/fast/canvas/canvas-lineDash-input-sequence.html
diff --git a/third_party/WebKit/LayoutTests/fast/canvas/canvas-lineDash-input-sequence.html b/third_party/WebKit/LayoutTests/fast/canvas/canvas-lineDash-input-sequence.html
index 061d9f4afb282f7d9ccb2118a3cb9d647c868fa3..1cbcb5f0e1170ca5a29f86868903ec51f2167c6e 100644
--- a/third_party/WebKit/LayoutTests/fast/canvas/canvas-lineDash-input-sequence.html
+++ b/third_party/WebKit/LayoutTests/fast/canvas/canvas-lineDash-input-sequence.html
@@ -1,77 +1,75 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
<link rel="help" href="http://www.w3.org/TR/2013/WD-2dcontext2-20130528/#dom-context-2d-setlinedash">
-<script src="../../resources/js-test.js"></script>
-</head>
+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
<body>
<script>
-description("Test that setLineDash converts input argument into a Web IDL sequence");
-
-var canvas = document.createElement('canvas');
-document.body.appendChild(canvas);
-canvas.setAttribute('width', '700');
-canvas.setAttribute('height', '700');
-var ctx = canvas.getContext('2d');
-
-var arrayValues = [5, 15, 25];
-
-function createTestArray(arrayType) {
- var array;
- if (arrayType == Object) {
- // Test a "sequence" (Object with length property).
- array = {length: arrayValues.length};
- } else {
- array = new arrayType(arrayValues.length);
- }
-
- for (var i = 0; i < arrayValues.length; ++i)
- array[i] = arrayValues[i]
- return array;
-}
-
-var lineDash;
-var inputArray;
-function checkLineDash(testArray, shouldFail) {
- inputArray = testArray;
- // Reset line dash.
- ctx.setLineDash([]);
- // Set line dash.
- if (shouldFail) {
- shouldThrow("ctx.setLineDash(inputArray)", "'TypeError: Failed to execute \\'setLineDash\\' on \\'CanvasRenderingContext2D\\': The 1st argument is neither an array, nor does it have indexed properties.'");
- } else {
- ctx.setLineDash(inputArray);
- lineDash = ctx.getLineDash();
- for (var i = 0; i < arrayValues.length; ++i)
- shouldBe("lineDash[" + i + "]", "" + arrayValues[i]);
+test(function(t) {
+
+ var canvas = document.createElement('canvas');
+ document.body.appendChild(canvas);
+ canvas.setAttribute('width', '700');
+ canvas.setAttribute('height', '700');
+ var ctx = canvas.getContext('2d');
+
+ var arrayValues = [5, 15, 25];
+
+ function createTestArray(arrayType) {
+ var array;
+ if (arrayType == Object) {
+ // Test a "sequence" (Object with length property).
+ array = {length: arrayValues.length};
+ } else {
+ array = new arrayType(arrayValues.length);
+ }
+
+ for (var i = 0; i < arrayValues.length; ++i)
+ array[i] = arrayValues[i]
+ return array;
}
-}
-
-var arrayTypes = [Array, Int8Array, Int16Array, Int32Array, Uint8Array, Uint16Array, Uint32Array, Float32Array, Float64Array, Uint8ClampedArray, Object];
-
-// Success cases.
-for (var i = 0; i < arrayTypes.length; ++i) {
- debug("* Test passing a " + arrayTypes[i].name + " as input.");
- checkLineDash(createTestArray(arrayTypes[i]), false);
-}
-
-// Failure cases.
-debug("* Test passing a Date as input.");
-checkLineDash(new Date(), true);
-debug("* Test passing a RegExp as input.");
-checkLineDash(new RegExp(), true);
-debug("* Test passing an Object without length as input.");
-checkLineDash({test: 1}, true);
-debug("* Test passing a Number as input.");
-checkLineDash(3, true);
-debug("* Test passing a String as input.");
-checkLineDash("Test", true);
-debug("* Test passing a Boolean as input.");
-checkLineDash(true, true);
-debug("* Test passing null as input.");
-checkLineDash(null, true);
-debug("* Test passing undefined as input.");
-checkLineDash(undefined, true);
+
+ var lineDash;
+ var inputArray;
+ function checkLineDash(testArray, shouldFail) {
+ inputArray = testArray;
+ // Reset line dash.
+ ctx.setLineDash([]);
+ // Set line dash.
+ if (shouldFail) {
+ assert_throws(null, function() {ctx.setLineDash(inputArray);}, "'TypeError: Failed to execute \\'setLineDash\\' on \\'CanvasRenderingContext2D\\': The 1st argument is neither an array, nor does it have indexed properties.'");
+ } else {
+ ctx.setLineDash(inputArray);
+ lineDash = ctx.getLineDash();
+ for (var i = 0; i < arrayValues.length; ++i)
+ assert_equals(lineDash[i], arrayValues[i]);
+ }
+ }
+
+ var arrayTypes = [Array, Int8Array, Int16Array, Int32Array, Uint8Array, Uint16Array, Uint32Array, Float32Array, Float64Array, Uint8ClampedArray, Object];
+
+ // Success cases.
+ for (var i = 0; i < arrayTypes.length; ++i) {
+ // Test passing a valid array time as input.
+ checkLineDash(createTestArray(arrayTypes[i]), false);
+ }
+
+ // Failure cases.
+ // Test passing a Date as input.
+ checkLineDash(new Date(), true);
+ // Test passing a RegExp as input.
+ checkLineDash(new RegExp(), true);
+ // Test passing an Object without length as input.
+ checkLineDash({test: 1}, true);
+ // Test passing a Number as input.
+ checkLineDash(3, true);
+ // Test passing a String as input.
+ checkLineDash("Test", true);
+ // Test passing a Boolean as input.
+ checkLineDash(true, true);
+ // Test passing null as input.
+ checkLineDash(null, true);
+ // Test passing undefined as input.
+ checkLineDash(undefined, true);
+
+}, 'Test that setLineDash converts input argument into a Web IDL sequence');
</script>
</body>
-</html>
« no previous file with comments | « third_party/WebKit/LayoutTests/fast/canvas/canvas-lineDash-expected.txt ('k') | third_party/WebKit/LayoutTests/fast/canvas/canvas-lineDash-input-sequence-expected.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698