TestNotesMigration: Initialize from env during constructor
I want to use TestNotesMigration from within InMemoryRepository at the
time the schema is created. The previous approach of calling setFromEnv
from AbstractDaemonTest#beforeTest was too late for this usage. There is
no way to move it earlier in AbstractDaemonTest, because we don't have
the TestNotesMigration until it's injected, which is after the schema is
created.
Instead, move initialization into the TestNotesMigration constructor, so
we never use an uninitialized instance. Keep the setFromEnv
functionality, but call it resetFromEnv. Call it after tests in case
tests have modified the values during tests.
Change-Id: Ib7cdcd97792edf4d278cdaea735a4fbedfd49ca3
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 42b1014..d3e084a 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
@@ -348,7 +348,6 @@
}
server.getTestInjector().injectMembers(this);
- notesMigration.setFromEnv();
Transport.register(inProcessProtocol);
toClose = Collections.synchronizedList(new ArrayList<Repository>());
admin = accounts.admin();
@@ -528,6 +527,7 @@
server.stop();
server = null;
}
+ notesMigration.resetFromEnv();
}
protected TestRepository<?>.CommitBuilder commitBuilder() throws Exception {
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/update/BatchUpdateTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/update/BatchUpdateTest.java
index 892a9ff..107326e 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/update/BatchUpdateTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/update/BatchUpdateTest.java
@@ -31,11 +31,13 @@
import com.google.gerrit.testutil.InMemoryDatabase;
import com.google.gerrit.testutil.InMemoryModule;
import com.google.gerrit.testutil.InMemoryRepositoryManager;
+import com.google.gwtorm.server.SchemaFactory;
import com.google.inject.Guice;
import com.google.inject.Inject;
import com.google.inject.Injector;
import com.google.inject.Provider;
import com.google.inject.util.Providers;
+
import org.eclipse.jgit.internal.storage.dfs.InMemoryRepository;
import org.eclipse.jgit.junit.TestRepository;
import org.eclipse.jgit.revwalk.RevCommit;
@@ -45,19 +47,16 @@
public class BatchUpdateTest {
@Inject private AccountManager accountManager;
-
@Inject private IdentifiedUser.GenericFactory userFactory;
-
- @Inject private InMemoryDatabase schemaFactory;
-
+ @Inject private SchemaFactory<ReviewDb> schemaFactory;
@Inject private InMemoryRepositoryManager repoManager;
-
@Inject private SchemaCreator schemaCreator;
-
@Inject private ThreadLocalRequestContext requestContext;
-
@Inject private BatchUpdate.Factory batchUpdateFactory;
+ // Only for use in setting up/tearing down injector; other users should use schemaFactory.
+ @Inject private InMemoryDatabase inMemoryDatabase;
+
private LifecycleManager lifecycle;
private ReviewDb db;
private TestRepository<InMemoryRepository> repo;
@@ -72,8 +71,10 @@
lifecycle.add(injector);
lifecycle.start();
+ try (ReviewDb underlyingDb = inMemoryDatabase.getDatabase().open()) {
+ schemaCreator.create(underlyingDb);
+ }
db = schemaFactory.open();
- schemaCreator.create(db);
Account.Id userId = accountManager.authenticate(AuthRequest.forUser("user")).getAccountId();
user = userFactory.create(userId);
@@ -108,7 +109,7 @@
if (db != null) {
db.close();
}
- InMemoryDatabase.drop(schemaFactory);
+ InMemoryDatabase.drop(inMemoryDatabase);
}
@Test
diff --git a/gerrit-server/src/test/java/com/google/gerrit/testutil/GerritServerTests.java b/gerrit-server/src/test/java/com/google/gerrit/testutil/GerritServerTests.java
index 038baac..dd42b67 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/testutil/GerritServerTests.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/testutil/GerritServerTests.java
@@ -49,8 +49,10 @@
};
public void beforeTest() throws Exception {
- notesMigration = new TestNotesMigration().setFromEnv();
+ notesMigration = new TestNotesMigration();
}
- public void afterTest() {}
+ public void afterTest() {
+ notesMigration.resetFromEnv();
+ }
}
diff --git a/gerrit-server/src/test/java/com/google/gerrit/testutil/TestNotesMigration.java b/gerrit-server/src/test/java/com/google/gerrit/testutil/TestNotesMigration.java
index d4ddaf1..160ed8a 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/testutil/TestNotesMigration.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/testutil/TestNotesMigration.java
@@ -29,7 +29,9 @@
private volatile boolean disableChangeReviewDb;
private volatile boolean failOnLoad;
- public TestNotesMigration() {}
+ public TestNotesMigration() {
+ resetFromEnv();
+ }
@Override
public boolean readChanges() {
@@ -94,7 +96,7 @@
return setReadChanges(enabled).setWriteChanges(enabled);
}
- public TestNotesMigration setFromEnv() {
+ public TestNotesMigration resetFromEnv() {
switch (NoteDbMode.get()) {
case READ_WRITE:
setWriteChanges(true);
