paulsp 02/03/30 04:37:37
Modified: build build.xml
xdocs changes.xml
docs/site changes.html
Added: src/java/org/apache/jetspeed/test TurbineTestUtilities.java
TestBasicSanity.java
Log:
o Added basic test of Jetspeed to build target "tests_tomcat_xxx"
Revision Changes Path
1.1
jakarta-jetspeed/src/java/org/apache/jetspeed/test/TurbineTestUtilities.java
Index: TurbineTestUtilities.java
===================================================================
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2000-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" and
* "Apache Jetspeed" must not be used to endorse or promote products
* derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache" or
* "Apache Jetspeed", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
package org.apache.jetspeed.test;
// Turbine imports
import org.apache.turbine.modules.actions.sessionvalidator.SessionValidator;
import org.apache.turbine.modules.ActionLoader;
import org.apache.turbine.modules.PageLoader;
import org.apache.turbine.services.resources.TurbineResources;
import org.apache.turbine.services.template.TurbineTemplate;
import org.apache.turbine.util.RunData;
/**
* This class is designed to aid in the testing of Jetspeed
* page generation. It includes methods that mimic what
* is done in turbine.
*
* As a minimum you test case should look like:
* <CODE>
* {
* setupRunData(rundata);
* generatePage(rundata);
* outputPage(rundata);
* }
* </CODE>
*
* @author <a href="[EMAIL PROTECTED]">Paul Spencer</a>
* @version $Id: TurbineTestUtilities.java,v 1.1 2002/03/30 12:37:37 paulsp Exp $
*/
public abstract class TurbineTestUtilities
{
/**
* Do all of the initialization and setup of RunData. This includes
* setting up the session, users.
*
* Note: This code is modeled after Turbine's org.apache.turbine.Turbine
*
* @param rundata Rundata to setup
* @throws Exception General exceptions
*/
public static void setupRunData(RunData rundata) throws Exception
{
if (rundata == null)
throw new NullPointerException("rundata is null");
// Get the instance of the Session Validator.
SessionValidator sessionValidator = (SessionValidator)ActionLoader
.getInstance().getInstance(TurbineResources.getString(
"action.sessionvalidator"));
if (sessionValidator == null)
throw new NullPointerException("Failed to get a SessonValidator");
// Fill in the screen and action variables.
rundata.setScreen( rundata.getParameters().getString("screen") );
rundata.setAction( rundata.getParameters().getString("action") );
// Login or out if requested
if ( rundata.hasAction()
&& rundata.getAction().equalsIgnoreCase(TurbineResources
.getString("action.login"))
|| rundata.getAction().equalsIgnoreCase(TurbineResources
.getString("action.logout")))
{
if (rundata.getAction().equalsIgnoreCase(TurbineResources
.getString("action.login")))
{
String[] names = rundata.getSession().getValueNames();
if (names != null)
{
for (int i=0; i< names.length; i++)
{
rundata.getSession().removeValue(names[i]);
}
}
}
ActionLoader.getInstance().exec( rundata, rundata.getAction() );
rundata.setAction(null);
}
// Do the session validation
ActionLoader.getInstance().exec(
rundata,TurbineResources.getString("action.sessionvalidator") );
// Put the access control list (ACL) into rundata.
ActionLoader.getInstance().exec(
rundata,TurbineResources.getString("action.accesscontroller"));
}
/**
* Generate the page/content defined by rundata
* @param rundata Rundata to setup
* @throws Exception General exceptions
*/
public static void generatePage(RunData rundata) throws Exception
{
if (rundata == null)
throw new NullPointerException("rundata is null");
String defaultPage = TurbineTemplate.getDefaultPageName(rundata);
PageLoader.getInstance().exec(rundata, defaultPage);
}
/**
* Instuct turbine, via rundata, to output the page.
*
* Note: This code is modeled after Turbine's org.apache.turbine.Turbine
*
* @param rundata Rundata to setup
* @throws Exception General exceptions
*/
public static void outputPage(RunData rundata) throws Exception
{
if (rundata == null)
throw new NullPointerException("rundata is null");
rundata.getResponse().setLocale( rundata.getLocale() );
rundata.getResponse().setContentType( rundata.getContentType() );
rundata.getResponse().setStatus( rundata.getStatusCode() );
rundata.getPage().output(rundata.getOut());
try
{
rundata.getOut().close();
}
catch (Exception e)
{
// Ignore.
}
}
}
1.1
jakarta-jetspeed/src/java/org/apache/jetspeed/test/TestBasicSanity.java
Index: TestBasicSanity.java
===================================================================
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2000-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" and
* "Apache Jetspeed" must not be used to endorse or promote products
* derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache" or
* "Apache Jetspeed", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
package org.apache.jetspeed.test;
// Java imports
// ECS imports
import org.apache.ecs.ConcreteElement;
// Junit imports
import junit.awtui.TestRunner;
import junit.framework.Test;
import junit.framework.TestSuite;
// Cactus imports
import org.apache.cactus.ServletTestCase;
import org.apache.cactus.WebRequest;
import org.apache.cactus.WebResponse;
// Jetspeed imports
import org.apache.jetspeed.capability.CapabilityMap;
import org.apache.jetspeed.om.profile.Profile;
import org.apache.jetspeed.om.profile.ProfileLocator;
import org.apache.jetspeed.om.profile.PSMLDocument;
import org.apache.jetspeed.services.Profiler;
import org.apache.jetspeed.services.JetspeedSecurity;
import org.apache.jetspeed.services.rundata.JetspeedRunData;
import org.apache.jetspeed.test.TurbineTestUtilities;
// Turbine imports
import org.apache.turbine.om.security.User;
import org.apache.turbine.services.pull.TurbinePull;
import org.apache.turbine.services.velocity.TurbineVelocity;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.RunDataFactory;
// Velocity
import org.apache.velocity.context.Context;
/**
*
* @author <a href="[EMAIL PROTECTED]">Paul Spencer</a>
* @version $Id: TestBasicSanity.java,v 1.1 2002/03/30 12:37:37 paulsp Exp $
*/
public class TestBasicSanity extends ServletTestCase
{
private static String TEST_ANON_USER_NAME = "";
private static String TEST_CONTEXT = null;
private static String TEST_HOST = "localhost";
private static String TEST_SERVLET = "/portal";
private static String TEST_GROUP = "apache";
private static String TEST_PAGE = "news";
private RunData rundata = null;
/**
* Defines the testcase name for JUnit.
*
* @param name the testcase's name.
*/
public TestBasicSanity(String name)
{
super( name );
}
/**
* Start the tests.
*
* @param args the arguments. Not used
*/
public static void main(String args[])
{
TestRunner.main( new String[] { TestBasicSanity.class.getName() } );
}
/**
* Creates the test suite.
*
* @return a test suite (<code>TestSuite</code>) that includes all methods
* starting with "test"
*/
public static Test suite()
{
// All methods starting with "test" will be executed in the test suite.
return new TestSuite( TestBasicSanity.class );
}
/**
* Sets up the test case.
*
*/
protected void setUp () throws Exception
{
}
/**
* Test: DefaultURL
* With the default URL "/"
* 1) A page is generated
* 2) The user is anonymous
* 3) Group and Role are not set
*/
public void beginDefaultURL(WebRequest theRequest)
{
System.out.println("URL = " + theRequest.getURL());
theRequest.setURL(TEST_HOST, TEST_CONTEXT, TEST_SERVLET, "", null);
System.out.println("post set URL = " + theRequest.getURL());
}
/**
* Execute the test
*
* @throws Exception
*/
public void testDefaultURL() throws Exception
{
// Create the RunData object to be used during testing.
rundata = RunDataFactory.getRunData ( request, response, config );
assertNotNull( "Got rundata", rundata);
TurbineTestUtilities.setupRunData(rundata);
// Verify we have a user
User user = rundata.getUser();
assertNotNull( "Got user", user);
// Verify we have a CapabilityMap
CapabilityMap cm = ((JetspeedRunData)rundata).getCapability();
assertNotNull( "Got Capability", cm);
// Verify we have a profile
Profile profile = Profiler.getProfile(rundata);
assertNotNull( "Got profile from Profiler", profile);
// Verify the profile location information in the profile
if (profile instanceof ProfileLocator)
{
ProfileLocator profileLocator = (ProfileLocator) profile;
assertTrue("Verify the 'anonymous' is set",
profileLocator.getAnonymous());
assertNull("Verify the group is null", profileLocator.getGroup());
assertNull("Verify the role is null", profileLocator.getRole());
} else
{
assertTrue( "profile does not implement ProfileLocator", false);
}
// Verify we have a Document
PSMLDocument psmlDoc = profile.getDocument();
assertNotNull( "Got psmlDocument", psmlDoc);
System.out.println("DocumentName = " + profile.getDocument().getName());
// Get and populate the context
Context context = TurbineVelocity.getContext(rundata);
assertNotNull( "Got context", context);
TurbinePull.populateContext( context, rundata);
// Verify tool are in the context
assertNotNull( "Got jtool from context", context.get("jlink"));
// Generatate and output thre page
TurbineTestUtilities.generatePage(rundata);
TurbineTestUtilities.outputPage(rundata);
// Return the used RunData to the factory for recycling.
RunDataFactory.putRunData(rundata);
}
public void endDefaultURL(org.apache.cactus.WebResponse theResponse)
{
System.out.println("text length = " + theResponse.getText().length());
// System.out.println("text length = " + theResponse.getText());
}
/**
* Test: GroupURL
* With the default URL "/group/apache"
* 1) A page is generated
* 2) The user is anonymous
* 3) Group is set to "apache"
* 4) Role is not set
*/
public void beginGroupUrl(WebRequest theRequest)
{
System.out.println("URL = " + theRequest.getURL());
theRequest.setURL(TEST_HOST, TEST_CONTEXT, TEST_SERVLET
, "/group/" + TEST_GROUP , null);
System.out.println("post set URL = " + theRequest.getURL());
}
/**
* Test the Group link
* @throws Exception
*/
public void testGroupUrl() throws Exception
{
// Create the RunData object to be used during testing.
rundata = RunDataFactory.getRunData ( request, response, config );
assertNotNull( "Got rundata", rundata);
TurbineTestUtilities.setupRunData(rundata);
// Verify we have a profile
Profile profile = Profiler.getProfile(rundata);
assertNotNull( "Got profile from Profiler", profile);
// Verify the profile location information in the profile
if (profile instanceof ProfileLocator)
{
// FIXME: Need to verify 'anonymous' and group name
ProfileLocator profileLocator = (ProfileLocator) profile;
// assertTrue("Verify the 'anonymous' is set",
profileLocator.getAnonymous());
assertNotNull("Verify the group is not null", profileLocator.getGroup());
assertNull("Verify the role is null", profileLocator.getRole());
} else
{
assertTrue( "profile does not implement ProfileLocator", false);
}
TurbineTestUtilities.generatePage(rundata);
TurbineTestUtilities.outputPage(rundata);
// Return the used RunData to the factory for recycling.
RunDataFactory.putRunData(rundata);
}
public void endGroupURL(WebResponse theResponse)
{
System.out.println("text length = " + theResponse.getText().length());
// System.out.println("text length = " + theResponse.getText());
}
/**
* Test: PageURL
* With the page URL "/page/apache"
* 1) A page is generated
* 2) The user is anonymous
* 3) Group is set to "apache"
* 4) Role is not set
*/
public void beginPageUrl(WebRequest theRequest)
{
System.out.println("URL = " + theRequest.getURL());
theRequest.setURL(TEST_HOST, TEST_CONTEXT, TEST_SERVLET
, "/page/" + TEST_PAGE , null);
System.out.println("post set URL = " + theRequest.getURL());
}
/**
* Test the PageURL
*
* @throws Exception
*/
public void testPageUrl() throws Exception
{
// Create the RunData object to be used during testing.
rundata = RunDataFactory.getRunData ( request, response, config );
assertNotNull( "Got rundata", rundata);
TurbineTestUtilities.setupRunData(rundata);
// Verify we have a profile
Profile profile = Profiler.getProfile(rundata);
assertNotNull( "Got profile from Profiler", profile);
// Verify the profile location information in the profile
if (profile instanceof ProfileLocator)
{
ProfileLocator profileLocator = (ProfileLocator) profile;
// FIXME: Need to verify 'anonymous' and page name
assertTrue("Verify the 'anonymous' is set",
profileLocator.getAnonymous());
assertNull("Verify the group is null", profileLocator.getGroup());
assertNull("Verify the role is null", profileLocator.getRole());
} else
{
assertTrue( "profile does not implement ProfileLocator", false);
}
TurbineTestUtilities.generatePage(rundata);
TurbineTestUtilities.outputPage(rundata);
// Return the used RunData to the factory for recycling.
RunDataFactory.putRunData(rundata);
}
public void endPageURL(WebResponse theResponse)
{
System.out.println("text length = " + theResponse.getText().length());
// System.out.println("text length = " + theResponse.getText());
}
}
1.132 +4 -2 jakarta-jetspeed/build/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/build/build.xml,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- build.xml 28 Mar 2002 23:09:14 -0000 1.131
+++ build.xml 30 Mar 2002 12:37:37 -0000 1.132
@@ -631,6 +631,7 @@
<!-- Cactus unit tests -->
<test name="org.apache.jetspeed.modules.actions.TestJLoginUser"/>
+ <test name="org.apache.jetspeed.test.TestBasicSanity"/>
</junit>
</target>
@@ -657,6 +658,7 @@
<!-- Cactus unit tests -->
<test name="org.apache.jetspeed.modules.actions.TestJLoginUser"/>
+ <test name="org.apache.jetspeed.test.TestBasicSanity"/>
</junit>
</target>
@@ -788,8 +790,8 @@
<!-- JUnit unit tests -->
<test name="org.apache.jetspeed.services.psmlmanager.TestMarshalPsml"/>
<test name="org.apache.jetspeed.services.idgenerator.TestIdGenerator"/>
- <test
name="org.apache.jetspeed.services.registry.TestMarshallRegistry"/>
- <test
name="org.apache.jetspeed.services.registry.TestRegistryCategories"/>
+ <test
name="org.apache.jetspeed.services.registry.TestMarshallRegistry"/>
+ <test
name="org.apache.jetspeed.services.registry.TestRegistryCategories"/>
</junit>
</target>
1.33 +4 -1 jakarta-jetspeed/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/xdocs/changes.xml,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- changes.xml 30 Mar 2002 00:22:14 -0000 1.32
+++ changes.xml 30 Mar 2002 12:37:37 -0000 1.33
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!--
-$Id: changes.xml,v 1.32 2002/03/30 00:22:14 taylor Exp $
+$Id: changes.xml,v 1.33 2002/03/30 12:37:37 paulsp Exp $
-->
<document>
<properties>
@@ -224,6 +224,9 @@
</li>
<li>
Add - 2002/03/29 - Added HTTP Basic Authentication from David Powers to Web Page
Portlet (DST)
+</li>
+<li>
+ Add - 2002/03/30 - Added basic test of Jetspeed to tests_tomcat_xx (PS)
</li>
</ul>
</section>
1.18 +12 -0 jakarta-jetspeed/docs/site/changes.html
Index: changes.html
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/docs/site/changes.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- changes.html 20 Mar 2002 06:55:48 -0000 1.17
+++ changes.html 30 Mar 2002 12:37:37 -0000 1.18
@@ -320,6 +320,18 @@
<li>Add - formReadOnlyText to GlobalMacro.vm for readonly field in a form</li>
</ul>
</li>
+<li>
+ Add - 2002/03/23 - Added content caching facility to VelocityPortlet (CK)
+</li>
+<li>
+ Add - 2002/03/28 - Added Registry catalogue feature (DST)
+</li>
+<li>
+ Add - 2002/03/29 - Added HTTP Basic Authentication from David Powers to Web Page
Portlet (DST)
+</li>
+<li>
+ Add - 2002/03/30 - Added basic test of Jetspeed to tests_tomcat_xx (PS)
+</li>
</ul>
</blockquote>
</p>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
