You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2004/09/10 16:29:23 UTC
svn commit: rev 43670 - in incubator/lenya/branches/BRANCH_1_2_X/src/test/org/apache/lenya/ac: file impl
Author: andreas
Date: Fri Sep 10 07:29:22 2004
New Revision: 43670
Modified:
incubator/lenya/branches/BRANCH_1_2_X/src/test/org/apache/lenya/ac/file/FileUserTest.java
incubator/lenya/branches/BRANCH_1_2_X/src/test/org/apache/lenya/ac/impl/LDAPUserTest.java
incubator/lenya/branches/BRANCH_1_2_X/src/test/org/apache/lenya/ac/impl/UserManagerTest.java
Log:
fixed test cases
Modified: incubator/lenya/branches/BRANCH_1_2_X/src/test/org/apache/lenya/ac/file/FileUserTest.java
==============================================================================
--- incubator/lenya/branches/BRANCH_1_2_X/src/test/org/apache/lenya/ac/file/FileUserTest.java (original)
+++ incubator/lenya/branches/BRANCH_1_2_X/src/test/org/apache/lenya/ac/file/FileUserTest.java Fri Sep 10 07:29:22 2004
@@ -15,7 +15,7 @@
*
*/
-/* $Id: FileUserTest.java,v 1.3 2004/03/04 15:37:59 egli Exp $ */
+/* $Id$ */
package org.apache.lenya.ac.file;
@@ -27,9 +27,15 @@
import org.apache.lenya.ac.AccessControlException;
import org.apache.lenya.ac.Group;
import org.apache.lenya.ac.User;
+import org.apache.lenya.ac.UserType;
import org.apache.lenya.ac.impl.AccessControlTest;
import org.apache.lenya.cms.PublicationHelper;
+/**
+ * File user test.
+ *
+ * @version $Id:$
+ */
public class FileUserTest extends AccessControlTest {
private HashMap groups = new HashMap();
@@ -100,7 +106,9 @@
editorGroup.save();
adminGroup.save();
user.save();
- FileUserManager manager = FileUserManager.instance(configDir);
+
+ UserType[] userTypes = { FileAccreditableManager.getDefaultUserType() };
+ FileUserManager manager = FileUserManager.instance(configDir, userTypes);
manager.add(user);
return user;
@@ -117,7 +125,8 @@
*/
final public FileUser loadUser(String userName) throws AccessControlException {
File configDir = getAccreditablesDirectory();
- FileUserManager manager = FileUserManager.instance(configDir);
+ UserType[] userTypes = { FileAccreditableManager.getDefaultUserType() };
+ FileUserManager manager = FileUserManager.instance(configDir, userTypes);
return (FileUser) manager.getUser(userName);
}
@@ -199,8 +208,8 @@
String id = "albert";
FileUser user = createAndSaveUser(id, "Albert Einstein", "albert@physics.org", "secret");
File configDir = getAccreditablesDirectory();
- FileUserManager manager = null;
- manager = FileUserManager.instance(configDir);
+ UserType[] userTypes = { FileAccreditableManager.getDefaultUserType() };
+ FileUserManager manager = FileUserManager.instance(configDir, userTypes);
assertNotNull(manager);
assertNotNull(manager.getUser(id));
@@ -220,8 +229,8 @@
assertTrue(user.authenticate(password));
File configDir = getAccreditablesDirectory();
- FileUserManager manager = null;
- manager = FileUserManager.instance(configDir);
+ UserType[] userTypes = { FileAccreditableManager.getDefaultUserType() };
+ FileUserManager manager = FileUserManager.instance(configDir, userTypes);
assertNotNull(manager);
User lenya = manager.getUser("lenya");
Modified: incubator/lenya/branches/BRANCH_1_2_X/src/test/org/apache/lenya/ac/impl/LDAPUserTest.java
==============================================================================
--- incubator/lenya/branches/BRANCH_1_2_X/src/test/org/apache/lenya/ac/impl/LDAPUserTest.java (original)
+++ incubator/lenya/branches/BRANCH_1_2_X/src/test/org/apache/lenya/ac/impl/LDAPUserTest.java Fri Sep 10 07:29:22 2004
@@ -15,8 +15,6 @@
*
*/
-/* $Id: LDAPUserTest.java,v 1.3 2004/03/04 15:40:19 egli Exp $ */
-
package org.apache.lenya.ac.impl;
import java.io.File;
@@ -24,6 +22,8 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.lenya.ac.AccessControlException;
import org.apache.lenya.ac.User;
+import org.apache.lenya.ac.UserType;
+import org.apache.lenya.ac.file.FileAccreditableManager;
import org.apache.lenya.ac.file.FileGroup;
import org.apache.lenya.ac.file.FileRole;
import org.apache.lenya.ac.file.FileUserManager;
@@ -33,6 +33,11 @@
import org.apache.lenya.cms.publication.PublicationException;
import org.apache.lenya.cms.publication.PublicationFactory;
+/**
+ * LDAP user test.
+ *
+ * @version $Id:$
+ */
public class LDAPUserTest extends AccessControlTest {
/**
* Constructor for LDAPUserTest.
@@ -52,14 +57,14 @@
}
/**
- * @see TestCase#setUp()
+ * @see junit.framework.TestCase#setUp()
*/
protected void setUp() throws Exception {
super.setUp();
}
/**
- * @see TestCase#tearDown()
+ * @see junit.framework.TestCase#tearDown()
*/
public void tearDown() throws Exception {
super.tearDown();
@@ -140,7 +145,8 @@
*/
final public LDAPUser loadUser(String userName)
throws AccessControlException {
- FileUserManager manager = FileUserManager.instance(getAccreditablesDirectory());
+ UserType[] userTypes = { FileAccreditableManager.getDefaultUserType() };
+ FileUserManager manager = FileUserManager.instance(getAccreditablesDirectory(), userTypes);
return (LDAPUser)manager.getUser(userName);
}
Modified: incubator/lenya/branches/BRANCH_1_2_X/src/test/org/apache/lenya/ac/impl/UserManagerTest.java
==============================================================================
--- incubator/lenya/branches/BRANCH_1_2_X/src/test/org/apache/lenya/ac/impl/UserManagerTest.java (original)
+++ incubator/lenya/branches/BRANCH_1_2_X/src/test/org/apache/lenya/ac/impl/UserManagerTest.java Fri Sep 10 07:29:22 2004
@@ -15,8 +15,6 @@
*
*/
-/* $Id: UserManagerTest.java,v 1.3 2004/03/04 15:40:19 egli Exp $ */
-
package org.apache.lenya.ac.impl;
import java.io.File;
@@ -24,6 +22,8 @@
import org.apache.lenya.ac.AccessControlException;
import org.apache.lenya.ac.Group;
import org.apache.lenya.ac.User;
+import org.apache.lenya.ac.UserType;
+import org.apache.lenya.ac.file.FileAccreditableManager;
import org.apache.lenya.ac.file.FileGroup;
import org.apache.lenya.ac.file.FileGroupManager;
import org.apache.lenya.ac.file.FileRole;
@@ -31,6 +31,11 @@
import org.apache.lenya.ac.file.FileUserManager;
import org.apache.lenya.cms.PublicationHelper;
+/**
+ * User manager test.
+ *
+ * @version $Id:$
+ */
public class UserManagerTest extends AccessControlTest {
/**
@@ -66,7 +71,8 @@
*/
final public void testInstance() throws AccessControlException {
File configDir = getAccreditablesDirectory();
- FileUserManager manager = FileUserManager.instance(configDir);
+ UserType[] userTypes = { FileAccreditableManager.getDefaultUserType() };
+ FileUserManager manager = FileUserManager.instance(configDir, userTypes);
assertNotNull(manager);
}
@@ -107,9 +113,9 @@
adminGroup.add(user);
user.save();
- FileUserManager userManager = null;
FileGroupManager groupManager = null;
- userManager = FileUserManager.instance(configDir);
+ UserType[] userTypes = { FileAccreditableManager.getDefaultUserType() };
+ FileUserManager userManager = FileUserManager.instance(configDir, userTypes);
assertNotNull(userManager);
groupManager = FileGroupManager.instance(configDir);
@@ -129,7 +135,6 @@
*/
final public void testGetUser() throws AccessControlException {
File configDir = getAccreditablesDirectory();
- FileUserManager manager = null;
String userName = "testuser";
FileUser user =
new FileUser(
@@ -138,7 +143,8 @@
"Alice in Wonderland",
"alice@wonderland.com",
"secret");
- manager = FileUserManager.instance(configDir);
+ UserType[] userTypes = { FileAccreditableManager.getDefaultUserType() };
+ FileUserManager manager = FileUserManager.instance(configDir, userTypes);
assertNotNull(manager);
manager.add(user);
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org