You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by dl...@apache.org on 2005/08/13 19:14:51 UTC
svn commit: r232508 -
/portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/userinfo/TestUserInfoManager.java
Author: dlestrat
Date: Sat Aug 13 10:14:48 2005
New Revision: 232508
URL: http://svn.apache.org/viewcvs?rev=232508&view=rev
Log:
Fixing broken test.
Modified:
portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/userinfo/TestUserInfoManager.java
Modified: portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/userinfo/TestUserInfoManager.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/userinfo/TestUserInfoManager.java?rev=232508&r1=232507&r2=232508&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/userinfo/TestUserInfoManager.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/userinfo/TestUserInfoManager.java Sat Aug 13 10:14:48 2005
@@ -105,8 +105,8 @@
private void innerTestSetUserInfoMap(UserInfoManager uim) throws Exception
{
- PortletApplicationDescriptor pad = new PortletApplicationDescriptor(new FileReader(
- buildProperties.getUserProperty("org.apache.jetspeed.project.home")
+ PortletApplicationDescriptor pad = new PortletApplicationDescriptor(new FileReader(buildProperties
+ .getUserProperty("org.apache.jetspeed.portal.home")
+ "/components/portal/test/testdata/deploy/portlet.xml"), "unit-test");
portletApp = pad.createPortletApplication();
assertNotNull("App is null", portletApp);
@@ -141,12 +141,11 @@
assertNull("should not contain user.home-info.online.email", userInfo.get("user.home-info.online.email"));
// With linked attributes
- ExtendedPortletMetadata extMetaData = new ExtendedPortletMetadata(new FileReader(
- buildProperties.getUserProperty("org.apache.jetspeed.project.home")
- + "/components/portal/test/testdata/deploy/jetspeed-portlet.xml"),
- portletApp);
+ ExtendedPortletMetadata extMetaData = new ExtendedPortletMetadata(new FileReader(buildProperties
+ .getUserProperty("org.apache.jetspeed.portal.home")
+ + "/components/portal/test/testdata/deploy/jetspeed-portlet.xml"), portletApp);
extMetaData.load();
-
+
// persist the app
try
{
@@ -257,15 +256,18 @@
private void cleanUp() throws Exception
{
// remove the app
- try
- {
- portletRegistry.removeApplication(portletApp);
- }
- catch (Exception e)
+ if (null != portletApp)
{
- String msg = "Unable to remove portlet application, " + portletApp.getName()
- + ", through the portlet portletRegistry: " + e.toString();
- throw new Exception(msg, e);
+ try
+ {
+ portletRegistry.removeApplication(portletApp);
+ }
+ catch (Exception e)
+ {
+ String msg = "Unable to remove portlet application, " + portletApp.getName()
+ + ", through the portlet portletRegistry: " + e.toString();
+ throw new Exception(msg, e);
+ }
}
destroyUser();
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org