Adapt to changed PushOneCommit.Factory method signatures
Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: I3625e9e3d1daff0f71220c4d3f5c8369e15bfe1e
diff --git a/javatests/com/googlesource/gerrit/plugins/supermanifest/JiriSuperManifestIT.java b/javatests/com/googlesource/gerrit/plugins/supermanifest/JiriSuperManifestIT.java
index bec7dfc..602b1f1 100644
--- a/javatests/com/googlesource/gerrit/plugins/supermanifest/JiriSuperManifestIT.java
+++ b/javatests/com/googlesource/gerrit/plugins/supermanifest/JiriSuperManifestIT.java
@@ -59,7 +59,7 @@
TestRepository<InMemoryRepository> repo = cloneProject(testRepoKeys[i], admin);
PushOneCommit push =
- pushFactory.create(db, admin.getIdent(), repo, "Subject", "file" + i, "file");
+ pushFactory.create(admin.getIdent(), repo, "Subject", "file" + i, "file");
push.to("refs/heads/master").assertOkStatus();
}
}
@@ -71,7 +71,7 @@
allProjectRepo.reset("config");
PushOneCommit push =
pushFactory.create(
- db, admin.getIdent(), allProjectRepo, "Subject", "supermanifest.config", config);
+ admin.getIdent(), allProjectRepo, "Subject", "supermanifest.config", config);
PushOneCommit.Result res = push.to("refs/meta/config");
res.assertOkStatus();
}
@@ -111,7 +111,7 @@
+ "</projects>\n</manifest>\n";
pushFactory
- .create(db, admin.getIdent(), manifestRepo, "Subject", "default", xml)
+ .create(admin.getIdent(), manifestRepo, "Subject", "default", xml)
.to("refs/heads/srcbranch")
.assertOkStatus();
@@ -142,7 +142,7 @@
+ "</projects>\n</manifest>\n";
pushFactory
- .create(db, admin.getIdent(), manifestRepo, "Subject", "default", xml)
+ .create(admin.getIdent(), manifestRepo, "Subject", "default", xml)
.to("refs/heads/srcbranch")
.assertOkStatus();
@@ -174,7 +174,7 @@
+ "</projects>\n</manifest>\n";
pushFactory
- .create(db, admin.getIdent(), manifestRepo, "Subject", "default", xml)
+ .create(admin.getIdent(), manifestRepo, "Subject", "default", xml)
.to("refs/heads/srcbranch")
.assertOkStatus();
@@ -237,11 +237,11 @@
+ "\" path=\"manifest2\" />\n"
+ "</projects>\n</manifest>\n";
pushFactory
- .create(db, admin.getIdent(), manifest2Repo, "Subject", "default", xml2)
+ .create(admin.getIdent(), manifest2Repo, "Subject", "default", xml2)
.to("refs/heads/master")
.assertOkStatus();
pushFactory
- .create(db, admin.getIdent(), manifest1Repo, "Subject", "default", xml1)
+ .create(admin.getIdent(), manifest1Repo, "Subject", "default", xml1)
.to("refs/heads/srcbranch")
.assertOkStatus();
@@ -287,7 +287,7 @@
+ "</projects>\n</manifest>\n";
Result c =
pushFactory
- .create(db, admin.getIdent(), manifest2Repo, "Subject", "default", xml2)
+ .create(admin.getIdent(), manifest2Repo, "Subject", "default", xml2)
.to("refs/heads/master");
c.assertOkStatus();
RevCommit commit = c.getCommit();
@@ -311,7 +311,7 @@
+ "</projects>\n</manifest>\n";
pushFactory
- .create(db, admin.getIdent(), manifest2Repo, "Subject", "default", xml2)
+ .create(admin.getIdent(), manifest2Repo, "Subject", "default", xml2)
.to("refs/heads/master")
.assertOkStatus();
@@ -337,7 +337,7 @@
+ "</projects>\n</manifest>\n";
pushFactory
- .create(db, admin.getIdent(), manifest1Repo, "Subject", "default", xml1)
+ .create(admin.getIdent(), manifest1Repo, "Subject", "default", xml1)
.to("refs/heads/srcbranch")
.assertOkStatus();
@@ -389,7 +389,7 @@
+ "\" path=\"manifest2\" />\n"
+ "</projects>\n</manifest>\n";
pushFactory
- .create(db, admin.getIdent(), manifest2Repo, "Subject", "default", xml2)
+ .create(admin.getIdent(), manifest2Repo, "Subject", "default", xml2)
.to("refs/heads/b1")
.assertOkStatus();
@@ -412,7 +412,7 @@
+ "</projects>\n</manifest>\n";
pushFactory
- .create(db, admin.getIdent(), manifest2Repo, "Subject", "default", xml2)
+ .create(admin.getIdent(), manifest2Repo, "Subject", "default", xml2)
.to("refs/heads/master")
.assertOkStatus();
@@ -436,7 +436,7 @@
+ "</projects>\n</manifest>\n";
pushFactory
- .create(db, admin.getIdent(), manifest1Repo, "Subject", "default", xml1)
+ .create(admin.getIdent(), manifest1Repo, "Subject", "default", xml1)
.to("refs/heads/srcbranch")
.assertOkStatus();
@@ -513,7 +513,7 @@
+ "</projects>\n</manifest>\n";
pushFactory
- .create(db, admin.getIdent(), manifestRepo, "Subject", "default", xml)
+ .create(admin.getIdent(), manifestRepo, "Subject", "default", xml)
.to("refs/heads/src1")
.assertOkStatus();
@@ -529,7 +529,7 @@
+ "</projects>\n</manifest>\n";
pushFactory
- .create(db, admin.getIdent(), manifestRepo, "Subject", "default", xml)
+ .create(admin.getIdent(), manifestRepo, "Subject", "default", xml)
.to("refs/heads/src2")
.assertOkStatus();
@@ -593,7 +593,7 @@
+ "</projects>\n</manifest>\n";
pushFactory
- .create(db, admin.getIdent(), manifestRepo, "Subject", "default", xml)
+ .create(admin.getIdent(), manifestRepo, "Subject", "default", xml)
.to("refs/heads/srcbranch")
.assertOkStatus();
@@ -644,7 +644,7 @@
NameKey manifestKey = projectOperations.newProject().name(name("manifest")).create();
TestRepository<InMemoryRepository> manifestRepo = cloneProject(manifestKey, admin);
pushFactory
- .create(db, admin.getIdent(), manifestRepo, "Subject", "default", xml)
+ .create(admin.getIdent(), manifestRepo, "Subject", "default", xml)
.to("refs/heads/master")
.assertOkStatus();
@@ -655,7 +655,7 @@
+ "</imports>\n</manifest>";
pushFactory
- .create(db, admin.getIdent(), manifestRepo, "Subject", "super", superXml)
+ .create(admin.getIdent(), manifestRepo, "Subject", "super", superXml)
.to("refs/heads/master")
.assertOkStatus();
@@ -677,7 +677,7 @@
// (rather than the one mentioned in srcPath), to double check that we don't try to be too
// smart about eluding nops.
pushFactory
- .create(db, admin.getIdent(), manifestRepo, "Subject", "default", xml + " ")
+ .create(admin.getIdent(), manifestRepo, "Subject", "default", xml + " ")
.to("refs/heads/master")
.assertOkStatus();
@@ -717,7 +717,7 @@
+ " toolType = jiri\n");
TestRepository<InMemoryRepository> manifestRepo = cloneProject(manifestKey, admin);
pushFactory
- .create(db, admin.getIdent(), manifestRepo, "Subject", "default", xml)
+ .create(admin.getIdent(), manifestRepo, "Subject", "default", xml)
.to("refs/heads/master")
.assertOkStatus();
@@ -733,7 +733,7 @@
+ "</imports>\n</manifest>";
pushFactory
- .create(db, admin.getIdent(), manifestRepo, "Subject", "super", superXml)
+ .create(admin.getIdent(), manifestRepo, "Subject", "super", superXml)
.to("refs/heads/master")
.assertOkStatus();
diff --git a/javatests/com/googlesource/gerrit/plugins/supermanifest/RepoSuperManifestIT.java b/javatests/com/googlesource/gerrit/plugins/supermanifest/RepoSuperManifestIT.java
index cae2b54..6f376a5 100644
--- a/javatests/com/googlesource/gerrit/plugins/supermanifest/RepoSuperManifestIT.java
+++ b/javatests/com/googlesource/gerrit/plugins/supermanifest/RepoSuperManifestIT.java
@@ -61,7 +61,7 @@
TestRepository<InMemoryRepository> repo = cloneProject(testRepoKeys[i], admin);
PushOneCommit push =
- pushFactory.create(db, admin.getIdent(), repo, "Subject", "file" + i, "file");
+ pushFactory.create(admin.getIdent(), repo, "Subject", "file" + i, "file");
Result r = push.to("refs/heads/master");
r.assertOkStatus();
@@ -76,7 +76,7 @@
allProjectRepo.reset("config");
PushOneCommit push =
pushFactory.create(
- db, admin.getIdent(), allProjectRepo, "Subject", "supermanifest.config", config);
+ admin.getIdent(), allProjectRepo, "Subject", "supermanifest.config", config);
PushOneCommit.Result res = push.to("refs/meta/config");
res.assertOkStatus();
}
@@ -116,7 +116,7 @@
+ "</manifest>\n";
pushFactory
- .create(db, admin.getIdent(), manifestRepo, "Subject", "default.xml", xml)
+ .create(admin.getIdent(), manifestRepo, "Subject", "default.xml", xml)
.to("refs/heads/srcbranch")
.assertOkStatus();
@@ -143,7 +143,7 @@
+ "</manifest>\n";
pushFactory
- .create(db, admin.getIdent(), manifestRepo, "Subject", "default.xml", xml)
+ .create(admin.getIdent(), manifestRepo, "Subject", "default.xml", xml)
.to("refs/heads/srcbranch")
.assertOkStatus();
@@ -173,7 +173,7 @@
+ "</manifest>\n";
pushFactory
- .create(db, admin.getIdent(), manifestRepo, "Subject", "default.xml", xml)
+ .create(admin.getIdent(), manifestRepo, "Subject", "default.xml", xml)
.to("refs/heads/srcbranch")
.assertOkStatus();
@@ -205,7 +205,7 @@
+ "</manifest>\n";
pushFactory
- .create(db, admin.getIdent(), manifestRepo, "Subject", "default.xml", xml)
+ .create(admin.getIdent(), manifestRepo, "Subject", "default.xml", xml)
.to("refs/heads/srcbranch")
.assertOkStatus();
@@ -257,7 +257,7 @@
+ "</manifest>\n";
pushFactory
- .create(db, admin.getIdent(), manifestRepo, "Subject", "default.xml", xml)
+ .create(admin.getIdent(), manifestRepo, "Subject", "default.xml", xml)
.to("refs/heads/srcbranch")
.assertOkStatus();
@@ -276,8 +276,7 @@
{ // Advance head, but the manifest refers to the previous one.
TestRepository<InMemoryRepository> repo = cloneProject(testRepoKeys[0], admin);
- PushOneCommit push =
- pushFactory.create(db, admin.getIdent(), repo, "Subject", "file3", "file");
+ PushOneCommit push = pushFactory.create(admin.getIdent(), repo, "Subject", "file3", "file");
Result r = push.to("refs/heads/master");
r.assertOkStatus();
@@ -318,7 +317,7 @@
+ "</manifest>\n";
pushFactory
- .create(db, admin.getIdent(), manifestRepo, "Subject", "default.xml", xml)
+ .create(admin.getIdent(), manifestRepo, "Subject", "default.xml", xml)
.to("refs/heads/srcbranch")
.assertOkStatus();
@@ -418,7 +417,7 @@
+ "</manifest>\n";
pushFactory
- .create(db, admin.getIdent(), manifestRepo, "Subject", "default.xml", xml)
+ .create(admin.getIdent(), manifestRepo, "Subject", "default.xml", xml)
.to("refs/heads/src1")
.assertOkStatus();
@@ -433,7 +432,7 @@
+ "</manifest>\n";
pushFactory
- .create(db, admin.getIdent(), manifestRepo, "Subject", "default.xml", xml)
+ .create(admin.getIdent(), manifestRepo, "Subject", "default.xml", xml)
.to("refs/heads/src2")
.assertOkStatus();
@@ -475,7 +474,7 @@
Project.NameKey manifestKey = projectOperations.newProject().name(name("manifest")).create();
TestRepository<InMemoryRepository> manifestRepo = cloneProject(manifestKey, admin);
pushFactory
- .create(db, admin.getIdent(), manifestRepo, "Subject", "default.xml", xml)
+ .create(admin.getIdent(), manifestRepo, "Subject", "default.xml", xml)
.to("refs/heads/master")
.assertOkStatus();
@@ -486,7 +485,7 @@
+ "</manifest>";
pushFactory
- .create(db, admin.getIdent(), manifestRepo, "Subject", "super.xml", superXml)
+ .create(admin.getIdent(), manifestRepo, "Subject", "super.xml", superXml)
.to("refs/heads/master")
.assertOkStatus();
@@ -507,7 +506,7 @@
// (rather than the one mentioned in srcPath), to double check that we don't try to be too
// smart about eliding nops.
pushFactory
- .create(db, admin.getIdent(), manifestRepo, "Subject", "default.xml", xml + " ")
+ .create(admin.getIdent(), manifestRepo, "Subject", "default.xml", xml + " ")
.to("refs/heads/master")
.assertOkStatus();
@@ -553,7 +552,7 @@
+ "\" path=\"path1\" />\n"
+ "</manifest>\n";
pushFactory
- .create(db, admin.getIdent(), manifestRepo, "Subject", "default.xml", xml)
+ .create(admin.getIdent(), manifestRepo, "Subject", "default.xml", xml)
.to("refs/heads/srcbranch")
.assertOkStatus();
