Merge branch 'master' of archives.plil.fr:GIS2A4-Java/spring-persistence

Conflicts: src/test/resources/application.properties

Merge branch 'master' of archives.plil.fr:GIS2A4-Java/spring-persistence
Conflicts: src/test/resources/application.properties
rvangrev
2 parents fa02d31b 33ac96dc
Showing 6 changed files with 32 additions and 10 deletions Show diff stats
README.md
src/main/java/fr/plil/sio/persistence/api/RightService.java
src/main/java/fr/plil/sio/persistence/api/UserService.java
src/test/java/fr/plil/sio/persistence/jdbc/GroupServiceTest.java
src/test/java/fr/plil/sio/persistence/jdbc/RightServiceTest.java
src/test/resources/application.properties
@@ -0,0 +1,23 @@
+Description
+===========
+
+
+
+
+TODO
+====
+
+Documentation
+-------------
+
+* add usage scenario
+* complete documentation to precise one level dependencies for create and find methods
+* clarify tree of rights
+* clarify why the dependencies need to be managed in the service (to avoid to break the
+CRUD model, *i.e.* repository methods are specialised to load the one-level 
+dependencies, thus cannot be used to load object as dependencies  
+
+Tests
+-----
+
+* tests for one-level dependencies
 \ No newline at end of file
@@ -15,8 +15,7 @@ public interface RightService {
     /**
      * Create a sibling right attached to a parent right with a specific name in the database.
-     * It is possible that two rights has the same name.
-     * Return only the right with the parent in the field parent.
+     * It is possible that two rights has the same name. Return only the right with the parent in the field parent.
      *
      *
      * @param name   the name of the right
@@ -5,6 +5,7 @@ public interface UserService {
     /**
      * Create an user with a specific name in the database and affected to an existing group.
      * There is no two users with the same name in the database.
+     * Only references at one level are loaded (i.e. the group where the user belong).
      *
      * @param name the name of the user
      * @param groupName the name of the group
@@ -69,7 +69,7 @@ public class GroupServiceTest extends AbstractServiceSupport {
     @Test
     public void deleteGroupDoesDeleteUsers() {
         userService.create("user1", "group");
-        userService.create("user1", "group");
+        userService.create("user2", "group");
         assertNotNull(userService.findByName("user1"));
         assertNotNull(userService.findByName("user2"));
         groupService.delete("group");
@@ -128,8 +128,8 @@ public class GroupServiceTest extends AbstractServiceSupport {
         assertEquals(0, group.getRights().size());
     }
-    @Test
-    public void testRemoveRightIfNotPresent() {
+    @Test(expected = IllegalArgumentException.class)
+    public void testRemoveRightIfNotInDatabase() {
         Right right = new Right();
         right.setName("not-a-right");
         assertFalse(groupService.removeRight("group", right));
@@ -86,11 +86,11 @@ public class RightServiceTest extends AbstractServiceSupport {
         assertEquals(0, rightService.findByName("parent").size());
     }
-    @Test
-    public void testDeleteRightIfNotFound() {
+    @Test(expected = IllegalArgumentException.class)
+    public void testDeleteRightIfNotInDatabase() {
         Right right = new Right();
         right.setName("not-a-right");
-        assertFalse(rightService.delete(right));
+        rightService.delete(right);
     }
     @Test(expected = IllegalArgumentException.class)
@@ -2,5 +2,4 @@ logging.level.org.springframework=INFO
 logging.level.org.hibernate.SQL=DEBUG
 logging.level.org.hibernate=INFO
 spring.datasource.url=jdbc:h2:mem:persistence;TRACE_LEVEL_FILE=4;
-#spring.datasource.maxActive=300
-spring.datasource.tomcat.max-active=500
 \ No newline at end of file
+spring.datasource.tomcat.max-active=500