From 0a1cd17adbe91a554c7272d12da04ec515d35c6c Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Tue, 2 May 2017 15:03:14 -0400 Subject: [PATCH] Pull BatchUpdate.Factory field up into AbstractDaemonTest Change-Id: Ie3c0d314b7edd01e3710acdf452c96dc8e94cc90 --- .../com/google/gerrit/acceptance/AbstractDaemonTest.java | 2 ++ .../com/google/gerrit/acceptance/api/change/ChangeIT.java | 4 +--- .../gerrit/acceptance/rest/change/AbstractSubmit.java | 4 +--- .../gerrit/acceptance/rest/change/DraftChangeIT.java | 7 ++----- .../acceptance/server/change/ConsistencyCheckerIT.java | 4 +--- .../gerrit/acceptance/server/change/GetRelatedIT.java | 4 +--- .../gerrit/acceptance/server/notedb/ChangeRebuilderIT.java | 2 -- .../gerrit/acceptance/server/notedb/NoteDbOnlyIT.java | 3 --- .../gerrit/acceptance/server/notedb/NoteDbPrimaryIT.java | 2 -- 9 files changed, 8 insertions(+), 24 deletions(-) diff --git a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java index 54acdcbae1..e7a9568575 100644 --- a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java +++ b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java @@ -98,6 +98,7 @@ import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.project.Util; import com.google.gerrit.server.query.change.ChangeData; import com.google.gerrit.server.query.change.InternalChangeQuery; +import com.google.gerrit.server.update.BatchUpdate; import com.google.gerrit.testutil.ConfigSuite; import com.google.gerrit.testutil.FakeEmailSender; import com.google.gerrit.testutil.FakeEmailSender.Message; @@ -197,6 +198,7 @@ public abstract class AbstractDaemonTest { @Inject protected AccountCache accountCache; @Inject protected AccountCreator accounts; @Inject protected AllProjectsName allProjects; + @Inject protected BatchUpdate.Factory batchUpdateFactory; @Inject protected ChangeData.Factory changeDataFactory; @Inject protected ChangeFinder changeFinder; @Inject protected ChangeIndexer indexer; diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java index 0456aa19fa..dd6016ef5f 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java @@ -145,8 +145,6 @@ import org.junit.Test; public class ChangeIT extends AbstractDaemonTest { private String systemTimeZone; - @Inject private BatchUpdate.Factory updateFactory; - @Inject private DynamicSet changeMessageModifiers; @Before @@ -2784,7 +2782,7 @@ public class ChangeIT extends AbstractDaemonTest { private void setChangeStatus(Change.Id id, Change.Status newStatus) throws Exception { try (BatchUpdate batchUpdate = - updateFactory.create(db, project, atrScope.get().getUser(), TimeUtil.nowTs())) { + batchUpdateFactory.create(db, project, atrScope.get().getUser(), TimeUtil.nowTs())) { batchUpdate.addOp(id, new ChangeStatusUpdateOp(newStatus)); batchUpdate.execute(); } diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java index 359883a5ad..4111a3d5f8 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java @@ -114,8 +114,6 @@ public abstract class AbstractSubmit extends AbstractDaemonTest { @Inject private IdentifiedUser.GenericFactory userFactory; - @Inject private BatchUpdate.Factory updateFactory; - @Inject private DynamicSet onSubmitValidationListeners; private RegistrationHandle onSubmitValidatorHandle; @@ -807,7 +805,7 @@ public abstract class AbstractSubmit extends AbstractDaemonTest { private void setChangeStatusToNew(PushOneCommit.Result... changes) throws Exception { for (PushOneCommit.Result change : changes) { try (BatchUpdate bu = - updateFactory.create(db, project, userFactory.create(admin.id), TimeUtil.nowTs())) { + batchUpdateFactory.create(db, project, userFactory.create(admin.id), TimeUtil.nowTs())) { bu.addOp( change.getChange().getId(), new BatchUpdateOp() { diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/DraftChangeIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/DraftChangeIT.java index 26e68479dd..c2822cedb8 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/DraftChangeIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/DraftChangeIT.java @@ -45,7 +45,6 @@ import com.google.gerrit.server.update.BatchUpdate; import com.google.gerrit.server.update.BatchUpdateOp; import com.google.gerrit.server.update.ChangeContext; import com.google.gerrit.testutil.ConfigSuite; -import com.google.inject.Inject; import java.util.Collection; import java.util.EnumSet; import java.util.List; @@ -58,8 +57,6 @@ public class DraftChangeIT extends AbstractDaemonTest { return allowDraftsDisabledConfig(); } - @Inject private BatchUpdate.Factory updateFactory; - @Test public void deleteDraftChange() throws Exception { assume().that(isAllowDrafts()).isTrue(); @@ -244,7 +241,7 @@ public class DraftChangeIT extends AbstractDaemonTest { private void markChangeAsDraft(Change.Id id) throws Exception { try (BatchUpdate batchUpdate = - updateFactory.create(db, project, atrScope.get().getUser(), TimeUtil.nowTs())) { + batchUpdateFactory.create(db, project, atrScope.get().getUser(), TimeUtil.nowTs())) { batchUpdate.addOp(id, new MarkChangeAsDraftUpdateOp()); batchUpdate.execute(); } @@ -256,7 +253,7 @@ public class DraftChangeIT extends AbstractDaemonTest { private void setDraftStatusOfPatchSetsOfChange(Change.Id id, boolean draftStatus) throws Exception { try (BatchUpdate batchUpdate = - updateFactory.create(db, project, atrScope.get().getUser(), TimeUtil.nowTs())) { + batchUpdateFactory.create(db, project, atrScope.get().getUser(), TimeUtil.nowTs())) { batchUpdate.addOp(id, new DraftStatusOfPatchSetsUpdateOp(draftStatus)); batchUpdate.execute(); } diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/ConsistencyCheckerIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/ConsistencyCheckerIT.java index 329716fbc9..8f256be130 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/ConsistencyCheckerIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/ConsistencyCheckerIT.java @@ -79,8 +79,6 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { @Inject private IdentifiedUser.GenericFactory userFactory; - @Inject private BatchUpdate.Factory updateFactory; - @Inject private ChangeInserter.Factory changeInserterFactory; @Inject private PatchSetInserter.Factory patchSetInserterFactory; @@ -784,7 +782,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest { } private BatchUpdate newUpdate(Account.Id owner) { - return updateFactory.create(db, project, userFactory.create(owner), TimeUtil.nowTs()); + return batchUpdateFactory.create(db, project, userFactory.create(owner), TimeUtil.nowTs()); } private ChangeControl insertChange() throws Exception { diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/GetRelatedIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/GetRelatedIT.java index fcbad4f676..e957c88908 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/GetRelatedIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/GetRelatedIT.java @@ -64,8 +64,6 @@ public class GetRelatedIT extends AbstractDaemonTest { System.setProperty("user.timezone", systemTimeZone); } - @Inject private BatchUpdate.Factory updateFactory; - @Inject private ChangesCollection changes; @Test @@ -578,7 +576,7 @@ public class GetRelatedIT extends AbstractDaemonTest { } private void clearGroups(final PatchSet.Id psId) throws Exception { - try (BatchUpdate bu = updateFactory.create(db, project, user(user), TimeUtil.nowTs())) { + try (BatchUpdate bu = batchUpdateFactory.create(db, project, user(user), TimeUtil.nowTs())) { bu.addOp( psId.getParentKey(), new BatchUpdateOp() { diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/ChangeRebuilderIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/ChangeRebuilderIT.java index 15b74bde87..9560a44107 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/ChangeRebuilderIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/ChangeRebuilderIT.java @@ -139,8 +139,6 @@ public class ChangeRebuilderIT extends AbstractDaemonTest { @Inject private TestChangeRebuilderWrapper rebuilderWrapper; - @Inject private BatchUpdate.Factory batchUpdateFactory; - @Inject private Sequences seq; @Inject private ChangeBundleReader bundleReader; diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/NoteDbOnlyIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/NoteDbOnlyIT.java index 4a5d496017..8b5c68a578 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/NoteDbOnlyIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/NoteDbOnlyIT.java @@ -31,7 +31,6 @@ import com.google.gerrit.server.update.BatchUpdate; import com.google.gerrit.server.update.BatchUpdateOp; import com.google.gerrit.server.update.ChangeContext; import com.google.gerrit.server.update.RepoContext; -import com.google.inject.Inject; import java.io.IOException; import java.util.EnumSet; import java.util.List; @@ -43,8 +42,6 @@ import org.junit.Before; import org.junit.Test; public class NoteDbOnlyIT extends AbstractDaemonTest { - @Inject private BatchUpdate.Factory batchUpdateFactory; - @Before public void setUp() throws Exception { assume().that(notesMigration.disableChangeReviewDb()).isTrue(); diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/NoteDbPrimaryIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/NoteDbPrimaryIT.java index dd2e8afe32..d628268f10 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/NoteDbPrimaryIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/NoteDbPrimaryIT.java @@ -62,7 +62,6 @@ import com.google.gerrit.server.notedb.NoteDbChangeState.PrimaryStorage; import com.google.gerrit.server.notedb.PrimaryStorageMigrator; import com.google.gerrit.server.notedb.TestChangeRebuilderWrapper; import com.google.gerrit.server.project.ChangeControl; -import com.google.gerrit.server.update.BatchUpdate; import com.google.gerrit.testutil.ConfigSuite; import com.google.gerrit.testutil.NoteDbMode; import com.google.gerrit.testutil.TestTimeUtil; @@ -95,7 +94,6 @@ public class NoteDbPrimaryIT extends AbstractDaemonTest { } @Inject private AllUsersName allUsers; - @Inject private BatchUpdate.Factory batchUpdateFactory; @Inject private ChangeBundleReader bundleReader; @Inject private CommentsUtil commentsUtil; @Inject private TestChangeRebuilderWrapper rebuilderWrapper;