From 9d49469af4bc6178ec9f4a77d3041ae8d7baec34 Mon Sep 17 00:00:00 2001 From: Vijay Menon Date: Thu, 28 Apr 2016 13:00:07 -0700 Subject: [PATCH] Reenable typed_data and html tests TBR=jacobr@google.com Review URL: https://codereview.chromium.org/1924423002 . --- pkg/dev_compiler/karma.conf.js | 4 +- ..._default_arg_test_default_value_multi.dart | 59 ------------------- ...ault_arg_test_explicit_argument_multi.dart | 59 ------------------- ...d_interop_default_arg_test_none_multi.dart | 59 ------------------- 4 files changed, 2 insertions(+), 179 deletions(-) delete mode 100644 pkg/dev_compiler/test/codegen/lib/html/js_typed_interop_default_arg_test_default_value_multi.dart delete mode 100644 pkg/dev_compiler/test/codegen/lib/html/js_typed_interop_default_arg_test_explicit_argument_multi.dart delete mode 100644 pkg/dev_compiler/test/codegen/lib/html/js_typed_interop_default_arg_test_none_multi.dart diff --git a/pkg/dev_compiler/karma.conf.js b/pkg/dev_compiler/karma.conf.js index a3920d0d5f97..61e8442c4d33 100644 --- a/pkg/dev_compiler/karma.conf.js +++ b/pkg/dev_compiler/karma.conf.js @@ -26,8 +26,8 @@ module.exports = function(config) { 'test/codegen/expect/language/**.js', 'test/codegen/expect/language/sub/sub.js', 'test/codegen/expect/language/*.lib', - 'test/codegen/expect/lib-typed_data/**.js', - 'test/codegen/expect/lib-html/**.js', + 'test/codegen/expect/lib/typed_data/**.js', + 'test/codegen/expect/lib/html/**.js', 'test/browser/*.js', 'test-main.js', ], diff --git a/pkg/dev_compiler/test/codegen/lib/html/js_typed_interop_default_arg_test_default_value_multi.dart b/pkg/dev_compiler/test/codegen/lib/html/js_typed_interop_default_arg_test_default_value_multi.dart deleted file mode 100644 index 88bf8a65f113..000000000000 --- a/pkg/dev_compiler/test/codegen/lib/html/js_typed_interop_default_arg_test_default_value_multi.dart +++ /dev/null @@ -1,59 +0,0 @@ -// Copyright (c) 2015, 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. - -@JS() -library js_typed_interop_test; - -import 'dart:html'; - -import 'package:expect/expect.dart' show NoInline; -import 'package:js/js.dart'; -import 'package:unittest/unittest.dart'; -import 'package:unittest/html_config.dart'; - -_injectJs() { - document.body.append(new ScriptElement() - ..type = 'text/javascript' - ..innerHtml = r""" - var Foo = { - get42: function(b) { return arguments.length >= 1 ? b : 42; }, - get43: function(b) { return arguments.length >= 1 ? b : 43; } - }; -"""); -} - -@JS() -class Foo { - // Note: it's invalid to provide a default value. - external static num get42([num b - = 3 /// default_value: compile-time error - ]); - external static num get43([num b]); -} - -main() { - _injectJs(); - useHtmlConfiguration(); - - test('call directly from dart', () { - expect(Foo.get42(2), 2); - expect(Foo.get42(), 42); - }); - - test('call tearoff from dart with arg', () { - var f = Foo.get42; - - }); - - test('call tearoff from dart with default', () { - var f = Foo.get42; - // Note: today both SSA and CPS remove the extra argument on static calls, - // but they fail to do so on tearoffs. - expect(f(), 3); /// default_value: continued - - f = Foo.get43; - expect(f(), 43); - }); -} -// Test created from multitest named /usr/local/google/home/jacobr/git/dev_compilers/5/dev_compiler/test/codegen/lib/html/js_typed_interop_default_arg_test.dart. diff --git a/pkg/dev_compiler/test/codegen/lib/html/js_typed_interop_default_arg_test_explicit_argument_multi.dart b/pkg/dev_compiler/test/codegen/lib/html/js_typed_interop_default_arg_test_explicit_argument_multi.dart deleted file mode 100644 index 40de01c19ac3..000000000000 --- a/pkg/dev_compiler/test/codegen/lib/html/js_typed_interop_default_arg_test_explicit_argument_multi.dart +++ /dev/null @@ -1,59 +0,0 @@ -// Copyright (c) 2015, 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. - -@JS() -library js_typed_interop_test; - -import 'dart:html'; - -import 'package:expect/expect.dart' show NoInline; -import 'package:js/js.dart'; -import 'package:unittest/unittest.dart'; -import 'package:unittest/html_config.dart'; - -_injectJs() { - document.body.append(new ScriptElement() - ..type = 'text/javascript' - ..innerHtml = r""" - var Foo = { - get42: function(b) { return arguments.length >= 1 ? b : 42; }, - get43: function(b) { return arguments.length >= 1 ? b : 43; } - }; -"""); -} - -@JS() -class Foo { - // Note: it's invalid to provide a default value. - external static num get42([num b - - ]); - external static num get43([num b]); -} - -main() { - _injectJs(); - useHtmlConfiguration(); - - test('call directly from dart', () { - expect(Foo.get42(2), 2); - expect(Foo.get42(), 42); - }); - - test('call tearoff from dart with arg', () { - var f = Foo.get42; - expect(f(2), 2); /// explicit_argument: ok - }); - - test('call tearoff from dart with default', () { - var f = Foo.get42; - // Note: today both SSA and CPS remove the extra argument on static calls, - // but they fail to do so on tearoffs. - - - f = Foo.get43; - expect(f(), 43); - }); -} -// Test created from multitest named /usr/local/google/home/jacobr/git/dev_compilers/5/dev_compiler/test/codegen/lib/html/js_typed_interop_default_arg_test.dart. diff --git a/pkg/dev_compiler/test/codegen/lib/html/js_typed_interop_default_arg_test_none_multi.dart b/pkg/dev_compiler/test/codegen/lib/html/js_typed_interop_default_arg_test_none_multi.dart deleted file mode 100644 index 01a843c3faab..000000000000 --- a/pkg/dev_compiler/test/codegen/lib/html/js_typed_interop_default_arg_test_none_multi.dart +++ /dev/null @@ -1,59 +0,0 @@ -// Copyright (c) 2015, 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. - -@JS() -library js_typed_interop_test; - -import 'dart:html'; - -import 'package:expect/expect.dart' show NoInline; -import 'package:js/js.dart'; -import 'package:unittest/unittest.dart'; -import 'package:unittest/html_config.dart'; - -_injectJs() { - document.body.append(new ScriptElement() - ..type = 'text/javascript' - ..innerHtml = r""" - var Foo = { - get42: function(b) { return arguments.length >= 1 ? b : 42; }, - get43: function(b) { return arguments.length >= 1 ? b : 43; } - }; -"""); -} - -@JS() -class Foo { - // Note: it's invalid to provide a default value. - external static num get42([num b - - ]); - external static num get43([num b]); -} - -main() { - _injectJs(); - useHtmlConfiguration(); - - test('call directly from dart', () { - expect(Foo.get42(2), 2); - expect(Foo.get42(), 42); - }); - - test('call tearoff from dart with arg', () { - var f = Foo.get42; - - }); - - test('call tearoff from dart with default', () { - var f = Foo.get42; - // Note: today both SSA and CPS remove the extra argument on static calls, - // but they fail to do so on tearoffs. - - - f = Foo.get43; - expect(f(), 43); - }); -} -// Test created from multitest named /usr/local/google/home/jacobr/git/dev_compilers/5/dev_compiler/test/codegen/lib/html/js_typed_interop_default_arg_test.dart.