From e0ab70591adeca28e9c6514c584321e188aae0ec Mon Sep 17 00:00:00 2001
From: Eduard Heimbuch <eduard.heimbuch@cloudogu.com>
Date: Fri, 10 May 2019 13:23:41 +0200
Subject: [PATCH] fix Tests

---
 .../RepositoryRoleRootResourceTest.java       | 22 +++++++++----------
 .../DefaultRepositoryRoleManagerTest.java     |  9 +++++++-
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRoleRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRoleRootResourceTest.java
index 0489717926..af968efd1f 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRoleRootResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRoleRootResourceTest.java
@@ -117,9 +117,9 @@ public class RepositoryRoleRootResourceTest {
       .contains(
         "\"name\":\"" + CUSTOM_ROLE + "\"",
         "\"verbs\":[\"verb\"]",
-        "\"self\":{\"href\":\"/v2/repository-roles/" + CUSTOM_ROLE + "\"}",
-        "\"update\":{\"href\":\"/v2/repository-roles/" + CUSTOM_ROLE + "\"}",
-        "\"delete\":{\"href\":\"/v2/repository-roles/" + CUSTOM_ROLE + "\"}"
+        "\"self\":{\"href\":\"/v2/repositoryRoles/" + CUSTOM_ROLE + "\"}",
+        "\"update\":{\"href\":\"/v2/repositoryRoles/" + CUSTOM_ROLE + "\"}",
+        "\"delete\":{\"href\":\"/v2/repositoryRoles/" + CUSTOM_ROLE + "\"}"
       );
   }
 
@@ -135,11 +135,11 @@ public class RepositoryRoleRootResourceTest {
       .contains(
         "\"name\":\"" + SYSTEM_ROLE + "\"",
         "\"verbs\":[\"admin\"]",
-        "\"self\":{\"href\":\"/v2/repository-roles/" + SYSTEM_ROLE + "\"}"
+        "\"self\":{\"href\":\"/v2/repositoryRoles/" + SYSTEM_ROLE + "\"}"
       )
       .doesNotContain(
-        "\"delete\":{\"href\":\"/v2/repository-roles/" + CUSTOM_ROLE + "\"}",
-        "\"update\":{\"href\":\"/v2/repository-roles/" + CUSTOM_ROLE + "\"}"
+        "\"delete\":{\"href\":\"/v2/repositoryRoles/" + CUSTOM_ROLE + "\"}",
+        "\"update\":{\"href\":\"/v2/repositoryRoles/" + CUSTOM_ROLE + "\"}"
       );
   }
 
@@ -215,7 +215,7 @@ public class RepositoryRoleRootResourceTest {
     assertThat(createCaptor.getValue().getName()).isEqualTo("newRole");
     assertThat(createCaptor.getValue().getVerbs()).containsExactly("write", "push");
     Object location = response.getOutputHeaders().getFirst("Location");
-    assertThat(location).isEqualTo(create("/v2/repository-roles/newRole"));
+    assertThat(location).isEqualTo(create("/v2/repositoryRoles/newRole"));
   }
 
   @Test
@@ -245,12 +245,12 @@ public class RepositoryRoleRootResourceTest {
         "\"name\":\"" + SYSTEM_ROLE + "\"",
         "\"verbs\":[\"verb\"]",
         "\"verbs\":[\"admin\"]",
-        "\"self\":{\"href\":\"/v2/repository-roles",
-        "\"delete\":{\"href\":\"/v2/repository-roles/" + CUSTOM_ROLE + "\"}",
-        "\"create\":{\"href\":\"/v2/repository-roles/\"}"
+        "\"self\":{\"href\":\"/v2/repositoryRoles",
+        "\"delete\":{\"href\":\"/v2/repositoryRoles/" + CUSTOM_ROLE + "\"}",
+        "\"create\":{\"href\":\"/v2/repositoryRoles/\"}"
       )
     .doesNotContain(
-      "\"delete\":{\"href\":\"/v2/repository-roles/" + SYSTEM_ROLE + "\"}"
+      "\"delete\":{\"href\":\"/v2/repositoryRoles/" + SYSTEM_ROLE + "\"}"
     );
   }
 
diff --git a/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryRoleManagerTest.java b/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryRoleManagerTest.java
index 0542626dd5..cd0ba963b9 100644
--- a/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryRoleManagerTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryRoleManagerTest.java
@@ -16,6 +16,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
 import org.mockito.junit.jupiter.MockitoSettings;
 import org.mockito.quality.Strictness;
 import sonia.scm.NotFoundException;
+import sonia.scm.ScmConstraintViolationException;
 import sonia.scm.security.RepositoryPermissionProvider;
 
 import java.util.Collection;
@@ -119,11 +120,17 @@ class DefaultRepositoryRoleManagerTest {
 
     @Test
     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);
       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
     void shouldNotModifyRole_whenRoleDoesNotExists() {
       assertThrows(NotFoundException.class, () -> manager.modify(new RepositoryRole("noSuchRole", singletonList("changed"), null)));