Skip to content
GitLab
Commit 688be7af authored by Greg Messner's avatar Greg Messner
Browse files

Fixed getStarredProjects() tests.

parent 44d556bb
Hide whitespace changes
Inline Side-by-side
src/test/java/org/gitlab4j/api/TestProjectApi.java
View file @ 688be7af
...@@ -34,15 +34,18 @@ public class TestProjectApi { ...@@ -34,15 +34,18 @@ public class TestProjectApi {
// The following needs to be set to your test repository // The following needs to be set to your test repository
private static final String TEST_NAMESPACE; private static final String TEST_NAMESPACE;
private static final String TEST_PROJECT_NAME;
private static final String TEST_HOST_URL; private static final String TEST_HOST_URL;
private static final String TEST_PRIVATE_TOKEN; private static final String TEST_PRIVATE_TOKEN;
static { static {
TEST_NAMESPACE = TestUtils.getProperty("TEST_NAMESPACE"); TEST_NAMESPACE = TestUtils.getProperty("TEST_NAMESPACE");
TEST_PROJECT_NAME = TestUtils.getProperty("TEST_PROJECT_NAME");
TEST_HOST_URL = TestUtils.getProperty("TEST_HOST_URL"); TEST_HOST_URL = TestUtils.getProperty("TEST_HOST_URL");
TEST_PRIVATE_TOKEN = TestUtils.getProperty("TEST_PRIVATE_TOKEN"); TEST_PRIVATE_TOKEN = TestUtils.getProperty("TEST_PRIVATE_TOKEN");
} }
private static final String TEST_PROJECT_NAME = "test-gitlab4j-create-project"; private static final String TEST_PROJECT_NAME_1 = "test-gitlab4j-create-project";
private static final String TEST_PROJECT_NAME_2 = "test-gitlab4j-create-project-2"; private static final String TEST_PROJECT_NAME_2 = "test-gitlab4j-create-project-2";
private static GitLabApi gitLabApi; private static GitLabApi gitLabApi;
...@@ -74,7 +77,7 @@ public class TestProjectApi { ...@@ -74,7 +77,7 @@ public class TestProjectApi {
if (gitLabApi != null) { if (gitLabApi != null) {
try { try {
Project project = gitLabApi.getProjectApi().getProject(TEST_NAMESPACE, TEST_PROJECT_NAME); Project project = gitLabApi.getProjectApi().getProject(TEST_NAMESPACE, TEST_PROJECT_NAME_1);
gitLabApi.getProjectApi().deleteProject(project); gitLabApi.getProjectApi().deleteProject(project);
project = gitLabApi.getProjectApi().getProject(TEST_NAMESPACE, TEST_PROJECT_NAME_2); project = gitLabApi.getProjectApi().getProject(TEST_NAMESPACE, TEST_PROJECT_NAME_2);
gitLabApi.getProjectApi().deleteProject(project); gitLabApi.getProjectApi().deleteProject(project);
...@@ -87,7 +90,7 @@ public class TestProjectApi { ...@@ -87,7 +90,7 @@ public class TestProjectApi {
public static void teardown() throws GitLabApiException { public static void teardown() throws GitLabApiException {
if (gitLabApi != null) { if (gitLabApi != null) {
try { try {
Project project = gitLabApi.getProjectApi().getProject(TEST_NAMESPACE, TEST_PROJECT_NAME); Project project = gitLabApi.getProjectApi().getProject(TEST_NAMESPACE, TEST_PROJECT_NAME_1);
gitLabApi.getProjectApi().deleteProject(project); gitLabApi.getProjectApi().deleteProject(project);
project = gitLabApi.getProjectApi().getProject(TEST_NAMESPACE, TEST_PROJECT_NAME_2); project = gitLabApi.getProjectApi().getProject(TEST_NAMESPACE, TEST_PROJECT_NAME_2);
gitLabApi.getProjectApi().deleteProject(project); gitLabApi.getProjectApi().deleteProject(project);
...@@ -105,7 +108,7 @@ public class TestProjectApi { ...@@ -105,7 +108,7 @@ public class TestProjectApi {
public void testCreate() throws GitLabApiException { public void testCreate() throws GitLabApiException {
Project project = new Project() Project project = new Project()
.withName(TEST_PROJECT_NAME) .withName(TEST_PROJECT_NAME_1)
.withDescription("GitLab4J test project.") .withDescription("GitLab4J test project.")
.withIssuesEnabled(true) .withIssuesEnabled(true)
.withMergeRequestsEnabled(true) .withMergeRequestsEnabled(true)
...@@ -115,7 +118,7 @@ public class TestProjectApi { ...@@ -115,7 +118,7 @@ public class TestProjectApi {
Project newProject = gitLabApi.getProjectApi().createProject(project); Project newProject = gitLabApi.getProjectApi().createProject(project);
assertNotNull(newProject); assertNotNull(newProject);
assertEquals(TEST_PROJECT_NAME, newProject.getName()); assertEquals(TEST_PROJECT_NAME_1, newProject.getName());
assertEquals(project.getDescription(), newProject.getDescription()); assertEquals(project.getDescription(), newProject.getDescription());
assertEquals(project.getIssuesEnabled(), newProject.getIssuesEnabled()); assertEquals(project.getIssuesEnabled(), newProject.getIssuesEnabled());
assertEquals(project.getMergeRequestsEnabled(), newProject.getMergeRequestsEnabled()); assertEquals(project.getMergeRequestsEnabled(), newProject.getMergeRequestsEnabled());
...@@ -133,7 +136,7 @@ public class TestProjectApi { ...@@ -133,7 +136,7 @@ public class TestProjectApi {
int matchCount = 0; int matchCount = 0;
for (Project project : projects) { for (Project project : projects) {
if (TEST_PROJECT_NAME.equals(project.getName())) if (TEST_PROJECT_NAME_1.equals(project.getName()))
matchCount++; matchCount++;
else if (TEST_PROJECT_NAME_2.equals(project.getName())) else if (TEST_PROJECT_NAME_2.equals(project.getName()))
matchCount++; matchCount++;
...@@ -141,11 +144,11 @@ public class TestProjectApi { ...@@ -141,11 +144,11 @@ public class TestProjectApi {
assertEquals(2, matchCount); assertEquals(2, matchCount);
projects = gitLabApi.getProjectApi().getProjects(TEST_PROJECT_NAME); projects = gitLabApi.getProjectApi().getProjects(TEST_PROJECT_NAME_1);
assertNotNull(projects); assertNotNull(projects);
assertEquals(2, projects.size()); assertEquals(2, projects.size());
assertEquals(TEST_PROJECT_NAME_2, projects.get(0).getName()); assertEquals(TEST_PROJECT_NAME_2, projects.get(0).getName());
assertEquals(TEST_PROJECT_NAME, projects.get(1).getName()); assertEquals(TEST_PROJECT_NAME_1, projects.get(1).getName());
} }
@Test @Test
...@@ -158,7 +161,7 @@ public class TestProjectApi { ...@@ -158,7 +161,7 @@ public class TestProjectApi {
int matchCount = 0; int matchCount = 0;
for (Project project : projects) { for (Project project : projects) {
if (TEST_PROJECT_NAME.equals(project.getName())) if (TEST_PROJECT_NAME_1.equals(project.getName()))
matchCount++; matchCount++;
else if (TEST_PROJECT_NAME_2.equals(project.getName())) else if (TEST_PROJECT_NAME_2.equals(project.getName()))
matchCount++; matchCount++;
...@@ -166,11 +169,11 @@ public class TestProjectApi { ...@@ -166,11 +169,11 @@ public class TestProjectApi {
assertEquals(2, matchCount); assertEquals(2, matchCount);
projects = gitLabApi.getProjectApi().getProjects(TEST_PROJECT_NAME); projects = gitLabApi.getProjectApi().getProjects(TEST_PROJECT_NAME_1);
assertNotNull(projects); assertNotNull(projects);
assertEquals(2, projects.size()); assertEquals(2, projects.size());
assertEquals(TEST_PROJECT_NAME_2, projects.get(0).getName()); assertEquals(TEST_PROJECT_NAME_2, projects.get(0).getName());
assertEquals(TEST_PROJECT_NAME, projects.get(1).getName()); assertEquals(TEST_PROJECT_NAME_1, projects.get(1).getName());
} }
@Test @Test
...@@ -184,7 +187,7 @@ public class TestProjectApi { ...@@ -184,7 +187,7 @@ public class TestProjectApi {
List<Project> projects = pager.next(); List<Project> projects = pager.next();
int matchCount = 0; int matchCount = 0;
for (Project project : projects) { for (Project project : projects) {
if (TEST_PROJECT_NAME.equals(project.getName())) if (TEST_PROJECT_NAME_1.equals(project.getName()))
matchCount++; matchCount++;
else if (TEST_PROJECT_NAME_2.equals(project.getName())) else if (TEST_PROJECT_NAME_2.equals(project.getName()))
matchCount++; matchCount++;
...@@ -192,11 +195,11 @@ public class TestProjectApi { ...@@ -192,11 +195,11 @@ public class TestProjectApi {
assertEquals(2, matchCount); assertEquals(2, matchCount);
projects = gitLabApi.getProjectApi().getProjects(TEST_PROJECT_NAME); projects = gitLabApi.getProjectApi().getProjects(TEST_PROJECT_NAME_1);
assertNotNull(projects); assertNotNull(projects);
assertEquals(2, projects.size()); assertEquals(2, projects.size());
assertEquals(TEST_PROJECT_NAME_2, projects.get(0).getName()); assertEquals(TEST_PROJECT_NAME_2, projects.get(0).getName());
assertEquals(TEST_PROJECT_NAME, projects.get(1).getName()); assertEquals(TEST_PROJECT_NAME_1, projects.get(1).getName());
} }
@Test @Test
...@@ -209,7 +212,7 @@ public class TestProjectApi { ...@@ -209,7 +212,7 @@ public class TestProjectApi {
int matchCount = 0; int matchCount = 0;
for (Project project : projects) { for (Project project : projects) {
if (TEST_PROJECT_NAME.equals(project.getName())) if (TEST_PROJECT_NAME_1.equals(project.getName()))
matchCount++; matchCount++;
else if (TEST_PROJECT_NAME_2.equals(project.getName())) else if (TEST_PROJECT_NAME_2.equals(project.getName()))
matchCount++; matchCount++;
...@@ -217,11 +220,11 @@ public class TestProjectApi { ...@@ -217,11 +220,11 @@ public class TestProjectApi {
assertEquals(2, matchCount); assertEquals(2, matchCount);
projects = gitLabApi.getProjectApi().getProjects(TEST_PROJECT_NAME); projects = gitLabApi.getProjectApi().getProjects(TEST_PROJECT_NAME_1);
assertNotNull(projects); assertNotNull(projects);
assertEquals(2, projects.size()); assertEquals(2, projects.size());
assertEquals(TEST_PROJECT_NAME_2, projects.get(0).getName()); assertEquals(TEST_PROJECT_NAME_2, projects.get(0).getName());
assertEquals(TEST_PROJECT_NAME, projects.get(1).getName()); assertEquals(TEST_PROJECT_NAME_1, projects.get(1).getName());
} }
@Test @Test
...@@ -229,21 +232,24 @@ public class TestProjectApi { ...@@ -229,21 +232,24 @@ public class TestProjectApi {
List<Project> projects = gitLabApi.getProjectApi().getStarredProjects(); List<Project> projects = gitLabApi.getProjectApi().getStarredProjects();
assertNotNull(projects); assertNotNull(projects);
assertTrue(projects.isEmpty()); assertNotNull(projects);
assertEquals(1, projects.size());
assertEquals(TEST_PROJECT_NAME, projects.get(0).getName());
} }
@Test @Test
public void testListStarredProjectsWithParams() throws GitLabApiException { public void testListStarredProjectsWithParams() throws GitLabApiException {
List<Project> projects = gitLabApi.getProjectApi().getProjects(false, Visibility.PUBLIC, List<Project> projects = gitLabApi.getProjectApi().getProjects(false, Visibility.PUBLIC,
Constants.ProjectOrderBy.NAME, Constants.SortOrder.DESC, null, true, true, true, true, true); Constants.ProjectOrderBy.NAME, Constants.SortOrder.DESC, TEST_PROJECT_NAME, true, true, true, true, true);
assertNotNull(projects); assertNotNull(projects);
assertTrue(projects.isEmpty()); assertEquals(1, projects.size());
assertEquals(TEST_PROJECT_NAME, projects.get(0).getName());
} }
@Test @Test
public void testRemoveByDelete() throws GitLabApiException { public void testRemoveByDelete() throws GitLabApiException {
Project project = gitLabApi.getProjectApi().getProject(TEST_NAMESPACE, TEST_PROJECT_NAME); Project project = gitLabApi.getProjectApi().getProject(TEST_NAMESPACE, TEST_PROJECT_NAME_1);
gitLabApi.getProjectApi().deleteProject(project); gitLabApi.getProjectApi().deleteProject(project);
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment