X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/blobdiff_plain/0ad365ec4b9947d5690f3b4e4e4eaee8147c5c7e..27b8c6456f3d2c476afc362cbbe8312b0fe9eecf:/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/UserAndGroupServiceImplTest.java

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/UserAndGroupServiceImplTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/UserAndGroupServiceImplTest.java
index 3bcd1a43c1..c2c0035351 100644
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/UserAndGroupServiceImplTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/UserAndGroupServiceImplTest.java
@@ -10,6 +10,7 @@
 package eu.etaxonomy.cdm.api.service;
 
 
+import java.io.FileNotFoundException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -27,16 +28,15 @@ import org.unitils.dbunit.annotation.DataSet;
 import org.unitils.spring.annotation.SpringBeanByType;
 
 import eu.etaxonomy.cdm.database.PermissionDeniedException;
-import eu.etaxonomy.cdm.model.common.GrantedAuthorityImpl;
-import eu.etaxonomy.cdm.model.common.Group;
-import eu.etaxonomy.cdm.model.common.User;
-import eu.etaxonomy.cdm.persistence.hibernate.permission.Role;
+import eu.etaxonomy.cdm.model.permission.GrantedAuthorityImpl;
+import eu.etaxonomy.cdm.model.permission.Group;
+import eu.etaxonomy.cdm.model.permission.User;
+import eu.etaxonomy.cdm.persistence.permission.Role;
 
 
 /**
  * @author a.kohlbecker
- * @date Feb 4, 2014
- *
+ * @since Feb 4, 2014
  */
 @DataSet(value="SecurityTest.xml")
 public class UserAndGroupServiceImplTest extends AbstractSecurityTestBase {
@@ -58,21 +58,17 @@ public class UserAndGroupServiceImplTest extends AbstractSecurityTestBase {
     @SpringBeanByType
     private ITaxonService taxonService;
 
-
     private Authentication authentication;
 
-
     @Test
     public void testCreateUser() {
 
-
         authentication = authenticationManager.authenticate(tokenForAdmin);
         SecurityContext context = SecurityContextHolder.getContext();
         context.setAuthentication(authentication);
 
-
         try{
-            userService.createUser(User.NewInstance("new user 1", "00000"));
+            userService.createUser(User.NewInstance("new_user_1", "00000"));
         }catch(Exception e){
             Assert.fail();
         }
@@ -82,14 +78,13 @@ public class UserAndGroupServiceImplTest extends AbstractSecurityTestBase {
         context.setAuthentication(authentication);
 
         try{
-            userService.createUser(User.NewInstance("new user 2", "00000"));
+            userService.createUser(User.NewInstance("new_user_2", "00000"));
             Assert.fail();
         }catch(Exception e){
             Assert.assertEquals("Access is denied", e.getMessage());
         }
     }
 
-
     @Test
     public void testUpdateUser(){
 
@@ -131,7 +126,6 @@ public class UserAndGroupServiceImplTest extends AbstractSecurityTestBase {
         }catch (Exception e){
             Assert.assertEquals("Access is denied", e.getMessage());
         }
-
     }
 
     @Test
@@ -170,7 +164,6 @@ public class UserAndGroupServiceImplTest extends AbstractSecurityTestBase {
         userService.changePasswordForUser(tokenForAdmin.getName(), "newPassword");
     }
 
-
     @Test
     public void testCreateGroup(){
 
@@ -178,22 +171,20 @@ public class UserAndGroupServiceImplTest extends AbstractSecurityTestBase {
         SecurityContext context = SecurityContextHolder.getContext();
         context.setAuthentication(authentication);
 
+        List<GrantedAuthority> authorityList = new ArrayList<>();
+        GrantedAuthorityImpl roleRemotingAuthority = GrantedAuthorityImpl.NewInstance(null);
+        roleRemotingAuthority.setAuthority(Role.ROLE_REMOTING.toString()); // testing if creating a Role from string is working
+        authorityList.add(roleRemotingAuthority);
 
-        List<GrantedAuthority> authorityList = new ArrayList<GrantedAuthority>();
-        GrantedAuthorityImpl rolePublishAthotrity = GrantedAuthorityImpl.NewInstance();
-        rolePublishAthotrity.setAuthority(Role.ROLE_PUBLISH.toString()); // testing if creating a Role from string is working
-        authorityList.add(rolePublishAthotrity);
-
-        String publishersGroupName = "publishers";
+        String remotingGroupName = "publishers";
 
-        groupService.createGroup(publishersGroupName, authorityList);
+        groupService.createGroup(remotingGroupName, authorityList);
 
         commitAndStartNewTransaction(null);
 
-        List<GrantedAuthority> groupAuthorities = groupService.findGroupAuthorities(publishersGroupName);
-
-        Assert.assertEquals(Role.ROLE_PUBLISH.toString(), groupAuthorities.get(0).getAuthority());
+        List<GrantedAuthority> groupAuthorities = groupService.findGroupAuthorities(remotingGroupName);
 
+        Assert.assertEquals(Role.ROLE_REMOTING.toString(), groupAuthorities.get(0).getAuthority());
     }
 
     @Test
@@ -228,7 +219,6 @@ public class UserAndGroupServiceImplTest extends AbstractSecurityTestBase {
         context.setAuthentication(authentication);
 
         // create an entity of ROLE_PUBLISH and save it to the database
-        grantedAuthorityService.save(Role.ROLE_PUBLISH.asNewGrantedAuthority());
         commitAndStartNewTransaction(null);
         GrantedAuthorityImpl rolePublish = grantedAuthorityService.load(Role.ROLE_PUBLISH.getUuid());
 
@@ -330,9 +320,10 @@ public class UserAndGroupServiceImplTest extends AbstractSecurityTestBase {
             if(group.getName().equals(groupSpecialEditor_Name)){
                 Assert.fail("The user TaxonEditor should no longer be member of this group");
             }
-
         }
-
     }
 
-}
\ No newline at end of file
+    @Override
+    public void createTestDataSet() throws FileNotFoundException {}
+
+}