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 we...@apache.org on 2003/10/18 22:48:27 UTC
cvs commit: jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/services/page TestPageXmlPersistence.java
weaver 2003/10/18 13:48:27
Modified: portal/src/test/org/apache/jetspeed/services/persistence
TestPersistenceService.java
portal/src/test/org/apache/jetspeed/tools/pamanager
TestPortletDescriptor.java
portal/src/test/org/apache/jetspeed/services/page
TestPageXmlPersistence.java
Log:
All fulcrum, ServiceUtil AND JetpseedServices references removed and
replaces with CPS.
Revision Changes Path
1.8 +4 -3 jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/services/persistence/TestPersistenceService.java
Index: TestPersistenceService.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/services/persistence/TestPersistenceService.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TestPersistenceService.java 10 Oct 2003 05:12:11 -0000 1.7
+++ TestPersistenceService.java 18 Oct 2003 20:48:27 -0000 1.8
@@ -61,6 +61,7 @@
import junit.framework.TestSuite;
import org.apache.commons.configuration.Configuration;
+import org.apache.jetspeed.cps.CommonPortletServices;
import org.apache.jetspeed.om.common.MutableLanguage;
import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
@@ -73,7 +74,6 @@
import org.apache.jetspeed.persistence.PersistencePlugin;
import org.apache.jetspeed.persistence.PersistenceService;
import org.apache.jetspeed.test.JetspeedTest;
-import org.apache.jetspeed.util.ServiceUtil;
import org.apache.pluto.om.common.Language;
import org.apache.pluto.om.portlet.PortletDefinition;
import org.apache.pluto.om.servlet.WebApplicationDefinition;
@@ -280,7 +280,8 @@
{
if (service == null)
{
- service = (PersistenceService) ServiceUtil.getServiceByName(PersistenceService.SERVICE_NAME);
+ // service = (PersistenceService) ServiceUtil.getServiceByName(PersistenceService.SERVICE_NAME);
+ service = (PersistenceService) CommonPortletServices.getPortalService(PersistenceService.SERVICE_NAME);
}
return service;
}
1.7 +3 -3 jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/tools/pamanager/TestPortletDescriptor.java
Index: TestPortletDescriptor.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/tools/pamanager/TestPortletDescriptor.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TestPortletDescriptor.java 17 Oct 2003 20:20:11 -0000 1.6
+++ TestPortletDescriptor.java 18 Oct 2003 20:48:27 -0000 1.7
@@ -63,6 +63,7 @@
import org.apache.commons.configuration.Configuration;
import org.apache.jetspeed.Jetspeed;
+import org.apache.jetspeed.cps.CommonPortletServices;
import org.apache.jetspeed.om.common.MutableLanguage;
import org.apache.jetspeed.om.common.ParameterComposite;
import org.apache.jetspeed.om.common.portlet.ContentTypeComposite;
@@ -73,7 +74,6 @@
import org.apache.jetspeed.persistence.PersistenceService;
import org.apache.jetspeed.services.registry.JetspeedPortletRegistry;
import org.apache.jetspeed.test.JetspeedTest;
-import org.apache.jetspeed.util.ServiceUtil;
import org.apache.pluto.om.common.DisplayName;
import org.apache.pluto.om.common.LanguageSet;
import org.apache.pluto.om.common.ParameterSet;
@@ -313,7 +313,7 @@
app.setName("HW_App");
JetspeedPortletRegistry.registerPortletApplication(app);
- PersistenceService ps = (PersistenceService) ServiceUtil.getServiceByName(PersistenceService.SERVICE_NAME);
+ PersistenceService ps = (PersistenceService) CommonPortletServices.getPortalService(PersistenceService.SERVICE_NAME);
PersistencePlugin plugin = ps.getDefaultPersistencePlugin();
plugin.clearCache();
1.3 +26 -26 jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/services/page/TestPageXmlPersistence.java
Index: TestPageXmlPersistence.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/services/page/TestPageXmlPersistence.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestPageXmlPersistence.java 15 Aug 2003 00:27:54 -0000 1.2
+++ TestPageXmlPersistence.java 18 Oct 2003 20:48:27 -0000 1.3
@@ -59,11 +59,12 @@
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.apache.jetspeed.cps.CommonPortletServices;
import org.apache.jetspeed.om.page.Fragment;
import org.apache.jetspeed.om.page.Page;
import org.apache.jetspeed.om.page.Property;
import org.apache.jetspeed.test.JetspeedTest;
-import org.apache.jetspeed.util.ServiceUtil;
+
/**
* TestPageXmlPersistence
*
@@ -80,9 +81,9 @@
*
* @param name the testcase's name.
*/
- public TestPageXmlPersistence( String name )
+ public TestPageXmlPersistence(String name)
{
- super( name );
+ super(name);
}
/**
@@ -92,7 +93,7 @@
*/
public static void main(String args[])
{
- junit.awtui.TestRunner.main( new String[] { TestPageXmlPersistence.class.getName() } );
+ junit.awtui.TestRunner.main(new String[] { TestPageXmlPersistence.class.getName()});
}
public void setup()
@@ -109,15 +110,14 @@
public static Test suite()
{
// All methods starting with "test" will be executed in the test suite.
- return new TestSuite( TestPageXmlPersistence.class );
+ return new TestSuite(TestPageXmlPersistence.class);
}
-
protected PageManagerService getService()
{
if (service == null)
{
- service = (PageManagerService) ServiceUtil.getServiceByName("XML"+PageManagerService.SERVICE_NAME);
+ service = (PageManagerService) CommonPortletServices.getPortalService("XML" + PageManagerService.SERVICE_NAME);
}
return service;
}
@@ -173,33 +173,33 @@
List children = root.getFragments();
assertNotNull(children);
- assertTrue(children.size()==3);
+ assertTrue(children.size() == 3);
- Fragment f = (Fragment)children.get(0);
+ Fragment f = (Fragment) children.get(0);
assertTrue(f.getId().equals("pe001"));
assertTrue(f.getName().equals("HelloPortlet"));
assertTrue(f.getType().equals(Fragment.PORTLET));
List properties = f.getProperties(root.getName());
assertNotNull(properties);
- assertTrue(properties.size()==2);
- assertTrue(((Property)properties.get(0)).getName().equals("row"));
- assertTrue(((Property)properties.get(0)).getValue().equals("0"));
- assertTrue(((Property)properties.get(1)).getName().equals("column"));
- assertTrue(((Property)properties.get(1)).getValue().equals("0"));
+ assertTrue(properties.size() == 2);
+ assertTrue(((Property) properties.get(0)).getName().equals("row"));
+ assertTrue(((Property) properties.get(0)).getValue().equals("0"));
+ assertTrue(((Property) properties.get(1)).getName().equals("column"));
+ assertTrue(((Property) properties.get(1)).getValue().equals("0"));
- f = (Fragment)children.get(1);
+ f = (Fragment) children.get(1);
assertTrue(f.getId().equals("pe002"));
assertTrue(f.getName().equals("JMXPortlet"));
assertTrue(f.getType().equals(Fragment.PORTLET));
properties = f.getProperties(root.getName());
assertNotNull(properties);
- assertTrue(properties.size()==2);
- assertTrue(((Property)properties.get(0)).getName().equals("row"));
- assertTrue(((Property)properties.get(0)).getValue().equals("0"));
- assertTrue(((Property)properties.get(1)).getName().equals("column"));
- assertTrue(((Property)properties.get(1)).getValue().equals("1"));
+ assertTrue(properties.size() == 2);
+ assertTrue(((Property) properties.get(0)).getName().equals("row"));
+ assertTrue(((Property) properties.get(0)).getValue().equals("0"));
+ assertTrue(((Property) properties.get(1)).getName().equals("column"));
+ assertTrue(((Property) properties.get(1)).getValue().equals("1"));
f = testpage.getFragmentById("f002");
assertNotNull(f);
@@ -208,7 +208,7 @@
assertTrue(f.getType().equals(Fragment.LAYOUT));
assertTrue(f.getDecorator().equals("Tab"));
assertNotNull(f.getFragments());
- assertTrue(f.getFragments().size()==2);
+ assertTrue(f.getFragments().size() == 2);
}
public void testRegisterPage() throws Exception
@@ -255,11 +255,11 @@
assertTrue(page.getTitle().equals("Registered Page"));
assertNotNull(page.getRootFragment());
assertTrue(page.getRootFragment().getName().equals("TestLayout"));
- assertTrue(page.getRootFragment().getFragments().size()==1);
+ assertTrue(page.getRootFragment().getFragments().size() == 1);
- f = (Fragment)page.getRootFragment().getFragments().get(0);
+ f = (Fragment) page.getRootFragment().getFragments().get(0);
assertNotNull(f.getProperties("TestLayout"));
- assertTrue(((Property)f.getProperties("TestLayout").get(0)).getValue().equals("0"));
+ assertTrue(((Property) f.getProperties("TestLayout").get(0)).getValue().equals("0"));
}
public void testUpdatePage() throws Exception
@@ -288,7 +288,7 @@
{
PageManagerService pms = getService();
List pages = pms.listPages();
- assertTrue(pages.size()==2);
+ assertTrue(pages.size() == 2);
assertTrue(pages.contains(this.test_id));
assertTrue(pages.contains("test001"));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org