From 8bfe22bf570bdb1c2ea8f9f8d8510770259aea6b Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Thu, 10 May 2012 09:06:43 +0200
Subject: [PATCH] Trying to fix tests related with unbound users in UserDAOTest

FEA: ItEr76S27ResourceBinding
---
 .../business/test/users/daos/UserDAOTest.java | 73 ++++++++++++++++---
 1 file changed, 61 insertions(+), 12 deletions(-)

diff --git a/libreplan-business/src/test/java/org/libreplan/business/test/users/daos/UserDAOTest.java b/libreplan-business/src/test/java/org/libreplan/business/test/users/daos/UserDAOTest.java
index af25d774c..556430921 100644
--- a/libreplan-business/src/test/java/org/libreplan/business/test/users/daos/UserDAOTest.java
+++ b/libreplan-business/src/test/java/org/libreplan/business/test/users/daos/UserDAOTest.java
@@ -292,11 +292,32 @@ public class UserDAOTest {
 
     @Test
     public void testUnoundUsers1() {
-        int previous = userDAO.getUnboundUsers(null).size();
-        userDAO.save(createUser(getUniqueName()));
+        int previous = transactionService
+                .runOnAnotherReadOnlyTransaction(new IOnTransaction<Integer>() {
+                    @Override
+                    public Integer execute() {
+                        return userDAO.getUnboundUsers(null).size();
+                    }
+                });
 
-        List<User> unboundUsers = userDAO.getUnboundUsers(null);
-        assertEquals(previous + 1, unboundUsers.size());
+        transactionService.runOnAnotherTransaction(new IOnTransaction<Void>() {
+
+            @Override
+            public Void execute() {
+                userDAO.save(createUser(getUniqueName()));
+                return null;
+            }
+        });
+
+        int size = transactionService
+                .runOnAnotherReadOnlyTransaction(new IOnTransaction<Integer>() {
+                    @Override
+                    public Integer execute() {
+                        return userDAO.getUnboundUsers(null).size();
+                    }
+                });
+
+        assertEquals(previous + 1, size);
     }
 
     private Worker givenStoredWorkerRelatedTo(final User user) {
@@ -320,22 +341,50 @@ public class UserDAOTest {
 
     @Test
     public void testUnoundUsers2() {
-        int previous = userDAO.getUnboundUsers(null).size();
+        int previous = transactionService
+                .runOnAnotherReadOnlyTransaction(new IOnTransaction<Integer>() {
+                    @Override
+                    public Integer execute() {
+                        return userDAO.getUnboundUsers(null).size();
+                    }
+                });
+
         User user = createUser(getUniqueName());
         user.setWorker(givenStoredWorkerRelatedTo(user));
 
-        List<User> unboundUsers = userDAO.getUnboundUsers(null);
-        assertEquals(previous, unboundUsers.size());
+        int size = transactionService
+                .runOnAnotherReadOnlyTransaction(new IOnTransaction<Integer>() {
+                    @Override
+                    public Integer execute() {
+                        return userDAO.getUnboundUsers(null).size();
+                    }
+                });
+
+        assertEquals(previous, size);
     }
 
     @Test
     public void testUnoundUsers3() {
-        int previous = userDAO.getUnboundUsers(null).size();
-        User user = createUser(getUniqueName());
-        user.setWorker(givenStoredWorkerRelatedTo(user));
+        int previous = transactionService
+                .runOnAnotherReadOnlyTransaction(new IOnTransaction<Integer>() {
+                    @Override
+                    public Integer execute() {
+                        return userDAO.getUnboundUsers(null).size();
+                    }
+                });
 
-        List<User> unboundUsers = userDAO.getUnboundUsers(user.getWorker());
-        assertEquals(previous + 1, unboundUsers.size());
+        User user = createUser(getUniqueName());
+        final Worker worker = givenStoredWorkerRelatedTo(user);
+        user.setWorker(worker);
+
+        int size = transactionService
+                .runOnAnotherReadOnlyTransaction(new IOnTransaction<Integer>() {
+                    @Override
+                    public Integer execute() {
+                        return userDAO.getUnboundUsers(worker).size();
+                    }
+                });
+        assertEquals(previous + 1, size);
     }
 
 }