[jboss-svn-commits] JBoss Portal SVN: r5592 - in trunk/theme/src: main/org/jboss/portal/test/theme main/org/jboss/portal/test/theme/metadata main/org/jboss/portal/test/theme/render resources/test/xml
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Nov 7 11:30:47 EST 2006
Author: roy.russo at jboss.com
Date: 2006-11-07 11:30:42 -0500 (Tue, 07 Nov 2006)
New Revision: 5592
Modified:
trunk/theme/src/main/org/jboss/portal/test/theme/TestHelper.java
trunk/theme/src/main/org/jboss/portal/test/theme/TestLayoutServiceImpl.java
trunk/theme/src/main/org/jboss/portal/test/theme/metadata/TestLayoutStrategySetMetaData.java
trunk/theme/src/main/org/jboss/portal/test/theme/metadata/TestPortalLayoutMetaData.java
trunk/theme/src/main/org/jboss/portal/test/theme/metadata/TestPortalThemeMetaData.java
trunk/theme/src/main/org/jboss/portal/test/theme/metadata/TestRenderSetMetaData.java
trunk/theme/src/main/org/jboss/portal/test/theme/render/TestRenderContext.java
trunk/theme/src/resources/test/xml/portal-layouts.xml
trunk/theme/src/resources/test/xml/portal-themes.xml
Log:
JBPORTAL-1099 - theme tests, still broken.
Modified: trunk/theme/src/main/org/jboss/portal/test/theme/TestHelper.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/test/theme/TestHelper.java 2006-11-07 12:45:39 UTC (rev 5591)
+++ trunk/theme/src/main/org/jboss/portal/test/theme/TestHelper.java 2006-11-07 16:30:42 UTC (rev 5592)
@@ -58,6 +58,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.bind.Unmarshaller;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
@@ -152,7 +153,7 @@
return renderSets;
}
- private static Reader createRenderSetDescriptor()
+ private static String createRenderSetDescriptor()
throws IOException, SAXException, ParserConfigurationException
{
StringBuffer testString = new StringBuffer();
@@ -177,7 +178,8 @@
testString.append("</portal-renderSet>");
- return new StringReader(testString.toString());
+ return testString.toString();
+ //return new StringReader(testString.toString());
}
public static PortalLayoutMetaData createLayoutMD() throws Exception
Modified: trunk/theme/src/main/org/jboss/portal/test/theme/TestLayoutServiceImpl.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/test/theme/TestLayoutServiceImpl.java 2006-11-07 12:45:39 UTC (rev 5591)
+++ trunk/theme/src/main/org/jboss/portal/test/theme/TestLayoutServiceImpl.java 2006-11-07 16:30:42 UTC (rev 5592)
@@ -75,6 +75,7 @@
runtimeContext = TestHelper.createRuntimeContext();
LoaderResource res = new CLLoader().getResource("xml/portal-layouts.xml");
+ assertNotNull("Layout xml could not be loaded", res);
Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
portalLayouts = (List)unmarshaller.unmarshal(res.asInputStream(), new PortalLayoutMetaDataFactory(), null);
Modified: trunk/theme/src/main/org/jboss/portal/test/theme/metadata/TestLayoutStrategySetMetaData.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/test/theme/metadata/TestLayoutStrategySetMetaData.java 2006-11-07 12:45:39 UTC (rev 5591)
+++ trunk/theme/src/main/org/jboss/portal/test/theme/metadata/TestLayoutStrategySetMetaData.java 2006-11-07 16:30:42 UTC (rev 5592)
@@ -92,7 +92,7 @@
}
}
- public void testLayoutStrategyMetaDataNoName() throws JBossXBException
+ public void testLayoutStrategyMetaDataNoName()
{
StringBuffer testString = new StringBuffer();
testString.append("<portal-strategies>");
@@ -111,12 +111,18 @@
testString.append("</portal-strategies>");
- List strategies = (List)UnmarshallerFactory.newInstance().newUnmarshaller().unmarshal(new StringReader(testString.toString()), new LayoutStategyMetaDataFactory(), null);
- LayoutStrategyMetaData strategyMD = (LayoutStrategyMetaData)strategies.get(0);
- assertNull(strategyMD.getName());
+ try
+ {
+ List strategies = (List)UnmarshallerFactory.newInstance().newUnmarshaller().unmarshal(new StringReader(testString.toString()), new LayoutStategyMetaDataFactory(), null);
+ assertTrue("Expected exception did not occur", false);
+ }
+ catch (JBossXBException ex)
+ {
+ // expected
+ }
}
- public void testLayoutStrategyMetaDataNoMime() throws JBossXBException
+ public void testLayoutStrategyMetaDataNoMime()
{
StringBuffer testString = new StringBuffer();
testString.append("<portal-strategies>");
@@ -143,7 +149,7 @@
}
- public void testLayoutStrategyMetaDataEmpty() throws JBossXBException
+ public void testLayoutStrategyMetaDataEmpty()
{
StringBuffer testString = new StringBuffer();
testString.append("<portal-strategies>");
@@ -154,13 +160,13 @@
testString.append("</portal-strategies>");
- List strategies = (List)UnmarshallerFactory.newInstance().newUnmarshaller().unmarshal(new StringReader(testString.toString()), new LayoutStategyMetaDataFactory(), null);
+
try
{
- LayoutStrategyMetaData strategyMD = (LayoutStrategyMetaData)strategies.get(0);
+ List strategies = (List)UnmarshallerFactory.newInstance().newUnmarshaller().unmarshal(new StringReader(testString.toString()), new LayoutStategyMetaDataFactory(), null);
assertFalse("expected exception did not occur", true);
}
- catch (IndexOutOfBoundsException ioe)
+ catch (JBossXBException e)
{
// expected
}
Modified: trunk/theme/src/main/org/jboss/portal/test/theme/metadata/TestPortalLayoutMetaData.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/test/theme/metadata/TestPortalLayoutMetaData.java 2006-11-07 12:45:39 UTC (rev 5591)
+++ trunk/theme/src/main/org/jboss/portal/test/theme/metadata/TestPortalLayoutMetaData.java 2006-11-07 16:30:42 UTC (rev 5592)
@@ -100,7 +100,7 @@
}
}
- public void testLayoutMetaDataNoName() throws Exception
+ public void testLayoutMetaDataNoName()
{
StringBuffer testString = new StringBuffer();
testString.append("<layouts>");
@@ -117,12 +117,19 @@
testString.append("</layouts>");
- List layoutMDList = (List)UnmarshallerFactory.newInstance().newUnmarshaller().unmarshal(new StringReader(testString.toString()), new PortalLayoutMetaDataFactory(), null);
- PortalLayoutMetaData layoutMD = (PortalLayoutMetaData)layoutMDList.get(0);
- assertTrue(layoutMD.getName() == null);
+ try
+ {
+ List layoutMDList = (List)UnmarshallerFactory.newInstance().newUnmarshaller().unmarshal(new StringReader(testString.toString()), new PortalLayoutMetaDataFactory(), null);
+ assertTrue("Expected exception did not occur", false);
+ }
+ catch (JBossXBException ex)
+ {
+ // expected
+ }
+
}
- public void testLayoutMetaDataNoURI() throws JBossXBException
+ public void testLayoutMetaDataNoURI()
{
StringBuffer testString = new StringBuffer();
testString.append("<layouts>");
@@ -134,12 +141,18 @@
// testString.append("<uri>/nodesk/index.jsp</uri>");
testString.append("</layouts>");
- List layoutMDList = (List)UnmarshallerFactory.newInstance().newUnmarshaller().unmarshal(new StringReader(testString.toString()), new PortalLayoutMetaDataFactory(), null);
- PortalLayoutMetaData layoutMD = (PortalLayoutMetaData)layoutMDList.get(0);
- assertTrue(layoutMD.getURI() == null);
+ try
+ {
+ List layoutMDList = (List)UnmarshallerFactory.newInstance().newUnmarshaller().unmarshal(new StringReader(testString.toString()), new PortalLayoutMetaDataFactory(), null);
+ assertTrue("Expected exception did not occur", false);
+ }
+ catch (JBossXBException ex)
+ {
+ // expected
+ }
}
- public void testLayoutMetaDataNoRegions() throws Exception
+ public void testLayoutMetaDataNoRegions()
{
StringBuffer testString = new StringBuffer();
testString.append("<layouts>");
@@ -149,11 +162,22 @@
testString.append("<uri>/nodesk/index.jsp</uri>");
testString.append("</layout>");
testString.append("</layouts>");
- List layoutMDList = (List)UnmarshallerFactory.newInstance().newUnmarshaller().unmarshal(new StringReader(testString.toString()), new PortalLayoutMetaDataFactory(), null);
+ try
+ {
+ List layoutMDList = (List)UnmarshallerFactory.newInstance().newUnmarshaller().unmarshal(new StringReader(testString.toString()), new PortalLayoutMetaDataFactory(), null);
+ assertTrue("Expected exception did not occur", false);
+ }
+ catch (JBossXBException ex)
+ {
+ // expected
+ }
+
+/*
assertNotNull(layoutMDList);
PortalLayoutMetaData layoutMD = (PortalLayoutMetaData)layoutMDList.get(0);
assertNotNull(layoutMD.getRegionNames());
assertTrue(layoutMD.getRegionNames().size() == 0);
+*/
}
// What in the world does this do?
Modified: trunk/theme/src/main/org/jboss/portal/test/theme/metadata/TestPortalThemeMetaData.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/test/theme/metadata/TestPortalThemeMetaData.java 2006-11-07 12:45:39 UTC (rev 5591)
+++ trunk/theme/src/main/org/jboss/portal/test/theme/metadata/TestPortalThemeMetaData.java 2006-11-07 16:30:42 UTC (rev 5592)
@@ -117,7 +117,7 @@
}
}
- public void testThemeMetaDataNoName() throws JBossXBException
+ public void testThemeMetaDataNoName()
{
StringBuffer testString = new StringBuffer();
testString.append("<themes>");
@@ -130,13 +130,18 @@
testString.append("</theme>");
testString.append("</themes>");
-
- List themes = (List)UnmarshallerFactory.newInstance().newUnmarshaller().unmarshal(new StringReader(testString.toString()), new PortalThemeMetaDataFactory(), null);
- PortalThemeMetaData meta = (PortalThemeMetaData)themes.get(0);
- assertTrue(meta.getName() == null);
+ try
+ {
+ List themes = (List)UnmarshallerFactory.newInstance().newUnmarshaller().unmarshal(new StringReader(testString.toString()), new PortalThemeMetaDataFactory(), null);
+ assertTrue("Expected exception did not occur", false);
+ }
+ catch (JBossXBException ex)
+ {
+ // expected
+ }
}
- public void testThemeMetaDataNoLinks() throws JBossXBException
+ public void testThemeMetaDataNoLinks()
{
StringBuffer testString = new StringBuffer();
testString.append("<themes>");
@@ -148,9 +153,13 @@
testString.append("</themes>");
- List themes = (List)UnmarshallerFactory.newInstance().newUnmarshaller().unmarshal(new StringReader(testString.toString()), new PortalThemeMetaDataFactory(), null);
- PortalThemeMetaData meta = (PortalThemeMetaData)themes.get(0);
- assertTrue(meta.getLinks().size() == 0);
- assertTrue(meta.getScripts().size() == 0);
+ try
+ {
+ List themes = (List)UnmarshallerFactory.newInstance().newUnmarshaller().unmarshal(new StringReader(testString.toString()), new PortalThemeMetaDataFactory(), null);
+ }
+ catch (JBossXBException ex)
+ {
+ // expected
+ }
}
}
Modified: trunk/theme/src/main/org/jboss/portal/test/theme/metadata/TestRenderSetMetaData.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/test/theme/metadata/TestRenderSetMetaData.java 2006-11-07 12:45:39 UTC (rev 5591)
+++ trunk/theme/src/main/org/jboss/portal/test/theme/metadata/TestRenderSetMetaData.java 2006-11-07 16:30:42 UTC (rev 5592)
@@ -131,7 +131,7 @@
}
}
- public void testRenderSetMetaDataNoMime() throws JBossXBException
+ public void testRenderSetMetaDataNoMime()
{
StringBuffer testString = new StringBuffer();
// no content type attribute in the set
@@ -158,7 +158,7 @@
}
}
- public void testRenderSetMetaDataNoWindowRenderer() throws JBossXBException
+ public void testRenderSetMetaDataNoWindowRenderer()
{
StringBuffer testString = new StringBuffer();
// no window renderer defined in the set
@@ -173,26 +173,36 @@
testString.append("</renderSet>");
testString.append("</portal-renderSet>");
- List setList = (List)UnmarshallerFactory.newInstance().newUnmarshaller().unmarshal(new StringReader(testString.toString()), new RenderSetMetaDataFactory(), null);
+ try
+ {
+ List setList = (List)UnmarshallerFactory.newInstance().newUnmarshaller().unmarshal(new StringReader(testString.toString()), new RenderSetMetaDataFactory(), null);
+ assertTrue("Expected exception did not occur", false);
+ }
+ catch (JBossXBException ex)
+ {
+ // expected
+ }
+/*
RenderSetMetaData renderSetMD = (RenderSetMetaData)setList.get(0);
RendererSetMetaData rendererSetMD = (RendererSetMetaData)renderSetMD.getRendererSet().get(0);
assertTrue(rendererSetMD.getWindowRenderer() == null);
+*/
}
- public void testRenderSetMetaDataEmpty() throws JBossXBException
+ public void testRenderSetMetaDataEmpty()
{
StringBuffer testString = new StringBuffer();
// empty render set descriptor
testString.append("<portal-renderSet>");
testString.append("</portal-renderSet>");
- List setList = (List)UnmarshallerFactory.newInstance().newUnmarshaller().unmarshal(new StringReader(testString.toString()), new RenderSetMetaDataFactory(), null);
+
try
{
- RenderSetMetaData renderSetMD = (RenderSetMetaData)setList.get(0);
+ List setList = (List)UnmarshallerFactory.newInstance().newUnmarshaller().unmarshal(new StringReader(testString.toString()), new RenderSetMetaDataFactory(), null);
assertFalse("expected exception did not occur", true);
}
- catch (IndexOutOfBoundsException ioe)
+ catch (JBossXBException ex)
{
// expected
}
Modified: trunk/theme/src/main/org/jboss/portal/test/theme/render/TestRenderContext.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/test/theme/render/TestRenderContext.java 2006-11-07 12:45:39 UTC (rev 5591)
+++ trunk/theme/src/main/org/jboss/portal/test/theme/render/TestRenderContext.java 2006-11-07 16:30:42 UTC (rev 5592)
@@ -49,7 +49,6 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Set;
/**
* @author <a href="mailto:mholzner at novell.com">Martin Holzner</a>
@@ -108,8 +107,15 @@
portalProps.put(ThemeConstants.PORTAL_PROP_RENDERSET, "emptyRenderer");
markupResult.setPortalProperties(portalProps);
runtimeContext = TestHelper.createRuntimeContext();
- RenderSetMetaData renderSetMD = TestHelper.createRenderSetMD();
- layoutService.addRenderSet(runtimeContext, renderSetMD);
+ try
+ {
+ RenderSetMetaData renderSetMD = TestHelper.createRenderSetMD();
+ layoutService.addRenderSet(runtimeContext, renderSetMD);
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
renderSet = layoutService.getRenderSet("emptyRenderer", MediaType.HTML);
PortalLayoutMetaData layoutMD = TestHelper.createLayoutMD();
@@ -209,7 +215,9 @@
assertNotNull(ctx.getPortletRenderer());
}
- /** Test the overwrite behaviour of window properties Window Properties can */
+ /**
+ * Test the overwrite behaviour of window properties Window Properties can
+ */
public void testRenderContext3()
{
Map windowProperties = new HashMap();
Modified: trunk/theme/src/resources/test/xml/portal-layouts.xml
===================================================================
--- trunk/theme/src/resources/test/xml/portal-layouts.xml 2006-11-07 12:45:39 UTC (rev 5591)
+++ trunk/theme/src/resources/test/xml/portal-layouts.xml 2006-11-07 16:30:42 UTC (rev 5592)
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ JBoss, a division of Red Hat ~
~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
@@ -27,18 +26,14 @@
<name>nodesk</name>
<uri>/nodesk/index.jsp</uri>
<uri state="maximized">/nodesk/index.jsp</uri>
-<!--
<regions>
<region name="left"/>
<region name="center"/>
</regions>
--->
</layout>
<layout>
<name>phalanx</name>
-<!--
<uri>/phalanx/index.jsp</uri>
--->
<uri state="maximized">/phalanx/index.jsp</uri>
<regions>
<region name="left"/>
Modified: trunk/theme/src/resources/test/xml/portal-themes.xml
===================================================================
--- trunk/theme/src/resources/test/xml/portal-themes.xml 2006-11-07 12:45:39 UTC (rev 5591)
+++ trunk/theme/src/resources/test/xml/portal-themes.xml 2006-11-07 16:30:42 UTC (rev 5592)
@@ -30,7 +30,7 @@
</theme>
<theme>
<name>Nphalanx</name>
-<!-- <link rel="stylesheet" id="main_css" href="/themes/phalanx/portal_style.css" type="text/css"/>-->
+ <link rel="stylesheet" id="main_css" href="/themes/phalanx/portal_style.css" type="text/css"/>
<link rel="shortcut icon" href="/themes/phalanx/images/favicon.ico"/>
</theme>
<theme>
More information about the jboss-svn-commits
mailing list