Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-17 02:31:14 +01:00
Code Issues Packages Projects Releases Activity

Minor refactoring

Browse Source
This commit is contained in:
Philipp Czora
2018-09-06 10:41:49 +02:00
parent 69f5760c3a
commit b961a82e15
2 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
scm-it/src/test/java/sonia/scm/it/RepositoryAccessITCase.java
View File

@@ -109,8 +109,7 @@ public class RepositoryAccessITCase {
assertThat(response.body()).isNotNull(); assertThat(response.body()).isNotNull();
assertThat(response.body().asString()) assertThat(response.body().asString())
.isNotNull() .isNotNull()
.isNotBlank() .isNotBlank();
;
RepositoryUtil.addTag(repositoryClient, changeset.getId(), tagName); RepositoryUtil.addTag(repositoryClient, changeset.getId(), tagName);
response = given(VndMediaType.TAG_COLLECTION, ADMIN_USERNAME, ADMIN_PASSWORD) response = given(VndMediaType.TAG_COLLECTION, ADMIN_USERNAME, ADMIN_PASSWORD)
@@ -118,48 +117,46 @@ public class RepositoryAccessITCase {
.get(tagsUrl) .get(tagsUrl)
.then() .then()
.statusCode(HttpStatus.SC_OK) .statusCode(HttpStatus.SC_OK)
.extract() .extract();
;
assertThat(response).isNotNull(); assertThat(response).isNotNull();
assertThat(response.body()).isNotNull(); assertThat(response.body()).isNotNull();
assertThat(response.body().asString()) assertThat(response.body().asString())
.isNotNull() .isNotNull()
.isNotBlank() .isNotBlank();
;
assertThat(response.body().jsonPath().getString("_links.self.href")) assertThat(response.body().jsonPath().getString("_links.self.href"))
.as("assert tags self link") .as("assert tags self link")
.isNotNull() .isNotNull()
.contains(repositoryUrl + "/tags/") .contains(repositoryUrl + "/tags/");
;
assertThat(response.body().jsonPath().getList("_embedded.tags")) assertThat(response.body().jsonPath().getList("_embedded.tags"))
.as("assert tag size") .as("assert tag size")
.isNotNull() .isNotNull()
.size() .size()
.isGreaterThan(0) .isGreaterThan(0);
;
assertThat(response.body().jsonPath().getMap("_embedded.tags.find{it.name=='" + tagName + "'}")) assertThat(response.body().jsonPath().getMap("_embedded.tags.find{it.name=='" + tagName + "'}"))
.as("assert tag name and revision") .as("assert tag name and revision")
.isNotNull() .isNotNull()
.hasSize(3) .hasSize(3)
.containsEntry("name", tagName) .containsEntry("name", tagName)
.containsEntry("revision", changeset.getId()) .containsEntry("revision", changeset.getId());
;
assertThat(response.body().jsonPath().getString("_embedded.tags.find{it.name=='" + tagName + "'}._links.self.href")) assertThat(response.body().jsonPath().getString("_embedded.tags.find{it.name=='" + tagName + "'}._links.self.href"))
.as("assert single tag self link") .as("assert single tag self link")
.isNotNull() .isNotNull()
.contains(String.format("%s/tags/%s", repositoryUrl, tagName)) .contains(String.format("%s/tags/%s", repositoryUrl, tagName));
;
assertThat(response.body().jsonPath().getString("_embedded.tags.find{it.name=='" + tagName + "'}._links.sources.href")) assertThat(response.body().jsonPath().getString("_embedded.tags.find{it.name=='" + tagName + "'}._links.sources.href"))
.as("assert single tag source link") .as("assert single tag source link")
.isNotNull() .isNotNull()
.contains(String.format("%s/sources/%s", repositoryUrl, changeset.getId())) .contains(String.format("%s/sources/%s", repositoryUrl, changeset.getId()));
;
assertThat(response.body().jsonPath().getString("_embedded.tags.find{it.name=='" + tagName + "'}._links.changesets.href")) assertThat(response.body().jsonPath().getString("_embedded.tags.find{it.name=='" + tagName + "'}._links.changesets.href"))
.as("assert single tag changesets link") .as("assert single tag changesets link")
.isNotNull() .isNotNull()
.contains(String.format("%s/changesets/%s", repositoryUrl, changeset.getId())) .contains(String.format("%s/changesets/%s", repositoryUrl, changeset.getId()));
;
} }
@Test @Test
@@ -200,6 +197,7 @@ public class RepositoryAccessITCase {
.statusCode(HttpStatus.SC_OK) .statusCode(HttpStatus.SC_OK)
.extract() .extract()
.path("files.find{it.name=='subfolder'}._links.self.href"); .path("files.find{it.name=='subfolder'}._links.self.href");
String subfolderContentUrl= given() String subfolderContentUrl= given()
.when() .when()
.get(subfolderSourceUrl) .get(subfolderSourceUrl)
@@ -207,6 +205,7 @@ public class RepositoryAccessITCase {
.statusCode(HttpStatus.SC_OK) .statusCode(HttpStatus.SC_OK)
.extract() .extract()
.path("files[0]._links.self.href"); .path("files[0]._links.self.href");
given() given()
.when() .when()
.get(subfolderContentUrl) .get(subfolderContentUrl)

4
scm-webapp/src/test/java/sonia/scm/api/v2/resources/TagRootResourceTest.java
View File

@@ -121,9 +121,7 @@ public class TagRootResourceTest {
assertThat(response).isNotNull(); assertThat(response).isNotNull();
assertThat(response.getContentAsString()) assertThat(response.getContentAsString())
.isNotBlank() .isNotBlank()
.contains("_links") .contains("_links");
;
} }
@Test @Test