Update pubspecs and dependencies to get pkgbuild tests working.

This also removes the vendored copy of Angular, which was an outdated version of
an unstaffed branch.

R=pquitslund@google.com

Review URL: https://codereview.chromium.org//1058283006

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@45410 260f80e4-7a28-3924-810f-c04153c831b5

pkg/analysis_server/pubspec.yaml

@@ -15,7 +15,7 @@ dependencies:
   watcher: any
   yaml: any
 dev_dependencies:
-  html5lib: any
+  html: any
   mock: '>=0.11.0 <0.12.0'
   test_reflective_loader: '>=0.0.3 <0.1.0'
   typed_mock: '>=0.0.4 <1.0.0'

pkg/analysis_server/tool/spec/api.dart

@@ -10,7 +10,7 @@ library api;
 
 import 'dart:collection';
 
-import 'package:html5lib/dom.dart' as dom;
+import 'package:html/dom.dart' as dom;
 
 /**
  * Toplevel container for the API.

pkg/analysis_server/tool/spec/codegen_dart_protocol.dart

@@ -6,7 +6,7 @@ library codegen.protocol;
 
 import 'dart:convert';
 
-import 'package:html5lib/dom.dart' as dom;
+import 'package:html/dom.dart' as dom;
 
 import 'api.dart';
 import 'codegen_dart.dart';

pkg/analysis_server/tool/spec/codegen_java.dart

@@ -7,7 +7,7 @@
  */
 library CodegenJava;
 
-import 'package:html5lib/dom.dart' as dom;
+import 'package:html/dom.dart' as dom;
 
 import 'api.dart';
 import 'codegen_tools.dart';

pkg/analysis_server/tool/spec/codegen_java_types.dart

@@ -7,7 +7,7 @@
  */
 library java.generator.types;
 
-import 'package:html5lib/dom.dart' as dom;
+import 'package:html/dom.dart' as dom;
 
 import 'api.dart';
 import 'codegen_java.dart';

pkg/analysis_server/tool/spec/codegen_tools.dart

@@ -9,7 +9,7 @@ library codegen.tools;
 
 import 'dart:io';
 
-import 'package:html5lib/dom.dart' as dom;
+import 'package:html/dom.dart' as dom;
 import 'package:path/path.dart';
 
 import 'html_tools.dart';

pkg/analysis_server/tool/spec/from_html.dart

@@ -9,8 +9,8 @@ library from.html;
 
 import 'dart:io';
 
-import 'package:html5lib/dom.dart' as dom;
-import 'package:html5lib/parser.dart' as parser;
+import 'package:html/dom.dart' as dom;
+import 'package:html/parser.dart' as parser;
 
 import 'api.dart';
 import 'html_tools.dart';

pkg/analysis_server/tool/spec/html_tools.dart

@@ -7,7 +7,7 @@
  */
 library html.tools;
 
-import 'package:html5lib/dom.dart' as dom;
+import 'package:html/dom.dart' as dom;
 
 /**
  * Make a deep copy of the given HTML nodes.

pkg/analysis_server/tool/spec/text_formatter.dart

@@ -7,7 +7,7 @@
  */
 library text.formatter;
 
-import 'package:html5lib/dom.dart' as dom;
+import 'package:html/dom.dart' as dom;
 
 import 'codegen_tools.dart';
 

pkg/analysis_server/tool/spec/to_html.dart

@@ -11,7 +11,7 @@ library to.html;
 
 import 'dart:convert';
 
-import 'package:html5lib/dom.dart' as dom;
+import 'package:html/dom.dart' as dom;
 
 import 'api.dart';
 import 'codegen_tools.dart';

pkg/pkg.status

@@ -15,8 +15,6 @@
 docgen/test/inherited_comments_test: Fail # issue 22233
 
 [ $compiler == none && ($runtime == drt || $runtime == dartium || $runtime == ContentShellOnAndroid) ]
