opendev/gerrit
Code Issues Proposed changes

Merge changes I552aa95c,Ie65aeb40,I7cf2b92f

Browse Source 
* changes:
  Add Javadoc and use a more general name for SchemaUpgradeTestEnvironment
  Use retry mechanism for group creations and name updates
  RetryHelper: Let callers care about exception handling
This commit is contained in:
Edwin Kempin
2018-01-23 08:39:36 +00:00
committed by Gerrit Code Review
parent dffe4d5870 1f721d35fc
commit 1ab287d81c
9 changed files with 269 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
javatests/com/google/gerrit/server/schema/Schema_150_to_151_Test.java
View File

@@ -25,7 +25,7 @@ import com.google.gerrit.reviewdb.client.AccountGroup;
import com.google.gerrit.reviewdb.client.AccountGroup.Id;
import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.restapi.group.CreateGroup;
import com.google.gerrit.testing.SchemaUpgradeTestEnvironment;
import com.google.gerrit.testing.InMemoryTestEnvironment;
import com.google.gerrit.testing.TestUpdateUI;
import com.google.gwtorm.jdbc.JdbcSchema;
import com.google.inject.Inject;
@@ -44,7 +44,7 @@ import org.junit.Test;
public class Schema_150_to_151_Test {
@Rule public SchemaUpgradeTestEnvironment testEnv = new SchemaUpgradeTestEnvironment();
@Rule public InMemoryTestEnvironment testEnv = new InMemoryTestEnvironment();
@Inject private CreateGroup.Factory createGroupFactory;
@Inject private Schema_151 schema151;

4
javatests/com/google/gerrit/server/schema/Schema_159_to_160_Test.java
View File

@@ -33,7 +33,7 @@ import com.google.gerrit.server.account.AccountCache;
import com.google.gerrit.server.account.VersionedAccountPreferences;
import com.google.gerrit.server.config.AllUsersName;
import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.testing.SchemaUpgradeTestEnvironment;
import com.google.gerrit.testing.InMemoryTestEnvironment;
import com.google.gerrit.testing.TestUpdateUI;
import com.google.inject.Inject;
import com.google.inject.Provider;
@@ -46,7 +46,7 @@ import org.junit.Rule;
import org.junit.Test;
public class Schema_159_to_160_Test {
@Rule public SchemaUpgradeTestEnvironment testEnv = new SchemaUpgradeTestEnvironment();
@Rule public InMemoryTestEnvironment testEnv = new InMemoryTestEnvironment();
@Inject private AccountCache accountCache;
@Inject private AllUsersName allUsersName;

4
javatests/com/google/gerrit/server/schema/Schema_161_to_162_Test.java
View File

@@ -26,7 +26,7 @@ import com.google.gerrit.server.extensions.events.GitReferenceUpdated;
import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.server.git.MetaDataUpdate;
import com.google.gerrit.server.git.ProjectConfig;
import com.google.gerrit.testing.SchemaUpgradeTestEnvironment;
import com.google.gerrit.testing.InMemoryTestEnvironment;
import com.google.gerrit.testing.TestUpdateUI;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
@@ -39,7 +39,7 @@ import org.junit.Rule;
import org.junit.Test;
public class Schema_161_to_162_Test {
@Rule public SchemaUpgradeTestEnvironment testEnv = new SchemaUpgradeTestEnvironment();
@Rule public InMemoryTestEnvironment testEnv = new InMemoryTestEnvironment();
@Inject private AllProjectsName allProjectsName;
@Inject private AllUsersName allUsersName;