Skip to content

Commit e1abdd7

Browse files
committed
Fixed testTransferProject() test (#276).
1 parent df7e1ec commit e1abdd7

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

src/test/java/org/gitlab4j/api/TestProjectApi.java

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -139,30 +139,32 @@ private static void deleteAllTestProjects() {
139139
Project project = gitLabApi.getProjectApi().getProject(TEST_NAMESPACE, TEST_PROJECT_NAME_UPDATE);
140140
gitLabApi.getProjectApi().deleteProject(project);
141141
} catch (GitLabApiException ignore) {}
142+
143+
try {
144+
Project project = gitLabApi.getProjectApi().getProject(TEST_NAMESPACE, TEST_XFER_PROJECT_NAME);
145+
gitLabApi.getProjectApi().deleteProject(project);
146+
} catch (GitLabApiException ignore) {}
142147

143148
if (TEST_GROUP != null && TEST_PROJECT_NAME != null) {
144149
try {
145150
Project project = gitLabApi.getProjectApi().getProject(TEST_NAMESPACE, TEST_PROJECT_NAME);
146151
List<Group> groups = gitLabApi.getGroupApi().getGroups(TEST_GROUP);
147152
gitLabApi.getProjectApi().unshareProject(project.getId(), groups.get(0).getId());
148-
} catch (GitLabApiException ignore) {
149-
}
153+
} catch (GitLabApiException ignore) {}
150154
}
151155

152156
if (TEST_GROUP != null && TEST_GROUP_PROJECT != null) {
153157
try {
154158
Project project = gitLabApi.getProjectApi().getProject(TEST_NAMESPACE, TEST_GROUP_PROJECT);
155159
gitLabApi.getProjectApi().deleteProject(project);
156-
} catch (GitLabApiException ignore) {
157-
}
160+
} catch (GitLabApiException ignore) {}
158161
}
159162

160163
if (TEST_XFER_NAMESPACE != null) {
161164
try {
162165
Project project = gitLabApi.getProjectApi().getProject(TEST_XFER_NAMESPACE, TEST_XFER_PROJECT_NAME);
163166
gitLabApi.getProjectApi().deleteProject(project);
164-
} catch (GitLabApiException ignore) {
165-
}
167+
} catch (GitLabApiException ignore) {}
166168
}
167169
}
168170
}
@@ -581,7 +583,10 @@ public void testTransferProject() throws GitLabApiException {
581583
Project newProject = gitLabApi.getProjectApi().createProject(project);
582584
assertNotNull(newProject);
583585

584-
Project transferedProject = gitLabApi.getProjectApi().transferProject(newProject, TEST_XFER_NAMESPACE);
586+
Project projectToTransfer = gitLabApi.getProjectApi().getProject(newProject);
587+
assertNotNull(projectToTransfer);
588+
589+
Project transferedProject = gitLabApi.getProjectApi().transferProject(projectToTransfer, TEST_XFER_NAMESPACE);
585590
assertNotNull(transferedProject);
586591
}
587592
}

0 commit comments

Comments
 (0)