-third_party/angular_tests/browser_test/*: Skip # github perf_api.dart issue 5
-third_party/angular_tests/browser_test/core_dom/shadow_root_options: Fail # Issue 19329
 mutation_observer: Skip # Issue 21149
 unittest/*: Skip # Issue 21949
 
@@ -30,7 +28,6 @@ analysis_server/tool/spec/check_all_test: SkipSlow # Times out
 analyzer/test/generated/element_test: SkipSlow  # Times out
 analyzer/test/generated/parser_test: SkipSlow  # Times out
 docgen/test/*: SkipSlow
-third_party/html5lib/test/tokenizer_test: SkipSlow  # Times out
 
 [ $runtime == vm && $system == windows]
 analysis_server/test/analysis/get_errors_test: Skip # runtime error, Issue 22180
@@ -43,7 +40,6 @@ collection/test/equality_test/04: Fail # Issue 1533
 collection/test/equality_test/05: Fail # Issue 1533
 collection/test/equality_test/none: Pass, Fail # Issue 14348
 docgen/test/*: SkipSlow # Far too slow
-third_party/angular_tests/browser_test: Pass, Slow # Large dart2js compile time
 typed_data/test/typed_buffers_test/01: Fail # Not supporting Int64List, Uint64List.
 analyzer/test/generated/engine_test: SkipSlow
 analyzer/test/generated/static_type_warning_code_test: Pass, Slow
@@ -66,9 +62,6 @@ analysis_server/test/integration: Skip
 [ $compiler == dart2js && $checked ]
 crypto/test/base64_test: Slow, Pass
 
-[ $compiler == dart2js && $runtime == drt ]
-third_party/angular_tests/browser_test/core_dom/shadow_root_options: Fail # Issue 19329
-
 [ $runtime == d8 ]
 analysis_server/test/analysis_notification_overrides_test: Pass, Slow # Issue 19756
 analysis_server/test/analysis_notification_occurrences_test: Pass, Slow # Issue 19756
@@ -99,9 +92,6 @@ async/test/stream_zip_test: RuntimeError, Pass # Issue 18548
 collection/test/unmodifiable_collection_test: SkipSlow # Times out. Issue 22050
 async/test/stream_zip_test: SkipSlow # Times out. Issue 22050
 
-[ $runtime == vm || $runtime == d8 || $runtime == jsshell ]
-third_party/angular_tests/browser_test: SkipByDesign # uses dart:html
-
 [$compiler == dart2dart]
 *: Skip
 
@@ -113,10 +103,6 @@ typed_data/test/typed_buffers_test/none: Fail # Issue   17607 (I put this here e
 # Unexplained errors only occuring on Safari 6.1 and earlier.
 typed_data/test/typed_buffers_test: RuntimeError
 
-# Skip browser-specific tests on VM
-[ $runtime == vm ]
-third_party/angular_tests/vm_test: Fail # Uses removed APIs. See issue 18733.
-
 [ $runtime == vm && $system == windows ]
 analyzer/test/generated/all_the_rest_test: Fail # Issue 21772
 
@@ -128,11 +114,6 @@ mock/test/mock_stepwise_negative_test: Skip
 
 compiler/samples/compile_loop/compile_loop: CompileTimeError  # Issue 16524
 
-[ $compiler == dartanalyzer || $compiler == dart2analyzer ]
-# This test uses third_party/pkg/perf_api/lib/perf_api.dart, which
-# contains illegal constant constructors.
-third_party/angular_tests/browser_test: CompileTimeError
-
 [ $compiler == dart2js && $csp ]
 # This test cannot run under CSP because it is injecting a JavaScript polyfill
 mutation_observer: Skip
@@ -152,11 +133,6 @@ http_server/test/*: Fail, OK # Uses dart:io.
 observe/test/transformer_test: Fail, OK # Uses dart:io.
 observe/test/unique_message_test: SkipByDesign  # Uses dart:io.
 stub_core_library/test/*: Fail, OK # Uses dart:io.
-third_party/angular_tests/browser_test/core_dom/cookies: Fail # Issue 16337
-third_party/angular_tests/vm_test: SkipByDesign # Uses dart:io
-third_party/html5lib/test/parser_test: SkipByDesign # Uses dart:io.
-third_party/html5lib/test/selectors/*: SkipByDesign # Uses dart:io.
-third_party/html5lib/test/tokenizer_test: SkipByDesign # Uses dart:io.
 
 [ $runtime == vm && ($arch == simarm64 || $arch == simarm || $arch == simarmv5te || $arch == simmips || $arch == armv5te) ]
 # Timeout. These are not unit tests. They do not run efficiently on our
@@ -166,25 +142,10 @@ third_party/html5lib/test/tokenizer_test: SkipByDesign # Uses dart:io.
 [ $runtime == vm ]
 # Skip tests on the VM if the package depends on dart:html
 mutation_observer: Skip
-third_party/html5lib/test/browser/browser_test: Skip
-
-[ $compiler == dartanalyzer || $compiler == dart2analyzer ]
-third_party/angular_tests/vm_test: StaticWarning # Uses removed APIs. See issue 18733.
-
-[ $runtime == safari || $runtime == safarimobilesim || $runtime == chrome || $runtime == ff || $ie ]
-# Various issues due to limited browser testing in Angular.
-third_party/angular_tests/*: Skip
 
 [ $compiler == dart2js && $runtime == chrome && $system == macos ]
 third_party/di_tests/di_test: Pass, Slow # Issue 22896
 
-[ $unchecked ]
-third_party/angular_tests/browser_test/angular: SkipByDesign # Requires checked mode.
-third_party/angular_tests/browser_test/core/scope: SkipByDesign # Requires checked mode.
-third_party/angular_tests/browser_test/core/zone: SkipByDesign # Requires checked mode.
-third_party/angular_tests/browser_test/directive/ng_repeat: Skip # Issue 17152
-third_party/angular_tests/browser_test/change_detection/dirty_checking_change_detector: Skip # Issue 17152
-
 [ $use_repository_packages ]
 analyzer/test/*: PubGetError
 
@@ -690,7 +651,6 @@ mock/test/mock_regexp_negative_test: Crash # Instance of 'TypeOperator': unimple
 mock/test/mock_stepwise_negative_test: Crash # cannot compile methods that need interceptor calling convention.
 mock/test/mock_test: Crash # Instance of 'TypeOperator': unimplemented in CodeGenerator
 stub_core_library/test/stub_test: Crash #  try/finally
-third_party/angular_tests/vm_test: Crash #  try/finally
 third_party/di_tests/di_test: Crash #  try/finally
 typed_data/test/typed_buffers_test/01: Crash # cannot compile methods that need interceptor calling convention.
 typed_data/test/typed_buffers_test/none: Crash # cannot compile methods that need interceptor calling convention.

pkg/pkgbuild.status

@@ -8,11 +8,8 @@ pkg/docgen: Pass, Slow
 
 [ $use_repository_packages ]
 pkg/analyzer: PubGetError
-pkg/browser: PubGetError
 samples/third_party/angular_todo: Fail # angular needs to be updated
 samples/third_party/todomvc_performance: Skip # dependencies are not in the repo
-third_party/pkg/intl: PubGetError # Issue 19782
-third_party/pkg/html5lib: PubGetError # angular needs to be updated
 
 [ $use_public_packages ]
 samples/third_party/angular_todo: Pass, Slow

pkg/third_party/angular_tests/browser_test.dart

@@ -1,329 +0,0 @@
-/// auto-generated by update_angular.sh
-
-// Copyright (c) 2014, 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.
-
-library angular_browser_tests;
-
-import 'package:angular/mock/module.dart';
-import 'package:unittest/html_individual_config.dart';
-import 'package:unittest/unittest.dart';
-import '../../../third_party/pkg/angular/test/angular_spec.dart' as test_0;
-import '../../../third_party/pkg/angular/test/bootstrap_spec.dart' as test_1;
-import '../../../third_party/pkg/angular/test/change_detection/dirty_checking_change_detector_spec.dart' as test_2;
-import '../../../third_party/pkg/angular/test/change_detection/watch_group_spec.dart' as test_3;
-import '../../../third_party/pkg/angular/test/core/cache_spec.dart' as test_4;
-import '../../../third_party/pkg/angular/test/core/core_directive_spec.dart' as test_5;
-import '../../../third_party/pkg/angular/test/core/interpolate_spec.dart' as test_6;
-import '../../../third_party/pkg/angular/test/core/parser/generated_getter_setter_spec.dart' as test_7;
-import '../../../third_party/pkg/angular/test/core/parser/lexer_spec.dart' as test_8;
-import '../../../third_party/pkg/angular/test/core/parser/parser_spec.dart' as test_9;
-import '../../../third_party/pkg/angular/test/core/parser/static_parser_spec.dart' as test_10;
-import '../../../third_party/pkg/angular/test/core/registry_spec.dart' as test_11;
-import '../../../third_party/pkg/angular/test/core/scope_spec.dart' as test_12;
-import '../../../third_party/pkg/angular/test/core/templateurl_spec.dart' as test_13;
-import '../../../third_party/pkg/angular/test/core/zone_spec.dart' as test_14;
-import '../../../third_party/pkg/angular/test/core_dom/block_spec.dart' as test_15;
-import '../../../third_party/pkg/angular/test/core_dom/compiler_spec.dart' as test_16;
-import '../../../third_party/pkg/angular/test/core_dom/cookies_spec.dart' as test_17;
-import '../../../third_party/pkg/angular/test/core_dom/directive_spec.dart' as test_18;
-import '../../../third_party/pkg/angular/test/core_dom/http_spec.dart' as test_19;
-import '../../../third_party/pkg/angular/test/core_dom/ng_mustache_spec.dart' as test_20;
-import '../../../third_party/pkg/angular/test/core_dom/node_cursor_spec.dart' as test_21;
-import '../../../third_party/pkg/angular/test/core_dom/selector_spec.dart' as test_22;
-import '../../../third_party/pkg/angular/test/core_dom/shadow_root_options_spec.dart' as test_23;
-import '../../../third_party/pkg/angular/test/directive/input_select_spec.dart' as test_24;
-import '../../../third_party/pkg/angular/test/directive/ng_a_spec.dart' as test_25;
-import '../../../third_party/pkg/angular/test/directive/ng_bind_html_spec.dart' as test_26;
-import '../../../third_party/pkg/angular/test/directive/ng_bind_spec.dart' as test_27;
-import '../../../third_party/pkg/angular/test/directive/ng_bind_template_spec.dart' as test_28;
-import '../../../third_party/pkg/angular/test/directive/ng_class_spec.dart' as test_29;
-import '../../../third_party/pkg/angular/test/directive/ng_cloak_spec.dart' as test_30;
-import '../../../third_party/pkg/angular/test/directive/ng_events_spec.dart' as test_31;
-import '../../../third_party/pkg/angular/test/directive/ng_form_spec.dart' as test_32;
-import '../../../third_party/pkg/angular/test/directive/ng_if_spec.dart' as test_33;
-import '../../../third_party/pkg/angular/test/directive/ng_include_spec.dart' as test_34;
-import '../../../third_party/pkg/angular/test/directive/ng_model_spec.dart' as test_35;
-import '../../../third_party/pkg/angular/test/directive/ng_model_validators_spec.dart' as test_36;
-import '../../../third_party/pkg/angular/test/directive/ng_non_bindable_spec.dart' as test_37;
-import '../../../third_party/pkg/angular/test/directive/ng_pluralize_spec.dart' as test_38;
-import '../../../third_party/pkg/angular/test/directive/ng_repeat_spec.dart' as test_39;
-import '../../../third_party/pkg/angular/test/directive/ng_show_hide_spec.dart' as test_40;
-import '../../../third_party/pkg/angular/test/directive/ng_src_boolean_spec.dart' as test_41;
-import '../../../third_party/pkg/angular/test/directive/ng_style_spec.dart' as test_42;
-import '../../../third_party/pkg/angular/test/directive/ng_switch_spec.dart' as test_43;
-import '../../../third_party/pkg/angular/test/directive/ng_template_spec.dart' as test_44;
-import '../../../third_party/pkg/angular/test/filter/currency_spec.dart' as test_45;
-import '../../../third_party/pkg/angular/test/filter/date_spec.dart' as test_46;
-import '../../../third_party/pkg/angular/test/filter/filter_spec.dart' as test_47;
-import '../../../third_party/pkg/angular/test/filter/json_spec.dart' as test_48;
-import '../../../third_party/pkg/angular/test/filter/limit_to_spec.dart' as test_49;
-import '../../../third_party/pkg/angular/test/filter/lowercase_spec.dart' as test_50;
-import '../../../third_party/pkg/angular/test/filter/number_spec.dart' as test_51;
-import '../../../third_party/pkg/angular/test/filter/order_by_spec.dart' as test_52;
-import '../../../third_party/pkg/angular/test/filter/uppercase_spec.dart' as test_53;
-import '../../../third_party/pkg/angular/test/introspection_spec.dart' as test_54;
-import '../../../third_party/pkg/angular/test/mock/http_backend_spec.dart' as test_55;
-import '../../../third_party/pkg/angular/test/mock/test_bed_spec.dart' as test_56;
-import '../../../third_party/pkg/angular/test/mock/zone_spec.dart' as test_57;
-import '../../../third_party/pkg/angular/test/routing/ng_bind_route_spec.dart' as test_58;
-import '../../../third_party/pkg/angular/test/routing/ng_view_spec.dart' as test_59;
-import '../../../third_party/pkg/angular/test/routing/routing_spec.dart' as test_60;
-import '../../../third_party/pkg/angular/test/_specs_spec.dart' as test_61;
-
-main() {
-  useHtmlIndividualConfiguration();
-
-  setUp(() {
-    setUpInjector();
-  });
-
-  group('angular', () {
-    test_0.main();
-  });
-
-  group('bootstrap', () {
-    test_1.main();
-  });
-
-  group('change_detection/dirty_checking_change_detector', () {
-    test_2.main();
-  });
-
-  group('change_detection/watch_group', () {
-    test_3.main();
-  });
-
-  group('core/cache', () {
-    test_4.main();
-  });
-
-  group('core/core_directive', () {
-    test_5.main();
-  });
-
-  group('core/interpolate', () {
-    test_6.main();
-  });
-
-  group('core/parser/generated_getter_setter', () {
-    test_7.main();
-  });
-
-  group('core/parser/lexer', () {
-    test_8.main();
-  });
-
-  group('core/parser/parser', () {
-    test_9.main();
-  });
-
-  group('core/parser/static_parser', () {
-    test_10.main();
-  });
-
-  group('core/registry', () {
-    test_11.main();
-  });
-
-  group('core/scope', () {
-    test_12.main();
-  });
-
-  group('core/templateurl', () {
-    test_13.main();
-  });
-
-  group('core/zone', () {
-    test_14.main();
-  });
-
-  group('core_dom/block', () {
-    test_15.main();
-  });
-
-  group('core_dom/compiler', () {
-    test_16.main();
-  });
-
-  group('core_dom/cookies', () {
-    test_17.main();
-  });
-
-  group('core_dom/directive', () {
-    test_18.main();
-  });
-
-  group('core_dom/http', () {
-    test_19.main();
-  });
-
-  group('core_dom/ng_mustache', () {
-    test_20.main();
-  });
-
-  group('core_dom/node_cursor', () {
-    test_21.main();
-  });
-
-  group('core_dom/selector', () {
-    test_22.main();
-  });
-
-  group('core_dom/shadow_root_options', () {
-    test_23.main();
-  });
-
-  group('directive/input_select', () {
-    test_24.main();
-  });
-
-  group('directive/ng_a', () {
-    test_25.main();
-  });
-
-  group('directive/ng_bind_html', () {
-    test_26.main();
-  });
-
-  group('directive/ng_bind', () {
-    test_27.main();
-  });
-
-  group('directive/ng_bind_template', () {
-    test_28.main();
-  });
-
-  group('directive/ng_class', () {
-    test_29.main();
-  });
-
-  group('directive/ng_cloak', () {
-    test_30.main();
-  });
-
-  group('directive/ng_events', () {
-    test_31.main();
-  });
-
-  group('directive/ng_form', () {
-    test_32.main();
-  });
-
-  group('directive/ng_if', () {
-    test_33.main();
-  });
-
-  group('directive/ng_include', () {
-    test_34.main();
-  });
-
-  group('directive/ng_model', () {
-    test_35.main();
-  });
-
-  group('directive/ng_model_validators', () {
-    test_36.main();
-  });
-
-  group('directive/ng_non_bindable', () {
-    test_37.main();
-  });
-
-  group('directive/ng_pluralize', () {
-    test_38.main();
-  });
-
-  group('directive/ng_repeat', () {
-    test_39.main();
-  });
-
-  group('directive/ng_show_hide', () {
-    test_40.main();
-  });
-
-  group('directive/ng_src_boolean', () {
-    test_41.main();
-  });
-
-  group('directive/ng_style', () {
-    test_42.main();
-  });
-
-  group('directive/ng_switch', () {
-    test_43.main();
-  });
-
-  group('directive/ng_template', () {
-    test_44.main();
-  });
-
-  group('filter/currency', () {
-    test_45.main();
-  });
-
-  group('filter/date', () {
-    test_46.main();
-  });
-
-  group('filter/filter', () {
-    test_47.main();
-  });
-
-  group('filter/json', () {
-    test_48.main();
-  });
-
-  group('filter/limit_to', () {
-    test_49.main();
-  });
-
-  group('filter/lowercase', () {
-    test_50.main();
-  });
-
-  group('filter/number', () {
-    test_51.main();
-  });
-
-  group('filter/order_by', () {
-    test_52.main();
-  });
-
-  group('filter/uppercase', () {
-    test_53.main();
-  });
-
-  group('introspection', () {
-    test_54.main();
-  });
-
-  group('mock/http_backend', () {
-    test_55.main();
-  });
-
-  group('mock/test_bed', () {
-    test_56.main();
-  });
-
-  group('mock/zone', () {
-    test_57.main();
-  });
-
-  group('routing/ng_bind_route', () {
-    test_58.main();
-  });
-
-  group('routing/ng_view', () {
-    test_59.main();
-  });
-
-  group('routing/routing', () {
-    test_60.main();
-  });
-
-  group('_specs', () {
-    test_61.main();
-  });
-}

pkg/third_party/angular_tests/browser_test.html

@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="dart.unittest" content="full-stack-traces">
-  <title> browser_test.dart </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/shadow_dom/shadow_dom.debug.js"></script>
-</head>
-<body>
-  <h1> Running browser_test.dart </h1>
-  <script type="text/javascript"
-      src="/root_dart/tools/testing/dart/test_controller.js"></script>
-  <script type="text/javascript"
-      src="/packages/browser/interop.js"></script>
-  %TEST_SCRIPTS%
-</body>
-</html>

pkg/third_party/angular_tests/vm_test.dart

@@ -1,29 +0,0 @@
-/// auto-generated by update_angular.sh
-
-// Copyright (c) 2014, 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.
-
-library angular_vm_tests;
-
-import 'package:unittest/compact_vm_config.dart';
-import 'package:unittest/unittest.dart';
-import '../../../third_party/pkg/angular/test/tools/html_extractor_spec.dart' as test_0;
-import '../../../third_party/pkg/angular/test/tools/selector_spec.dart' as test_1;
-import '../../../third_party/pkg/angular/test/tools/source_metadata_extractor_spec.dart' as test_2;
-
-main() {
-  useCompactVMConfiguration();
-
-  group('tools/html_extractor', () {
-    test_0.main();
-  });
-
-  group('tools/selector', () {
-    test_1.main();
-  });
-
-  group('tools/source_metadata_extractor', () {
-    test_2.main();
-  });
-}

runtime/observatory/pubspec.yaml

@@ -36,8 +36,8 @@ dependency_overrides:
     path: ../../third_party/observatory_pub_packages/dart_style
   glob:
     path: ../../third_party/observatory_pub_packages/glob
-  html5lib:
-    path: ../../third_party/observatory_pub_packages/html5lib
+  html:
+    path: ../../third_party/observatory_pub_packages/html
   initialize:
     path: ../../third_party/observatory_pub_packages/initialize
   logging: