Revert "Use scheduled_test for Pub tests."

utils/tests/pub/pub_uploader_test.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.
 
 library pub_uploader_test;
 
 import 'dart:io';
 import 'dart:json' as json;
 
-import '../../../pkg/scheduled_test/lib/scheduled_process.dart';
-import '../../../pkg/scheduled_test/lib/scheduled_server.dart';
-import '../../../pkg/scheduled_test/lib/scheduled_test.dart';
-
+import 'test_pub.dart';
+import '../../../pkg/unittest/lib/unittest.dart';
+import '../../pub/utils.dart';
 import '../../pub/io.dart';
-import '../../pub/utils.dart';
-import 'descriptor.dart' as d;
-import 'test_pub.dart';
 
 final USAGE_STRING = '''
     Manage uploaders for a package on pub.dartlang.org.
 
     Usage: pub uploader [options] {add/remove} <email>
     --server     The package server on which the package is hosted
                  (defaults to "https://pub.dartlang.org")
 
     --package    The package whose uploaders will be modified
                  (defaults to the current package)
@@ skipping 19 matching lines @@
     });
 
     integration('when run with an invalid command', () {
       schedulePub(args: ['uploader', 'foo', 'email'],
           output: USAGE_STRING, exitCode: 64);
     });
   });
 
   integration('adds an uploader', () {
     var server = new ScheduledServer();
-    d.credentialsFile(server, 'access token').create();
+    credentialsFile(server, 'access token').scheduleCreate();
     var pub = startPubUploader(server, ['--package', 'pkg', 'add', 'email']);
 
-    server.handle('POST', '/packages/pkg/uploaders.json', (request) {
+    server.handle('POST', '/packages/pkg/uploaders.json', (request, response) {
       expect(new ByteStream(request).toBytes().then((bodyBytes) {
         expect(new String.fromCharCodes(bodyBytes), equals('email=email'));
 
-        request.response.headers.contentType =
-            new ContentType("application", "json");
-        request.response.write(json.stringify({
+        response.headers.contentType = new ContentType("application", "json");
+        response.write(json.stringify({
           'success': {'message': 'Good job!'}
         }));
-        request.response.close();
+        response.close();
       }), completes);
     });
 
-    expect(pub.nextLine(), completion(equals('Good job!')));
+    expectLater(pub.nextLine(), equals('Good job!'));
     pub.shouldExit(0);
   });
 
   integration('removes an uploader', () {
     var server = new ScheduledServer();
-    d.credentialsFile(server, 'access token').create();
+    credentialsFile(server, 'access token').scheduleCreate();
     var pub = startPubUploader(server, ['--package', 'pkg', 'remove', 'email']);
 
-    server.handle('DELETE', '/packages/pkg/uploaders/email.json', (request) {
-      request.response.headers.contentType =
-          new ContentType("application", "json");
-      request.response.write(json.stringify({
+    server.handle('DELETE', '/packages/pkg/uploaders/email.json',
+        (request, response) {
+      response.headers.contentType = new ContentType("application", "json");
+      response.write(json.stringify({
         'success': {'message': 'Good job!'}
       }));
-      request.response.close();
+      response.close();
     });
 
-    expect(pub.nextLine(), completion(equals('Good job!')));
+    expectLater(pub.nextLine(), equals('Good job!'));
     pub.shouldExit(0);
   });
 
   integration('defaults to the current package', () {
-    d.validPackage.create();
+    normalPackage.scheduleCreate();
 
     var server = new ScheduledServer();
-    d.credentialsFile(server, 'access token').create();
+    credentialsFile(server, 'access token').scheduleCreate();
     var pub = startPubUploader(server, ['add', 'email']);
 
-    server.handle('POST', '/packages/test_pkg/uploaders.json', (request) {
-      request.response.headers.contentType =
-          new ContentType("application", "json");
-      request.response.write(json.stringify({
+    server.handle('POST', '/packages/test_pkg/uploaders.json',
+        (request, response) {
+      response.headers.contentType = new ContentType("application", "json");
+      response.write(json.stringify({
         'success': {'message': 'Good job!'}
       }));
-      request.response.close();
+      response.close();
     });
 
-    expect(pub.nextLine(), completion(equals('Good job!')));
+    expectLater(pub.nextLine(), equals('Good job!'));
     pub.shouldExit(0);
   });
 
   integration('add provides an error', () {
     var server = new ScheduledServer();
-    d.credentialsFile(server, 'access token').create();
+    credentialsFile(server, 'access token').scheduleCreate();
     var pub = startPubUploader(server, ['--package', 'pkg', 'add', 'email']);
 
-    server.handle('POST', '/packages/pkg/uploaders.json', (request) {
-      request.response.statusCode = 400;
-      request.response.headers.contentType =
-          new ContentType("application", "json");
-      request.response.write(json.stringify({
+    server.handle('POST', '/packages/pkg/uploaders.json', (request, response) {
+      response.statusCode = 400;
+      response.headers.contentType = new ContentType("application", "json");
+      response.write(json.stringify({
         'error': {'message': 'Bad job!'}
       }));
-      request.response.close();
+      response.close();
     });
 
-    expect(pub.nextErrLine(), completion(equals('Bad job!')));
+    expectLater(pub.nextErrLine(), equals('Bad job!'));
     pub.shouldExit(1);
   });
 
   integration('remove provides an error', () {
     var server = new ScheduledServer();
-    d.credentialsFile(server, 'access token').create();
+    credentialsFile(server, 'access token').scheduleCreate();
     var pub = startPubUploader(server,
         ['--package', 'pkg', 'remove', 'e/mail']);
 
-    server.handle('DELETE', '/packages/pkg/uploaders/e%2Fmail.json', (request) {
-      request.response.statusCode = 400;
-      request.response.headers.contentType =
-          new ContentType("application", "json");
-      request.response.write(json.stringify({
+    server.handle('DELETE', '/packages/pkg/uploaders/e%2Fmail.json',
+        (request, response) {
+      response.statusCode = 400;
+      response.headers.contentType = new ContentType("application", "json");
+      response.write(json.stringify({
         'error': {'message': 'Bad job!'}
       }));
-      request.response.close();
+      response.close();
     });
 
-    expect(pub.nextErrLine(), completion(equals('Bad job!')));
+    expectLater(pub.nextErrLine(), equals('Bad job!'));
     pub.shouldExit(1);
   });
 
   integration('add provides invalid JSON', () {
     var server = new ScheduledServer();
-    d.credentialsFile(server, 'access token').create();
+    credentialsFile(server, 'access token').scheduleCreate();
     var pub = startPubUploader(server, ['--package', 'pkg', 'add', 'email']);
 
-    server.handle('POST', '/packages/pkg/uploaders.json', (request) {
-      request.response.write("{not json");
-      request.response.close();
+    server.handle('POST', '/packages/pkg/uploaders.json', (request, response) {
+      response.write("{not json");
+      response.close();
     });
 
-    expect(pub.nextErrLine(), completion(equals('Invalid server response:')));
-    expect(pub.nextErrLine(), completion(equals('{not json')));
+    expectLater(pub.nextErrLine(), equals('Invalid server response:'));
+    expectLater(pub.nextErrLine(), equals('{not json'));
     pub.shouldExit(1);
   });
 
   integration('remove provides invalid JSON', () {
     var server = new ScheduledServer();
-    d.credentialsFile(server, 'access token').create();
+    credentialsFile(server, 'access token').scheduleCreate();
     var pub = startPubUploader(server, ['--package', 'pkg', 'remove', 'email']);
 
-    server.handle('DELETE', '/packages/pkg/uploaders/email.json', (request) {
-      request.response.write("{not json");
-      request.response.close();
+    server.handle('DELETE', '/packages/pkg/uploaders/email.json',
+        (request, response) {
+      response.write("{not json");
+      response.close();
     });
 
-    expect(pub.nextErrLine(), completion(equals('Invalid server response:')));
-    expect(pub.nextErrLine(), completion(equals('{not json')));
+    expectLater(pub.nextErrLine(), equals('Invalid server response:'));
+    expectLater(pub.nextErrLine(), equals('{not json'));
     pub.shouldExit(1);
   });
 }