Support listing child projects via REST

It is now possible to list the direct child projects of a project via
REST by GET on /projects/*/children/.

Change-Id: If57b44118c6742f7d0bef751f2be0b8abebfc0a2
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
This commit is contained in:
Edwin Kempin
2013-03-18 13:23:00 +01:00
committed by David Pursehouse
parent 0ec5daccaf
commit 4425c746eb
10 changed files with 341 additions and 1 deletions

View File

@@ -18,6 +18,7 @@ import com.google.common.collect.Iterables;
import com.google.gerrit.acceptance.SshSession;
import com.google.gerrit.acceptance.TempFileUtil;
import com.google.gerrit.acceptance.TestAccount;
import com.google.gerrit.reviewdb.client.Project;
import com.jcraft.jsch.JSch;
import com.jcraft.jsch.JSchException;
@@ -74,7 +75,21 @@ public class GitUtil {
public static void createProject(SshSession s, String name)
throws JSchException, IOException {
s.exec("gerrit create-project --empty-commit --name \"" + name + "\"");
createProject(s, name, null);
}
public static void createProject(SshSession s, String name, Project.NameKey parent)
throws JSchException, IOException {
StringBuilder b = new StringBuilder();
b.append("gerrit create-project --empty-commit --name \"");
b.append(name);
b.append("\"");
if (parent != null) {
b.append(" --parent \"");
b.append(parent.get());
b.append("\"");
}
s.exec(b.toString());
}
public static Git cloneProject(String url) throws GitAPIException, IOException {

View File

@@ -0,0 +1,99 @@
// Copyright (C) 2013 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.acceptance.rest.project;
import static com.google.gerrit.acceptance.git.GitUtil.createProject;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static com.google.gerrit.acceptance.rest.project.ProjectAssert.assertProjects;
import com.google.gson.reflect.TypeToken;
import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.AccountCreator;
import com.google.gerrit.acceptance.RestResponse;
import com.google.gerrit.acceptance.RestSession;
import com.google.gerrit.acceptance.SshSession;
import com.google.gerrit.acceptance.TestAccount;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.config.AllProjectsName;
import com.google.gson.Gson;
import com.google.inject.Inject;
import com.jcraft.jsch.JSchException;
import org.apache.http.HttpStatus;
import org.junit.Before;
import org.junit.Test;
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
public class ListChildProjectsIT extends AbstractDaemonTest {
@Inject
private AccountCreator accounts;
@Inject
private AllProjectsName allProjects;
private TestAccount admin;
private RestSession session;
@Before
public void setUp() throws Exception {
admin =
accounts.create("admin", "admin@example.com", "Administrator",
"Administrators");
session = new RestSession(admin);
}
@Test
public void listChildrenOfNonExistingProject_NotFound() throws IOException {
assertEquals(HttpStatus.SC_NOT_FOUND,
GET("/projects/non-existing/children/").getStatusCode());
}
@Test
public void listNoChildren() throws IOException {
RestResponse r = GET("/projects/" + allProjects.get() + "/children/");
assertEquals(HttpStatus.SC_OK, r.getStatusCode());
List<ProjectInfo> children =
(new Gson()).fromJson(r.getReader(),
new TypeToken<List<ProjectInfo>>() {}.getType());
assertTrue(children.isEmpty());
}
@Test
public void listChildren() throws IOException, JSchException {
SshSession sshSession = new SshSession(admin);
Project.NameKey child1 = new Project.NameKey("p1");
createProject(sshSession, child1.get());
Project.NameKey child2 = new Project.NameKey("p2");
createProject(sshSession, child2.get());
createProject(sshSession, "p1.1", child1);
RestResponse r = GET("/projects/" + allProjects.get() + "/children/");
assertEquals(HttpStatus.SC_OK, r.getStatusCode());
List<ProjectInfo> children =
(new Gson()).fromJson(r.getReader(),
new TypeToken<List<ProjectInfo>>() {}.getType());
assertProjects(Arrays.asList(child1, child2), children);
}
private RestResponse GET(String endpoint) throws IOException {
return session.get(endpoint);
}
}

View File

@@ -15,18 +15,36 @@
package com.google.gerrit.acceptance.rest.project;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import com.google.common.base.Predicate;
import com.google.common.base.Strings;
import com.google.common.collect.Iterables;
import com.google.gerrit.extensions.restapi.Url;
import com.google.gerrit.reviewdb.client.AccountGroup;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.project.ProjectState;
import java.util.List;
import java.util.Set;
public class ProjectAssert {
public static void assertProjects(Iterable<Project.NameKey> expected,
List<ProjectInfo> actual) {
for (final Project.NameKey p : expected) {
ProjectInfo info = Iterables.find(actual, new Predicate<ProjectInfo>() {
@Override
public boolean apply(ProjectInfo info) {
return new Project.NameKey(info.name).equals(p);
}}, null);
assertNotNull("missing project: " + p, info);
actual.remove(info);
}
assertTrue("unexpected projects: " + actual, actual.isEmpty());
}
public static void assertProjectInfo(Project project, ProjectInfo info) {
if (info.name != null) {
// 'name' is not set if returned in a map

View File

@@ -19,4 +19,9 @@ public class ProjectInfo {
public String name;
public String parent;
public String description;
@Override
public String toString() {
return name;
}
}