Clean up tests that are duplicated between install and update.

sdk/lib/_internal/pub/test/test_pub.dart

 // 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.
 
 /// Test infrastructure for testing pub. Unlike typical unit tests, most pub
 /// tests are integration tests that stage some stuff on the file system, run
 /// pub, and then validate the results. This library provides an API to build
 /// tests like that.
 library test_pub;
 
@@ skipping 219 matching lines @@
 /// directory.
 final String appPath = "myapp";
 
 /// The path of the packages directory in the mock app used for tests. Relative
 /// to the sandbox directory.
 final String packagesPath = "$appPath/packages";
 
 /// Set to true when the current batch of scheduled events should be aborted.
 bool _abortScheduled = false;
 
+/// Many tests validate behavior that is the same between pub install and
+/// update have the same behavior. Instead of duplicating those tests, this
+/// takes a callback that defines install/update agnostic tests and runs them
+/// with both commands.
+void forBothPubInstallAndUpdate(void callback(String command)) {
+  group('install', () => callback('install'));
+  group('update', () => callback('update'));
+}
+
+/// Schedules an invocation of pub [command] and validates that it completes
+/// in an expected way.
+///
+/// By default, this validates that the command completes successfully and
+/// understands the normal output of a successful pub command. If [warning] is
+/// given, it expects the command to complete successfully *and* print
+/// [warning] to stderr. If [error] is given, it expects the command to *only*
+/// print [error] to stderr.
+// TODO(rnystrom): Clean up other tests to call this when possible.
+void runPub(String command, {Iterable<String> args, Pattern error,

[nweiz, 2013/05/23 20:54:57]

Since [command] can only be one of a finite set of supported options, make it an
enum instead of a string. You can have them have toStrings that return the
command name so you can easily pass them in to forBothPubInstallAndUpdate.

I'm not sure "runPub" is the best name for this, since it can't really run
generic pub commands. Maybe "runSimplePub" or something?

[Bob Nystrom, 2013/05/23 23:44:44]

Done.
Changed to pubCommand(). Added pubInstall() and pubUpdate() helpers for
converting later tests.

+    Pattern warning}) {
+  var allArgs = [command];
+  if (args != null) allArgs.addAll(args);
+
+  var output;
+  switch (command) {
+    case 'install':
+      output = new RegExp("Dependencies installed!\$");
+      break;
+
+    case 'update':
+      output = new RegExp("Dependencies updated!\$");
+      break;
+
+    default:
+      throw 'Unknown pub command "$command".';

[nweiz, 2013/05/23 20:54:57]

Wrap this in Exception.

[Bob Nystrom, 2013/05/23 23:44:44]

Done.

+  }
+
+  var exitCode = null;
+  if (error != null) exitCode = 1;
+
+  // No success output on an error.
+  if (error != null) output = null;
+  if (warning != null) error = warning;

[nweiz, 2013/05/23 20:54:57]

We should probably document and assert that error and warning can't both be
passed. As it stands, warning will just silently clobber error if they're both
passed.

[Bob Nystrom, 2013/05/23 23:44:44]

Done.

+
+  schedulePub(args: allArgs, output: output, error: error, exitCode: exitCode);
+}
+
 /// Defines an integration test. The [body] should schedule a series of
 /// operations which will be run asynchronously.
 void integration(String description, void body()) =>
   _integration(description, body, test);
 
 /// Like [integration], but causes only this test to run.
 void solo_integration(String description, void body()) =>
   _integration(description, body, solo_test);
 
 void _integration(String description, void body(), [Function testFn]) {
@@ skipping 432 matching lines @@
   bool matches(item, MatchState matchState) {
     if (item is! Pair) return false;
     return _firstMatcher.matches(item.first, matchState) &&
         _lastMatcher.matches(item.last, matchState);
   }
 
   Description describe(Description description) {
     description.addAll("(", ", ", ")", [_firstMatcher, _lastMatcher]);
   }
 }