opendev/gerrit
Code Issues Proposed changes

Move EventRecorder setup to AbstractDaemonTest

Browse Source 
So it can also be used by other tests.

Change-Id: Ieb6d1f08e403fefcf8ab73f700581fa00df80c6b
This commit is contained in:
David Pursehouse
2016-06-16 14:14:27 +09:00
parent d66154ca48
commit 0fd4b3a2c0
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -93,7 +93,9 @@ import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.PersonIdent; import org.eclipse.jgit.lib.PersonIdent;
import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.transport.Transport; import org.eclipse.jgit.transport.Transport;
import org.junit.After;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.Before;
import org.junit.Rule; import org.junit.Rule;
import org.junit.rules.ExpectedException; import org.junit.rules.ExpectedException;
import org.junit.rules.TemporaryFolder; import org.junit.rules.TemporaryFolder;
@@ -202,6 +204,9 @@ public abstract class AbstractDaemonTest {
@Inject @Inject
protected ChangeResource.Factory changeResourceFactory; protected ChangeResource.Factory changeResourceFactory;
@Inject
private EventRecorder.Factory eventRecorderFactory;
protected TestRepository<InMemoryRepository> testRepo; protected TestRepository<InMemoryRepository> testRepo;
protected GerritServer server; protected GerritServer server;
protected TestAccount admin; protected TestAccount admin;
@@ -212,6 +217,7 @@ public abstract class AbstractDaemonTest {
protected SshSession userSshSession; protected SshSession userSshSession;
protected ReviewDb db; protected ReviewDb db;
protected Project.NameKey project; protected Project.NameKey project;
protected EventRecorder eventRecorder;
@Inject @Inject
protected TestNotesMigration notesMigration; protected TestNotesMigration notesMigration;
@@ -246,6 +252,16 @@ public abstract class AbstractDaemonTest {
@Rule @Rule
public TemporaryFolder tempSiteDir = new TemporaryFolder(); public TemporaryFolder tempSiteDir = new TemporaryFolder();
@Before
public void startEventRecorder() {
eventRecorder = eventRecorderFactory.create(user);
}
@After
public void closeEventRecorder() {
eventRecorder.close();
}
@AfterClass @AfterClass
public static void stopCommonServer() throws Exception { public static void stopCommonServer() throws Exception {
if (commonServer != null) { if (commonServer != null) {

12
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java
View File

@@ -27,7 +27,6 @@ import com.google.common.base.Function;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.EventRecorder;
import com.google.gerrit.acceptance.NoHttpd; import com.google.gerrit.acceptance.NoHttpd;
import com.google.gerrit.acceptance.PushOneCommit; import com.google.gerrit.acceptance.PushOneCommit;
import com.google.gerrit.acceptance.TestProjectInput; import com.google.gerrit.acceptance.TestProjectInput;
@@ -85,11 +84,6 @@ public abstract class AbstractSubmit extends AbstractDaemonTest {
@Inject @Inject
private Submit submitHandler; private Submit submitHandler;
@Inject
private EventRecorder.Factory eventRecorderFactory;
protected EventRecorder eventRecorder;
private String systemTimeZone; private String systemTimeZone;
@Before @Before
@@ -104,14 +98,8 @@ public abstract class AbstractSubmit extends AbstractDaemonTest {
System.setProperty("user.timezone", systemTimeZone); System.setProperty("user.timezone", systemTimeZone);
} }
@Before
public void setUp() throws Exception {
eventRecorder = eventRecorderFactory.create(user);
}
@After @After
public void cleanup() { public void cleanup() {
eventRecorder.close();
db.close(); db.close();
} }