Fix some tests

Author: gspencergoog

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.22.0
+* Added the ability to run external tools on a section of documentation and 
+  replace it with the output of the tool.
+
 ## 0.21.0
 * Expand categories to all top level items as well as libraries.  (#1681, #1353)
 * The categoryOrder option in dartdoc_options.yaml and the command line

lib/src/version.dart

@@ -1,6 +1,6 @@
 name: dartdoc
 # Also update the `version` field in lib/dartdoc.dart.
-version: 0.21.0
+version: 0.22.0
 author: Dart Team <[email protected]>
 description: A documentation generator for Dart.
 homepage: https://github.com/dart-lang/dartdoc

pubspec.yaml

@@ -336,7 +336,7 @@ void main() {
       });
 
       test('multiple packages, sorted default', () {
-        expect(ginormousPackageGraph.localPackages, hasLength(4));
+        expect(ginormousPackageGraph.localPackages, hasLength(5));
         expect(ginormousPackageGraph.localPackages.first.name,
             equals('test_package'));
       });
@@ -1267,7 +1267,7 @@ void main() {
     });
 
     test('correctly finds all the classes', () {
-      expect(classes, hasLength(28));
+      expect(classes, hasLength(29));
     });
 
     test('abstract', () {

test/model_test.dart

@@ -45,7 +45,7 @@ void main() {
       expect(
           result,
           contains(new RegExp(
-              r'Args: \[--file=.*[/\\]dartdoc_tools_[^/\\]+[/\\]input_\d+\]')));
+              r'Args: \[--file=<INPUT_FILE>]')));
       expect(result, contains('## `TEST INPUT`'));
     });
     test('can invoke a non-Dart tool', () {

test/tool_runner_test.dart

@@ -13,7 +13,19 @@ void main(List<String> argList) {
   argParser.addOption('special');
   final ArgResults args = argParser.parse(argList);
 
-  print('Args: ${argList}');
+  // Normalize the filename, since it includes random
+  // and system-specific components, but make sure it
+  // matches the pattern we expect.
+  RegExp filenameRegExp = new RegExp(
+      r'(--file=)(.*)([/\\]dartdoc_tools_)([^/\\]+)([/\\]input_)(\d+)');
+  List<String> normalized = argList.map((String arg) {
+    if (filenameRegExp.hasMatch(arg)) {
+      return '--file=<INPUT_FILE>';
+    } else {
+      return arg;
+    }
+  }).toList();
+  print('Args: $normalized');
   if (args['file'] != null) {
     File file = new File(args['file']);
     if (file.existsSync()) {
@@ -26,4 +38,4 @@ void main(List<String> argList) {
     }
   }
   exit(0);
-}
+}

testing/test_package/bin/drill.dart

@@ -4,7 +4,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta name="generator" content="made with love by dartdoc 0.21.0">
+  <meta name="generator" content="made with love by dartdoc 0.22.0">
   <meta name="description" content="test_package API docs, for the Dart programming language.">
   <title>test_package - Dart API docs</title>
 

testing/test_package_docs_dev/__404error.html

@@ -72,7 +72,7 @@ <h1>invokeTool method</h1>
     </section>
     <section class="desc markdown">
       <p>Invokes a tool.</p>
-<p>Args: <code>--file=/var/folders/8m/5my4p3zj5nq4ssxv_lqpz828000r4t/T/dartdoc_tools_hKW4dC/input_1, --special= |[</code>!@#"'$%^&amp;*()_+]</p>
+<p>Args: <code>--file=&lt;INPUT_FILE&gt;, --special= |[</code>!@#"'$%^&amp;*()_+]</p>
 <h2 id="yes-it-is"><code>Yes it is!</code></h2>
 <h2 id="ok-fine-it-isnt"><code>Ok, fine it isn't.</code></h2>
     </section>

testing/test_package_docs_dev/ex/ToolUser/invokeTool.html

@@ -4,7 +4,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta name="generator" content="made with love by dartdoc 0.21.0">
+  <meta name="generator" content="made with love by dartdoc 0.22.0">
   <meta name="description" content="test_package API docs, for the Dart programming language.">
   <title>test_package - Dart API docs</title>