Fix for web_component tests. Take 4
R=jmesserly@google.com
Review URL: https://codereview.chromium.org//327663004
git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart/pkg/web_components@37153 260f80e4-7a28-3924-810f-c04153c831b5
diff --git a/test/interop2_test.dart b/test/interop2_test.dart
deleted file mode 100644
index 90f9163..0000000
--- a/test/interop2_test.dart
+++ /dev/null
@@ -1,97 +0,0 @@
-// Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// TODO(sigmund): delete this file after issue 19322 is resolved.
-// This test is a trimmed down version of interop_test. interop_test is
-// currently failing in dart2js because of bug/19322, so we have this copy
-// that excludes the causes of failure to get some test coverage in .js.
-library web_components.interop2_test;
-
-import 'dart:html';
-import 'dart:async';
-import 'dart:js' show context, JsObject;
-import 'package:unittest/html_config.dart';
-import 'package:unittest/unittest.dart';
-import 'package:web_components/interop.dart';
-import 'package:web_components/polyfill.dart';
-
-final globalSetup = customElementsReady.then((_) {
- registerDartType('x-a', XAWrapper);
- registerDartType('x-b', XBWrapper, extendsTag: 'div');
- registerDartType('x-c', XCWrapper);
- });
-
-main() {
- useHtmlConfiguration();
- setUp(() => globalSetup);
-
- test('interop is supported', () {
- expect(isSupported, isTrue);
- });
-
- test('previously created elements are not upgraded', () {
- var a = document.querySelector('x-a');
- expect(a is HtmlElement, isTrue, reason: 'x-a is HtmlElement');
- expect(a is XAWrapper, isFalse, reason: 'x-a should not be upgraded yet');
- expect(_readX(a), 0);
-
- var c = document.querySelector('x-c');
- expect(c is HtmlElement, isTrue, reason: 'x-c is HtmlElement');
- expect(c is XCWrapper, isFalse, reason: 'x-c should not be upgraded yet');
- expect(_readX(c), null, reason: 'x-c has not been registered in JS yet');
- });
-
- test('events seen for anything created after registering Dart type', () {
- context.callMethod('addA');
- var list = document.querySelectorAll('x-a');
- expect(list.length, 2);
- var a = list[1];
- expect(a is HtmlElement, isTrue, reason: 'x-a is HtmlElement');
- expect(a is XAWrapper, isTrue, reason: 'x-a is upgraded to XAWrapper');
- expect(a.x, 2);
- expect(a.wrapperCount, 0);
- });
-
- test('events seen if Dart type is registered before registerElement', () {
- var c = document.querySelector('x-c');
- expect(c is XCWrapper, isFalse);
- expect(_readX(c), null, reason: 'x-c has not been registered in JS yet');
-
- context.callMethod('registerC');
- c = document.querySelector('x-c');
- expect(c is XCWrapper, isTrue);
- expect(c.x, 3);
- expect(c.wrapperCount, 1);
-
- context.callMethod('addC');
- var list = document.querySelectorAll('x-c');
- expect(list.length, 2);
- expect(list[0], c);
- c = list[1];
- expect(c is HtmlElement, isTrue, reason: 'x-c is HtmlElement');
- expect(c is XCWrapper, isTrue, reason: 'x-c is upgraded to XCWrapper');
- expect(c.x, 4);
- expect(c.wrapperCount, 2);
- });
-}
-int _count = 0;
-
-abstract class Wrapper {
- int wrapperCount = _count++;
- int get x => _readX(this);
-}
-
-_readX(e) => new JsObject.fromBrowserObject(e)['x'];
-
-class XAWrapper extends HtmlElement with Wrapper {
- XAWrapper.created() : super.created();
-}
-
-class XBWrapper extends DivElement with Wrapper {
- XBWrapper.created() : super.created();
-}
-
-class XCWrapper extends HtmlElement with Wrapper {
- XCWrapper.created() : super.created();
-}
diff --git a/test/interop2_test.html b/test/interop2_test.html
deleted file mode 100644
index 3c4f10e..0000000
--- a/test/interop2_test.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
- <meta name="dart.unittest" content="full-stack-traces">
- <title> interop_test.html </title>
- <style>
- .unittest-table { font-family:monospace; border:1px; }
- .unittest-pass { background: #6b3;}
- .unittest-fail { background: #d55;}
- .unittest-error { background: #a11;}
- </style>
- <script src="/packages/web_components/platform.js"></script>
- <script src="/packages/web_components/dart_support.js"></script>
-</head>
-<body>
- <h1> Running interop_test </h1>
- <script>
- var counter = 0;
- var A = function() {};
- A.prototype = Object.create(HTMLElement.prototype);
- A.prototype.inc = function() { this.x = counter++; };
- A.prototype.createdCallback = function() { this.inc(); };
-
- var B = function() {};
- B.prototype = Object.create(HTMLDivElement.prototype);
- B.prototype.createdCallback = function() { this.x = counter++; };
- B.extends = 'div';
-
- document.registerElement('x-a', A);
- document.registerElement('x-b', B);
-
- function registerC() {
- var proto = Object.create(HTMLElement.prototype, {
- inc: { value: function() { this.x = counter++; } },
- createdCallback: {
- value: function() { this.inc(); },
- configurable: true},
- });
- document.registerElement('x-c', {prototype: proto});
- }
- function addA() {
- document.body.appendChild(document.createElement('x-a'));
- }
- function addB() {
- document.body.appendChild(document.createElement('div', 'x-b'));
- }
- function addC() {
- document.body.appendChild(document.createElement('x-c'));
- }
- </script>
- <x-a id="i1"></x-a>
- <div is="x-b" id="i2"></div>
- <x-c id="i3"></x-b>
- <script type="text/javascript"
- src="/root_dart/tools/testing/dart/test_controller.js"></script>
- %TEST_SCRIPTS%
-</body>
-</html>
