Commit e1abdd78 authored by Greg Messner's avatar Greg Messner
Browse files

Fixed testTransferProject() test (#276).

parent df7e1ec8
...@@ -139,30 +139,32 @@ public class TestProjectApi { ...@@ -139,30 +139,32 @@ public class TestProjectApi {
Project project = gitLabApi.getProjectApi().getProject(TEST_NAMESPACE, TEST_PROJECT_NAME_UPDATE); Project project = gitLabApi.getProjectApi().getProject(TEST_NAMESPACE, TEST_PROJECT_NAME_UPDATE);
gitLabApi.getProjectApi().deleteProject(project); gitLabApi.getProjectApi().deleteProject(project);
} catch (GitLabApiException ignore) {} } catch (GitLabApiException ignore) {}
try {
Project project = gitLabApi.getProjectApi().getProject(TEST_NAMESPACE, TEST_XFER_PROJECT_NAME);
gitLabApi.getProjectApi().deleteProject(project);
} catch (GitLabApiException ignore) {}
if (TEST_GROUP != null && TEST_PROJECT_NAME != null) { if (TEST_GROUP != null && TEST_PROJECT_NAME != null) {
try { try {
Project project = gitLabApi.getProjectApi().getProject(TEST_NAMESPACE, TEST_PROJECT_NAME); Project project = gitLabApi.getProjectApi().getProject(TEST_NAMESPACE, TEST_PROJECT_NAME);
List<Group> groups = gitLabApi.getGroupApi().getGroups(TEST_GROUP); List<Group> groups = gitLabApi.getGroupApi().getGroups(TEST_GROUP);
gitLabApi.getProjectApi().unshareProject(project.getId(), groups.get(0).getId()); gitLabApi.getProjectApi().unshareProject(project.getId(), groups.get(0).getId());
} catch (GitLabApiException ignore) { } catch (GitLabApiException ignore) {}
}
} }
if (TEST_GROUP != null && TEST_GROUP_PROJECT != null) { if (TEST_GROUP != null && TEST_GROUP_PROJECT != null) {
try { try {
Project project = gitLabApi.getProjectApi().getProject(TEST_NAMESPACE, TEST_GROUP_PROJECT); Project project = gitLabApi.getProjectApi().getProject(TEST_NAMESPACE, TEST_GROUP_PROJECT);
gitLabApi.getProjectApi().deleteProject(project); gitLabApi.getProjectApi().deleteProject(project);
} catch (GitLabApiException ignore) { } catch (GitLabApiException ignore) {}
}
} }
if (TEST_XFER_NAMESPACE != null) { if (TEST_XFER_NAMESPACE != null) {
try { try {
Project project = gitLabApi.getProjectApi().getProject(TEST_XFER_NAMESPACE, TEST_XFER_PROJECT_NAME); Project project = gitLabApi.getProjectApi().getProject(TEST_XFER_NAMESPACE, TEST_XFER_PROJECT_NAME);
gitLabApi.getProjectApi().deleteProject(project); gitLabApi.getProjectApi().deleteProject(project);
} catch (GitLabApiException ignore) { } catch (GitLabApiException ignore) {}
}
} }
} }
} }
...@@ -581,7 +583,10 @@ public class TestProjectApi { ...@@ -581,7 +583,10 @@ public class TestProjectApi {
Project newProject = gitLabApi.getProjectApi().createProject(project); Project newProject = gitLabApi.getProjectApi().createProject(project);
assertNotNull(newProject); assertNotNull(newProject);
Project transferedProject = gitLabApi.getProjectApi().transferProject(newProject, TEST_XFER_NAMESPACE); Project projectToTransfer = gitLabApi.getProjectApi().getProject(newProject);
assertNotNull(projectToTransfer);
Project transferedProject = gitLabApi.getProjectApi().transferProject(projectToTransfer, TEST_XFER_NAMESPACE);
assertNotNull(transferedProject); assertNotNull(transferedProject);
} }
} }
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