Changeset 1323

Timestamp:

05/17/11 07:43:39 (13 years ago)

Author:

twagoo

Message:

userDao: getByPrincipalName

Location:

ComponentRegistry/trunk/ComponentRegistry/src

Files:

• main/java/clarin/cmdi/componentregistry/impl/database/UserDao.java (modified) (1 diff)
• test/java/clarin/cmdi/componentregistry/impl/database/UserDaoTest.java (modified) (4 diffs)

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/database/UserDao.java

@@ -20 +20 @@
     public List<User> getAllUsers() {
         return getList(SELECT_BASE);
+    }
+
+    public User getByPrincipalName(String principalName) {
+        return getFirstOrNull(SELECT_BASE + " WHERE principal_name = ?", principalName);
     }
 

ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/impl/database/UserDaoTest.java

@@ -6 +6 @@
 import org.junit.Test;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertEquals;
 import org.junit.Before;
@@ -41 +42 @@
     @Test
     public void testInsertUser() {
-        User testUser = new User();
-        testUser.setName("Aap");
-        testUser.setPrincipalName("aap@clarin.eu");
+        User testUser = createTestUser();
 
         assertEquals(0, userDao.getAllUsers().size());
@@ -52 +51 @@
         assertEquals(1, users.size());
 
-        assertEquals("Aap", users.get(0).getName());
-        assertEquals("aap@clarin.eu", users.get(0).getPrincipalName());
+        assertEquals(TEST_USER_NAME, users.get(0).getName());
+        assertEquals(TEST_USER_PRINCIPAL_NAME, users.get(0).getPrincipalName());
     }
 
@@ -60 +59 @@
         assertEquals(0, userDao.getAllUsers().size());
     }
+
+    @Test
+    public void testGetUserByPrincipalName(){
+        User testUser = createTestUser();
+        userDao.insertUser(testUser);
+
+        assertNotNull(userDao.getByPrincipalName(TEST_USER_PRINCIPAL_NAME));
+        assertNull(userDao.getByPrincipalName("NON-EXISTING PRINCIPAL NAME"));
+    }
+
+    private User createTestUser(){
+        User testUser = new User();
+        testUser.setName(TEST_USER_NAME);
+        testUser.setPrincipalName(TEST_USER_PRINCIPAL_NAME);
+        return testUser;
+    }
+
+    private final static String TEST_USER_NAME = "Aap";
+    private final static String TEST_USER_PRINCIPAL_NAME = "aap@clarin.eu";
 }