Api roll 2: 2014-09-29

generated/googleapis/test/civicinfo/v2_test.dart

Index: generated/googleapis/test/civicinfo/v2_test.dart
diff --git a/generated/googleapis/test/civicinfo/v1_test.dart b/generated/googleapis/test/civicinfo/v2_test.dart
similarity index 72%
copy from generated/googleapis/test/civicinfo/v1_test.dart
copy to generated/googleapis/test/civicinfo/v2_test.dart
index 58d929182ae09b9782350e904b41dcfb121832dd..31e775cb020a72002876391870fd843fc612de34 100644
--- a/generated/googleapis/test/civicinfo/v1_test.dart
+++ b/generated/googleapis/test/civicinfo/v2_test.dart
@@ -1,4 +1,4 @@
-library googleapis.civicinfo.v1.test;
+library googleapis.civicinfo.v2.test;
 
 import "dart:core" as core;
 import "dart:collection" as collection;
@@ -12,18 +12,18 @@ 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/civicinfo/v1.dart' as api;
+import 'package:googleapis/civicinfo/v2.dart' as api;
 
 
 
-buildUnnamed65() {
+buildUnnamed208() {
   var o = new core.List<api.Source>();
   o.add(buildSource());
   o.add(buildSource());
   return o;
 }
 
-checkUnnamed65(core.List<api.Source> o) {
+checkUnnamed208(core.List<api.Source> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSource(o[0]);
   checkSource(o[1]);
@@ -38,7 +38,7 @@ buildAdministrationRegion() {
     o.id = "foo";
     o.localJurisdiction = buildAdministrationRegion();
     o.name = "foo";
-    o.sources = buildUnnamed65();
+    o.sources = buildUnnamed208();
   }
   buildCounterAdministrationRegion--;
   return o;
@@ -51,32 +51,32 @@ checkAdministrationRegion(api.AdministrationRegion o) {
     unittest.expect(o.id, unittest.equals('foo'));
     checkAdministrationRegion(o.localJurisdiction);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed65(o.sources);
+    checkUnnamed208(o.sources);
   }
   buildCounterAdministrationRegion--;
 }
 
-buildUnnamed66() {
+buildUnnamed209() {
   var o = new core.List<api.ElectionOfficial>();
   o.add(buildElectionOfficial());
   o.add(buildElectionOfficial());
   return o;
 }
 
-checkUnnamed66(core.List<api.ElectionOfficial> o) {
+checkUnnamed209(core.List<api.ElectionOfficial> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkElectionOfficial(o[0]);
   checkElectionOfficial(o[1]);
 }
 
-buildUnnamed67() {
+buildUnnamed210() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed67(core.List<core.String> o) {
+checkUnnamed210(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'));
@@ -91,14 +91,14 @@ buildAdministrativeBody() {
     o.ballotInfoUrl = "foo";
     o.correspondenceAddress = buildSimpleAddressType();
     o.electionInfoUrl = "foo";
-    o.electionOfficials = buildUnnamed66();
+    o.electionOfficials = buildUnnamed209();
     o.electionRegistrationConfirmationUrl = "foo";
     o.electionRegistrationUrl = "foo";
     o.electionRulesUrl = "foo";
     o.hoursOfOperation = "foo";
     o.name = "foo";
     o.physicalAddress = buildSimpleAddressType();
-    o.voterServices = buildUnnamed67();
+    o.voterServices = buildUnnamed210();
     o.votingLocationFinderUrl = "foo";
   }
   buildCounterAdministrativeBody--;
@@ -112,27 +112,27 @@ checkAdministrativeBody(api.AdministrativeBody o) {
     unittest.expect(o.ballotInfoUrl, unittest.equals('foo'));
     checkSimpleAddressType(o.correspondenceAddress);
     unittest.expect(o.electionInfoUrl, unittest.equals('foo'));
-    checkUnnamed66(o.electionOfficials);
+    checkUnnamed209(o.electionOfficials);
     unittest.expect(o.electionRegistrationConfirmationUrl, unittest.equals('foo'));
     unittest.expect(o.electionRegistrationUrl, unittest.equals('foo'));
     unittest.expect(o.electionRulesUrl, unittest.equals('foo'));
     unittest.expect(o.hoursOfOperation, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     checkSimpleAddressType(o.physicalAddress);
-    checkUnnamed67(o.voterServices);
+    checkUnnamed210(o.voterServices);
     unittest.expect(o.votingLocationFinderUrl, unittest.equals('foo'));
   }
   buildCounterAdministrativeBody--;
 }
 
-buildUnnamed68() {
+buildUnnamed211() {
   var o = new core.List<api.Channel>();
   o.add(buildChannel());
   o.add(buildChannel());
   return o;
 }
 
-checkUnnamed68(core.List<api.Channel> o) {
+checkUnnamed211(core.List<api.Channel> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkChannel(o[0]);
   checkChannel(o[1]);
@@ -144,7 +144,7 @@ buildCandidate() {
   buildCounterCandidate++;
   if (buildCounterCandidate < 3) {
     o.candidateUrl = "foo";
-    o.channels = buildUnnamed68();
+    o.channels = buildUnnamed211();
     o.email = "foo";
     o.name = "foo";
     o.orderOnBallot = "foo";
@@ -160,7 +160,7 @@ checkCandidate(api.Candidate o) {
   buildCounterCandidate++;
   if (buildCounterCandidate < 3) {
     unittest.expect(o.candidateUrl, unittest.equals('foo'));
-    checkUnnamed68(o.channels);
+    checkUnnamed211(o.channels);
     unittest.expect(o.email, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.orderOnBallot, unittest.equals('foo'));
@@ -192,27 +192,53 @@ checkChannel(api.Channel o) {
   buildCounterChannel--;
 }
 
-buildUnnamed69() {
+buildUnnamed212() {
   var o = new core.List<api.Candidate>();
   o.add(buildCandidate());
   o.add(buildCandidate());
   return o;
 }
 
-checkUnnamed69(core.List<api.Candidate> o) {
+checkUnnamed212(core.List<api.Candidate> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCandidate(o[0]);
   checkCandidate(o[1]);
 }
 
-buildUnnamed70() {
+buildUnnamed213() {
+  var o = new core.List<core.String>();
+  o.add("foo");
+  o.add("foo");
+  return o;
+}
+
+checkUnnamed213(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'));
+}
+
+buildUnnamed214() {
+  var o = new core.List<core.String>();
+  o.add("foo");
+  o.add("foo");
+  return o;
+}
+
+checkUnnamed214(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'));
+}
+
+buildUnnamed215() {
   var o = new core.List<api.Source>();
   o.add(buildSource());
   o.add(buildSource());
   return o;
 }
 
-checkUnnamed70(core.List<api.Source> o) {
+checkUnnamed215(core.List<api.Source> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSource(o[0]);
   checkSource(o[1]);
@@ -224,11 +250,11 @@ buildContest() {
   buildCounterContest++;
   if (buildCounterContest < 3) {
     o.ballotPlacement = "foo";
-    o.candidates = buildUnnamed69();
+    o.candidates = buildUnnamed212();
     o.district = buildElectoralDistrict();
     o.electorateSpecifications = "foo";
     o.id = "foo";
-    o.level = "foo";
+    o.level = buildUnnamed213();
     o.numberElected = "foo";
     o.numberVotingFor = "foo";
     o.office = "foo";
@@ -236,7 +262,8 @@ buildContest() {
     o.referendumSubtitle = "foo";
     o.referendumTitle = "foo";
     o.referendumUrl = "foo";
-    o.sources = buildUnnamed70();
+    o.roles = buildUnnamed214();
+    o.sources = buildUnnamed215();
     o.special = "foo";
     o.type = "foo";
   }
@@ -248,11 +275,11 @@ checkContest(api.Contest o) {
   buildCounterContest++;
   if (buildCounterContest < 3) {
     unittest.expect(o.ballotPlacement, unittest.equals('foo'));
-    checkUnnamed69(o.candidates);
+    checkUnnamed212(o.candidates);
     checkElectoralDistrict(o.district);
     unittest.expect(o.electorateSpecifications, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
-    unittest.expect(o.level, unittest.equals('foo'));
+    checkUnnamed213(o.level);
     unittest.expect(o.numberElected, unittest.equals('foo'));
     unittest.expect(o.numberVotingFor, unittest.equals('foo'));
     unittest.expect(o.office, unittest.equals('foo'));
@@ -260,21 +287,22 @@ checkContest(api.Contest o) {
     unittest.expect(o.referendumSubtitle, unittest.equals('foo'));
     unittest.expect(o.referendumTitle, unittest.equals('foo'));
     unittest.expect(o.referendumUrl, unittest.equals('foo'));
-    checkUnnamed70(o.sources);
+    checkUnnamed214(o.roles);
+    checkUnnamed215(o.sources);
     unittest.expect(o.special, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterContest--;
 }
 
-buildUnnamed71() {
+buildUnnamed216() {
   var o = new core.List<api.DivisionSearchResult>();
   o.add(buildDivisionSearchResult());
   o.add(buildDivisionSearchResult());
   return o;
 }
 
-checkUnnamed71(core.List<api.DivisionSearchResult> o) {
+checkUnnamed216(core.List<api.DivisionSearchResult> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDivisionSearchResult(o[0]);
   checkDivisionSearchResult(o[1]);
@@ -286,8 +314,7 @@ buildDivisionSearchResponse() {
   buildCounterDivisionSearchResponse++;
   if (buildCounterDivisionSearchResponse < 3) {
     o.kind = "foo";
-    o.results = buildUnnamed71();
-    o.status = "foo";
+    o.results = buildUnnamed216();
   }
   buildCounterDivisionSearchResponse--;
   return o;
@@ -297,20 +324,19 @@ checkDivisionSearchResponse(api.DivisionSearchResponse o) {
   buildCounterDivisionSearchResponse++;
   if (buildCounterDivisionSearchResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed71(o.results);
-    unittest.expect(o.status, unittest.equals('foo'));
+    checkUnnamed216(o.results);
   }
   buildCounterDivisionSearchResponse--;
 }
 
-buildUnnamed72() {
+buildUnnamed217() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed72(core.List<core.String> o) {
+checkUnnamed217(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'));
@@ -321,7 +347,7 @@ buildDivisionSearchResult() {
   var o = new api.DivisionSearchResult();
   buildCounterDivisionSearchResult++;
   if (buildCounterDivisionSearchResult < 3) {
-    o.aliases = buildUnnamed72();
+    o.aliases = buildUnnamed217();
     o.name = "foo";
     o.ocdId = "foo";
   }
@@ -332,7 +358,7 @@ buildDivisionSearchResult() {
 checkDivisionSearchResult(api.DivisionSearchResult o) {
   buildCounterDivisionSearchResult++;
   if (buildCounterDivisionSearchResult < 3) {
-    checkUnnamed72(o.aliases);
+    checkUnnamed217(o.aliases);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.ocdId, unittest.equals('foo'));
   }
@@ -389,14 +415,14 @@ checkElectionOfficial(api.ElectionOfficial o) {
   buildCounterElectionOfficial--;
 }
 
-buildUnnamed73() {
+buildUnnamed218() {
   var o = new core.List<api.Election>();
   o.add(buildElection());
   o.add(buildElection());
   return o;
 }
 
-checkUnnamed73(core.List<api.Election> o) {
+checkUnnamed218(core.List<api.Election> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkElection(o[0]);
   checkElection(o[1]);
@@ -407,7 +433,7 @@ buildElectionsQueryResponse() {
   var o = new api.ElectionsQueryResponse();
   buildCounterElectionsQueryResponse++;
   if (buildCounterElectionsQueryResponse < 3) {
-    o.elections = buildUnnamed73();
+    o.elections = buildUnnamed218();
     o.kind = "foo";
   }
   buildCounterElectionsQueryResponse--;
@@ -417,7 +443,7 @@ buildElectionsQueryResponse() {
 checkElectionsQueryResponse(api.ElectionsQueryResponse o) {
   buildCounterElectionsQueryResponse++;
   if (buildCounterElectionsQueryResponse < 3) {
-    checkUnnamed73(o.elections);
+    checkUnnamed218(o.elections);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterElectionsQueryResponse--;
@@ -446,30 +472,30 @@ checkElectoralDistrict(api.ElectoralDistrict o) {
   buildCounterElectoralDistrict--;
 }
 
-buildUnnamed74() {
+buildUnnamed219() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed74(core.List<core.String> o) {
+checkUnnamed219(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'));
 }
 
-buildUnnamed75() {
-  var o = new core.List<core.String>();
-  o.add("foo");
-  o.add("foo");
+buildUnnamed220() {
+  var o = new core.List<core.int>();
+  o.add(42);
+  o.add(42);
   return o;
 }
 
-checkUnnamed75(core.List<core.String> o) {
+checkUnnamed220(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
-  unittest.expect(o[0], unittest.equals('foo'));
-  unittest.expect(o[1], unittest.equals('foo'));
+  unittest.expect(o[0], unittest.equals(42));
+  unittest.expect(o[1], unittest.equals(42));
 }
 
 core.int buildCounterGeographicDivision = 0;
@@ -477,10 +503,9 @@ buildGeographicDivision() {
   var o = new api.GeographicDivision();
   buildCounterGeographicDivision++;
   if (buildCounterGeographicDivision < 3) {
-    o.alsoKnownAs = buildUnnamed74();
+    o.alsoKnownAs = buildUnnamed219();
     o.name = "foo";
-    o.officeIds = buildUnnamed75();
-    o.scope = "foo";
+    o.officeIndices = buildUnnamed220();
   }
   buildCounterGeographicDivision--;
   return o;
@@ -489,35 +514,60 @@ buildGeographicDivision() {
 checkGeographicDivision(api.GeographicDivision o) {
   buildCounterGeographicDivision++;
   if (buildCounterGeographicDivision < 3) {
-    checkUnnamed74(o.alsoKnownAs);
+    checkUnnamed219(o.alsoKnownAs);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed75(o.officeIds);
-    unittest.expect(o.scope, unittest.equals('foo'));
+    checkUnnamed220(o.officeIndices);
   }
   buildCounterGeographicDivision--;
 }
 
-buildUnnamed76() {
+buildUnnamed221() {
+  var o = new core.List<core.String>();
+  o.add("foo");
+  o.add("foo");
+  return o;
+}
+
+checkUnnamed221(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'));
+}
+
+buildUnnamed222() {
+  var o = new core.List<core.int>();
+  o.add(42);
+  o.add(42);
+  return o;
+}
+
+checkUnnamed222(core.List<core.int> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  unittest.expect(o[0], unittest.equals(42));
+  unittest.expect(o[1], unittest.equals(42));
+}
+
+buildUnnamed223() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed76(core.List<core.String> o) {
+checkUnnamed223(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'));
 }
 
-buildUnnamed77() {
+buildUnnamed224() {
   var o = new core.List<api.Source>();
   o.add(buildSource());
   o.add(buildSource());
   return o;
 }
 
-checkUnnamed77(core.List<api.Source> o) {
+checkUnnamed224(core.List<api.Source> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSource(o[0]);
   checkSource(o[1]);
@@ -529,10 +579,11 @@ buildOffice() {
   buildCounterOffice++;
   if (buildCounterOffice < 3) {
     o.divisionId = "foo";
-    o.level = "foo";
+    o.levels = buildUnnamed221();
     o.name = "foo";
-    o.officialIds = buildUnnamed76();
-    o.sources = buildUnnamed77();
+    o.officialIndices = buildUnnamed222();
+    o.roles = buildUnnamed223();
+    o.sources = buildUnnamed224();
   }
   buildCounterOffice--;
   return o;
@@ -542,74 +593,75 @@ checkOffice(api.Office o) {
   buildCounterOffice++;
   if (buildCounterOffice < 3) {
     unittest.expect(o.divisionId, unittest.equals('foo'));
-    unittest.expect(o.level, unittest.equals('foo'));
+    checkUnnamed221(o.levels);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed76(o.officialIds);
-    checkUnnamed77(o.sources);
+    checkUnnamed222(o.officialIndices);
+    checkUnnamed223(o.roles);
+    checkUnnamed224(o.sources);
   }
   buildCounterOffice--;
 }
 
-buildUnnamed78() {
+buildUnnamed225() {
   var o = new core.List<api.SimpleAddressType>();
   o.add(buildSimpleAddressType());
   o.add(buildSimpleAddressType());
   return o;
 }
 
-checkUnnamed78(core.List<api.SimpleAddressType> o) {
+checkUnnamed225(core.List<api.SimpleAddressType> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSimpleAddressType(o[0]);
   checkSimpleAddressType(o[1]);
 }
 
-buildUnnamed79() {
+buildUnnamed226() {
   var o = new core.List<api.Channel>();
   o.add(buildChannel());
   o.add(buildChannel());
   return o;
 }
 
-checkUnnamed79(core.List<api.Channel> o) {
+checkUnnamed226(core.List<api.Channel> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkChannel(o[0]);
   checkChannel(o[1]);
 }
 
-buildUnnamed80() {
+buildUnnamed227() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed80(core.List<core.String> o) {
+checkUnnamed227(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'));
 }
 
-buildUnnamed81() {
+buildUnnamed228() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed81(core.List<core.String> o) {
+checkUnnamed228(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'));
 }
 
-buildUnnamed82() {
+buildUnnamed229() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed82(core.List<core.String> o) {
+checkUnnamed229(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'));
@@ -620,14 +672,14 @@ buildOfficial() {
   var o = new api.Official();
   buildCounterOfficial++;
   if (buildCounterOfficial < 3) {
-    o.address = buildUnnamed78();
-    o.channels = buildUnnamed79();
-    o.emails = buildUnnamed80();
+    o.address = buildUnnamed225();
+    o.channels = buildUnnamed226();
+    o.emails = buildUnnamed227();
     o.name = "foo";
     o.party = "foo";
-    o.phones = buildUnnamed81();
+    o.phones = buildUnnamed228();
     o.photoUrl = "foo";
-    o.urls = buildUnnamed82();
+    o.urls = buildUnnamed229();
   }
   buildCounterOfficial--;
   return o;
@@ -636,26 +688,26 @@ buildOfficial() {
 checkOfficial(api.Official o) {
   buildCounterOfficial++;
   if (buildCounterOfficial < 3) {
-    checkUnnamed78(o.address);
-    checkUnnamed79(o.channels);
-    checkUnnamed80(o.emails);
+    checkUnnamed225(o.address);
+    checkUnnamed226(o.channels);
+    checkUnnamed227(o.emails);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.party, unittest.equals('foo'));
-    checkUnnamed81(o.phones);
+    checkUnnamed228(o.phones);
     unittest.expect(o.photoUrl, unittest.equals('foo'));
-    checkUnnamed82(o.urls);
+    checkUnnamed229(o.urls);
   }
   buildCounterOfficial--;
 }
 
-buildUnnamed83() {
+buildUnnamed230() {
   var o = new core.List<api.Source>();
   o.add(buildSource());
   o.add(buildSource());
   return o;
 }
 
-checkUnnamed83(core.List<api.Source> o) {
+checkUnnamed230(core.List<api.Source> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSource(o[0]);
   checkSource(o[1]);
@@ -672,7 +724,7 @@ buildPollingLocation() {
     o.name = "foo";
     o.notes = "foo";
     o.pollingHours = "foo";
-    o.sources = buildUnnamed83();
+    o.sources = buildUnnamed230();
     o.startDate = "foo";
     o.voterServices = "foo";
   }
@@ -689,69 +741,112 @@ checkPollingLocation(api.PollingLocation o) {
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.notes, unittest.equals('foo'));
     unittest.expect(o.pollingHours, unittest.equals('foo'));
-    checkUnnamed83(o.sources);
+    checkUnnamed230(o.sources);
     unittest.expect(o.startDate, unittest.equals('foo'));
     unittest.expect(o.voterServices, unittest.equals('foo'));
   }
   buildCounterPollingLocation--;
 }
 
-core.int buildCounterRepresentativeInfoRequest = 0;
-buildRepresentativeInfoRequest() {
-  var o = new api.RepresentativeInfoRequest();
-  buildCounterRepresentativeInfoRequest++;
-  if (buildCounterRepresentativeInfoRequest < 3) {
-    o.address = "foo";
+buildUnnamed231() {
+  var o = new core.Map<core.String, api.GeographicDivision>();
+  o["x"] = buildGeographicDivision();
+  o["y"] = buildGeographicDivision();
+  return o;
+}
+
+checkUnnamed231(core.Map<core.String, api.GeographicDivision> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  checkGeographicDivision(o["x"]);
+  checkGeographicDivision(o["y"]);
+}
+
+buildUnnamed232() {
+  var o = new core.List<api.Office>();
+  o.add(buildOffice());
+  o.add(buildOffice());
+  return o;
+}
+
+checkUnnamed232(core.List<api.Office> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  checkOffice(o[0]);
+  checkOffice(o[1]);
+}
+
+buildUnnamed233() {
+  var o = new core.List<api.Official>();
+  o.add(buildOfficial());
+  o.add(buildOfficial());
+  return o;
+}
+
+checkUnnamed233(core.List<api.Official> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  checkOfficial(o[0]);
+  checkOfficial(o[1]);
+}
+
+core.int buildCounterRepresentativeInfoData = 0;
+buildRepresentativeInfoData() {
+  var o = new api.RepresentativeInfoData();
+  buildCounterRepresentativeInfoData++;
+  if (buildCounterRepresentativeInfoData < 3) {
+    o.divisions = buildUnnamed231();
+    o.offices = buildUnnamed232();
+    o.officials = buildUnnamed233();
   }
-  buildCounterRepresentativeInfoRequest--;
+  buildCounterRepresentativeInfoData--;
   return o;
 }
 
-checkRepresentativeInfoRequest(api.RepresentativeInfoRequest o) {
-  buildCounterRepresentativeInfoRequest++;
-  if (buildCounterRepresentativeInfoRequest < 3) {
-    unittest.expect(o.address, unittest.equals('foo'));
+checkRepresentativeInfoData(api.RepresentativeInfoData o) {
+  buildCounterRepresentativeInfoData++;
+  if (buildCounterRepresentativeInfoData < 3) {
+    checkUnnamed231(o.divisions);
+    checkUnnamed232(o.offices);
+    checkUnnamed233(o.officials);
   }
-  buildCounterRepresentativeInfoRequest--;
+  buildCounterRepresentativeInfoData--;
 }
 
-buildUnnamed84() {
+buildUnnamed234() {
   var o = new core.Map<core.String, api.GeographicDivision>();
   o["x"] = buildGeographicDivision();
   o["y"] = buildGeographicDivision();
   return o;
 }
 
-checkUnnamed84(core.Map<core.String, api.GeographicDivision> o) {
+checkUnnamed234(core.Map<core.String, api.GeographicDivision> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGeographicDivision(o["x"]);
   checkGeographicDivision(o["y"]);
 }
 
-buildUnnamed85() {
-  var o = new core.Map<core.String, api.Office>();
-  o["x"] = buildOffice();
-  o["y"] = buildOffice();
+buildUnnamed235() {
+  var o = new core.List<api.Office>();
+  o.add(buildOffice());
+  o.add(buildOffice());
   return o;
 }
 
-checkUnnamed85(core.Map<core.String, api.Office> o) {
+checkUnnamed235(core.List<api.Office> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkOffice(o["x"]);
-  checkOffice(o["y"]);
+  checkOffice(o[0]);
+  checkOffice(o[1]);
 }
 
-buildUnnamed86() {
-  var o = new core.Map<core.String, api.Official>();
-  o["x"] = buildOfficial();
-  o["y"] = buildOfficial();
+buildUnnamed236() {
+  var o = new core.List<api.Official>();
+  o.add(buildOfficial());
+  o.add(buildOfficial());
   return o;
 }
 
-checkUnnamed86(core.Map<core.String, api.Official> o) {
+checkUnnamed236(core.List<api.Official> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkOfficial(o["x"]);
-  checkOfficial(o["y"]);
+  checkOfficial(o[0]);
+  checkOfficial(o[1]);
 }
 
 core.int buildCounterRepresentativeInfoResponse = 0;
@@ -759,12 +854,11 @@ buildRepresentativeInfoResponse() {
   var o = new api.RepresentativeInfoResponse();
   buildCounterRepresentativeInfoResponse++;
   if (buildCounterRepresentativeInfoResponse < 3) {
-    o.divisions = buildUnnamed84();
+    o.divisions = buildUnnamed234();
     o.kind = "foo";
     o.normalizedInput = buildSimpleAddressType();
-    o.offices = buildUnnamed85();
-    o.officials = buildUnnamed86();
-    o.status = "foo";
+    o.offices = buildUnnamed235();
+    o.officials = buildUnnamed236();
   }
   buildCounterRepresentativeInfoResponse--;
   return o;
@@ -773,12 +867,11 @@ buildRepresentativeInfoResponse() {
 checkRepresentativeInfoResponse(api.RepresentativeInfoResponse o) {
   buildCounterRepresentativeInfoResponse++;
   if (buildCounterRepresentativeInfoResponse < 3) {
-    checkUnnamed84(o.divisions);
+    checkUnnamed234(o.divisions);
     unittest.expect(o.kind, unittest.equals('foo'));
     checkSimpleAddressType(o.normalizedInput);
-    checkUnnamed85(o.offices);
-    checkUnnamed86(o.officials);
-    unittest.expect(o.status, unittest.equals('foo'));
+    checkUnnamed235(o.offices);
+    checkUnnamed236(o.officials);
   }
   buildCounterRepresentativeInfoResponse--;
 }
@@ -835,72 +928,66 @@ checkSource(api.Source o) {
   buildCounterSource--;
 }
 
-core.int buildCounterVoterInfoRequest = 0;
-buildVoterInfoRequest() {
-  var o = new api.VoterInfoRequest();
-  buildCounterVoterInfoRequest++;
-  if (buildCounterVoterInfoRequest < 3) {
-    o.address = "foo";
-  }
-  buildCounterVoterInfoRequest--;
-  return o;
-}
-
-checkVoterInfoRequest(api.VoterInfoRequest o) {
-  buildCounterVoterInfoRequest++;
-  if (buildCounterVoterInfoRequest < 3) {
-    unittest.expect(o.address, unittest.equals('foo'));
-  }
-  buildCounterVoterInfoRequest--;
-}
-
-buildUnnamed87() {
+buildUnnamed237() {
   var o = new core.List<api.Contest>();
   o.add(buildContest());
   o.add(buildContest());
   return o;
 }
 
-checkUnnamed87(core.List<api.Contest> o) {
+checkUnnamed237(core.List<api.Contest> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkContest(o[0]);
   checkContest(o[1]);
 }
 
-buildUnnamed88() {
+buildUnnamed238() {
   var o = new core.List<api.PollingLocation>();
   o.add(buildPollingLocation());
   o.add(buildPollingLocation());
   return o;
 }
 
-checkUnnamed88(core.List<api.PollingLocation> o) {
+checkUnnamed238(core.List<api.PollingLocation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPollingLocation(o[0]);
   checkPollingLocation(o[1]);
 }
 
-buildUnnamed89() {
+buildUnnamed239() {
+  var o = new core.List<api.Election>();
+  o.add(buildElection());
+  o.add(buildElection());
+  return o;
+}
+
+checkUnnamed239(core.List<api.Election> o) {
+  unittest.expect(o, unittest.hasLength(2));
+  checkElection(o[0]);
+  checkElection(o[1]);
+}
+
+buildUnnamed240() {
   var o = new core.List<api.PollingLocation>();
   o.add(buildPollingLocation());
   o.add(buildPollingLocation());
   return o;
 }
 
-checkUnnamed89(core.List<api.PollingLocation> o) {
+checkUnnamed240(core.List<api.PollingLocation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPollingLocation(o[0]);
   checkPollingLocation(o[1]);
 }
 
-buildUnnamed90() {
+buildUnnamed241() {
   var o = new core.List<api.AdministrationRegion>();
   o.add(buildAdministrationRegion());
   o.add(buildAdministrationRegion());
   return o;
 }
 
-checkUnnamed90(core.List<api.AdministrationRegion> o) {
+checkUnnamed241(core.List<api.AdministrationRegion> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAdministrationRegion(o[0]);
   checkAdministrationRegion(o[1]);
@@ -911,14 +998,15 @@ buildVoterInfoResponse() {
   var o = new api.VoterInfoResponse();
   buildCounterVoterInfoResponse++;
   if (buildCounterVoterInfoResponse < 3) {
-    o.contests = buildUnnamed87();
-    o.earlyVoteSites = buildUnnamed88();
+    o.contests = buildUnnamed237();
+    o.earlyVoteSites = buildUnnamed238();
     o.election = buildElection();
     o.kind = "foo";
     o.normalizedInput = buildSimpleAddressType();
-    o.pollingLocations = buildUnnamed89();
-    o.state = buildUnnamed90();
-    o.status = "foo";
+    o.otherElections = buildUnnamed239();
+    o.pollingLocations = buildUnnamed240();
+    o.precinctId = "foo";
+    o.state = buildUnnamed241();
   }
   buildCounterVoterInfoResponse--;
   return o;
@@ -927,18 +1015,71 @@ buildVoterInfoResponse() {
 checkVoterInfoResponse(api.VoterInfoResponse o) {
   buildCounterVoterInfoResponse++;
   if (buildCounterVoterInfoResponse < 3) {
-    checkUnnamed87(o.contests);
-    checkUnnamed88(o.earlyVoteSites);
+    checkUnnamed237(o.contests);
+    checkUnnamed238(o.earlyVoteSites);
     checkElection(o.election);
     unittest.expect(o.kind, unittest.equals('foo'));
     checkSimpleAddressType(o.normalizedInput);
-    checkUnnamed89(o.pollingLocations);
-    checkUnnamed90(o.state);
-    unittest.expect(o.status, unittest.equals('foo'));
+    checkUnnamed239(o.otherElections);
+    checkUnnamed240(o.pollingLocations);
+    unittest.expect(o.precinctId, unittest.equals('foo'));
+    checkUnnamed241(o.state);
   }
   buildCounterVoterInfoResponse--;
 }
 
+buildUnnamed242() {
+  var o = new core.List<core.String>();
+  o.add("foo");
+  o.add("foo");
+  return o;
+}
+
+checkUnnamed242(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'));
+}
+
+buildUnnamed243() {
+  var o = new core.List<core.String>();
+  o.add("foo");
+  o.add("foo");
+  return o;
+}
+
+checkUnnamed243(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'));
+}
+
+buildUnnamed244() {
+  var o = new core.List<core.String>();
+  o.add("foo");
+  o.add("foo");
+  return o;
+}
+
+checkUnnamed244(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'));
+}
+
+buildUnnamed245() {
+  var o = new core.List<core.String>();
+  o.add("foo");
+  o.add("foo");
+  return o;
+}
+
+checkUnnamed245(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-AdministrationRegion", () {
@@ -1076,11 +1217,11 @@ main() {
   });
 
 
-  unittest.group("obj-schema-RepresentativeInfoRequest", () {
+  unittest.group("obj-schema-RepresentativeInfoData", () {
     unittest.test("to-json--from-json", () {
-      var o = buildRepresentativeInfoRequest();
-      var od = new api.RepresentativeInfoRequest.fromJson(o.toJson());
-      checkRepresentativeInfoRequest(od);
+      var o = buildRepresentativeInfoData();
+      var od = new api.RepresentativeInfoData.fromJson(o.toJson());
+      checkRepresentativeInfoData(od);
     });
   });
 
@@ -1112,15 +1253,6 @@ main() {
   });
 
 
-  unittest.group("obj-schema-VoterInfoRequest", () {
-    unittest.test("to-json--from-json", () {
-      var o = buildVoterInfoRequest();
-      var od = new api.VoterInfoRequest.fromJson(o.toJson());
-      checkVoterInfoRequest(od);
-    });
-  });
-
-
   unittest.group("obj-schema-VoterInfoResponse", () {
     unittest.test("to-json--from-json", () {
       var o = buildVoterInfoResponse();
@@ -1143,10 +1275,10 @@ main() {
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
-        unittest.expect(path.substring(pathOffset, pathOffset + 13), unittest.equals("civicinfo/v1/"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 13), unittest.equals("civicinfo/v2/"));
         pathOffset += 13;
-        unittest.expect(path.substring(pathOffset, pathOffset + 31), unittest.equals("representatives/division_search"));
-        pathOffset += 31;
+        unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("divisions"));
+        pathOffset += 9;
 
         var query = (req.url).query;
         var queryOffset = 0;
@@ -1193,7 +1325,7 @@ main() {
         var subPart;
         unittest.expect(path.substring(pathOffset, pathOffset + 1), unittest.equals("/"));
         pathOffset += 1;
-        unittest.expect(path.substring(pathOffset, pathOffset + 13), unittest.equals("civicinfo/v1/"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 13), unittest.equals("civicinfo/v2/"));
         pathOffset += 13;
         unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("elections"));
         pathOffset += 9;
@@ -1231,30 +1363,20 @@ main() {
 
       var mock = new common_test.HttpServerMock();
       api.ElectionsResourceApi res = new api.CivicinfoApi(mock).elections;
-      var arg_request = buildVoterInfoRequest();
+      var arg_address = "foo";
       var arg_electionId = "foo";
       var arg_officialOnly = true;
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
-        var obj = new api.VoterInfoRequest.fromJson(json);
-        checkVoterInfoRequest(obj);
-
         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 + 13), unittest.equals("civicinfo/v1/"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 13), unittest.equals("civicinfo/v2/"));
         pathOffset += 13;
-        unittest.expect(path.substring(pathOffset, pathOffset + 10), unittest.equals("voterinfo/"));
-        pathOffset += 10;
-        index = path.indexOf("/lookup", pathOffset);
-        unittest.expect(index >= 0, unittest.isTrue);
-        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset, index));
-        pathOffset = index;
-        unittest.expect(subPart, unittest.equals("$arg_electionId"));
-        unittest.expect(path.substring(pathOffset, pathOffset + 7), unittest.equals("/lookup"));
-        pathOffset += 7;
+        unittest.expect(path.substring(pathOffset, pathOffset + 9), unittest.equals("voterinfo"));
+        pathOffset += 9;
 
         var query = (req.url).query;
         var queryOffset = 0;
@@ -1272,6 +1394,8 @@ main() {
             addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
           }
         }
+        unittest.expect(queryMap["address"].first, unittest.equals(arg_address));
+        unittest.expect(queryMap["electionId"].first, unittest.equals(arg_electionId));
         unittest.expect(queryMap["officialOnly"].first, unittest.equals("$arg_officialOnly"));
 
 
@@ -1281,7 +1405,7 @@ main() {
         var resp = convert.JSON.encode(buildVoterInfoResponse());
         return new async.Future.value(common_test.stringResponse(200, h, resp));
       }), true);
-      res.voterInfoQuery(arg_request, arg_electionId, officialOnly: arg_officialOnly).then(unittest.expectAsync(((api.VoterInfoResponse response) {
+      res.voterInfoQuery(arg_address, electionId: arg_electionId, officialOnly: arg_officialOnly).then(unittest.expectAsync(((api.VoterInfoResponse response) {
         checkVoterInfoResponse(response);
       })));
     });
@@ -1290,28 +1414,25 @@ main() {
 
 
   unittest.group("resource-RepresentativesResourceApi", () {
-    unittest.test("method--representativeInfoQuery", () {
+    unittest.test("method--representativeInfoByAddress", () {
 
       var mock = new common_test.HttpServerMock();
       api.RepresentativesResourceApi res = new api.CivicinfoApi(mock).representatives;
-      var arg_request = buildRepresentativeInfoRequest();
+      var arg_address = "foo";
       var arg_includeOffices = true;
-      var arg_ocdId = "foo";
-      var arg_recursive = true;
+      var arg_levels = buildUnnamed242();
+      var arg_roles = buildUnnamed243();
       mock.register(unittest.expectAsync((http.BaseRequest req, json) {
-        var obj = new api.RepresentativeInfoRequest.fromJson(json);
-        checkRepresentativeInfoRequest(obj);
-
         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 + 13), unittest.equals("civicinfo/v1/"));
+        unittest.expect(path.substring(pathOffset, pathOffset + 13), unittest.equals("civicinfo/v2/"));
         pathOffset += 13;
-        unittest.expect(path.substring(pathOffset, pathOffset + 22), unittest.equals("representatives/lookup"));
-        pathOffset += 22;
+        unittest.expect(path.substring(pathOffset, pathOffset + 15), unittest.equals("representatives"));
+        pathOffset += 15;
 
         var query = (req.url).query;
         var queryOffset = 0;
@@ -1329,9 +1450,10 @@ main() {
             addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
           }
         }
+        unittest.expect(queryMap["address"].first, unittest.equals(arg_address));
         unittest.expect(queryMap["includeOffices"].first, unittest.equals("$arg_includeOffices"));
-        unittest.expect(queryMap["ocdId"].first, unittest.equals(arg_ocdId));
-        unittest.expect(queryMap["recursive"].first, unittest.equals("$arg_recursive"));
+        unittest.expect(queryMap["levels"], unittest.equals(arg_levels));
+        unittest.expect(queryMap["roles"], unittest.equals(arg_roles));
 
 
         var h = {
@@ -1340,11 +1462,66 @@ main() {
         var resp = convert.JSON.encode(buildRepresentativeInfoResponse());
         return new async.Future.value(common_test.stringResponse(200, h, resp));
       }), true);
-      res.representativeInfoQuery(arg_request, includeOffices: arg_includeOffices, ocdId: arg_ocdId, recursive: arg_recursive).then(unittest.expectAsync(((api.RepresentativeInfoResponse response) {
+      res.representativeInfoByAddress(address: arg_address, includeOffices: arg_includeOffices, levels: arg_levels, roles: arg_roles).then(unittest.expectAsync(((api.RepresentativeInfoResponse response) {
         checkRepresentativeInfoResponse(response);
       })));
     });
 
+    unittest.test("method--representativeInfoByDivision", () {
+
+      var mock = new common_test.HttpServerMock();
+      api.RepresentativesResourceApi res = new api.CivicinfoApi(mock).representatives;
+      var arg_ocdId = "foo";
+      var arg_levels = buildUnnamed244();
+      var arg_recursive = true;
+      var arg_roles = buildUnnamed245();
+      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 + 13), unittest.equals("civicinfo/v2/"));
+        pathOffset += 13;
+        unittest.expect(path.substring(pathOffset, pathOffset + 16), unittest.equals("representatives/"));
+        pathOffset += 16;
+        subPart = core.Uri.decodeQueryComponent(path.substring(pathOffset));
+        pathOffset = path.length;
+        unittest.expect(subPart, unittest.equals("$arg_ocdId"));
+
+        var query = (req.url).query;
+        var queryOffset = 0;
+        var queryMap = {};
+        addQueryParam(n, v) => queryMap.putIfAbsent(n, () => []).add(v);
+        parseBool(n) {
+          if (n == "true") return true;
+          if (n == "false") return false;
+          if (n == null) return null;
+          throw new core.ArgumentError("Invalid boolean: $n");
+        }
+        if (query.length > 0) {
+          for (var part in query.split("&")) {
+            var keyvalue = part.split("=");
+            addQueryParam(core.Uri.decodeQueryComponent(keyvalue[0]), core.Uri.decodeQueryComponent(keyvalue[1]));
+          }
+        }
+        unittest.expect(queryMap["levels"], unittest.equals(arg_levels));
+        unittest.expect(queryMap["recursive"].first, unittest.equals("$arg_recursive"));
+        unittest.expect(queryMap["roles"], unittest.equals(arg_roles));
+
+
+        var h = {
+          "content-type" : "application/json; charset=utf-8",
+        };
+        var resp = convert.JSON.encode(buildRepresentativeInfoData());
+        return new async.Future.value(common_test.stringResponse(200, h, resp));
+      }), true);
+      res.representativeInfoByDivision(arg_ocdId, levels: arg_levels, recursive: arg_recursive, roles: arg_roles).then(unittest.expectAsync(((api.RepresentativeInfoData response) {
+        checkRepresentativeInfoData(response);
+      })));
+    });
+
   });