| Index: tests/html/instance_of_test.dart
 | 
| ===================================================================
 | 
| --- tests/html/instance_of_test.dart	(revision 14156)
 | 
| +++ tests/html/instance_of_test.dart	(working copy)
 | 
| @@ -11,46 +11,60 @@
 | 
|    canvas.attributes['height'] = 100;
 | 
|    document.body.nodes.add(canvas);
 | 
|  
 | 
| +  var isCanvasRenderingContext = predicate((x) => x is CanvasRenderingContext,
 | 
| +      'is a CanvasRenderingContext');
 | 
| +  var isCanvasRenderingContext2D = 
 | 
| +      predicate((x) => x is CanvasRenderingContext2D,
 | 
| +      'is a CanvasRenderingContext2D');
 | 
| +  var isElement = predicate((x) => x is Element, 'is an Element');
 | 
| +  var isCanvasElement = 
 | 
| +      predicate((x) => x is CanvasElement, 'is a CanvasElement');
 | 
| +  var isImageData = predicate((x) => x is ImageData, 'is an ImageData');
 | 
| +  //var isCanvasPixelArray =
 | 
| +  //  predicate((x) => x is CanvasPixelArray, 'is a CanvasPixelArray');
 | 
| +  var isUint8ClampedArray = 
 | 
| +      predicate((x) => x is Uint8ClampedArray, 'is a Uint8ClampedArray');
 | 
| +
 | 
|    useHtmlConfiguration();
 | 
|    test('Instanceof', () {
 | 
| -    Expect.isFalse(canvas is CanvasRenderingContext);
 | 
| -    Expect.isFalse(canvas is CanvasRenderingContext2D);
 | 
| -    Expect.isTrue(canvas is Element);
 | 
| -    Expect.isTrue(canvas is CanvasElement);
 | 
| -    Expect.isFalse(canvas is ImageData);
 | 
| -    // Expect.isFalse(canvas is CanvasPixelArray);
 | 
| +    expect(canvas, isNot(isCanvasRenderingContext));
 | 
| +    expect(canvas, isNot(isCanvasRenderingContext2D));
 | 
| +    expect(canvas, isElement);
 | 
| +    expect(canvas, isCanvasElement);
 | 
| +    expect(canvas, isNot(isImageData));
 | 
| +    // expect(canvas, isNot(isCanvasPixelArray));
 | 
|  
 | 
|      CanvasRenderingContext2D context = canvas.getContext('2d');
 | 
| -    Expect.isTrue(context is CanvasRenderingContext);
 | 
| -    Expect.isTrue(context is CanvasRenderingContext2D);
 | 
| -    Expect.isFalse(context is Element);
 | 
| -    Expect.isFalse(context is CanvasElement);
 | 
| -    Expect.isFalse(context is ImageData);
 | 
| -    // Expect.isFalse(context is CanvasPixelArray);
 | 
| +    expect(context, isCanvasRenderingContext);
 | 
| +    expect(context, isCanvasRenderingContext2D);
 | 
| +    expect(context, isNot(isElement));
 | 
| +    expect(context, isNot(isCanvasElement));
 | 
| +    expect(context, isNot(isImageData));
 | 
| +    // expect(context, isNot(isCanvasPixelArray));
 | 
|  
 | 
|      // FIXME(b/5286633): Interface injection type check workaround.
 | 
|      var image = context.createImageData(canvas.width as Dynamic,
 | 
|                                          canvas.height as Dynamic);
 | 
| -    Expect.isFalse(image is CanvasRenderingContext);
 | 
| -    Expect.isFalse(image is CanvasRenderingContext2D);
 | 
| -    Expect.isFalse(image is Element);
 | 
| -    Expect.isFalse(image is CanvasElement);
 | 
| -    Expect.isTrue(image is ImageData);
 | 
| -    // Expect.isFalse(image is CanvasPixelArray);
 | 
| +    expect(image, isNot(isCanvasRenderingContext));
 | 
| +    expect(image, isNot(isCanvasRenderingContext2D));
 | 
| +    expect(image, isNot(isElement));
 | 
| +    expect(image, isNot(isCanvasElement));
 | 
| +    expect(image, isImageData);
 | 
| +    // expect(image, isNot(isCanvasPixelArray));
 | 
|  
 | 
|      // Include CanvasPixelArray since constructor and prototype are not
 | 
|      // available until one is created.
 | 
|      var bytes = image.data;
 | 
| -    Expect.isFalse(bytes is CanvasRenderingContext);
 | 
| -    Expect.isFalse(bytes is CanvasRenderingContext2D);
 | 
| -    Expect.isFalse(bytes is Element);
 | 
| -    Expect.isFalse(bytes is CanvasElement);
 | 
| -    Expect.isFalse(bytes is ImageData);
 | 
| -    Expect.isTrue(bytes is Uint8ClampedArray);
 | 
| +    expect(bytes, isNot(isCanvasRenderingContext));
 | 
| +    expect(bytes, isNot(isCanvasRenderingContext2D));
 | 
| +    expect(bytes, isNot(isElement));
 | 
| +    expect(bytes, isNot(isCanvasElement));
 | 
| +    expect(bytes, isNot(isImageData));
 | 
| +    expect(bytes, isUint8ClampedArray);
 | 
|  
 | 
|      // FIXME: Ensure this is an SpanElement when we next update
 | 
|      // WebKit IDL.
 | 
|      var span = new Element.tag('span');
 | 
| -    Expect.isTrue(span is Element);
 | 
| +    expect(span, isElement);
 | 
|    });
 | 
|  }
 | 
| 
 |