opendev/gerrit
Code Issues Proposed changes

Simplify unit tests

Browse Source 
Some injected members were defined in the base class, but the tests weren't
adjusted. Particularly, these members are not needed any more and can be removed:

* AllProjectsName allProjects
* MetaDataUpdate.Server metaDataUpdateFactory
* ProjectCache projectCache

Change-Id: I28ac8e1e50121ba2857f80dbd49e7c806c125036
This commit is contained in:
David Ostrovsky
2014-10-11 00:15:36 +02:00
committed by David Ostrovsky
parent 3862ba2897
commit c77d267f51
20 changed files with 29 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/edit/ChangeEditIT.java
View File

@@ -30,7 +30,6 @@ import com.google.common.base.Optional;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.AcceptanceTestRequestScope;
import com.google.gerrit.acceptance.PushOneCommit;
import com.google.gerrit.acceptance.RestResponse;
import com.google.gerrit.acceptance.RestSession;
@@ -40,7 +39,6 @@ import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.change.ChangeEdits.Post;
import com.google.gerrit.server.change.ChangeEdits.Put;
import com.google.gerrit.server.change.FileContentUtil;
@@ -50,7 +48,6 @@ import com.google.gerrit.server.edit.ChangeEditUtil;
import com.google.gerrit.server.project.InvalidChangeOperationException;
import com.google.gwtorm.server.SchemaFactory;
import com.google.inject.Inject;
import com.google.inject.util.Providers;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.codec.binary.StringUtils;
@@ -81,9 +78,6 @@ public class ChangeEditIT extends AbstractDaemonTest {
@Inject
private SchemaFactory<ReviewDb> reviewDbProvider;
@Inject
private IdentifiedUser.GenericFactory identifiedUserFactory;
@Inject
private PushOneCommit.Factory pushFactory;
@@ -96,16 +90,12 @@ public class ChangeEditIT extends AbstractDaemonTest {
@Inject
private FileContentUtil fileUtil;
@Inject
private AcceptanceTestRequestScope atrScope;
private ReviewDb db;
private Change change;
private String changeId;
private Change change2;
private PatchSet ps;
private PatchSet ps2;
RestSession session;
@Before
public void setUp() throws Exception {
@@ -120,9 +110,6 @@ public class ChangeEditIT extends AbstractDaemonTest {
assertNotNull(change2);
ps2 = getCurrentPatchSet(changeId2);
assertNotNull(ps2);
session = new RestSession(server, admin);
atrScope.set(atrScope.newContext(reviewDbProvider, sshSession,
identifiedUserFactory.create(Providers.of(db), admin.getId())));
final long clockStepMs = MILLISECONDS.convert(1, SECONDS);
final AtomicLong clockMs = new AtomicLong(
new DateTime(2009, 9, 30, 17, 0, 0).getMillis());
@@ -183,7 +170,7 @@ public class ChangeEditIT extends AbstractDaemonTest {
FILE_NAME,
CONTENT_NEW));
Optional<ChangeEdit> edit = editUtil.byChange(change);
RestResponse r = session.post(urlPublish());
RestResponse r = adminSession.post(urlPublish());
assertEquals(SC_NO_CONTENT, r.getStatusCode());
edit = editUtil.byChange(change);
assertFalse(edit.isPresent());
@@ -203,7 +190,7 @@ public class ChangeEditIT extends AbstractDaemonTest {
FILE_NAME,
CONTENT_NEW));
Optional<ChangeEdit> edit = editUtil.byChange(change);
RestResponse r = session.delete(urlEdit());
RestResponse r = adminSession.delete(urlEdit());
assertEquals(SC_NO_CONTENT, r.getStatusCode());
edit = editUtil.byChange(change);
assertFalse(edit.isPresent());
@@ -255,7 +242,7 @@ public class ChangeEditIT extends AbstractDaemonTest {
assertEquals(current.getPatchSetId() - 1,
edit.getBasePatchSet().getPatchSetId());
Date beforeRebase = edit.getEditCommit().getCommitterIdent().getWhen();
RestResponse r = session.post(urlRebase());
RestResponse r = adminSession.post(urlRebase());
assertEquals(SC_NO_CONTENT, r.getStatusCode());
edit = editUtil.byChange(change).get();
assertArrayEquals(CONTENT_NEW,
@@ -293,7 +280,7 @@ public class ChangeEditIT extends AbstractDaemonTest {
@Test
public void retrieveEdit() throws Exception {
RestResponse r = session.get(urlEdit());
RestResponse r = adminSession.get(urlEdit());
assertEquals(SC_NO_CONTENT, r.getStatusCode());
assertEquals(RefUpdate.Result.NEW,
modifier.createEdit(
@@ -313,7 +300,7 @@ public class ChangeEditIT extends AbstractDaemonTest {
edit = editUtil.byChange(change);
editUtil.delete(edit.get());
r = session.get(urlEdit());
r = adminSession.get(urlEdit());
assertEquals(SC_NO_CONTENT, r.getStatusCode());
}
@@ -359,7 +346,7 @@ public class ChangeEditIT extends AbstractDaemonTest {
@Test
public void createEditByDeletingExistingFileRest() throws Exception {
RestResponse r = session.delete(urlEditFile());
RestResponse r = adminSession.delete(urlEditFile());
assertEquals(SC_NO_CONTENT, r.getStatusCode());
Optional<ChangeEdit> edit = editUtil.byChange(change);
try {
@@ -372,7 +359,7 @@ public class ChangeEditIT extends AbstractDaemonTest {
@Test
public void deletingNonExistingEditRest() throws Exception {
RestResponse r = session.delete(urlEdit());
RestResponse r = adminSession.delete(urlEdit());
assertEquals(SC_NOT_FOUND, r.getStatusCode());
}
@@ -382,7 +369,8 @@ public class ChangeEditIT extends AbstractDaemonTest {
modifier.createEdit(
change,
ps));
assertEquals(SC_NO_CONTENT, session.delete(urlEditFile()).getStatusCode());
assertEquals(SC_NO_CONTENT, adminSession.delete(urlEditFile())
.getStatusCode());
Optional<ChangeEdit> edit = editUtil.byChange(change);
try {
fileUtil.getContent(edit.get().getChange().getProject(),
@@ -413,7 +401,7 @@ public class ChangeEditIT extends AbstractDaemonTest {
public void restoreDeletedFileInPatchSetRest() throws Exception {
Post.Input in = new Post.Input();
in.restorePath = FILE_NAME;
assertEquals(SC_NO_CONTENT, session.post(urlEdit2(),
assertEquals(SC_NO_CONTENT, adminSession.post(urlEdit2(),
in).getStatusCode());
Optional<ChangeEdit> edit = editUtil.byChange(change2);
assertArrayEquals(CONTENT_OLD,
@@ -452,14 +440,14 @@ public class ChangeEditIT extends AbstractDaemonTest {
public void createAndChangeEditInOneRequestRest() throws Exception {
Put.Input in = new Put.Input();
in.content = RestSession.newRawInput(CONTENT_NEW);
assertEquals(SC_NO_CONTENT, session.putRaw(urlEditFile(),
assertEquals(SC_NO_CONTENT, adminSession.putRaw(urlEditFile(),
in.content).getStatusCode());
Optional<ChangeEdit> edit = editUtil.byChange(change);
assertArrayEquals(CONTENT_NEW,
toBytes(fileUtil.getContent(edit.get().getChange().getProject(),
edit.get().getRevision().get(), FILE_NAME)));
in.content = RestSession.newRawInput(CONTENT_NEW2);
assertEquals(SC_NO_CONTENT, session.putRaw(urlEditFile(),
assertEquals(SC_NO_CONTENT, adminSession.putRaw(urlEditFile(),
in.content).getStatusCode());
edit = editUtil.byChange(change);
assertArrayEquals(CONTENT_NEW2,
@@ -475,7 +463,7 @@ public class ChangeEditIT extends AbstractDaemonTest {
ps));
Put.Input in = new Put.Input();
in.content = RestSession.newRawInput(CONTENT_NEW);
assertEquals(SC_NO_CONTENT, session.putRaw(urlEditFile(),
assertEquals(SC_NO_CONTENT, adminSession.putRaw(urlEditFile(),
in.content).getStatusCode());
Optional<ChangeEdit> edit = editUtil.byChange(change);
assertArrayEquals(CONTENT_NEW,
@@ -489,7 +477,8 @@ public class ChangeEditIT extends AbstractDaemonTest {
modifier.createEdit(
change,
ps));
assertEquals(SC_NO_CONTENT, session.put(urlEditFile()).getStatusCode());
assertEquals(SC_NO_CONTENT, adminSession.put(urlEditFile())
.getStatusCode());
Optional<ChangeEdit> edit = editUtil.byChange(change);
assertArrayEquals("".getBytes(),
toBytes(fileUtil.getContent(edit.get().getChange().getProject(),
@@ -498,7 +487,7 @@ public class ChangeEditIT extends AbstractDaemonTest {
@Test
public void createEmptyEditRest() throws Exception {
assertEquals(SC_NO_CONTENT, session.post(urlEdit()).getStatusCode());
assertEquals(SC_NO_CONTENT, adminSession.post(urlEdit()).getStatusCode());
Optional<ChangeEdit> edit = editUtil.byChange(change);
assertArrayEquals(CONTENT_OLD,
toBytes(fileUtil.getContent(edit.get().getChange().getProject(),
@@ -509,7 +498,7 @@ public class ChangeEditIT extends AbstractDaemonTest {
public void getFileContentRest() throws Exception {
Put.Input in = new Put.Input();
in.content = RestSession.newRawInput(CONTENT_NEW);
assertEquals(SC_NO_CONTENT, session.putRaw(urlEditFile(),
assertEquals(SC_NO_CONTENT, adminSession.putRaw(urlEditFile(),
in.content).getStatusCode());
Optional<ChangeEdit> edit = editUtil.byChange(change);
assertEquals(RefUpdate.Result.FORCED,
@@ -518,7 +507,7 @@ public class ChangeEditIT extends AbstractDaemonTest {
FILE_NAME,
CONTENT_NEW2));
edit = editUtil.byChange(change);
RestResponse r = session.get(urlEditFile());
RestResponse r = adminSession.get(urlEditFile());
assertEquals(SC_OK, r.getStatusCode());
String content = r.getEntityContent();
assertEquals(StringUtils.newStringUtf8(CONTENT_NEW2),
@@ -531,7 +520,8 @@ public class ChangeEditIT extends AbstractDaemonTest {
modifier.createEdit(
change,
ps));
assertEquals(SC_NO_CONTENT, session.delete(urlEditFile()).getStatusCode());
assertEquals(SC_NO_CONTENT, adminSession.delete(urlEditFile())
.getStatusCode());
Optional<ChangeEdit> edit = editUtil.byChange(change);
try {
fileUtil.getContent(edit.get().getChange().getProject(),
@@ -539,7 +529,7 @@ public class ChangeEditIT extends AbstractDaemonTest {
fail("ResourceNotFoundException expected");
} catch (ResourceNotFoundException rnfe) {
}
RestResponse r = session.get(urlEditFile());
RestResponse r = adminSession.get(urlEditFile());
assertEquals(SC_NO_CONTENT, r.getStatusCode());
}
@@ -678,7 +668,7 @@ public class ChangeEditIT extends AbstractDaemonTest {
}
private EditInfo toEditInfo(boolean files) throws IOException {
RestResponse r = session.get(files ? urlGetFiles() : urlEdit());
RestResponse r = adminSession.get(files ? urlGetFiles() : urlEdit());
assertEquals(SC_OK, r.getStatusCode());
return newGson().fromJson(r.getReader(), EditInfo.class);
}

12
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/DraftChangeBlockedIT.java
View File

@@ -21,12 +21,9 @@ import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.NoHttpd;
import com.google.gerrit.acceptance.PushOneCommit;
import com.google.gerrit.common.data.Permission;
import com.google.gerrit.server.config.AllProjectsName;
import com.google.gerrit.server.git.MetaDataUpdate;
import com.google.gerrit.server.git.ProjectConfig;
import com.google.gerrit.server.project.ProjectCache;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import org.eclipse.jgit.api.errors.GitAPIException;
import org.junit.Before;
@@ -37,15 +34,6 @@ import java.io.IOException;
@NoHttpd
public class DraftChangeBlockedIT extends AbstractDaemonTest {
@Inject
private ProjectCache projectCache;
@Inject
private AllProjectsName allProjects;
@Inject
private MetaDataUpdate.Server metaDataUpdateFactory;
@Before
public void setUp() throws Exception {
ProjectConfig cfg = projectCache.checkedGet(allProjects).getConfig();

7
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/SubmitOnPushIT.java
View File

@@ -38,7 +38,6 @@ 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.server.notedb.ChangeNotes;
import com.google.gerrit.server.project.ProjectCache;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
@@ -63,12 +62,6 @@ public class SubmitOnPushIT extends AbstractDaemonTest {
@Inject
private ApprovalsUtil approvalsUtil;
@Inject
private MetaDataUpdate.Server metaDataUpdateFactory;
@Inject
private ProjectCache projectCache;
@Inject
private GroupCache groupCache;

12
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/CapabilitiesIT.java
View File

@@ -25,14 +25,11 @@ import com.google.gerrit.common.data.AccessSection;
import com.google.gerrit.common.data.GlobalCapability;
import com.google.gerrit.common.data.Permission;
import com.google.gerrit.common.data.PermissionRule;
import com.google.gerrit.server.config.AllProjectsName;
import com.google.gerrit.server.git.MetaDataUpdate;
import com.google.gerrit.server.git.ProjectConfig;
import com.google.gerrit.server.group.SystemGroupBackend;
import com.google.gerrit.server.project.ProjectCache;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.google.inject.Inject;
import org.eclipse.jgit.errors.ConfigInvalidException;
import org.junit.Test;
@@ -41,15 +38,6 @@ import java.io.IOException;
public class CapabilitiesIT extends AbstractDaemonTest {
@Inject
private AllProjectsName allProjects;
@Inject
private MetaDataUpdate.Server metaDataUpdateFactory;
@Inject
private ProjectCache projectCache;
@Test
public void testCapabilitiesUser() throws IOException,
ConfigInvalidException, IllegalArgumentException,

8
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/ChangeOwnerIT.java
View File

@@ -32,9 +32,7 @@ import com.google.gerrit.extensions.api.changes.ReviewInput;
import com.google.gerrit.server.git.MetaDataUpdate;
import com.google.gerrit.server.git.ProjectConfig;
import com.google.gerrit.server.group.SystemGroupBackend;
import com.google.gerrit.server.project.ProjectCache;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import org.apache.http.HttpStatus;
import org.eclipse.jgit.api.errors.GitAPIException;
@@ -46,12 +44,6 @@ import java.io.IOException;
public class ChangeOwnerIT extends AbstractDaemonTest {
@Inject
private MetaDataUpdate.Server metaDataUpdateFactory;
@Inject
private ProjectCache projectCache;
private TestAccount user2;
private RestSession sessionOwner;

11
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SuggestReviewersIT.java
View File

@@ -31,10 +31,8 @@ import com.google.gerrit.reviewdb.client.AccountGroup;
import com.google.gerrit.server.account.CreateGroupArgs;
import com.google.gerrit.server.account.PerformCreateGroup;
import com.google.gerrit.server.change.SuggestReviewers.SuggestedReviewerInfo;
import com.google.gerrit.server.config.AllProjectsName;
import com.google.gerrit.server.git.MetaDataUpdate;
import com.google.gerrit.server.git.ProjectConfig;
import com.google.gerrit.server.project.ProjectCache;
import com.google.gson.reflect.TypeToken;
import com.google.inject.Inject;
@@ -50,15 +48,6 @@ public class SuggestReviewersIT extends AbstractDaemonTest {
@Inject
private PerformCreateGroup.Factory createGroupFactory;
@Inject
private MetaDataUpdate.Server metaDataUpdateFactory;
@Inject
private AllProjectsName allProjects;
@Inject
private ProjectCache projectCache;
private AccountGroup group1;
private TestAccount user1;
private TestAccount user2;

12
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/config/CacheOperationsIT.java
View File

@@ -25,15 +25,12 @@ import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.RestResponse;
import com.google.gerrit.common.data.GlobalCapability;
import com.google.gerrit.reviewdb.client.AccountGroup;
import com.google.gerrit.server.config.AllProjectsName;
import com.google.gerrit.server.config.ListCaches.CacheInfo;
import com.google.gerrit.server.config.PostCaches;
import com.google.gerrit.server.git.MetaDataUpdate;
import com.google.gerrit.server.git.ProjectConfig;
import com.google.gerrit.server.group.SystemGroupBackend;
import com.google.gerrit.server.project.ProjectCache;
import com.google.gerrit.server.project.Util;
import com.google.inject.Inject;
import org.apache.http.HttpStatus;
import org.junit.Test;
@@ -43,15 +40,6 @@ import java.util.Arrays;
public class CacheOperationsIT extends AbstractDaemonTest {
@Inject
private ProjectCache projectCache;
@Inject
private AllProjectsName allProjects;
@Inject
private MetaDataUpdate.Server metaDataUpdateFactory;
@Test
public void flushAll() throws IOException {
RestResponse r = adminSession.get("/config/server/caches/project_list");

12
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/config/FlushCacheIT.java
View File

@@ -23,14 +23,11 @@ import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.RestResponse;
import com.google.gerrit.common.data.GlobalCapability;
import com.google.gerrit.reviewdb.client.AccountGroup;
import com.google.gerrit.server.config.AllProjectsName;
import com.google.gerrit.server.config.ListCaches.CacheInfo;
import com.google.gerrit.server.git.MetaDataUpdate;
import com.google.gerrit.server.git.ProjectConfig;
import com.google.gerrit.server.group.SystemGroupBackend;
import com.google.gerrit.server.project.ProjectCache;
import com.google.gerrit.server.project.Util;
import com.google.inject.Inject;
import org.apache.http.HttpStatus;
import org.junit.Test;
@@ -39,15 +36,6 @@ import java.io.IOException;
public class FlushCacheIT extends AbstractDaemonTest {
@Inject
private ProjectCache projectCache;
@Inject
private AllProjectsName allProjects;
@Inject
private MetaDataUpdate.Server metaDataUpdateFactory;
@Test
public void flushCache() throws IOException {
RestResponse r = adminSession.get("/config/server/caches/groups");

5
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/CreateBranchIT.java
View File

@@ -23,18 +23,13 @@ import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.RestResponse;
import com.google.gerrit.common.data.Permission;
import com.google.gerrit.reviewdb.client.Branch;
import com.google.gerrit.server.config.AllProjectsName;
import com.google.gerrit.server.git.ProjectConfig;
import com.google.inject.Inject;
import org.apache.http.HttpStatus;
import org.junit.Before;
import org.junit.Test;
public class CreateBranchIT extends AbstractDaemonTest {
@Inject
private AllProjectsName allProjects;
private Branch.NameKey branch;
@Before

8
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/CreateProjectIT.java
View File

@@ -24,7 +24,6 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.RestResponse;
import com.google.gerrit.extensions.api.GerritApi;
import com.google.gerrit.extensions.api.projects.ProjectInput;
import com.google.gerrit.extensions.common.InheritableBoolean;
import com.google.gerrit.extensions.common.ProjectInfo;
@@ -36,7 +35,6 @@ import com.google.gerrit.reviewdb.client.RefNames;
import com.google.gerrit.server.account.GroupCache;
import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.server.group.SystemGroupBackend;
import com.google.gerrit.server.project.ProjectCache;
import com.google.gerrit.server.project.ProjectState;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
@@ -58,18 +56,12 @@ import java.util.Set;
public class CreateProjectIT extends AbstractDaemonTest {
@Inject
private ProjectCache projectCache;
@Inject
private GroupCache groupCache;
@Inject
private GitRepositoryManager git;
@Inject
private GerritApi gApi;
@Test
public void testCreateProjectApi() throws RestApiException, IOException {
final String newProjectName = "newProject";

4
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/DeleteBranchIT.java
View File

@@ -23,9 +23,7 @@ import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.RestResponse;
import com.google.gerrit.common.data.Permission;
import com.google.gerrit.reviewdb.client.Branch;
import com.google.gerrit.server.config.AllProjectsName;
import com.google.gerrit.server.git.ProjectConfig;
import com.google.inject.Inject;
import org.apache.http.HttpStatus;
import org.junit.Before;
@@ -34,8 +32,6 @@ import org.junit.Test;
import java.io.IOException;
public class DeleteBranchIT extends AbstractDaemonTest {
@Inject
private AllProjectsName allProjects;
private Branch.NameKey branch;

10
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/GarbageCollectionIT.java
View File

@@ -22,7 +22,6 @@ import com.google.gerrit.acceptance.GcAssert;
import com.google.gerrit.acceptance.RestResponse;
import com.google.gerrit.acceptance.UseLocalDisk;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.config.AllProjectsName;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
@@ -36,20 +35,13 @@ import java.io.IOException;
public class GarbageCollectionIT extends AbstractDaemonTest {
@Inject
private AllProjectsName allProjects;
@Inject
private GcAssert gcAssert;
private Project.NameKey project1;
private Project.NameKey project2;
@Before
public void setUp() throws Exception {
project1 = new Project.NameKey("p1");
createProject(sshSession, project1.get());
project2 = new Project.NameKey("p2");
createProject(sshSession, project2.get());
}
@@ -72,7 +64,7 @@ public class GarbageCollectionIT extends AbstractDaemonTest {
public void testGcOneProject() throws JSchException, IOException {
assertEquals(HttpStatus.SC_OK, POST("/projects/" + allProjects.get() + "/gc"));
gcAssert.assertHasPackFile(allProjects);
gcAssert.assertHasNoPackFile(project1, project2);
gcAssert.assertHasNoPackFile(project, project2);
}
private int POST(String endPoint) throws IOException {

9
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/GetChildProjectIT.java
View File

@@ -23,9 +23,6 @@ import com.google.gerrit.acceptance.RestResponse;
import com.google.gerrit.acceptance.SshSession;
import com.google.gerrit.extensions.common.ProjectInfo;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.config.AllProjectsName;
import com.google.gerrit.server.project.ProjectCache;
import com.google.inject.Inject;
import com.jcraft.jsch.JSchException;
@@ -36,12 +33,6 @@ import java.io.IOException;
public class GetChildProjectIT extends AbstractDaemonTest {
@Inject
private AllProjectsName allProjects;
@Inject
private ProjectCache projectCache;
@Test
public void getNonExistingChildProject_NotFound() throws IOException {
assertEquals(HttpStatus.SC_NOT_FOUND,

8
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/GetCommitIT.java
View File

@@ -25,10 +25,8 @@ import com.google.gerrit.acceptance.RestResponse;
import com.google.gerrit.common.data.AccessSection;
import com.google.gerrit.common.data.Permission;
import com.google.gerrit.extensions.common.CommitInfo;
import com.google.gerrit.server.config.AllProjectsName;
import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.server.git.ProjectConfig;
import com.google.gerrit.server.project.ProjectCache;
import com.google.inject.Inject;
import org.apache.http.HttpStatus;
@@ -41,15 +39,9 @@ import org.junit.Before;
import org.junit.Test;
public class GetCommitIT extends AbstractDaemonTest {
@Inject
private AllProjectsName allProjects;
@Inject
private GitRepositoryManager repoManager;
@Inject
private ProjectCache projectCache;
private TestRepository<Repository> repo;
@Before

5
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/ListChildProjectsIT.java
View File

@@ -23,9 +23,7 @@ import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.RestResponse;
import com.google.gerrit.extensions.common.ProjectInfo;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.config.AllProjectsName;
import com.google.gson.reflect.TypeToken;
import com.google.inject.Inject;
import com.jcraft.jsch.JSchException;
@@ -38,9 +36,6 @@ import java.util.List;
public class ListChildProjectsIT extends AbstractDaemonTest {
@Inject
private AllProjectsName allProjects;
@Test
public void listChildrenOfNonExistingProject_NotFound() throws IOException {
assertEquals(HttpStatus.SC_NOT_FOUND,

4
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/ListProjectsIT.java
View File

@@ -26,7 +26,6 @@ import com.google.gerrit.extensions.api.projects.ProjectInput;
import com.google.gerrit.extensions.common.ProjectInfo;
import com.google.gerrit.extensions.restapi.RestApiException;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.config.AllProjectsName;
import com.google.gerrit.server.config.AllUsersName;
import com.google.gson.reflect.TypeToken;
import com.google.inject.Inject;
@@ -42,9 +41,6 @@ import java.util.Map;
public class ListProjectsIT extends AbstractDaemonTest {
@Inject
private AllProjectsName allProjects;
@Inject
private AllUsersName allUsers;

3
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/ProjectLevelConfigIT.java
View File

@@ -23,7 +23,6 @@ import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.PushOneCommit;
import com.google.gerrit.reviewdb.client.RefNames;
import com.google.gerrit.server.config.AllProjectsNameProvider;
import com.google.gerrit.server.project.ProjectCache;
import com.google.gerrit.server.project.ProjectState;
import com.google.inject.Inject;
@@ -36,8 +35,6 @@ import org.junit.Test;
import java.io.IOException;
public class ProjectLevelConfigIT extends AbstractDaemonTest {
@Inject
private ProjectCache projectCache;
@Inject
private AllProjectsNameProvider allProjects;

12
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/project/CustomLabelIT.java
View File

@@ -31,13 +31,10 @@ import com.google.gerrit.extensions.api.changes.ReviewInput;
import com.google.gerrit.extensions.common.ChangeInfo;
import com.google.gerrit.extensions.common.LabelInfo;
import com.google.gerrit.reviewdb.client.AccountGroup;
import com.google.gerrit.server.config.AllProjectsName;
import com.google.gerrit.server.git.MetaDataUpdate;
import com.google.gerrit.server.git.ProjectConfig;
import com.google.gerrit.server.group.SystemGroupBackend;
import com.google.gerrit.server.project.ProjectCache;
import com.google.gerrit.server.project.Util;
import com.google.inject.Inject;
import org.junit.Before;
import org.junit.Test;
@@ -45,15 +42,6 @@ import org.junit.Test;
@NoHttpd
public class CustomLabelIT extends AbstractDaemonTest {
@Inject
private ProjectCache projectCache;
@Inject
private AllProjectsName allProjects;
@Inject
private MetaDataUpdate.Server metaDataUpdateFactory;
private final LabelType Q = category("CustomLabel",
value(1, "Positive"),
value(0, "No score"),

11
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/project/LabelTypeIT.java
View File

@@ -25,12 +25,10 @@ import com.google.gerrit.extensions.api.changes.CherryPickInput;
import com.google.gerrit.extensions.api.changes.ReviewInput;
import com.google.gerrit.extensions.common.ChangeInfo;
import com.google.gerrit.extensions.common.LabelInfo;
import com.google.gerrit.server.config.AllProjectsName;
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.server.notedb.NotesMigration;
import com.google.gerrit.server.project.ProjectCache;
import com.google.gerrit.testutil.ConfigSuite;
import com.google.inject.Inject;
@@ -49,15 +47,6 @@ public class LabelTypeIT extends AbstractDaemonTest {
@Inject
private GitRepositoryManager repoManager;
@Inject
private ProjectCache projectCache;
@Inject
private AllProjectsName allProjects;
@Inject
private MetaDataUpdate.Server metaDataUpdateFactory;
private LabelType codeReview;
@Before

20
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/GarbageCollectionIT.java
View File

@@ -25,7 +25,6 @@ import com.google.gerrit.acceptance.SshSession;
import com.google.gerrit.acceptance.UseLocalDisk;
import com.google.gerrit.common.data.GarbageCollectionResult;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.config.AllProjectsName;
import com.google.gerrit.server.git.GarbageCollection;
import com.google.gerrit.server.git.GarbageCollectionQueue;
import com.google.gwtorm.server.OrmException;
@@ -42,9 +41,6 @@ import java.util.Locale;
public class GarbageCollectionIT extends AbstractDaemonTest {
@Inject
private AllProjectsName allProjects;
@Inject
private GarbageCollection.Factory garbageCollectionFactory;
@@ -54,15 +50,11 @@ public class GarbageCollectionIT extends AbstractDaemonTest {
@Inject
private GcAssert gcAssert;
private Project.NameKey project1;
private Project.NameKey project2;
private Project.NameKey project3;
@Before
public void setUp() throws Exception {
project1 = new Project.NameKey("p1");
createProject(sshSession, project1.get());
project2 = new Project.NameKey("p2");
createProject(sshSession, project2.get());
@@ -74,11 +66,11 @@ public class GarbageCollectionIT extends AbstractDaemonTest {
@UseLocalDisk
public void testGc() throws JSchException, IOException {
String response =
sshSession.exec("gerrit gc \"" + project1.get() + "\" \""
sshSession.exec("gerrit gc \"" + project.get() + "\" \""
+ project2.get() + "\"");
assertFalse(sshSession.getError(), sshSession.hasError());
assertNoError(response);
gcAssert.assertHasPackFile(project1, project2);
gcAssert.assertHasPackFile(project, project2);
gcAssert.assertHasNoPackFile(allProjects, project3);
}
@@ -88,7 +80,7 @@ public class GarbageCollectionIT extends AbstractDaemonTest {
String response = sshSession.exec("gerrit gc --all");
assertFalse(sshSession.getError(), sshSession.hasError());
assertNoError(response);
gcAssert.assertHasPackFile(allProjects, project1, project2, project3);
gcAssert.assertHasPackFile(allProjects, project, project2, project3);
}
@Test
@@ -103,14 +95,14 @@ public class GarbageCollectionIT extends AbstractDaemonTest {
@Test
@UseLocalDisk
public void testGcAlreadyScheduled() {
gcQueue.addAll(Arrays.asList(project1));
gcQueue.addAll(Arrays.asList(project));
GarbageCollectionResult result = garbageCollectionFactory.create().run(
Arrays.asList(allProjects, project1, project2, project3));
Arrays.asList(allProjects, project, project2, project3));
assertTrue(result.hasErrors());
assertEquals(1, result.getErrors().size());
GarbageCollectionResult.Error error = result.getErrors().get(0);
assertEquals(GarbageCollectionResult.Error.Type.GC_ALREADY_SCHEDULED, error.getType());
assertEquals(project1, error.getProjectName());
assertEquals(project, error.getProjectName());
}
private void assertError(String expectedError, String response) {