roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r410926 - in /incubator/roller/branches/roller_3.0/tests/org/apache/roller/business: PermissionTest.java UserTest.java WeblogStatsTest.java
Date Thu, 01 Jun 2006 19:47:51 GMT
Author: snoopdave
Date: Thu Jun  1 12:47:51 2006
New Revision: 410926

URL: http://svn.apache.org/viewvc?rev=410926&view=rev
Log:
Ongoing Atlas frontpage dev: page models and query refinements

Modified:
    incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/PermissionTest.java
    incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/UserTest.java
    incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/WeblogStatsTest.java

Modified: incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/PermissionTest.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/PermissionTest.java?rev=410926&r1=410925&r2=410926&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/PermissionTest.java
(original)
+++ incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/PermissionTest.java
Thu Jun  1 12:47:51 2006
@@ -216,7 +216,7 @@
         TestUtils.endSession(true);
         
         // re-query now that we have changed things
-        user = mgr.getUserByUsername(user.getUserName());
+        user = mgr.getUserByUserName(user.getUserName());
         testWeblog = mgr.getWebsiteByHandle(testWeblog.getHandle());
         
         // assert that invitation list is empty
@@ -225,7 +225,7 @@
         
         // assert that user is member of weblog
         assertFalse(mgr.getPermissions(testWeblog, user).isPending());
-        List weblogs = mgr.getWebsites(user, null, null, 0, Integer.MAX_VALUE);
+        List weblogs = mgr.getWebsites(user, null, null, null, null, 0, Integer.MAX_VALUE);
         assertEquals(1, weblogs.size());
         assertEquals(testWeblog.getId(), ((WebsiteData)weblogs.get(0)).getId());
         
@@ -238,7 +238,7 @@
         TestUtils.endSession(true);
         
         user = mgr.getUser(user.getId());
-        weblogs = mgr.getWebsites(user, null, null, 0, -1);
+        weblogs = mgr.getWebsites(user, null, null, null, null, 0, -1);
         assertEquals(0, weblogs.size());
         
         // cleanup the extra test user

Modified: incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/UserTest.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/UserTest.java?rev=410926&r1=410925&r2=410926&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/UserTest.java (original)
+++ incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/UserTest.java Thu
Jun  1 12:47:51 2006
@@ -76,7 +76,7 @@
         testUser.setEnabled(Boolean.TRUE);
         
         // make sure test user does not exist
-        user = mgr.getUserByUsername(testUser.getUserName());
+        user = mgr.getUserByUserName(testUser.getUserName());
         assertNull(user);
         
         // add test user
@@ -125,7 +125,7 @@
         TestUtils.endSession(true);
         
         // lookup by username
-        user = mgr.getUserByUsername(testUser.getUserName());
+        user = mgr.getUserByUserName(testUser.getUserName());
         assertNotNull(user);
         assertEquals(testUser.getUserName(), user.getUserName());
         
@@ -156,7 +156,7 @@
         user.setEnabled(Boolean.FALSE);
         mgr.saveUser(user);
         user = null;
-        user = mgr.getUserByUsername(testUser.getUserName());
+        user = mgr.getUserByUserName(testUser.getUserName());
         assertNull(user);
         
         // remove test user
@@ -178,7 +178,7 @@
         TestUtils.endSession(true);
         
         // verify user has 2 roles, admin & editor
-        user = mgr.getUserByUsername(testUser.getUserName());
+        user = mgr.getUserByUserName(testUser.getUserName());
         assertNotNull(user);
         assertEquals(2, user.getRoles().size());
         assertTrue(user.hasRole("editor"));
@@ -191,7 +191,7 @@
         
         // check that role was removed
         user = null;
-        user = mgr.getUserByUsername(testUser.getUserName());
+        user = mgr.getUserByUserName(testUser.getUserName());
         assertNotNull(user);
         assertEquals(1, user.getRoles().size());
         assertTrue(user.hasRole("editor"));
@@ -204,7 +204,7 @@
         
         // check that role was added
         user = null;
-        user = mgr.getUserByUsername(testUser.getUserName());
+        user = mgr.getUserByUserName(testUser.getUserName());
         assertNotNull(user);
         assertEquals(2, user.getRoles().size());
         assertTrue(user.hasRole("editor"));

Modified: incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/WeblogStatsTest.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/WeblogStatsTest.java?rev=410926&r1=410925&r2=410926&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/WeblogStatsTest.java
(original)
+++ incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/WeblogStatsTest.java
Thu Jun  1 12:47:51 2006
@@ -82,9 +82,9 @@
         StatCount s2 = (StatCount)list.get(1);
         assertEquals(1L, s2.getCount());   
     }
-    public void testGetUsernameLetterMap() throws Exception {        
+    public void testGetUserNameLetterMap() throws Exception {        
         UserManager mgr = RollerFactory.getRoller().getUserManager();      
-        Map map = mgr.getUsernameLetterMap();    
+        Map map = mgr.getUserNameLetterMap();    
         assertNotNull(map.get("a"));
         assertNotNull(map.get("b"));
         assertNull(map.get("c"));



Mime
View raw message