Remove deprecated members from this repo.
This also releases test 0.12.0-beta.2.
R=kevmoo@google.com
Review URL: https://codereview.chromium.org//1046353002
diff --git a/CHANGELOG.md b/CHANGELOG.md
index daabed6..d17ff12 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@
through the `0.12.0` cycle, but it's deprecated and will just export the
`test` package.
+* Remove the deprecated members from `test`. These members will remain in
+ `unittest` for now.
+
### 0.12.0-beta.1
* Add a `--name` (shorthand `-n`) flag to the test runner for selecting which
diff --git a/lib/compact_vm_config.dart b/lib/compact_vm_config.dart
deleted file mode 100644
index 7c7c595..0000000
--- a/lib/compact_vm_config.dart
+++ /dev/null
@@ -1,20 +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.
-
-@deprecated
-library test.compact_vm_config;
-
-import 'vm_config.dart';
-
-@deprecated
-const int MAX_LINE = 80;
-
-/// This is a stub class used to preserve compatibility with unittest 0.11.*.
-///
-/// It will be removed before the next version is released.
-@deprecated
-class CompactVMConfiguration extends VMConfiguration {}
-
-@deprecated
-void useCompactVMConfiguration() {}
diff --git a/lib/coverage_controller.js b/lib/coverage_controller.js
deleted file mode 100644
index 1182279..0000000
--- a/lib/coverage_controller.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright (c) 2011, 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.
-
-/** This file is deprecated and will be removed before the next release. */
diff --git a/lib/html_config.dart b/lib/html_config.dart
deleted file mode 100644
index 8b6093d..0000000
--- a/lib/html_config.dart
+++ /dev/null
@@ -1,21 +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.
-
-@deprecated
-library test.html_config;
-
-import 'src/deprecated/simple_configuration.dart';
-
-/// This is a stub class used to preserve compatibility with unittest 0.11.*.
-///
-/// It will be removed before the next version is released.
-@deprecated
-class HtmlConfiguration extends SimpleConfiguration {
- HtmlConfiguration(bool isLayoutTest);
-
- void processMessage(e) {}
-}
-
-@deprecated
-void useHtmlConfiguration([bool isLayoutTest]) {}
diff --git a/lib/html_enhanced_config.dart b/lib/html_enhanced_config.dart
deleted file mode 100644
index fddab7c..0000000
--- a/lib/html_enhanced_config.dart
+++ /dev/null
@@ -1,21 +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.
-
-@deprecated
-library test.html_enhanced_config;
-
-import 'src/deprecated/simple_configuration.dart';
-
-/// This is a stub class used to preserve compatibility with unittest 0.11.*.
-///
-/// It will be removed before the next version is released.
-@deprecated
-class HtmlEnhancedConfiguration extends SimpleConfiguration {
- HtmlEnhancedConfiguration(bool isLayoutTest);
-
- void processMessage(e) {}
-}
-
-@deprecated
-void useHtmlEnhancedConfiguration([bool isLayoutTest]) {}
diff --git a/lib/html_individual_config.dart b/lib/html_individual_config.dart
deleted file mode 100644
index d9557b1..0000000
--- a/lib/html_individual_config.dart
+++ /dev/null
@@ -1,19 +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.
-
-@deprecated
-library test.html_individual_config;
-
-import 'html_config.dart';
-
-/// This is a stub class used to preserve compatibility with unittest 0.11.*.
-///
-/// It will be removed before the next version is released.
-@deprecated
-class HtmlIndividualConfiguration extends HtmlConfiguration {
- HtmlIndividualConfiguration(bool isLayoutTest) : super(isLayoutTest);
-}
-
-@deprecated
-void useHtmlIndividualConfiguration([bool isLayoutTest]) {}
diff --git a/lib/src/deprecated/configuration.dart b/lib/src/deprecated/configuration.dart
deleted file mode 100644
index aceba64..0000000
--- a/lib/src/deprecated/configuration.dart
+++ /dev/null
@@ -1,28 +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.
-
-library test.deprecated.configuration;
-
-import 'test_case.dart';
-
-/// This is a stub class used to preserve compatibility with unittest 0.11.*.
-///
-/// It will be removed before the next version is released.
-@deprecated
-class Configuration {
- Configuration();
- Configuration.blank();
-
- final autoStart = true;
- Duration timeout = const Duration(minutes: 2);
- void onInit() {}
- void onStart() {}
- void onTestStart(TestCase testCase) {}
- void onTestResult(TestCase testCase) {}
- void onTestResultChanged(TestCase testCase) {}
- void onLogMessage(TestCase testCase, String message) {}
- void onDone(bool success) {}
- void onSummary(int passed, int failed, int errors, List<TestCase> results,
- String uncaughtError) {}
-}
diff --git a/lib/src/deprecated/simple_configuration.dart b/lib/src/deprecated/simple_configuration.dart
deleted file mode 100644
index 8bf676a..0000000
--- a/lib/src/deprecated/simple_configuration.dart
+++ /dev/null
@@ -1,19 +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.
-
-library test.deprecated.simple_configuration;
-
-import 'test_case.dart';
-import 'configuration.dart';
-
-/// This is a stub class used to preserve compatibility with unittest 0.11.*.
-///
-/// It will be removed before the next version is released.
-@deprecated
-class SimpleConfiguration extends Configuration {
- bool throwOnTestFailures = true;
- SimpleConfiguration() : super.blank();
-
- String formatResult(TestCase testCase) => "";
-}
diff --git a/lib/src/deprecated/test_case.dart b/lib/src/deprecated/test_case.dart
deleted file mode 100644
index f2d9776..0000000
--- a/lib/src/deprecated/test_case.dart
+++ /dev/null
@@ -1,23 +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.
-
-library test.deprecated.test_case;
-
-/// This is a stub class used to preserve compatibility with unittest 0.11.*.
-///
-/// It will be removed before the next version is released.
-@deprecated
-abstract class TestCase {
- int get id;
- String get description;
- String get message;
- String get result;
- bool get passed;
- StackTrace get stackTrace;
- String get currentGroup;
- DateTime get startTime;
- Duration get runningTime;
- bool get enabled;
- final isComplete = false;
-}
diff --git a/lib/test.dart b/lib/test.dart
index d8ae1ed..9dab658 100644
--- a/lib/test.dart
+++ b/lib/test.dart
@@ -12,16 +12,11 @@
import 'src/backend/invoker.dart';
import 'src/backend/suite.dart';
import 'src/backend/test_platform.dart';
-import 'src/deprecated/configuration.dart';
-import 'src/deprecated/test_case.dart';
import 'src/runner/reporter/no_io_compact.dart';
import 'src/utils.dart';
export 'package:matcher/matcher.dart';
-export 'src/deprecated/configuration.dart';
-export 'src/deprecated/simple_configuration.dart';
-export 'src/deprecated/test_case.dart';
export 'src/frontend/expect.dart';
export 'src/frontend/expect_async.dart';
export 'src/frontend/future_matchers.dart';
@@ -116,76 +111,3 @@
/// Registers an exception that was caught for the current test.
void registerException(error, [StackTrace stackTrace]) =>
Invoker.current.handleError(error, stackTrace);
-
-// What follows are stubs for various top-level names supported by unittest
-// 0.11.*. These are preserved for the time being for ease of migration, but
-// should be removed before this is released as stable.
-
-@deprecated
-typedef dynamic TestFunction();
-
-@deprecated
-Configuration testConfiguration = new Configuration();
-
-@deprecated
-bool formatStacks = true;
-
-@deprecated
-bool filterStacks = true;
-
-@deprecated
-String groupSep = ' ';
-
-@deprecated
-void logMessage(String message) => print(message);
-
-@deprecated
-final testCases = [];
-
-@deprecated
-const int BREATH_INTERVAL = 200;
-
-@deprecated
-TestCase get currentTestCase => null;
-
-@deprecated
-const PASS = 'pass';
-
-@deprecated
-const FAIL = 'fail';
-
-@deprecated
-const ERROR = 'error';
-
-@deprecated
-void skip_test(String spec, TestFunction body) {}
-
-@deprecated
-void solo_test(String spec, TestFunction body) => test(spec, body);
-
-@deprecated
-void skip_group(String description, void body()) {}
-
-@deprecated
-void solo_group(String description, void body()) => group(description, body);
-
-@deprecated
-void filterTests(testFilter) {}
-
-@deprecated
-void runTests() {}
-
-@deprecated
-void ensureInitialized() {}
-
-@deprecated
-void setSoloTest(int id) {}
-
-@deprecated
-void enableTest(int id) {}
-
-@deprecated
-void disableTest(int id) {}
-
-@deprecated
-withTestEnvironment(callback()) => callback();
diff --git a/lib/test_controller.js b/lib/test_controller.js
deleted file mode 100644
index 1182279..0000000
--- a/lib/test_controller.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright (c) 2011, 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.
-
-/** This file is deprecated and will be removed before the next release. */
diff --git a/lib/vm_config.dart b/lib/vm_config.dart
deleted file mode 100644
index 72ab2d5..0000000
--- a/lib/vm_config.dart
+++ /dev/null
@@ -1,26 +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.
-
-@deprecated
-library test.vm_config;
-
-import 'src/deprecated/simple_configuration.dart';
-
-/// This is a stub class used to preserve compatibility with unittest 0.11.*.
-///
-/// It will be removed before the next version is released.
-@deprecated
-class VMConfiguration extends SimpleConfiguration {
- final String GREEN_COLOR = '\u001b[32m';
- final String RED_COLOR = '\u001b[31m';
- final String MAGENTA_COLOR = '\u001b[35m';
- final String NO_COLOR = '\u001b[0m';
-
- bool useColor = false;
-
- VMConfiguration() : super();
-}
-
-@deprecated
-void useVMConfiguration() {}
diff --git a/pubspec.yaml b/pubspec.yaml
index 5ebd223..7530234 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
name: test
-version: 0.12.0-dev
+version: 0.12.0-beta.2
author: Dart Team <misc@dartlang.org>
description: A library for writing dart unit tests.
homepage: https://github.com/dart-lang/test
