You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by gr...@apache.org on 2005/02/18 04:11:51 UTC
svn commit: r154229 - in lenya/trunk/src/test/org/apache/lenya:
ac/file/FileRoleTest.java ac/file/FileUserTest.java
ac/impl/GroupManagerTest.java ac/impl/LDAPUserTest.java
ac/impl/RoleManagerTest.java ac/impl/UserManagerTest.java
cms/workflow/WorkflowTest.java
Author: gregor
Date: Thu Feb 17 19:11:48 2005
New Revision: 154229
URL: http://svn.apache.org/viewcvs?view=rev&rev=154229
Log:
Fixed compilation errors for the unit tests
Modified:
lenya/trunk/src/test/org/apache/lenya/ac/file/FileRoleTest.java
lenya/trunk/src/test/org/apache/lenya/ac/file/FileUserTest.java
lenya/trunk/src/test/org/apache/lenya/ac/impl/GroupManagerTest.java
lenya/trunk/src/test/org/apache/lenya/ac/impl/LDAPUserTest.java
lenya/trunk/src/test/org/apache/lenya/ac/impl/RoleManagerTest.java
lenya/trunk/src/test/org/apache/lenya/ac/impl/UserManagerTest.java
lenya/trunk/src/test/org/apache/lenya/cms/workflow/WorkflowTest.java
Modified: lenya/trunk/src/test/org/apache/lenya/ac/file/FileRoleTest.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/test/org/apache/lenya/ac/file/FileRoleTest.java?view=diff&r1=154228&r2=154229
==============================================================================
--- lenya/trunk/src/test/org/apache/lenya/ac/file/FileRoleTest.java (original)
+++ lenya/trunk/src/test/org/apache/lenya/ac/file/FileRoleTest.java Thu Feb 17 19:11:48 2005
@@ -24,7 +24,7 @@
/**
* File role test.
*
- * @version $Id:$
+ * @version $Id$
*/
public class FileRoleTest extends AccessControlTest {
/**
@@ -57,7 +57,7 @@
role.save();
File path = null;
- path = FileRoleManager.instance(configDir, getLogEnabledLogger())
+ path = FileRoleManager.instance(configDir, getLogger())
.getConfigurationDirectory();
File roleFile = new File(path, name + FileRoleManager.SUFFIX);
@@ -77,7 +77,7 @@
role.save();
File path = null;
- path = FileRoleManager.instance(configDir, getLogEnabledLogger())
+ path = FileRoleManager.instance(configDir, getLogger())
.getConfigurationDirectory();
File roleFile = new File(path, name + FileRoleManager.SUFFIX);
Modified: lenya/trunk/src/test/org/apache/lenya/ac/file/FileUserTest.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/test/org/apache/lenya/ac/file/FileUserTest.java?view=diff&r1=154228&r2=154229
==============================================================================
--- lenya/trunk/src/test/org/apache/lenya/ac/file/FileUserTest.java (original)
+++ lenya/trunk/src/test/org/apache/lenya/ac/file/FileUserTest.java Thu Feb 17 19:11:48 2005
@@ -61,7 +61,7 @@
* (non-Javadoc)
* @see junit.framework.TestCase#setUp()
*/
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
}
@@ -121,7 +121,7 @@
protected FileUserManager getUserManager() throws AccessControlException {
UserType[] userTypes = { FileAccreditableManager.getDefaultUserType() };
FileUserManager _manager = FileUserManager.instance(getAccreditablesDirectory(), userTypes,
- getLogEnabledLogger());
+ getLogger());
return _manager;
}
Modified: lenya/trunk/src/test/org/apache/lenya/ac/impl/GroupManagerTest.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/test/org/apache/lenya/ac/impl/GroupManagerTest.java?view=diff&r1=154228&r2=154229
==============================================================================
--- lenya/trunk/src/test/org/apache/lenya/ac/impl/GroupManagerTest.java (original)
+++ lenya/trunk/src/test/org/apache/lenya/ac/impl/GroupManagerTest.java Thu Feb 17 19:11:48 2005
@@ -55,11 +55,11 @@
public final void testInstance() throws AccessControlException {
FileGroupManager _manager = null;
File configDir = getAccreditablesDirectory();
- _manager = FileGroupManager.instance(configDir, getLogEnabledLogger());
+ _manager = FileGroupManager.instance(configDir, getLogger());
assertNotNull(_manager);
FileGroupManager anotherManager = null;
- anotherManager = FileGroupManager.instance(configDir, getLogEnabledLogger());
+ anotherManager = FileGroupManager.instance(configDir, getLogger());
assertNotNull(anotherManager);
assertEquals(_manager, anotherManager);
}
Modified: lenya/trunk/src/test/org/apache/lenya/ac/impl/LDAPUserTest.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/test/org/apache/lenya/ac/impl/LDAPUserTest.java?view=diff&r1=154228&r2=154229
==============================================================================
--- lenya/trunk/src/test/org/apache/lenya/ac/impl/LDAPUserTest.java (original)
+++ lenya/trunk/src/test/org/apache/lenya/ac/impl/LDAPUserTest.java Thu Feb 17 19:11:48 2005
@@ -59,7 +59,7 @@
/**
* @see junit.framework.TestCase#setUp()
*/
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
}
@@ -81,7 +81,7 @@
String publicationId = "default";
String servletContextPath = "/home/egli/build/jakarta-tomcat-4.1.21-LE-jdk14/webapps/lenya/";
- PublicationFactory factory = PublicationFactory.getInstance(getLogEnabledLogger());
+ PublicationFactory factory = PublicationFactory.getInstance(getLogger());
return factory.getPublication(publicationId, servletContextPath);
}
@@ -139,7 +139,7 @@
final public LDAPUser loadUser(String userName) throws AccessControlException {
UserType[] userTypes = { FileAccreditableManager.getDefaultUserType() };
FileUserManager _manager = FileUserManager.instance(getAccreditablesDirectory(), userTypes,
- getLogEnabledLogger());
+ getLogger());
return (LDAPUser) _manager.getUser(userName);
}
Modified: lenya/trunk/src/test/org/apache/lenya/ac/impl/RoleManagerTest.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/test/org/apache/lenya/ac/impl/RoleManagerTest.java?view=diff&r1=154228&r2=154229
==============================================================================
--- lenya/trunk/src/test/org/apache/lenya/ac/impl/RoleManagerTest.java (original)
+++ lenya/trunk/src/test/org/apache/lenya/ac/impl/RoleManagerTest.java Thu Feb 17 19:11:48 2005
@@ -52,10 +52,10 @@
*/
final public void testInstance() throws AccessControlException {
File configDir = getAccreditablesDirectory();
- FileRoleManager _manager = FileRoleManager.instance(configDir, getLogEnabledLogger());
+ FileRoleManager _manager = FileRoleManager.instance(configDir, getLogger());
assertNotNull(_manager);
- FileRoleManager anotherManager = FileRoleManager.instance(configDir, getLogEnabledLogger());
+ FileRoleManager anotherManager = FileRoleManager.instance(configDir, getLogger());
assertNotNull(anotherManager);
assertEquals(_manager, anotherManager);
}
@@ -75,7 +75,7 @@
File configDir = getAccreditablesDirectory();
String name = "test";
FileRoleManager _manager = null;
- _manager = FileRoleManager.instance(configDir, getLogEnabledLogger());
+ _manager = FileRoleManager.instance(configDir, getLogger());
assertNotNull(_manager);
Role role = new FileRole(_manager.getConfigurationDirectory(), name);
_manager.add(role);
@@ -94,7 +94,7 @@
FileRoleManager _manager = null;
try {
- _manager = FileRoleManager.instance(configDir, getLogEnabledLogger());
+ _manager = FileRoleManager.instance(configDir, getLogger());
} catch (AccessControlException e) {
e.printStackTrace();
}
Modified: lenya/trunk/src/test/org/apache/lenya/ac/impl/UserManagerTest.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/test/org/apache/lenya/ac/impl/UserManagerTest.java?view=diff&r1=154228&r2=154229
==============================================================================
--- lenya/trunk/src/test/org/apache/lenya/ac/impl/UserManagerTest.java (original)
+++ lenya/trunk/src/test/org/apache/lenya/ac/impl/UserManagerTest.java Thu Feb 17 19:11:48 2005
@@ -58,7 +58,7 @@
/**
* @see junit.framework.TestCase#setUp()
*/
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
}
@@ -70,7 +70,7 @@
File configDir = getAccreditablesDirectory();
UserType[] userTypes = { FileAccreditableManager.getDefaultUserType() };
FileUserManager _manager = FileUserManager.instance(configDir, userTypes,
- getLogEnabledLogger());
+ getLogger());
assertNotNull(_manager);
}
@@ -113,10 +113,10 @@
FileGroupManager groupManager = null;
UserType[] userTypes = { FileAccreditableManager.getDefaultUserType() };
FileUserManager userManager = FileUserManager.instance(configDir, userTypes,
- getLogEnabledLogger());
+ getLogger());
assertNotNull(userManager);
- groupManager = FileGroupManager.instance(configDir, getLogEnabledLogger());
+ groupManager = FileGroupManager.instance(configDir, getLogger());
assertNotNull(groupManager);
Group fetchedGroup = groupManager.getGroup(editorGroupId);
@@ -137,7 +137,7 @@
"alice@wonderland.com", "secret");
UserType[] userTypes = { FileAccreditableManager.getDefaultUserType() };
FileUserManager _manager = FileUserManager.instance(configDir, userTypes,
- getLogEnabledLogger());
+ getLogger());
assertNotNull(_manager);
_manager.add(user);
Modified: lenya/trunk/src/test/org/apache/lenya/cms/workflow/WorkflowTest.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/test/org/apache/lenya/cms/workflow/WorkflowTest.java?view=diff&r1=154228&r2=154229
==============================================================================
--- lenya/trunk/src/test/org/apache/lenya/cms/workflow/WorkflowTest.java (original)
+++ lenya/trunk/src/test/org/apache/lenya/cms/workflow/WorkflowTest.java Thu Feb 17 19:11:48 2005
@@ -89,7 +89,7 @@
WorkflowResolver resolver = null;
try {
- resolver = (WorkflowResolver) this.manager.lookup(WorkflowResolver.ROLE);
+ resolver = (WorkflowResolver) getManager().lookup(WorkflowResolver.ROLE);
String[] emptyRoles = {};
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org