Roll of googleapis as of 4/7/2015.

generated/googleapis/test/plusdomains/v1_test.dart

 library googleapis.plusDomains.v1.test;
 
 import "dart:core" as core;
 import "dart:collection" as collection;
 import "dart:async" as async;
 import "dart:convert" as convert;
 
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:unittest/unittest.dart' as unittest;
-import 'package:googleapis/common/common.dart' as common;
-import 'package:googleapis/src/common_internal.dart' as common_internal;
-import '../common/common_internal_test.dart' as common_test;
 
 import 'package:googleapis/plusdomains/v1.dart' as api;
 
+class HttpServerMock extends http.BaseClient {
+  core.Function _callback;
+  core.bool _expectJson;
 
+  void register(core.Function callback, core.bool expectJson) {
+    _callback = callback;
+    _expectJson = expectJson;
+  }
 
-buildUnnamed951() {
+  async.Future<http.StreamedResponse> send(http.BaseRequest request) {
+    if (_expectJson) {
+      return request.finalize()
+          .transform(convert.UTF8.decoder)
+          .join('')
+          .then((core.String jsonString) {
+        if (jsonString.isEmpty) {
+          return _callback(request, null);
+        } else {
+          return _callback(request, convert.JSON.decode(jsonString));
+        }
+      });
+    } else {
+      var stream = request.finalize();
+      if (stream == null) {
+        return _callback(request, []);
+      } else {
+        return stream.toBytes().then((data) {
+          return _callback(request, data);
+        });
+      }
+    }
+  }
+}
+
+http.StreamedResponse stringResponse(
+    core.int status, core.Map headers, core.String body) {
+  var stream = new async.Stream.fromIterable([convert.UTF8.encode(body)]);
+  return new http.StreamedResponse(stream, status, headers: headers);
+}
+
+buildUnnamed1272() {
   var o = new core.List<api.PlusDomainsAclentryResource>();
   o.add(buildPlusDomainsAclentryResource());
   o.add(buildPlusDomainsAclentryResource());
   return o;
 }
 
-checkUnnamed951(core.List<api.PlusDomainsAclentryResource> o) {
+checkUnnamed1272(core.List<api.PlusDomainsAclentryResource> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlusDomainsAclentryResource(o[0]);
   checkPlusDomainsAclentryResource(o[1]);
 }
 
 core.int buildCounterAcl = 0;
 buildAcl() {
   var o = new api.Acl();
   buildCounterAcl++;
   if (buildCounterAcl < 3) {
     o.description = "foo";
     o.domainRestricted = true;
-    o.items = buildUnnamed951();
+    o.items = buildUnnamed1272();
     o.kind = "foo";
   }
   buildCounterAcl--;
   return o;
 }
 
 checkAcl(api.Acl o) {
   buildCounterAcl++;
   if (buildCounterAcl < 3) {
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.domainRestricted, unittest.isTrue);
-    checkUnnamed951(o.items);
+    checkUnnamed1272(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterAcl--;
 }
 
 core.int buildCounterActivityActorImage = 0;
 buildActivityActorImage() {
   var o = new api.ActivityActorImage();
   buildCounterActivityActorImage++;
   if (buildCounterActivityActorImage < 3) {
@@ skipping 186 matching lines @@
 }
 
 checkActivityObjectAttachmentsPreviewThumbnails(api.ActivityObjectAttachmentsPreviewThumbnails o) {
   buildCounterActivityObjectAttachmentsPreviewThumbnails++;
   if (buildCounterActivityObjectAttachmentsPreviewThumbnails < 3) {
     unittest.expect(o.url, unittest.equals('foo'));
   }
   buildCounterActivityObjectAttachmentsPreviewThumbnails--;
 }
 
-buildUnnamed952() {
+buildUnnamed1273() {
   var o = new core.List<api.ActivityObjectAttachmentsPreviewThumbnails>();
   o.add(buildActivityObjectAttachmentsPreviewThumbnails());
   o.add(buildActivityObjectAttachmentsPreviewThumbnails());
   return o;
 }
 
-checkUnnamed952(core.List<api.ActivityObjectAttachmentsPreviewThumbnails> o) {
+checkUnnamed1273(core.List<api.ActivityObjectAttachmentsPreviewThumbnails> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkActivityObjectAttachmentsPreviewThumbnails(o[0]);
   checkActivityObjectAttachmentsPreviewThumbnails(o[1]);
 }
 
 core.int buildCounterActivityObjectAttachmentsThumbnailsImage = 0;
 buildActivityObjectAttachmentsThumbnailsImage() {
   var o = new api.ActivityObjectAttachmentsThumbnailsImage();
   buildCounterActivityObjectAttachmentsThumbnailsImage++;
   if (buildCounterActivityObjectAttachmentsThumbnailsImage < 3) {
@@ skipping 33 matching lines @@
 checkActivityObjectAttachmentsThumbnails(api.ActivityObjectAttachmentsThumbnails o) {
   buildCounterActivityObjectAttachmentsThumbnails++;
   if (buildCounterActivityObjectAttachmentsThumbnails < 3) {
     unittest.expect(o.description, unittest.equals('foo'));
     checkActivityObjectAttachmentsThumbnailsImage(o.image);
     unittest.expect(o.url, unittest.equals('foo'));
   }
   buildCounterActivityObjectAttachmentsThumbnails--;
 }
 
-buildUnnamed953() {
+buildUnnamed1274() {
   var o = new core.List<api.ActivityObjectAttachmentsThumbnails>();
   o.add(buildActivityObjectAttachmentsThumbnails());
   o.add(buildActivityObjectAttachmentsThumbnails());
   return o;
 }
 
-checkUnnamed953(core.List<api.ActivityObjectAttachmentsThumbnails> o) {
+checkUnnamed1274(core.List<api.ActivityObjectAttachmentsThumbnails> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkActivityObjectAttachmentsThumbnails(o[0]);
   checkActivityObjectAttachmentsThumbnails(o[1]);
 }
 
 core.int buildCounterActivityObjectAttachments = 0;
 buildActivityObjectAttachments() {
   var o = new api.ActivityObjectAttachments();
   buildCounterActivityObjectAttachments++;
   if (buildCounterActivityObjectAttachments < 3) {
     o.content = "foo";
     o.displayName = "foo";
     o.embed = buildActivityObjectAttachmentsEmbed();
     o.fullImage = buildActivityObjectAttachmentsFullImage();
     o.id = "foo";
     o.image = buildActivityObjectAttachmentsImage();
     o.objectType = "foo";
-    o.previewThumbnails = buildUnnamed952();
-    o.thumbnails = buildUnnamed953();
+    o.previewThumbnails = buildUnnamed1273();
+    o.thumbnails = buildUnnamed1274();
     o.url = "foo";
   }
   buildCounterActivityObjectAttachments--;
   return o;
 }
 
 checkActivityObjectAttachments(api.ActivityObjectAttachments o) {
   buildCounterActivityObjectAttachments++;
   if (buildCounterActivityObjectAttachments < 3) {
     unittest.expect(o.content, unittest.equals('foo'));
     unittest.expect(o.displayName, unittest.equals('foo'));
     checkActivityObjectAttachmentsEmbed(o.embed);
     checkActivityObjectAttachmentsFullImage(o.fullImage);
     unittest.expect(o.id, unittest.equals('foo'));
     checkActivityObjectAttachmentsImage(o.image);
     unittest.expect(o.objectType, unittest.equals('foo'));
-    checkUnnamed952(o.previewThumbnails);
-    checkUnnamed953(o.thumbnails);
+    checkUnnamed1273(o.previewThumbnails);
+    checkUnnamed1274(o.thumbnails);
     unittest.expect(o.url, unittest.equals('foo'));
   }
   buildCounterActivityObjectAttachments--;
 }
 
-buildUnnamed954() {
+buildUnnamed1275() {
   var o = new core.List<api.ActivityObjectAttachments>();
   o.add(buildActivityObjectAttachments());
   o.add(buildActivityObjectAttachments());
   return o;
 }
 
-checkUnnamed954(core.List<api.ActivityObjectAttachments> o) {
+checkUnnamed1275(core.List<api.ActivityObjectAttachments> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkActivityObjectAttachments(o[0]);
   checkActivityObjectAttachments(o[1]);
 }
 
 core.int buildCounterActivityObjectPlusoners = 0;
 buildActivityObjectPlusoners() {
   var o = new api.ActivityObjectPlusoners();
   buildCounterActivityObjectPlusoners++;
   if (buildCounterActivityObjectPlusoners < 3) {
@@ skipping 81 matching lines @@
   }
   buildCounterActivityObjectStatusForViewer--;
 }
 
 core.int buildCounterActivityObject = 0;
 buildActivityObject() {
   var o = new api.ActivityObject();
   buildCounterActivityObject++;
   if (buildCounterActivityObject < 3) {
     o.actor = buildActivityObjectActor();
-    o.attachments = buildUnnamed954();
+    o.attachments = buildUnnamed1275();
     o.content = "foo";
     o.id = "foo";
     o.objectType = "foo";
     o.originalContent = "foo";
     o.plusoners = buildActivityObjectPlusoners();
     o.replies = buildActivityObjectReplies();
     o.resharers = buildActivityObjectResharers();
     o.statusForViewer = buildActivityObjectStatusForViewer();
     o.url = "foo";
   }
   buildCounterActivityObject--;
   return o;
 }
 
 checkActivityObject(api.ActivityObject o) {
   buildCounterActivityObject++;
   if (buildCounterActivityObject < 3) {
     checkActivityObjectActor(o.actor);
-    checkUnnamed954(o.attachments);
+    checkUnnamed1275(o.attachments);
     unittest.expect(o.content, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.objectType, unittest.equals('foo'));
     unittest.expect(o.originalContent, unittest.equals('foo'));
     checkActivityObjectPlusoners(o.plusoners);
     checkActivityObjectReplies(o.replies);
     checkActivityObjectResharers(o.resharers);
     checkActivityObjectStatusForViewer(o.statusForViewer);
     unittest.expect(o.url, unittest.equals('foo'));
   }
@@ skipping 69 matching lines @@
     unittest.expect(o.published, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     unittest.expect(o.radius, unittest.equals('foo'));
     unittest.expect(o.title, unittest.equals('foo'));
     unittest.expect(o.updated, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     unittest.expect(o.url, unittest.equals('foo'));
     unittest.expect(o.verb, unittest.equals('foo'));
   }
   buildCounterActivity--;
 }
 
-buildUnnamed955() {
+buildUnnamed1276() {
   var o = new core.List<api.Activity>();
   o.add(buildActivity());
   o.add(buildActivity());
   return o;
 }
 
-checkUnnamed955(core.List<api.Activity> o) {
+checkUnnamed1276(core.List<api.Activity> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkActivity(o[0]);
   checkActivity(o[1]);
 }
 
 core.int buildCounterActivityFeed = 0;
 buildActivityFeed() {
   var o = new api.ActivityFeed();
   buildCounterActivityFeed++;
   if (buildCounterActivityFeed < 3) {
     o.etag = "foo";
     o.id = "foo";
-    o.items = buildUnnamed955();
+    o.items = buildUnnamed1276();
     o.kind = "foo";
     o.nextLink = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
     o.title = "foo";
     o.updated = core.DateTime.parse("2002-02-27T14:01:02");
   }
   buildCounterActivityFeed--;
   return o;
 }
 
 checkActivityFeed(api.ActivityFeed o) {
   buildCounterActivityFeed++;
   if (buildCounterActivityFeed < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed955(o.items);
+    checkUnnamed1276(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
     unittest.expect(o.title, unittest.equals('foo'));
     unittest.expect(o.updated, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
   }
   buildCounterActivityFeed--;
 }
 
@@ skipping 17 matching lines @@
   if (buildCounterAudience < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     checkPlusDomainsAclentryResource(o.item);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.memberCount, unittest.equals(42));
     unittest.expect(o.visibility, unittest.equals('foo'));
   }
   buildCounterAudience--;
 }
 
-buildUnnamed956() {
+buildUnnamed1277() {
   var o = new core.List<api.Audience>();
   o.add(buildAudience());
   o.add(buildAudience());
   return o;
 }
 
-checkUnnamed956(core.List<api.Audience> o) {
+checkUnnamed1277(core.List<api.Audience> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAudience(o[0]);
   checkAudience(o[1]);
 }
 
 core.int buildCounterAudiencesFeed = 0;
 buildAudiencesFeed() {
   var o = new api.AudiencesFeed();
   buildCounterAudiencesFeed++;
   if (buildCounterAudiencesFeed < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed956();
+    o.items = buildUnnamed1277();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.totalItems = 42;
   }
   buildCounterAudiencesFeed--;
   return o;
 }
 
 checkAudiencesFeed(api.AudiencesFeed o) {
   buildCounterAudiencesFeed++;
   if (buildCounterAudiencesFeed < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed956(o.items);
+    checkUnnamed1277(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.totalItems, unittest.equals(42));
   }
   buildCounterAudiencesFeed--;
 }
 
 core.int buildCounterCirclePeople = 0;
 buildCirclePeople() {
   var o = new api.CirclePeople();
@@ skipping 37 matching lines @@
     unittest.expect(o.displayName, unittest.equals('foo'));
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     checkCirclePeople(o.people);
     unittest.expect(o.selfLink, unittest.equals('foo'));
   }
   buildCounterCircle--;
 }
 
-buildUnnamed957() {
+buildUnnamed1278() {
   var o = new core.List<api.Circle>();
   o.add(buildCircle());
   o.add(buildCircle());
   return o;
 }
 
-checkUnnamed957(core.List<api.Circle> o) {
+checkUnnamed1278(core.List<api.Circle> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCircle(o[0]);
   checkCircle(o[1]);
 }
 
 core.int buildCounterCircleFeed = 0;
 buildCircleFeed() {
   var o = new api.CircleFeed();
   buildCounterCircleFeed++;
   if (buildCounterCircleFeed < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed957();
+    o.items = buildUnnamed1278();
     o.kind = "foo";
     o.nextLink = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
     o.title = "foo";
     o.totalItems = 42;
   }
   buildCounterCircleFeed--;
   return o;
 }
 
 checkCircleFeed(api.CircleFeed o) {
   buildCounterCircleFeed++;
   if (buildCounterCircleFeed < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed957(o.items);
+    checkUnnamed1278(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
     unittest.expect(o.title, unittest.equals('foo'));
     unittest.expect(o.totalItems, unittest.equals(42));
   }
   buildCounterCircleFeed--;
 }
 
@@ skipping 55 matching lines @@
 
 checkCommentInReplyTo(api.CommentInReplyTo o) {
   buildCounterCommentInReplyTo++;
   if (buildCounterCommentInReplyTo < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.url, unittest.equals('foo'));
   }
   buildCounterCommentInReplyTo--;
 }
 
-buildUnnamed958() {
+buildUnnamed1279() {
   var o = new core.List<api.CommentInReplyTo>();
   o.add(buildCommentInReplyTo());
   o.add(buildCommentInReplyTo());
   return o;
 }
 
-checkUnnamed958(core.List<api.CommentInReplyTo> o) {
+checkUnnamed1279(core.List<api.CommentInReplyTo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCommentInReplyTo(o[0]);
   checkCommentInReplyTo(o[1]);
 }
 
 core.int buildCounterCommentObject = 0;
 buildCommentObject() {
   var o = new api.CommentObject();
   buildCounterCommentObject++;
   if (buildCounterCommentObject < 3) {
@@ skipping 35 matching lines @@
 }
 
 core.int buildCounterComment = 0;
 buildComment() {
   var o = new api.Comment();
   buildCounterComment++;
   if (buildCounterComment < 3) {
     o.actor = buildCommentActor();
     o.etag = "foo";
     o.id = "foo";
-    o.inReplyTo = buildUnnamed958();
+    o.inReplyTo = buildUnnamed1279();
     o.kind = "foo";
     o.object = buildCommentObject();
     o.plusoners = buildCommentPlusoners();
     o.published = core.DateTime.parse("2002-02-27T14:01:02");
     o.selfLink = "foo";
     o.updated = core.DateTime.parse("2002-02-27T14:01:02");
     o.verb = "foo";
   }
   buildCounterComment--;
   return o;
 }
 
 checkComment(api.Comment o) {
   buildCounterComment++;
   if (buildCounterComment < 3) {
     checkCommentActor(o.actor);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed958(o.inReplyTo);
+    checkUnnamed1279(o.inReplyTo);
     unittest.expect(o.kind, unittest.equals('foo'));
     checkCommentObject(o.object);
     checkCommentPlusoners(o.plusoners);
     unittest.expect(o.published, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     unittest.expect(o.selfLink, unittest.equals('foo'));
     unittest.expect(o.updated, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     unittest.expect(o.verb, unittest.equals('foo'));
   }
   buildCounterComment--;
 }
 
-buildUnnamed959() {
+buildUnnamed1280() {
   var o = new core.List<api.Comment>();
   o.add(buildComment());
   o.add(buildComment());
   return o;
 }
 
-checkUnnamed959(core.List<api.Comment> o) {
+checkUnnamed1280(core.List<api.Comment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkComment(o[0]);
   checkComment(o[1]);
 }
 
 core.int buildCounterCommentFeed = 0;
 buildCommentFeed() {
   var o = new api.CommentFeed();
   buildCounterCommentFeed++;
   if (buildCounterCommentFeed < 3) {
     o.etag = "foo";
     o.id = "foo";
-    o.items = buildUnnamed959();
+    o.items = buildUnnamed1280();
     o.kind = "foo";
     o.nextLink = "foo";
     o.nextPageToken = "foo";
     o.title = "foo";
     o.updated = core.DateTime.parse("2002-02-27T14:01:02");
   }
   buildCounterCommentFeed--;
   return o;
 }
 
 checkCommentFeed(api.CommentFeed o) {
   buildCounterCommentFeed++;
   if (buildCounterCommentFeed < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed959(o.items);
+    checkUnnamed1280(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.title, unittest.equals('foo'));
     unittest.expect(o.updated, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
   }
   buildCounterCommentFeed--;
 }
 
 core.int buildCounterMediaAuthorImage = 0;
@@ skipping 52 matching lines @@
 }
 
 checkMediaExif(api.MediaExif o) {
   buildCounterMediaExif++;
   if (buildCounterMediaExif < 3) {
     unittest.expect(o.time, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
   }
   buildCounterMediaExif--;
 }
 
-buildUnnamed960() {
+buildUnnamed1281() {
   var o = new core.List<api.Videostream>();
   o.add(buildVideostream());
   o.add(buildVideostream());
   return o;
 }
 
-checkUnnamed960(core.List<api.Videostream> o) {
+checkUnnamed1281(core.List<api.Videostream> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVideostream(o[0]);
   checkVideostream(o[1]);
 }
 
 core.int buildCounterMedia = 0;
 buildMedia() {
   var o = new api.Media();
   buildCounterMedia++;
   if (buildCounterMedia < 3) {
     o.author = buildMediaAuthor();
     o.displayName = "foo";
     o.etag = "foo";
     o.exif = buildMediaExif();
     o.height = 42;
     o.id = "foo";
     o.kind = "foo";
     o.mediaCreatedTime = core.DateTime.parse("2002-02-27T14:01:02");
     o.mediaUrl = "foo";
     o.published = core.DateTime.parse("2002-02-27T14:01:02");
     o.sizeBytes = "foo";
-    o.streams = buildUnnamed960();
+    o.streams = buildUnnamed1281();
     o.summary = "foo";
     o.updated = core.DateTime.parse("2002-02-27T14:01:02");
     o.url = "foo";
     o.videoDuration = "foo";
     o.videoStatus = "foo";
     o.width = 42;
   }
   buildCounterMedia--;
   return o;
 }
 
 checkMedia(api.Media o) {
   buildCounterMedia++;
   if (buildCounterMedia < 3) {
     checkMediaAuthor(o.author);
     unittest.expect(o.displayName, unittest.equals('foo'));
     unittest.expect(o.etag, unittest.equals('foo'));
     checkMediaExif(o.exif);
     unittest.expect(o.height, unittest.equals(42));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.mediaCreatedTime, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     unittest.expect(o.mediaUrl, unittest.equals('foo'));
     unittest.expect(o.published, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     unittest.expect(o.sizeBytes, unittest.equals('foo'));
-    checkUnnamed960(o.streams);
+    checkUnnamed1281(o.streams);
     unittest.expect(o.summary, unittest.equals('foo'));
     unittest.expect(o.updated, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     unittest.expect(o.url, unittest.equals('foo'));
     unittest.expect(o.videoDuration, unittest.equals('foo'));
     unittest.expect(o.videoStatus, unittest.equals('foo'));
     unittest.expect(o.width, unittest.equals(42));
   }
   buildCounterMedia--;
 }
 
-buildUnnamed961() {
+buildUnnamed1282() {
   var o = new core.List<api.Person>();
   o.add(buildPerson());
   o.add(buildPerson());
   return o;
 }
 
-checkUnnamed961(core.List<api.Person> o) {
+checkUnnamed1282(core.List<api.Person> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPerson(o[0]);
   checkPerson(o[1]);
 }
 
 core.int buildCounterPeopleFeed = 0;
 buildPeopleFeed() {
   var o = new api.PeopleFeed();
   buildCounterPeopleFeed++;
   if (buildCounterPeopleFeed < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed961();
+    o.items = buildUnnamed1282();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
     o.title = "foo";
     o.totalItems = 42;
   }
   buildCounterPeopleFeed--;
   return o;
 }
 
 checkPeopleFeed(api.PeopleFeed o) {
   buildCounterPeopleFeed++;
   if (buildCounterPeopleFeed < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed961(o.items);
+    checkUnnamed1282(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
     unittest.expect(o.title, unittest.equals('foo'));
     unittest.expect(o.totalItems, unittest.equals(42));
   }
   buildCounterPeopleFeed--;
 }
 
 core.int buildCounterPersonCoverCoverInfo = 0;
@@ skipping 77 matching lines @@
 
 checkPersonEmails(api.PersonEmails o) {
   buildCounterPersonEmails++;
   if (buildCounterPersonEmails < 3) {
     unittest.expect(o.type, unittest.equals('foo'));
     unittest.expect(o.value, unittest.equals('foo'));
   }
   buildCounterPersonEmails--;
 }
 
-buildUnnamed962() {
+buildUnnamed1283() {
   var o = new core.List<api.PersonEmails>();
   o.add(buildPersonEmails());
   o.add(buildPersonEmails());
   return o;
 }
 
-checkUnnamed962(core.List<api.PersonEmails> o) {
+checkUnnamed1283(core.List<api.PersonEmails> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPersonEmails(o[0]);
   checkPersonEmails(o[1]);
 }
 
 core.int buildCounterPersonImage = 0;
 buildPersonImage() {
   var o = new api.PersonImage();
   buildCounterPersonImage++;
   if (buildCounterPersonImage < 3) {
@@ skipping 70 matching lines @@
     unittest.expect(o.location, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.primary, unittest.isTrue);
     unittest.expect(o.startDate, unittest.equals('foo'));
     unittest.expect(o.title, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterPersonOrganizations--;
 }
 
-buildUnnamed963() {
+buildUnnamed1284() {
   var o = new core.List<api.PersonOrganizations>();
   o.add(buildPersonOrganizations());
   o.add(buildPersonOrganizations());
   return o;
 }
 
-checkUnnamed963(core.List<api.PersonOrganizations> o) {
+checkUnnamed1284(core.List<api.PersonOrganizations> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPersonOrganizations(o[0]);
   checkPersonOrganizations(o[1]);
 }
 
 core.int buildCounterPersonPlacesLived = 0;
 buildPersonPlacesLived() {
   var o = new api.PersonPlacesLived();
   buildCounterPersonPlacesLived++;
   if (buildCounterPersonPlacesLived < 3) {
     o.primary = true;
     o.value = "foo";
   }
   buildCounterPersonPlacesLived--;
   return o;
 }
 
 checkPersonPlacesLived(api.PersonPlacesLived o) {
   buildCounterPersonPlacesLived++;
   if (buildCounterPersonPlacesLived < 3) {
     unittest.expect(o.primary, unittest.isTrue);
     unittest.expect(o.value, unittest.equals('foo'));
   }
   buildCounterPersonPlacesLived--;
 }
 
-buildUnnamed964() {
+buildUnnamed1285() {
   var o = new core.List<api.PersonPlacesLived>();
   o.add(buildPersonPlacesLived());
   o.add(buildPersonPlacesLived());
   return o;
 }
 
-checkUnnamed964(core.List<api.PersonPlacesLived> o) {
+checkUnnamed1285(core.List<api.PersonPlacesLived> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPersonPlacesLived(o[0]);
   checkPersonPlacesLived(o[1]);
 }
 
 core.int buildCounterPersonUrls = 0;
 buildPersonUrls() {
   var o = new api.PersonUrls();
   buildCounterPersonUrls++;
   if (buildCounterPersonUrls < 3) {
     o.label = "foo";
     o.type = "foo";
     o.value = "foo";
   }
   buildCounterPersonUrls--;
   return o;
 }
 
 checkPersonUrls(api.PersonUrls o) {
   buildCounterPersonUrls++;
   if (buildCounterPersonUrls < 3) {
     unittest.expect(o.label, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
     unittest.expect(o.value, unittest.equals('foo'));
   }
   buildCounterPersonUrls--;
 }
 
-buildUnnamed965() {
+buildUnnamed1286() {
   var o = new core.List<api.PersonUrls>();
   o.add(buildPersonUrls());
   o.add(buildPersonUrls());
   return o;
 }
 
-checkUnnamed965(core.List<api.PersonUrls> o) {
+checkUnnamed1286(core.List<api.PersonUrls> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPersonUrls(o[0]);
   checkPersonUrls(o[1]);
 }
 
 core.int buildCounterPerson = 0;
 buildPerson() {
   var o = new api.Person();
   buildCounterPerson++;
   if (buildCounterPerson < 3) {
     o.aboutMe = "foo";
     o.birthday = "foo";
     o.braggingRights = "foo";
     o.circledByCount = 42;
     o.cover = buildPersonCover();
     o.currentLocation = "foo";
     o.displayName = "foo";
     o.domain = "foo";
-    o.emails = buildUnnamed962();
+    o.emails = buildUnnamed1283();
     o.etag = "foo";
     o.gender = "foo";
     o.id = "foo";
     o.image = buildPersonImage();
     o.isPlusUser = true;
     o.kind = "foo";
     o.name = buildPersonName();
     o.nickname = "foo";
     o.objectType = "foo";
     o.occupation = "foo";
-    o.organizations = buildUnnamed963();
-    o.placesLived = buildUnnamed964();
+    o.organizations = buildUnnamed1284();
+    o.placesLived = buildUnnamed1285();
     o.plusOneCount = 42;
     o.relationshipStatus = "foo";
     o.skills = "foo";
     o.tagline = "foo";
     o.url = "foo";
-    o.urls = buildUnnamed965();
+    o.urls = buildUnnamed1286();
     o.verified = true;
   }
   buildCounterPerson--;
   return o;
 }
 
 checkPerson(api.Person o) {
   buildCounterPerson++;
   if (buildCounterPerson < 3) {
     unittest.expect(o.aboutMe, unittest.equals('foo'));
     unittest.expect(o.birthday, unittest.equals('foo'));
     unittest.expect(o.braggingRights, unittest.equals('foo'));
     unittest.expect(o.circledByCount, unittest.equals(42));
     checkPersonCover(o.cover);
     unittest.expect(o.currentLocation, unittest.equals('foo'));
     unittest.expect(o.displayName, unittest.equals('foo'));
     unittest.expect(o.domain, unittest.equals('foo'));
-    checkUnnamed962(o.emails);
+    checkUnnamed1283(o.emails);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.gender, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     checkPersonImage(o.image);
     unittest.expect(o.isPlusUser, unittest.isTrue);
     unittest.expect(o.kind, unittest.equals('foo'));
     checkPersonName(o.name);
     unittest.expect(o.nickname, unittest.equals('foo'));
     unittest.expect(o.objectType, unittest.equals('foo'));
     unittest.expect(o.occupation, unittest.equals('foo'));
-    checkUnnamed963(o.organizations);
-    checkUnnamed964(o.placesLived);
+    checkUnnamed1284(o.organizations);
+    checkUnnamed1285(o.placesLived);
     unittest.expect(o.plusOneCount, unittest.equals(42));
     unittest.expect(o.relationshipStatus, unittest.equals('foo'));
     unittest.expect(o.skills, unittest.equals('foo'));
     unittest.expect(o.tagline, unittest.equals('foo'));
     unittest.expect(o.url, unittest.equals('foo'));
-    checkUnnamed965(o.urls);
+    checkUnnamed1286(o.urls);
     unittest.expect(o.verified, unittest.isTrue);
   }
   buildCounterPerson--;
 }
 
 core.int buildCounterPlaceAddress = 0;
 buildPlaceAddress() {
   var o = new api.PlaceAddress();
   buildCounterPlaceAddress++;
   if (buildCounterPlaceAddress < 3) {
@@ skipping 100 matching lines @@
   buildCounterVideostream++;
   if (buildCounterVideostream < 3) {
     unittest.expect(o.height, unittest.equals(42));
     unittest.expect(o.type, unittest.equals('foo'));
     unittest.expect(o.url, unittest.equals('foo'));
     unittest.expect(o.width, unittest.equals(42));
   }
   buildCounterVideostream--;
 }
 
-buildUnnamed966() {
+buildUnnamed1287() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed966(core.List<core.String> o) {
+checkUnnamed1287(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed967() {
+buildUnnamed1288() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed967(core.List<core.String> o) {
+checkUnnamed1288(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed968() {
+buildUnnamed1289() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed968(core.List<core.String> o) {
+checkUnnamed1289(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed969() {
+buildUnnamed1290() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed969(core.List<core.String> o) {
+checkUnnamed1290(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
 
 main() {
   unittest.group("obj-schema-Acl", () {
     unittest.test("to-json--from-json", () {
       var o = buildAcl();
@@ skipping 467 matching lines @@
       var o = buildVideostream();
       var od = new api.Videostream.fromJson(o.toJson());
       checkVideostream(od);
     });
   });
 
 
   unittest.group("resource-ActivitiesResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ActivitiesResourceApi res = new api.PlusDomainsApi(mock).activities;
       var arg_activityId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 15), unittest.equals("plusDomains/v1/"));
@@ skipping 19 matching lines @@
             var keyvalue = part.split("=");
             addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildActivity());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_activityId).then(unittest.expectAsync(((api.Activity response) {
         checkActivity(response);
       })));
     });
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ActivitiesResourceApi res = new api.PlusDomainsApi(mock).activities;
       var arg_request = buildActivity();
       var arg_userId = "foo";
       var arg_preview = true;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var obj = new api.Activity.fromJson(json);
         checkActivity(obj);
 
         var path = (req.url).path;
         var pathOffset = 0;
@@ skipping 29 matching lines @@
             addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
           }
         }
         unittest.expect(queryMap["preview"].first, unittest.equals("$arg_preview"));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildActivity());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_userId, preview: arg_preview).then(unittest.expectAsync(((api.Activity response) {
         checkActivity(response);
       })));
     });
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.ActivitiesResourceApi res = new api.PlusDomainsApi(mock).activities;
       var arg_userId = "foo";
       var arg_collection = "foo";
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
@@ skipping 31 matching lines @@
           }
         }
         unittest.expect(core.int.parse(queryMap["maxResults"].first), unittest.equals(arg_maxResults));
         unittest.expect(queryMap["pageToken"].first, unittest.equals(arg_pageToken));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildActivityFeed());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_userId, arg_collection, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.ActivityFeed response) {
         checkActivityFeed(response);
       })));
     });
 
   });
 
 
   unittest.group("resource-AudiencesResourceApi", () {
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.AudiencesResourceApi res = new api.PlusDomainsApi(mock).audiences;
       var arg_userId = "foo";
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
@@ skipping 27 matching lines @@
           }
         }
         unittest.expect(core.int.parse(queryMap["maxResults"].first), unittest.equals(arg_maxResults));
         unittest.expect(queryMap["pageToken"].first, unittest.equals(arg_pageToken));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildAudiencesFeed());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_userId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.AudiencesFeed response) {
         checkAudiencesFeed(response);
       })));
     });
 
   });
 
 
   unittest.group("resource-CirclesResourceApi", () {
     unittest.test("method--addPeople", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CirclesResourceApi res = new api.PlusDomainsApi(mock).circles;
       var arg_circleId = "foo";
-      var arg_email = buildUnnamed966();
-      var arg_userId = buildUnnamed967();
+      var arg_email = buildUnnamed1287();
+      var arg_userId = buildUnnamed1288();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 15), unittest.equals("plusDomains/v1/"));
         pathOffset += 15;
         unittest.expect(path.substring(pathOffset, pathOffset + 8), unittest.equals("circles/"));
@@ skipping 23 matching lines @@
           }
         }
         unittest.expect(queryMap["email"], unittest.equals(arg_email));
         unittest.expect(queryMap["userId"], unittest.equals(arg_userId));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCircle());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.addPeople(arg_circleId, email: arg_email, userId: arg_userId).then(unittest.expectAsync(((api.Circle response) {
         checkCircle(response);
       })));
     });
 
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CirclesResourceApi res = new api.PlusDomainsApi(mock).circles;
       var arg_circleId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 15), unittest.equals("plusDomains/v1/"));
@@ skipping 19 matching lines @@
             var keyvalue = part.split("=");
             addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCircle());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_circleId).then(unittest.expectAsync(((api.Circle response) {
         checkCircle(response);
       })));
     });
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CirclesResourceApi res = new api.PlusDomainsApi(mock).circles;
       var arg_request = buildCircle();
       var arg_userId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var obj = new api.Circle.fromJson(json);
         checkCircle(obj);
 
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
@@ skipping 27 matching lines @@
             var keyvalue = part.split("=");
             addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCircle());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_userId).then(unittest.expectAsync(((api.Circle response) {
         checkCircle(response);
       })));
     });
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CirclesResourceApi res = new api.PlusDomainsApi(mock).circles;
       var arg_userId = "foo";
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
@@ skipping 27 matching lines @@
           }
         }
         unittest.expect(core.int.parse(queryMap["maxResults"].first), unittest.equals(arg_maxResults));
         unittest.expect(queryMap["pageToken"].first, unittest.equals(arg_pageToken));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCircleFeed());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_userId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.CircleFeed response) {
         checkCircleFeed(response);
       })));
     });
 
     unittest.test("method--patch", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CirclesResourceApi res = new api.PlusDomainsApi(mock).circles;
       var arg_request = buildCircle();
       var arg_circleId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var obj = new api.Circle.fromJson(json);
         checkCircle(obj);
 
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
@@ skipping 23 matching lines @@
             var keyvalue = part.split("=");
             addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCircle());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.patch(arg_request, arg_circleId).then(unittest.expectAsync(((api.Circle response) {
         checkCircle(response);
       })));
     });
 
     unittest.test("method--remove", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CirclesResourceApi res = new api.PlusDomainsApi(mock).circles;
       var arg_circleId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 15), unittest.equals("plusDomains/v1/"));
@@ skipping 19 matching lines @@
             var keyvalue = part.split("=");
             addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.remove(arg_circleId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--removePeople", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CirclesResourceApi res = new api.PlusDomainsApi(mock).circles;
       var arg_circleId = "foo";
-      var arg_email = buildUnnamed968();
-      var arg_userId = buildUnnamed969();
+      var arg_email = buildUnnamed1289();
+      var arg_userId = buildUnnamed1290();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 15), unittest.equals("plusDomains/v1/"));
         pathOffset += 15;
         unittest.expect(path.substring(pathOffset, pathOffset + 8), unittest.equals("circles/"));
