From 24e1c7cfd88d69d9d873b5717c99e20ac1c0aeef Mon Sep 17 00:00:00 2001 From: j2blake Date: Tue, 20 Dec 2011 21:54:09 +0000 Subject: [PATCH] NIHVIVO-3523 Set up an empty PermissionRegistry for the unit test. --- .../vitro/webapp/controller/edit/AuthenticateTest.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/edit/AuthenticateTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/edit/AuthenticateTest.java index 7f64b7b14..b9518c3e2 100644 --- a/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/edit/AuthenticateTest.java +++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/edit/AuthenticateTest.java @@ -37,6 +37,8 @@ import edu.cornell.mannlib.vedit.beans.LoginStatusBean.AuthenticationSource; import edu.cornell.mannlib.vitro.testing.AbstractTestClass; import edu.cornell.mannlib.vitro.webapp.auth.identifier.ActiveIdentifierBundleFactories; import edu.cornell.mannlib.vitro.webapp.auth.identifier.common.CommonIdentifierBundleFactory; +import edu.cornell.mannlib.vitro.webapp.auth.permissions.Permission; +import edu.cornell.mannlib.vitro.webapp.auth.permissions.PermissionRegistry; import edu.cornell.mannlib.vitro.webapp.beans.UserAccount; import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties; import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator; @@ -130,7 +132,7 @@ public class AuthenticateTest extends AbstractTestClass { userAccountsDao.addUser(createUserFromUserInfo(OLD_STRANGER)); individualDao = new IndividualDaoStub(); - + webappDaoFactory = new WebappDaoFactoryStub(); webappDaoFactory.setUserAccountsDao(userAccountsDao); webappDaoFactory.setIndividualDao(individualDao); @@ -151,12 +153,15 @@ public class AuthenticateTest extends AbstractTestClass { response = new HttpServletResponseStub(); + PermissionRegistry.createRegistry(servletContext, + Collections. emptySet()); + auth = new Authenticate(); auth.init(servletConfig); setLoggerLevel(ConfigurationProperties.class, Level.WARN); new ConfigurationPropertiesStub().setBean(servletContext); - + ActiveIdentifierBundleFactories.addFactory(servletContext, new CommonIdentifierBundleFactory(servletContext)); }