You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by me...@apache.org on 2009/01/03 18:17:23 UTC
svn commit: r731025 [2/2] - in /incubator/jspwiki/trunk: ./
src/com/ecyrd/jspwiki/ src/com/ecyrd/jspwiki/log/
src/com/ecyrd/jspwiki/ui/admin/ src/com/ecyrd/jspwiki/util/
tests/com/ecyrd/jspwiki/ tests/com/ecyrd/jspwiki/action/
tests/com/ecyrd/jspwiki/a...
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/ui/InputValidatorTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/ui/InputValidatorTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/ui/InputValidatorTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/ui/InputValidatorTest.java Sat Jan 3 09:17:18 2009
@@ -51,6 +51,12 @@
val = new InputValidator( TEST, context );
}
+ protected void tearDown() throws Exception
+ {
+ super.tearDown();
+ testEngine.shutdown();
+ }
+
public void testUnsafePattern()
{
Pattern unsafe = InputValidator.UNSAFE_PATTERN;
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/ui/stripes/HandlerInfoTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/ui/stripes/HandlerInfoTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/ui/stripes/HandlerInfoTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/ui/stripes/HandlerInfoTest.java Sat Jan 3 09:17:18 2009
@@ -55,6 +55,12 @@
}
}
+ protected void tearDown() throws Exception
+ {
+ super.tearDown();
+ m_engine.shutdown();
+ }
+
public void testGetRequestContext() throws Exception
{
assertEquals( "createGroup", HandlerInfo.getHandlerInfo( GroupActionBean.class, "create" ).getRequestContext() );
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/url/DefaultURLConstructorTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/url/DefaultURLConstructorTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/url/DefaultURLConstructorTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/url/DefaultURLConstructorTest.java Sat Jan 3 09:17:18 2009
@@ -47,6 +47,12 @@
props.load( TestEngine.findTestProperties() );
}
+ protected void tearDown() throws Exception
+ {
+ super.tearDown();
+ testEngine.shutdown();
+ }
+
private URLConstructor getConstructor( String baseURL, String prefix )
throws WikiException
{
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/url/ShortURLConstructorTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/url/ShortURLConstructorTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/url/ShortURLConstructorTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/url/ShortURLConstructorTest.java Sat Jan 3 09:17:18 2009
@@ -47,6 +47,12 @@
props.load( TestEngine.findTestProperties() );
}
+ protected void tearDown() throws Exception
+ {
+ super.tearDown();
+ testEngine.shutdown();
+ }
+
private URLConstructor getConstructor( String baseURL, String prefix )
throws WikiException
{
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/url/ShortViewURLConstructorTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/url/ShortViewURLConstructorTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/url/ShortViewURLConstructorTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/url/ShortViewURLConstructorTest.java Sat Jan 3 09:17:18 2009
@@ -47,6 +47,12 @@
props.load( TestEngine.findTestProperties() );
}
+ protected void tearDown() throws Exception
+ {
+ super.tearDown();
+ testEngine.shutdown();
+ }
+
private URLConstructor getConstructor( String baseURL, String prefix )
throws WikiException
{
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/util/ClassUtilTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/util/ClassUtilTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/util/ClassUtilTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/util/ClassUtilTest.java Sat Jan 3 09:17:18 2009
@@ -36,9 +36,9 @@
public void testFindClass()
throws Exception
{
- Class foo = ClassUtil.findClass( "com.ecyrd.jspwiki.api", "WikiPage" );
+ Class foo = ClassUtil.findClass( "org.apache.jspwiki.api", "WikiPage" );
- assertEquals( foo.getName(), "com.ecyrd.jspwiki.api.WikiPage" );
+ assertEquals( foo.getName(), "org.apache.jspwiki.api.WikiPage" );
}
/**
@@ -49,7 +49,7 @@
{
try
{
- Class foo = ClassUtil.findClass( "com.ecyrd.jspwiki", "MubbleBubble" );
+ Class foo = ClassUtil.findClass( "org.apache.jspwiki", "MubbleBubble" );
fail("Found class:"+foo);
}
catch( ClassNotFoundException e )
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/util/MailUtilTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/util/MailUtilTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/util/MailUtilTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/util/MailUtilTest.java Sat Jan 3 09:17:18 2009
@@ -58,6 +58,8 @@
static final String TEST_RECEIVER = "someone@somewhere.org";
static final String TEST_SENDER = "homer.simpson@burns.com";
+ private TestEngine m_engine= null;
+
public MailUtilTest( String s )
{
super( s );
@@ -68,13 +70,14 @@
{
m_props.load( TestEngine.findTestProperties() );
- TestEngine testEngine = new TestEngine( m_props );
+ m_engine = new TestEngine( m_props );
- m_context = testEngine.getWikiContextFactory().newViewContext( testEngine.createPage( PAGE_NAME ) );
+ m_context = m_engine.getWikiContextFactory().newViewContext( m_engine.createPage( PAGE_NAME ) );
}
public void tearDown()
{
+ m_engine.shutdown();
}
/**
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/workflow/ApprovalWorkflowTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/workflow/ApprovalWorkflowTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/workflow/ApprovalWorkflowTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/workflow/ApprovalWorkflowTest.java Sat Jan 3 09:17:18 2009
@@ -62,6 +62,11 @@
m_builder = WorkflowBuilder.getBuilder( m_engine );
}
+ protected void tearDown() throws Exception
+ {
+ super.tearDown();
+ m_engine.shutdown();
+ }
public void testBuildApprovalWorkflow() throws WikiException
{
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/workflow/DecisionQueueTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/workflow/DecisionQueueTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/workflow/DecisionQueueTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/workflow/DecisionQueueTest.java Sat Jan 3 09:17:18 2009
@@ -71,6 +71,12 @@
m_queue.add(d3);
}
+ protected void tearDown() throws Exception
+ {
+ super.tearDown();
+ m_engine.shutdown();
+ }
+
public void testAdd()
{
Decision[] decisions = m_queue.decisions();
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/workflow/WorkflowManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/workflow/WorkflowManagerTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/workflow/WorkflowManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/workflow/WorkflowManagerTest.java Sat Jan 3 09:17:18 2009
@@ -58,6 +58,12 @@
w.addMessageArgument("MyPage");
}
+ protected void tearDown() throws Exception
+ {
+ super.tearDown();
+ m_engine.shutdown();
+ }
+
public void testStart() throws WikiException
{
// Once we start the workflow, it should show that it's started
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/xmlrpc/RPCHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/xmlrpc/RPCHandlerTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/xmlrpc/RPCHandlerTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/xmlrpc/RPCHandlerTest.java Sat Jan 3 09:17:18 2009
@@ -61,6 +61,8 @@
TestEngine.deleteTestPage( NAME1 );
TestEngine.deleteAttachments( NAME1 );
TestEngine.emptyWorkDir();
+
+ m_engine.shutdown();
}
public void testNonexistantPage()