Fix ensure_build_test

.travis.yml

@@ -22,7 +22,7 @@ jobs:
       env: PKG="example"
       dart: dev
     - stage: unit_test
-      script: ./tool/travis.sh test
+      script: ./tool/travis.sh test_0
       env: PKG="example"
       dart: dev
     - stage: analyzer_and_format
@@ -42,7 +42,11 @@ jobs:
       env: PKG="json_serializable"
       dart: dev
     - stage: unit_test
-      script: ./tool/travis.sh test
+      script: ./tool/travis.sh test_1
+      env: PKG="json_serializable"
+      dart: dev
+    - stage: unit_test
+      script: ./tool/travis.sh test_2
       env: PKG="json_serializable"
       dart: dev
     - stage: unit_test

json_serializable/.mono_repo.yml

@@ -8,5 +8,6 @@ stages:
     - dartanalyzer: --fatal-infos --fatal-warnings .
   - unit_test:
     # Run the tests -- include the default-skipped presubmit tests
-    - test: --run-skipped
+    - test
+    - test: --run-skipped test/ensure_build_test.dart
     - command: pub run build_runner test -- -p chrome

json_serializable/test/ensure_build_test.dart

@@ -3,55 +3,15 @@
 // BSD-style license that can be found in the LICENSE file.
 
 @TestOn('vm')
+@Tags(const ['presubmit-only'])
 
 import 'dart:convert';
 import 'dart:io';
 
 import 'package:path/path.dart' as p;
 import 'package:test/test.dart';
 
-String _getExampleContent(String fileName) {
-  var lines = new File(p.join('example', fileName)).readAsLinesSync();
-
-  var lastHadContent = false;
-
-  // All lines with content, except those starting with `/`.
-  // Also exclude blank lines that follow other blank lines
-  var cleanedSource = lines.where((l) {
-    if (l.startsWith(r'/')) {
-      return false;
-    }
-
-    if (l.trim().isNotEmpty) {
-      lastHadContent = true;
-      return true;
-    }
-
-    if (lastHadContent) {
-      lastHadContent = false;
-      return true;
-    }
-
-    return false;
-  }).join('\n');
-
-  return '''
-```dart
-$cleanedSource
-```''';
-}
-
 void main() {
-  test('README example', () {
-    var readmeContent = new File('README.md').readAsStringSync();
-
-    var exampleContent = _getExampleContent('example.dart');
-    expect(readmeContent, contains(exampleContent));
-
-    var exampleGeneratedContent = _getExampleContent('example.g.dart');
-    expect(readmeContent, contains(exampleGeneratedContent));
-  });
-
   // TODO(kevmoo): replace with a common utility
   //               https://github.com/dart-lang/build/issues/716
   test('ensure local build succeeds with no changes', () {
@@ -67,14 +27,16 @@ void main() {
     expect(_changedGeneratedFiles(), isEmpty);
 
     // 2 - run build - should be no output, since nothing should change
-    var result = _runProc('pub',
-        ['run', 'build_runner', 'build', '--delete-conflicting-outputs']);
+    var result = _runProc(
+        'dart', ['tool/build.dart', 'build', '--delete-conflicting-outputs']);
+
+    print(result);
     expect(result,
         contains(new RegExp(r'\[INFO\] Succeeded after \S+ with \d+ outputs')));
 
     // 3 - get a list of modified `.g.dart` files - should still be empty
     expect(_changedGeneratedFiles(), isEmpty);
-  }, tags: 'presubmit-only');
+  });
 }
 
 final _whitespace = new RegExp(r'\s');

json_serializable/test/readme_test.dart

@@ -0,0 +1,53 @@
+// Copyright (c) 2018, 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.
+
+@TestOn('vm')
+
+import 'dart:io';
+
+import 'package:test/test.dart';
+import 'package:path/path.dart' as p;
+
+void main() {
+  test('README example', () {
+    var readmeContent = new File('README.md').readAsStringSync();
+
+    var exampleContent = _getExampleContent('example.dart');
+    expect(readmeContent, contains(exampleContent));
+
+    var exampleGeneratedContent = _getExampleContent('example.g.dart');
+    expect(readmeContent, contains(exampleGeneratedContent));
+  });
+}
+
+String _getExampleContent(String fileName) {
+  var lines = new File(p.join('example', fileName)).readAsLinesSync();
+
+  var lastHadContent = false;
+
+  // All lines with content, except those starting with `/`.
+  // Also exclude blank lines that follow other blank lines
+  var cleanedSource = lines.where((l) {
+    if (l.startsWith(r'/')) {
+      return false;
+    }
+
+    if (l.trim().isNotEmpty) {
+      lastHadContent = true;
+      return true;
+    }
+
+    if (lastHadContent) {
+      lastHadContent = false;
+      return true;
+    }
+
+    return false;
+  }).join('\n');
+
+  return '''
+```dart
+$cleanedSource
+```''';
+}

tool/travis.sh

@@ -34,11 +34,21 @@ while (( "$#" )); do
     echo -e 'dartfmt -n --set-exit-if-changed .'
     dartfmt -n --set-exit-if-changed . || EXIT_CODE=$?
     ;;
-  test) echo
-    echo -e '\033[1mTASK: test\033[22m'
+  test_0) echo
+    echo -e '\033[1mTASK: test_0\033[22m'
     echo -e 'pub run test --run-skipped'
     pub run test --run-skipped || EXIT_CODE=$?
     ;;
+  test_1) echo
+    echo -e '\033[1mTASK: test_1\033[22m'
+    echo -e 'pub run test'
+    pub run test || EXIT_CODE=$?
+    ;;
+  test_2) echo
+    echo -e '\033[1mTASK: test_2\033[22m'
+    echo -e 'pub run test --run-skipped test/ensure_build_test.dart'
+    pub run test --run-skipped test/ensure_build_test.dart || EXIT_CODE=$?
+    ;;
   *) echo -e "\033[31mNot expecting TASK '${TASK}'. Error!\033[0m"
     EXIT_CODE=1
     ;;