@@ skipping 23 matching lines @@
           }
         }
         unittest.expect(queryMap["email"], unittest.equals(arg_email));
         unittest.expect(queryMap["userId"], unittest.equals(arg_userId));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = "";
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.removePeople(arg_circleId, email: arg_email, userId: arg_userId).then(unittest.expectAsync((_) {}));
     });
 
     unittest.test("method--update", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CirclesResourceApi res = new api.PlusDomainsApi(mock).circles;
       var arg_request = buildCircle();
       var arg_circleId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var obj = new api.Circle.fromJson(json);
         checkCircle(obj);
 
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
@@ skipping 23 matching lines @@
             var keyvalue = part.split("=");
             addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCircle());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.update(arg_request, arg_circleId).then(unittest.expectAsync(((api.Circle response) {
         checkCircle(response);
       })));
     });
 
   });
 
 
   unittest.group("resource-CommentsResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CommentsResourceApi res = new api.PlusDomainsApi(mock).comments;
       var arg_commentId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 15), unittest.equals("plusDomains/v1/"));
@@ skipping 19 matching lines @@
             var keyvalue = part.split("=");
             addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildComment());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_commentId).then(unittest.expectAsync(((api.Comment response) {
         checkComment(response);
       })));
     });
 
     unittest.test("method--insert", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CommentsResourceApi res = new api.PlusDomainsApi(mock).comments;
       var arg_request = buildComment();
       var arg_activityId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var obj = new api.Comment.fromJson(json);
         checkComment(obj);
 
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
@@ skipping 27 matching lines @@
             var keyvalue = part.split("=");
             addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildComment());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_activityId).then(unittest.expectAsync(((api.Comment response) {
         checkComment(response);
       })));
     });
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.CommentsResourceApi res = new api.PlusDomainsApi(mock).comments;
       var arg_activityId = "foo";
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_sortOrder = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
@@ skipping 29 matching lines @@
         }
         unittest.expect(core.int.parse(queryMap["maxResults"].first), unittest.equals(arg_maxResults));
         unittest.expect(queryMap["pageToken"].first, unittest.equals(arg_pageToken));
         unittest.expect(queryMap["sortOrder"].first, unittest.equals(arg_sortOrder));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildCommentFeed());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_activityId, maxResults: arg_maxResults, pageToken: arg_pageToken, sortOrder: arg_sortOrder).then(unittest.expectAsync(((api.CommentFeed response) {
         checkCommentFeed(response);
       })));
     });
 
   });
 
 
   unittest.group("resource-MediaResourceApi", () {
     unittest.test("method--insert", () {
       // TODO: Implement tests for media upload;
       // TODO: Implement tests for media download;
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.MediaResourceApi res = new api.PlusDomainsApi(mock).media;
       var arg_request = buildMedia();
       var arg_userId = "foo";
       var arg_collection = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var obj = new api.Media.fromJson(json);
         checkMedia(obj);
 
         var path = (req.url).path;
         var pathOffset = 0;
@@ skipping 31 matching lines @@
             var keyvalue = part.split("=");
             addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildMedia());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.insert(arg_request, arg_userId, arg_collection).then(unittest.expectAsync(((api.Media response) {
         checkMedia(response);
       })));
     });
 
   });
 
 
   unittest.group("resource-PeopleResourceApi", () {
     unittest.test("method--get", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PeopleResourceApi res = new api.PlusDomainsApi(mock).people;
       var arg_userId = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
         unittest.expect(path.substring(pathOffset, pathOffset + 15), unittest.equals("plusDomains/v1/"));
@@ skipping 19 matching lines @@
             var keyvalue = part.split("=");
             addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
           }
         }
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPerson());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.get(arg_userId).then(unittest.expectAsync(((api.Person response) {
         checkPerson(response);
       })));
     });
 
     unittest.test("method--list", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PeopleResourceApi res = new api.PlusDomainsApi(mock).people;
       var arg_userId = "foo";
       var arg_collection = "foo";
       var arg_maxResults = 42;
       var arg_orderBy = "foo";
       var arg_pageToken = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
@@ skipping 33 matching lines @@
         }
         unittest.expect(core.int.parse(queryMap["maxResults"].first), unittest.equals(arg_maxResults));
         unittest.expect(queryMap["orderBy"].first, unittest.equals(arg_orderBy));
         unittest.expect(queryMap["pageToken"].first, unittest.equals(arg_pageToken));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPeopleFeed());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.list(arg_userId, arg_collection, maxResults: arg_maxResults, orderBy: arg_orderBy, pageToken: arg_pageToken).then(unittest.expectAsync(((api.PeopleFeed response) {
         checkPeopleFeed(response);
       })));
     });
 
     unittest.test("method--listByActivity", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PeopleResourceApi res = new api.PlusDomainsApi(mock).people;
       var arg_activityId = "foo";
       var arg_collection = "foo";
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
@@ skipping 31 matching lines @@
           }
         }
         unittest.expect(core.int.parse(queryMap["maxResults"].first), unittest.equals(arg_maxResults));
         unittest.expect(queryMap["pageToken"].first, unittest.equals(arg_pageToken));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPeopleFeed());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.listByActivity(arg_activityId, arg_collection, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.PeopleFeed response) {
         checkPeopleFeed(response);
       })));
     });
 
     unittest.test("method--listByCircle", () {
 
-      var mock = new common_test.HttpServerMock();
+      var mock = new HttpServerMock();
       api.PeopleResourceApi res = new api.PlusDomainsApi(mock).people;
       var arg_circleId = "foo";
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
         var path = (req.url).path;
         var pathOffset = 0;
         var index;
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
@@ skipping 27 matching lines @@
           }
         }
         unittest.expect(core.int.parse(queryMap["maxResults"].first), unittest.equals(arg_maxResults));
         unittest.expect(queryMap["pageToken"].first, unittest.equals(arg_pageToken));
 
 
         var h = {
           "content-type" : "application/json; charset=utf-8",
         };
         var resp = convert.JSON.encode(buildPeopleFeed());
-        return new async.Future.value(common_test.stringResponse(200, h, resp));
+        return new async.Future.value(stringResponse(200, h, resp));
       }), true);
       res.listByCircle(arg_circleId, maxResults: arg_maxResults, pageToken: arg_pageToken).then(unittest.expectAsync(((api.PeopleFeed response) {
         checkPeopleFeed(response);
       })));
     });
 
   });
 
 
 }