Merge branch 'master' into devoncarew_more_tests
diff --git a/test/benchmark_harness_test.dart b/test/benchmark_harness_test.dart
new file mode 100644
index 0000000..ae06e7a
--- /dev/null
+++ b/test/benchmark_harness_test.dart
@@ -0,0 +1,29 @@
+// Copyright (c) 2014, Google Inc. 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 benchmark_harness_test;
+
+import 'package:benchmark_harness/benchmark_harness.dart';
+import 'package:unittest/unittest.dart';
+
+void main() {
+ group('benchmark_harness', () {
+ test('run is called', () {
+ MockBenchmark benchmark = new MockBenchmark();
+ double micros = benchmark.measure();
+ expect(micros, isPositive);
+ expect(benchmark.runCount, isPositive);
+ });
+ });
+}
+
+class MockBenchmark extends BenchmarkBase {
+ int runCount = 0;
+
+ MockBenchmark() : super('mock benchmark');
+
+ void run() {
+ runCount++;
+ }
+}
diff --git a/test/fixed-unittest.dart b/test/fixed-unittest.dart
index 2c1ed53..4f8951c 100644
--- a/test/fixed-unittest.dart
+++ b/test/fixed-unittest.dart
@@ -1,4 +1,4 @@
-library unittest;
+library fixed_unittest;
import 'package:unittest/unittest.dart';
diff --git a/test/result_emitter_test.dart b/test/result_emitter_test.dart
index 4975835..6441f53 100644
--- a/test/result_emitter_test.dart
+++ b/test/result_emitter_test.dart
@@ -1,9 +1,9 @@
-library remote;
+library result_emitter_test;
+
+import 'package:benchmark_harness/benchmark_harness.dart';
+import 'package:unittest/mock.dart';
import 'fixed-unittest.dart';
-import 'package:unittest/mock.dart';
-import 'package:benchmark_harness/benchmark_harness.dart';
-
void main() {
benchmarkHarnessTest();
@@ -46,4 +46,4 @@
emitter.getLogs(callsTo('emit')).verify(happenedOnce);
});
});
-}
\ No newline at end of file
+}