You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by eg...@apache.org on 2003/06/03 18:41:04 UTC
cvs commit: cocoon-lenya/src/test/org/apache/lenya/cms/ac UserManagerTest.java GroupManagerTest.java
egli 2003/06/03 09:41:04
Modified: src/test/org/apache/lenya/cms/ac UserManagerTest.java
GroupManagerTest.java
Log:
* Factor out the fetching of the publication
* Add more testcases (e.g. for loading)
Revision Changes Path
1.3 +78 -5 cocoon-lenya/src/test/org/apache/lenya/cms/ac/UserManagerTest.java
Index: UserManagerTest.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/test/org/apache/lenya/cms/ac/UserManagerTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UserManagerTest.java 2 Jun 2003 17:35:45 -0000 1.2
+++ UserManagerTest.java 3 Jun 2003 16:41:04 -0000 1.3
@@ -87,8 +87,15 @@
super.tearDown();
}
+ final public Publication getPublication() {
+ String publicationId = "default";
+ String servletContextPath = "/home/egli/build/jakarta-tomcat-4.1.21-LE-jdk14/webapps/lenya/";
+ return PublicationFactory.getPublication(publicationId, servletContextPath);
+ }
+
final public void testInstance() {
- Publication publication = PublicationFactory.getPublication("default", "/home/egli/build/jakarta-tomcat-4.1.21-LE-jdk14/webapps/lenya/");
+
+ Publication publication = getPublication();
UserManager manager = null;
try {
manager = (UserManager)UserManager.instance(publication);
@@ -96,8 +103,63 @@
assertNotNull(manager);
}
- final public void testGetUsers() {
- //TODO Implement getUsers().
+ final public void testLoadConfig() {
+ Publication publication = getPublication();
+ String userName = "alice";
+ String editorGroupName = "editorGroup";
+ String adminGroupName = "adminGroup";
+ String editorRoleName = "editorRole";
+ String adminRoleName = "adminRole";
+
+ FileRole editorRole = new FileRole(publication, editorRoleName);
+ FileRole adminRole = new FileRole(publication, adminRoleName);
+
+ User user = new FileUser(publication, userName);
+
+ try {
+ editorRole.save();
+ adminRole.save();
+ } catch (AccessControlException e5) {
+ e5.printStackTrace();
+ }
+ FileGroup editorGroup = new FileGroup(publication, editorGroupName);
+ editorGroup.addRole(editorRole);
+ user.addGroup(editorGroup);
+ FileGroup adminGroup = new FileGroup(publication, adminGroupName);
+ adminGroup.addRole(editorRole);
+ adminGroup.addRole(adminRole);
+ try {
+ editorGroup.save();
+ adminGroup.save();
+ } catch (AccessControlException e2) {
+ e2.printStackTrace();
+ }
+ user.addGroup(adminGroup);
+ try {
+ user.save();
+ } catch (AccessControlException e3) {
+ e3.printStackTrace();
+ }
+
+ UserManager userManager = null;
+ GroupManager groupManager = null;
+ try {
+ userManager = UserManager.instance(publication);
+ } catch (AccessControlException e) {}
+ assertNotNull(userManager);
+
+ try {
+ groupManager = GroupManager.instance(publication);
+ } catch (AccessControlException e4) {
+ e4.printStackTrace();
+ }
+ assertNotNull(groupManager);
+
+ Group fetchedGroup = groupManager.getGroup(editorGroupName);
+ assertTrue(editorGroup.equals(fetchedGroup));
+
+ fetchedGroup = groupManager.getGroup(adminGroupName);
+ assertTrue(adminGroup.equals(fetchedGroup));
}
final public void testAdd() {
@@ -109,7 +171,18 @@
}
final public void testGetUser() {
- //TODO Implement getUser().
+ Publication publication = getPublication();
+ UserManager manager = null;
+ String userName = "test-user";
+ FileUser user = new FileUser(publication, userName);
+ try {
+ manager = (UserManager)UserManager.instance(publication);
+ } catch (AccessControlException e) {}
+ assertNotNull(manager);
+ manager.add(user);
+
+ User otherUser = manager.getUser(userName);
+ assertEquals(user, otherUser);
}
}
1.2 +7 -2 cocoon-lenya/src/test/org/apache/lenya/cms/ac/GroupManagerTest.java
Index: GroupManagerTest.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/test/org/apache/lenya/cms/ac/GroupManagerTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GroupManagerTest.java 3 Jun 2003 13:52:12 -0000 1.1
+++ GroupManagerTest.java 3 Jun 2003 16:41:04 -0000 1.2
@@ -73,10 +73,15 @@
junit.textui.TestRunner.run(GroupManagerTest.class);
}
- final public void testInstance() {
+ public final Publication getPublication() {
String publicationId = "default";
String servletContext = "/home/egli/build/jakarta-tomcat-4.1.21-LE-jdk14/webapps/lenya/";
Publication pub = PublicationFactory.getPublication(publicationId, servletContext);
+ return pub;
+ }
+
+ public final void testInstance() {
+ Publication pub = getPublication();
GroupManager manager = null;
try {
manager = GroupManager.instance(pub);
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org