Use BuilddbConstants for role.

3 files changed, 15 insertions, 12 deletions

diff --git a/src/test/java/org/berzerkula/builddb/controllers/BuilddbAccountControllerTest.java b/src/test/java/org/berzerkula/builddb/controllers/BuilddbAccountControllerTest.java
index f96e129..7631980 100644
--- a/src/test/java/org/berzerkula/builddb/controllers/BuilddbAccountControllerTest.java
+++ b/src/test/java/org/berzerkula/builddb/controllers/BuilddbAccountControllerTest.java
@@ -1,5 +1,6 @@
 package org.berzerkula.builddb.controllers;
 
+import org.berzerkula.builddb.BuilddbConstants;
 import org.berzerkula.builddb.config.SecurityConfig;
 import org.berzerkula.builddb.models.AppUser;
 import org.berzerkula.builddb.repositories.AppUserRepository;
@@ -54,13 +55,13 @@ class BuilddbAccountControllerTest {
                 .andDo(print());
     }
 
-    @WithMockUser(roles="client")
+    @WithMockUser(roles=BuilddbConstants.ROLE_CLIENT)
     @Test
     void shouldReturnProfileView() throws Exception {
 
         appUserRepository.deleteAll();
         AppUser appUser = new AppUser("John", "Doe", "test@berzerkula.org",
-                "555-555-5555", "612 Wolf Avenue", "password", "client");
+                "555-555-5555", "612 Wolf Avenue", "password", BuilddbConstants.ROLE_CLIENT);
         appUserRepository.save(appUser);
 
         this.mockMvc.perform(get("/profile")
@@ -133,7 +134,7 @@ class BuilddbAccountControllerTest {
 
         appUserRepository.deleteAll();
         AppUser appUser = new AppUser("John", "Doe", "test@berzerkula.org",
-                "555-555-5555", "612 Wolf Avenue", "password", "client");
+                "555-555-5555", "612 Wolf Avenue", "password", BuilddbConstants.ROLE_CLIENT);
         appUserRepository.save(appUser);
 
         mockMvc.perform(post("/register")
diff --git a/src/test/java/org/berzerkula/builddb/controllers/BuilddbDashboardControllerTest.java b/src/test/java/org/berzerkula/builddb/controllers/BuilddbDashboardControllerTest.java
index d0e5496..15c7188 100644
--- a/src/test/java/org/berzerkula/builddb/controllers/BuilddbDashboardControllerTest.java
+++ b/src/test/java/org/berzerkula/builddb/controllers/BuilddbDashboardControllerTest.java
@@ -1,5 +1,6 @@
 package org.berzerkula.builddb.controllers;
 
+import org.berzerkula.builddb.BuilddbConstants;
 import org.berzerkula.builddb.config.SecurityConfig;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,7 +34,7 @@ class BuilddbDashboardControllerTest {
     }
 
     @Test
-    @WithMockUser(roles="admin")
+    @WithMockUser(roles=BuilddbConstants.ROLE_ADMIN)
     void shouldReturnAdminView() throws Exception {
         this.mockMvc.perform(get("/admin"))
                 .andExpect(status().isOk())
@@ -42,7 +43,7 @@ class BuilddbDashboardControllerTest {
     }
 
     @Test
-    @WithMockUser(roles="client")
+    @WithMockUser(roles=BuilddbConstants.ROLE_CLIENT)
     void shouldReturnClientView() throws Exception {
         this.mockMvc.perform(get("/client"))
                 .andExpect(status().isOk())
diff --git a/src/test/java/org/berzerkula/builddb/controllers/BuilddbPkgControllerTest.java b/src/test/java/org/berzerkula/builddb/controllers/BuilddbPkgControllerTest.java
index 778f336..462b365 100644
--- a/src/test/java/org/berzerkula/builddb/controllers/BuilddbPkgControllerTest.java
+++ b/src/test/java/org/berzerkula/builddb/controllers/BuilddbPkgControllerTest.java
@@ -1,5 +1,6 @@
 package org.berzerkula.builddb.controllers;
 
+import org.berzerkula.builddb.BuilddbConstants;
 import org.berzerkula.builddb.config.SecurityConfig;
 import org.berzerkula.builddb.models.Pkg;
 import org.berzerkula.builddb.repositories.TestH2PkgRepository;
@@ -33,7 +34,7 @@ class BuilddbPkgControllerTest {
     private MockMvc mockMvc;
 
     @Test
-    @WithMockUser(roles="client")
+    @WithMockUser(roles=BuilddbConstants.ROLE_CLIENT)
     void shouldReturnEmptyPackageListView() throws Exception {
         this.mockMvc.perform(get("/pkgs"))
                 .andExpect(status().isOk())
@@ -42,7 +43,7 @@ class BuilddbPkgControllerTest {
     }
 
     @Test
-    @WithMockUser(roles="client")
+    @WithMockUser(roles=BuilddbConstants.ROLE_CLIENT)
     void shouldReturnAddPackageView() throws Exception {
 
         this.mockMvc.perform(get("/pkgs/add"))
@@ -52,7 +53,7 @@ class BuilddbPkgControllerTest {
     }
 
     @Test
-    @WithMockUser(roles="client")
+    @WithMockUser(roles=BuilddbConstants.ROLE_CLIENT)
     void shouldReturnEditPackageView() throws Exception {
 
         Pkg pkg = new Pkg(1, "test", "1.2.3", "", "", "", "", "", "");
@@ -68,7 +69,7 @@ class BuilddbPkgControllerTest {
     }
 
     @Test
-    @WithMockUser(roles="client")
+    @WithMockUser(roles=BuilddbConstants.ROLE_CLIENT)
     void shouldGetPopupWhenDeletePackage() throws Exception {
 
         Pkg pkg = new Pkg(1, "test", "1.2.3", "", "", "", "", "", "");
@@ -84,7 +85,7 @@ class BuilddbPkgControllerTest {
     }
 
     @Test
-    @WithMockUser(roles="client")
+    @WithMockUser(roles=BuilddbConstants.ROLE_CLIENT)
     void shouldAddPkgValidationError() throws Exception {
         mockMvc.perform(post("/pkgs/add")
                         .with(csrf())
@@ -103,7 +104,7 @@ class BuilddbPkgControllerTest {
     }
 
     @Test
-    @WithMockUser(roles="client")
+    @WithMockUser(roles=BuilddbConstants.ROLE_CLIENT)
     void shouldAddPkgSuccess() throws Exception {
         mockMvc.perform(post("/pkgs/add")
                         .with(csrf())
@@ -122,7 +123,7 @@ class BuilddbPkgControllerTest {
     }
 
     @Test
-    @WithMockUser(roles="client")
+    @WithMockUser(roles=BuilddbConstants.ROLE_CLIENT)
     void shouldEditPkgSuccess() throws Exception {
 
         Pkg pkg = new Pkg(123, "test", "1.2.3", "", "", "", "", "", "");