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/10/13 21:06:56 UTC
svn commit: r824886 - in /incubator/jspwiki/trunk: ./
src/java/org/apache/wiki/ tests/java/org/apache/wiki/
tests/java/org/apache/wiki/auth/ tests/java/org/apache/wiki/auth/authorize/
tests/java/org/apache/wiki/auth/login/ tests/java/org/apache/wiki/co...
Author: metskem
Date: Tue Oct 13 19:06:55 2009
New Revision: 824886
URL: http://svn.apache.org/viewvc?rev=824886&view=rev
Log:
3.0.0-svn-163
TestEngine.emptyWorkdir() was only emptying the workdir if the
workdir contains a file called "refmgr.ser" (dunno why), causing the
PageViewPluginTest to fail.
Got rid of a bunch of error messages in the log by adding
engine.shutdown() statements to testcases.
Still a lot Stripes messages "..Configuration object cannot be located.."
remaining.
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/TestEngine.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/AuthenticationManagerTest.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/LdapAuthorizerTest.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/UserDatabaseLoginModuleTest.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/WebContainerLoginModuleTest.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/ContentManagerTest.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/resolver/EnglishPluralsPageNameResolverTest.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/resolver/SpecialPageNameResolverTest.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/GroupsTest.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/render/RenderingManagerTest.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/WorkflowManagerTest.java
incubator/jspwiki/trunk/tests/java/stress/MassiveRepositoryTest.java
incubator/jspwiki/trunk/tests/java/stress/StressTestSpeed.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=824886&r1=824885&r2=824886&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Tue Oct 13 19:06:55 2009
@@ -1,3 +1,15 @@
+2009-10-13 Harry Metske <me...@apache.org>
+
+ * 3.0.0-svn-163
+
+ TestEngine.emptyWorkdir() was only emptying the workdir if the
+ workdir contains a file called "refmgr.ser" (dunno why), causing the
+ PageViewPluginTest to fail.
+ Got rid of a bunch of error messages in the log by adding
+ engine.shutdown() statements to testcases.
+ Still a lot Stripes messages "..Configuration object cannot be located.."
+ remaining.
+
2009-10-11 Andrew Jaquith <ajaquith AT apache DOT org>
* 3.0.0-svn-162
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java?rev=824886&r1=824885&r2=824886&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Tue Oct 13 19:06:55 2009
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "162";
+ public static final String BUILD = "163";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/TestEngine.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/TestEngine.java?rev=824886&r1=824885&r2=824886&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/TestEngine.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/TestEngine.java Tue Oct 13 19:06:55 2009
@@ -199,7 +199,7 @@
{
File f = new File( workdir );
- if( f.exists() && f.isDirectory() && new File( f, "refmgr.ser" ).exists() )
+ if( f.exists() && f.isDirectory() )
{
deleteAll( f );
}
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/AuthenticationManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/AuthenticationManagerTest.java?rev=824886&r1=824885&r2=824886&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/AuthenticationManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/AuthenticationManagerTest.java Tue Oct 13 19:06:55 2009
@@ -123,6 +123,12 @@
m_session = WikiSessionTest.adminSession( m_engine );
}
+ protected void tearDown() throws Exception
+ {
+ super.tearDown();
+ m_engine.shutdown();
+ }
+
/**
* Tests a dummy WebAuthorizer that is guaranteed to return true for one
* role for each of the two <code>isInRole</code> methods.
@@ -134,6 +140,7 @@
Properties props = new Properties();
props.load( TestEngine.findTestProperties() );
props.put( AuthorizationManager.PROP_AUTHORIZER, "org.apache.wiki.auth.AuthenticationManagerTest$DummyAuthorizer" );
+ m_engine.shutdown();
m_engine = new TestEngine( props );
// Start a session without any container roles: DummyAuthorizer should ALWAYS allow AuthorizerRole
@@ -169,6 +176,7 @@
// Init the engine and verify that we initialized with a custom auth
// login module
+ m_engine.shutdown();
WikiEngine engine = new TestEngine( props );
AuthenticationManager authMgr = engine.getAuthenticationManager();
assertEquals( CookieAssertionLoginModule.class, authMgr.m_loginModuleClass );
@@ -186,6 +194,7 @@
// Init the engine and verify that we initialized with the correct
// options
+ m_engine.shutdown();
WikiEngine engine = new TestEngine( props );
AuthenticationManager authMgr = engine.getAuthenticationManager();
Map<String, String> options = authMgr.m_loginModuleOptions;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/LdapAuthorizerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/LdapAuthorizerTest.java?rev=824886&r1=824885&r2=824886&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/LdapAuthorizerTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/LdapAuthorizerTest.java Tue Oct 13 19:06:55 2009
@@ -85,11 +85,15 @@
protected void tearDown() throws Exception
{
- File file = new File("tests/etc/WEB-INF/test-keychain" );
- if ( file.exists() )
+ File file = new File( "tests/etc/WEB-INF/test-keychain" );
+ if( file.exists() )
{
file.delete();
}
+
+ super.tearDown();
+ m_engine.shutdown();
+
}
public void testGetRoles() throws Exception
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.java?rev=824886&r1=824885&r2=824886&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/AnonymousLoginModuleTest.java Tue Oct 13 19:06:55 2009
@@ -128,4 +128,10 @@
}
}
+ protected void tearDown() throws Exception
+ {
+ super.tearDown();
+ m_engine.shutdown();
+ }
+
}
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.java?rev=824886&r1=824885&r2=824886&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/CookieAssertionLoginModuleTest.java Tue Oct 13 19:06:55 2009
@@ -136,4 +136,11 @@
}
}
+
+ protected void tearDown() throws Exception
+ {
+ super.tearDown();
+ m_engine.shutdown();
+ }
+
}
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/UserDatabaseLoginModuleTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/UserDatabaseLoginModuleTest.java?rev=824886&r1=824885&r2=824886&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/UserDatabaseLoginModuleTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/UserDatabaseLoginModuleTest.java Tue Oct 13 19:06:55 2009
@@ -139,4 +139,10 @@
}
}
+ protected void tearDown() throws Exception
+ {
+ super.tearDown();
+ m_engine.shutdown();
+ }
+
}
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/WebContainerLoginModuleTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/WebContainerLoginModuleTest.java?rev=824886&r1=824885&r2=824886&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/WebContainerLoginModuleTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/WebContainerLoginModuleTest.java Tue Oct 13 19:06:55 2009
@@ -133,4 +133,10 @@
}
}
+ protected void tearDown() throws Exception
+ {
+ super.tearDown();
+ m_engine.shutdown();
+ }
+
}
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/ContentManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/ContentManagerTest.java?rev=824886&r1=824885&r2=824886&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/ContentManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/ContentManagerTest.java Tue Oct 13 19:06:55 2009
@@ -67,6 +67,7 @@
}
super.tearDown();
+ m_engine.shutdown();
}
public void testContentManagerGet() throws WikiException
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/resolver/EnglishPluralsPageNameResolverTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/resolver/EnglishPluralsPageNameResolverTest.java?rev=824886&r1=824885&r2=824886&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/resolver/EnglishPluralsPageNameResolverTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/resolver/EnglishPluralsPageNameResolverTest.java Tue Oct 13 19:06:55 2009
@@ -53,6 +53,7 @@
{
m_engine.deletePage( "SinglePage" );
m_engine.deletePage( "PluralPages" );
+ m_engine.shutdown();
}
public void testFinalPageName() throws Exception
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/resolver/SpecialPageNameResolverTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/resolver/SpecialPageNameResolverTest.java?rev=824886&r1=824885&r2=824886&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/resolver/SpecialPageNameResolverTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/resolver/SpecialPageNameResolverTest.java Tue Oct 13 19:06:55 2009
@@ -35,16 +35,24 @@
public class SpecialPageNameResolverTest extends TestCase
{
private SpecialPageNameResolver resolver;
+ WikiEngine m_engine ;
public void setUp() throws Exception
{
Properties props = new Properties();
props.load( TestEngine.findTestProperties() );
- WikiEngine engine = new TestEngine( props );
+ m_engine = new TestEngine( props );
- resolver = new SpecialPageNameResolver(engine);
+ resolver = new SpecialPageNameResolver(m_engine);
}
-
+
+ public void tearDown() throws Exception
+ {
+ m_engine.deletePage( "SinglePage" );
+ m_engine.deletePage( "PluralPages" );
+ m_engine.shutdown();
+ }
+
public void testSpecialPageReference()
{
URI uri;
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java?rev=824886&r1=824885&r2=824886&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java Tue Oct 13 19:06:55 2009
@@ -128,7 +128,6 @@
props.load( TestEngine.findTestProperties() );
props.setProperty( "jspwiki.translatorReader.useRelNofollow", "true" );
- testEngine.shutdown();
TestEngine testEngine2 = new TestEngine( props );
WikiContext context = testEngine2.getWikiContextFactory().newViewContext( testEngine2.createPage( PAGE_NAME ) );
@@ -137,6 +136,8 @@
XHTMLRenderer conv = new XHTMLRenderer( context, r.parse() );
+ testEngine2.shutdown();
+
return conv.getString();
}
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/GroupsTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/GroupsTest.java?rev=824886&r1=824885&r2=824886&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/GroupsTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/GroupsTest.java Tue Oct 13 19:06:55 2009
@@ -53,6 +53,8 @@
super.tearDown();
m_testEngine.deletePage( "Test" );
+
+ m_testEngine.shutdown();
}
public void testTag() throws Exception
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/render/RenderingManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/render/RenderingManagerTest.java?rev=824886&r1=824885&r2=824886&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/render/RenderingManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/render/RenderingManagerTest.java Tue Oct 13 19:06:55 2009
@@ -54,6 +54,7 @@
protected void tearDown() throws Exception
{
m_engine.deletePage( "TestPage" );
+ m_engine.shutdown();
}
/**
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/WorkflowManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/WorkflowManagerTest.java?rev=824886&r1=824885&r2=824886&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/WorkflowManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/WorkflowManagerTest.java Tue Oct 13 19:06:55 2009
@@ -23,7 +23,6 @@
import java.util.Properties;
import org.apache.wiki.TestEngine;
-import org.apache.wiki.WikiEngine;
import org.apache.wiki.api.WikiException;
import org.apache.wiki.auth.GroupPrincipal;
import org.apache.wiki.auth.WikiPrincipal;
@@ -35,7 +34,7 @@
{
protected Workflow w;
protected WorkflowManager wm;
- protected WikiEngine m_engine;
+ protected TestEngine m_engine;
protected void setUp() throws Exception
{
Modified: incubator/jspwiki/trunk/tests/java/stress/MassiveRepositoryTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/stress/MassiveRepositoryTest.java?rev=824886&r1=824885&r2=824886&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/stress/MassiveRepositoryTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/stress/MassiveRepositoryTest.java Tue Oct 13 19:06:55 2009
@@ -51,6 +51,7 @@
{
engine.emptyRepository();
super.tearDown();
+ engine.shutdown();
}
private String getName( int i )
Modified: incubator/jspwiki/trunk/tests/java/stress/StressTestSpeed.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/stress/StressTestSpeed.java?rev=824886&r1=824885&r2=824886&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/stress/StressTestSpeed.java (original)
+++ incubator/jspwiki/trunk/tests/java/stress/StressTestSpeed.java Tue Oct 13 19:06:55 2009
@@ -69,6 +69,8 @@
f = new File( files, "RCS" );
f.delete();
+
+ engine.shutdown();
}
public void testSpeed1()