Return-Path: Delivered-To: apmail-incubator-roller-commits-archive@www.apache.org Received: (qmail 94112 invoked from network); 1 Jun 2006 19:48:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 1 Jun 2006 19:48:42 -0000 Received: (qmail 4199 invoked by uid 500); 1 Jun 2006 19:48:42 -0000 Delivered-To: apmail-incubator-roller-commits-archive@incubator.apache.org Received: (qmail 4136 invoked by uid 500); 1 Jun 2006 19:48:40 -0000 Mailing-List: contact roller-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: roller-dev@incubator.apache.org Delivered-To: mailing list roller-commits@incubator.apache.org Received: (qmail 4121 invoked by uid 99); 1 Jun 2006 19:48:40 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jun 2006 12:48:40 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jun 2006 12:48:12 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 4242B1A983A; Thu, 1 Jun 2006 12:47:52 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: roller-commits@incubator.apache.org From: snoopdave@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060601194752.4242B1A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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"));