Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-13 08:55:44 +01:00
Code Issues Packages Projects Releases Activity

fix Tests

Browse Source
This commit is contained in:
Eduard Heimbuch
2019-05-10 13:23:41 +02:00
parent 7fa2898420
commit e0ab70591a
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRoleRootResourceTest.java
View File

@@ -117,9 +117,9 @@ public class RepositoryRoleRootResourceTest {
.contains( .contains(
"\"name\":\"" + CUSTOM_ROLE + "\"", "\"name\":\"" + CUSTOM_ROLE + "\"",
"\"verbs\":[\"verb\"]", "\"verbs\":[\"verb\"]",
"\"self\":{\"href\":\"/v2/repository-roles/" + CUSTOM_ROLE + "\"}", "\"self\":{\"href\":\"/v2/repositoryRoles/" + CUSTOM_ROLE + "\"}",
"\"update\":{\"href\":\"/v2/repository-roles/" + CUSTOM_ROLE + "\"}", "\"update\":{\"href\":\"/v2/repositoryRoles/" + CUSTOM_ROLE + "\"}",
"\"delete\":{\"href\":\"/v2/repository-roles/" + CUSTOM_ROLE + "\"}" "\"delete\":{\"href\":\"/v2/repositoryRoles/" + CUSTOM_ROLE + "\"}"
); );
} }
@@ -135,11 +135,11 @@ public class RepositoryRoleRootResourceTest {
.contains( .contains(
"\"name\":\"" + SYSTEM_ROLE + "\"", "\"name\":\"" + SYSTEM_ROLE + "\"",
"\"verbs\":[\"admin\"]", "\"verbs\":[\"admin\"]",
"\"self\":{\"href\":\"/v2/repository-roles/" + SYSTEM_ROLE + "\"}" "\"self\":{\"href\":\"/v2/repositoryRoles/" + SYSTEM_ROLE + "\"}"
) )
.doesNotContain( .doesNotContain(
"\"delete\":{\"href\":\"/v2/repository-roles/" + CUSTOM_ROLE + "\"}", "\"delete\":{\"href\":\"/v2/repositoryRoles/" + CUSTOM_ROLE + "\"}",
"\"update\":{\"href\":\"/v2/repository-roles/" + CUSTOM_ROLE + "\"}" "\"update\":{\"href\":\"/v2/repositoryRoles/" + CUSTOM_ROLE + "\"}"
); );
} }
@@ -215,7 +215,7 @@ public class RepositoryRoleRootResourceTest {
assertThat(createCaptor.getValue().getName()).isEqualTo("newRole"); assertThat(createCaptor.getValue().getName()).isEqualTo("newRole");
assertThat(createCaptor.getValue().getVerbs()).containsExactly("write", "push"); assertThat(createCaptor.getValue().getVerbs()).containsExactly("write", "push");
Object location = response.getOutputHeaders().getFirst("Location"); Object location = response.getOutputHeaders().getFirst("Location");
assertThat(location).isEqualTo(create("/v2/repository-roles/newRole")); assertThat(location).isEqualTo(create("/v2/repositoryRoles/newRole"));
} }
@Test @Test
@@ -245,12 +245,12 @@ public class RepositoryRoleRootResourceTest {
"\"name\":\"" + SYSTEM_ROLE + "\"", "\"name\":\"" + SYSTEM_ROLE + "\"",
"\"verbs\":[\"verb\"]", "\"verbs\":[\"verb\"]",
"\"verbs\":[\"admin\"]", "\"verbs\":[\"admin\"]",
"\"self\":{\"href\":\"/v2/repository-roles", "\"self\":{\"href\":\"/v2/repositoryRoles",
"\"delete\":{\"href\":\"/v2/repository-roles/" + CUSTOM_ROLE + "\"}", "\"delete\":{\"href\":\"/v2/repositoryRoles/" + CUSTOM_ROLE + "\"}",
"\"create\":{\"href\":\"/v2/repository-roles/\"}" "\"create\":{\"href\":\"/v2/repositoryRoles/\"}"
) )
.doesNotContain( .doesNotContain(
"\"delete\":{\"href\":\"/v2/repository-roles/" + SYSTEM_ROLE + "\"}" "\"delete\":{\"href\":\"/v2/repositoryRoles/" + SYSTEM_ROLE + "\"}"
); );
} }

9
scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryRoleManagerTest.java
View File

@@ -16,6 +16,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
import org.mockito.junit.jupiter.MockitoSettings; import org.mockito.junit.jupiter.MockitoSettings;
import org.mockito.quality.Strictness; import org.mockito.quality.Strictness;
import sonia.scm.NotFoundException; import sonia.scm.NotFoundException;
import sonia.scm.ScmConstraintViolationException;
import sonia.scm.security.RepositoryPermissionProvider; import sonia.scm.security.RepositoryPermissionProvider;
import java.util.Collection; import java.util.Collection;
@@ -119,11 +120,17 @@ class DefaultRepositoryRoleManagerTest {
@Test @Test
void shouldModifyRole() { void shouldModifyRole() {
RepositoryRole role = new RepositoryRole(CUSTOM_ROLE_NAME, singletonList("changed"), null); RepositoryRole role = new RepositoryRole(CUSTOM_ROLE_NAME, singletonList("changed"), "xml");
manager.modify(role); manager.modify(role);
verify(dao).modify(role); verify(dao).modify(role);
} }
@Test
void shouldNotModifyRole_whenTypeChanged() {
assertThrows(ScmConstraintViolationException.class, () -> manager.modify(new RepositoryRole(CUSTOM_ROLE_NAME, singletonList("changed"), null)));
verify(dao, never()).modify(any());
}
@Test @Test
void shouldNotModifyRole_whenRoleDoesNotExists() { void shouldNotModifyRole_whenRoleDoesNotExists() {
assertThrows(NotFoundException.class, () -> manager.modify(new RepositoryRole("noSuchRole", singletonList("changed"), null))); assertThrows(NotFoundException.class, () -> manager.modify(new RepositoryRole("noSuchRole", singletonList("changed"), null)));