opendev/gerrit
Code Issues Proposed changes

AbstractDaemonTest: Add notesMigration

Browse Source 
AbstractPushForReview and VisibleRefFilterIT both have a notesMigration
member. Move it up to AbstractDaemonTest so it's reused by both, and
can also be reused by other tests in future.

Change-Id: I462bda4ddb0c62139f10ad273360b3987d9b1f2a
This commit is contained in:
David Pursehouse
2015-10-22 17:27:46 +09:00
parent 3ba6273a94
commit 17728b4c56
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
View File

@@ -55,6 +55,7 @@ import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.server.git.MetaDataUpdate; import com.google.gerrit.server.git.MetaDataUpdate;
import com.google.gerrit.server.git.ProjectConfig; import com.google.gerrit.server.git.ProjectConfig;
import com.google.gerrit.server.index.ChangeIndexer; import com.google.gerrit.server.index.ChangeIndexer;
import com.google.gerrit.server.notedb.NotesMigration;
import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.project.ProjectCache;
import com.google.gerrit.server.project.Util; import com.google.gerrit.server.project.Util;
import com.google.gerrit.server.query.change.InternalChangeQuery; import com.google.gerrit.server.query.change.InternalChangeQuery;
@@ -173,6 +174,9 @@ public abstract class AbstractDaemonTest {
protected ReviewDb db; protected ReviewDb db;
protected Project.NameKey project; protected Project.NameKey project;
@Inject
protected NotesMigration notesMigration;
@Rule @Rule
public ExpectedException exception = ExpectedException.none(); public ExpectedException exception = ExpectedException.none();

4
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/AbstractPushForReview.java
View File

@@ -33,7 +33,6 @@ import com.google.gerrit.extensions.common.LabelInfo;
import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.server.notedb.NotesMigration; import com.google.gerrit.server.notedb.NotesMigration;
import com.google.gerrit.testutil.ConfigSuite; import com.google.gerrit.testutil.ConfigSuite;
import com.google.inject.Inject;
import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.Config;
import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevCommit;
@@ -54,9 +53,6 @@ public abstract class AbstractPushForReview extends AbstractDaemonTest {
return NotesMigration.allEnabledConfig(); return NotesMigration.allEnabledConfig();
} }
@Inject
private NotesMigration notesMigration;
protected enum Protocol { protected enum Protocol {
// TODO(dborowitz): TEST. // TODO(dborowitz): TEST.
SSH, HTTP SSH, HTTP

4
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/VisibleRefFilterIT.java
View File

@@ -34,7 +34,6 @@ import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.reviewdb.client.RefNames; import com.google.gerrit.reviewdb.client.RefNames;
import com.google.gerrit.server.edit.ChangeEditModifier; import com.google.gerrit.server.edit.ChangeEditModifier;
import com.google.gerrit.server.git.ProjectConfig; import com.google.gerrit.server.git.ProjectConfig;
import com.google.gerrit.server.notedb.NotesMigration;
import com.google.gerrit.server.project.Util; import com.google.gerrit.server.project.Util;
import com.google.gerrit.testutil.ConfigSuite; import com.google.gerrit.testutil.ConfigSuite;
import com.google.inject.Inject; import com.google.inject.Inject;
@@ -60,9 +59,6 @@ public class VisibleRefFilterIT extends AbstractDaemonTest {
return cfg; return cfg;
} }
@Inject
private NotesMigration notesMigration;
@Inject @Inject
private ChangeEditModifier editModifier; private ChangeEditModifier editModifier;