opendev/gerrit
Code Issues Proposed changes

Merge "Remove GitRepositoryManager#openMetadataRepository"

Browse Source
This commit is contained in:
Dave Borowitz
2016-04-11 15:36:56 +00:00
committed by Gerrit Code Review
parent b50cd86eff 5c0f0825a3
commit 78cb56c393
19 changed files with 36 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gerrit-server/src/test/java/com/google/gerrit/server/git/LocalDiskRepositoryManagerTest.java
View File

@@ -18,7 +18,6 @@ import static com.google.common.truth.Truth.assertThat;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.config.SitePaths;
import com.google.gerrit.server.notedb.NotesMigration;
import com.google.gerrit.testutil.TempFileUtil;
import com.google.gwtorm.client.KeyUtil;
import com.google.gwtorm.server.StandardKeyEncoder;
@@ -53,16 +52,13 @@ public class LocalDiskRepositoryManagerTest extends EasyMockSupport {
site.resolve("git").toFile().mkdir();
cfg = new Config();
cfg.setString("gerrit", null, "basePath", "git");
repoManager =
new LocalDiskRepositoryManager(site, cfg,
createNiceMock(NotesMigration.class));
repoManager = new LocalDiskRepositoryManager(site, cfg);
repoManager.start();
}
@Test(expected = IllegalStateException.class)
public void testThatNullBasePathThrowsAnException() {
new LocalDiskRepositoryManager(site, new Config(),
createNiceMock(NotesMigration.class));
new LocalDiskRepositoryManager(site, new Config());
}
@Test

9
gerrit-server/src/test/java/com/google/gerrit/server/git/MultiBaseLocalDiskRepositoryManagerTest.java
View File

@@ -23,7 +23,6 @@ import static org.easymock.EasyMock.reset;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.config.RepositoryConfig;
import com.google.gerrit.server.config.SitePaths;
import com.google.gerrit.server.notedb.NotesMigration;
import com.google.gerrit.testutil.TempFileUtil;
import com.google.gwtorm.client.KeyUtil;
import com.google.gwtorm.server.StandardKeyEncoder;
@@ -66,11 +65,8 @@ public class MultiBaseLocalDiskRepositoryManagerTest {
configMock = createNiceMock(RepositoryConfig.class);
expect(configMock.getAllBasePaths()).andReturn(new ArrayList<Path>()).anyTimes();
replay(configMock);
NotesMigration notesMigrationMock = createNiceMock(NotesMigration.class);
replay(notesMigrationMock);
repoManager =
new MultiBaseLocalDiskRepositoryManager(site, cfg,
notesMigrationMock, configMock);
new MultiBaseLocalDiskRepositoryManager(site, cfg, configMock);
}
@After
@@ -188,7 +184,6 @@ public class MultiBaseLocalDiskRepositoryManagerTest {
.andReturn(Arrays.asList(Paths.get("repos"))).anyTimes();
replay(configMock);
repoManager =
new MultiBaseLocalDiskRepositoryManager(site, cfg,
createNiceMock(NotesMigration.class), configMock);
new MultiBaseLocalDiskRepositoryManager(site, cfg, configMock);
}
}

6
gerrit-server/src/test/java/com/google/gerrit/server/notedb/RepoSequenceTest.java
View File

@@ -160,7 +160,7 @@ public class RepoSequenceTest {
@Test
public void failOnWrongType() throws Exception {
try (Repository repo = repoManager.openMetadataRepository(project)) {
try (Repository repo = repoManager.openRepository(project)) {
TestRepository<Repository> tr = new TestRepository<>(repo);
tr.branch(RefNames.REFS_SEQUENCES + "id").commit().create();
try {
@@ -206,7 +206,7 @@ public class RepoSequenceTest {
private ObjectId writeBlob(String sequenceName, String value) {
String refName = RefNames.REFS_SEQUENCES + sequenceName;
try (Repository repo = repoManager.openMetadataRepository(project);
try (Repository repo = repoManager.openRepository(project);
ObjectInserter ins = repo.newObjectInserter()) {
ObjectId newId = ins.insert(OBJ_BLOB, value.getBytes(UTF_8));
ins.flush();
@@ -222,7 +222,7 @@ public class RepoSequenceTest {
private String readBlob(String sequenceName) throws Exception {
String refName = RefNames.REFS_SEQUENCES + sequenceName;
try (Repository repo = repoManager.openMetadataRepository(project);
try (Repository repo = repoManager.openRepository(project);
RevWalk rw = new RevWalk(repo)) {
ObjectId id = repo.exactRef(refName).getObjectId();
return new String(rw.getObjectReader().open(id).getCachedBytes(), UTF_8);

6
gerrit-server/src/test/java/com/google/gerrit/testutil/InMemoryRepositoryManager.java
View File

@@ -88,12 +88,6 @@ public class InMemoryRepositoryManager implements GitRepositoryManager {
return repo;
}
@Override
public synchronized Repo openMetadataRepository(
Project.NameKey name) throws RepositoryNotFoundException {
return openRepository(name);
}
@Override
public synchronized SortedSet<Project.NameKey> list() {
SortedSet<Project.NameKey> names = Sets.newTreeSet();

2
gerrit-server/src/test/java/com/google/gerrit/testutil/NoteDbChecker.java
View File

@@ -117,7 +117,7 @@ public class NoteDbChecker {
public void assertNoChangeRef(Project.NameKey project, Change.Id changeId)
throws Exception {
try (Repository repo = repoManager.openMetadataRepository(project)) {
try (Repository repo = repoManager.openRepository(project)) {
assertThat(repo.exactRef(ChangeNoteUtil.changeRefName(changeId)))
.isNull();
}