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 [1/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...
Author: metskem
Date: Sat Jan 3 09:17:18 2009
New Revision: 731025
URL: http://svn.apache.org/viewvc?rev=731025&view=rev
Log:
3.0.0-svn-43 JSPWIKI-452 - The LoggerFactory is now also multi-wiki-per-JVM capable
Fixed a lot JUnit tests, mostly adding a m_engine.shutdown() to the tearDown()
Removed the NPE checks from LoggerImpl, the NPE's were a result of stopping
the webapp before stopping the background threads, this has been solved by
invoking engine.shutdown() from the SessionMonitor (thanks to Andrew).
Cleanup of AdminBeanManager and WikiEngine
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiEngine.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/log/LoggerFactory.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/log/LoggerImpl.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/admin/AdminBeanManager.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/ClassUtil.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/PageManagerTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/ReferenceManagerTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/VariableManagerTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/WikiEngineTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/WikiSessionTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/action/GroupActionBeanTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/action/LoginActionBeanTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/action/RenameActionBeanTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/action/UserPreferencesActionBeanTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/action/UserProfileActionBeanTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/action/ViewActionBeanTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/action/WikiContextFactoryTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/attachment/AttachmentManagerTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/AuthenticationManagerTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/AuthorizationManagerTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/GroupManagerTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/UserManagerTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/acl/AclImplTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/acl/DefaultAclManagerTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/authorize/GroupTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/authorize/JDBCGroupDatabaseTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/authorize/WebContainerAuthorizerTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/authorize/XMLGroupDatabaseTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/login/AnonymousLoginModuleTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/login/CookieAssertionLoginModuleTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/login/UserDatabaseLoginModuleTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/login/WebContainerLoginModuleTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/user/UserProfileTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/user/XMLUserDatabaseTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/content/PageRenamerTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/dav/AttachmentDavProviderTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/dav/HTMLPagesDavProviderTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/dav/RawPagesDavProviderTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/diff/ContextualDiffProviderTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/filters/FilterManagerTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/CounterPluginTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/DenouncePluginTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/InsertPageTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/PluginIndexPluginTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/PluginManagerTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/ReferredPagesPluginTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/ReferringPagesPluginTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/TableOfContentsTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/UndefinedPagesPluginTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/BasicAttachmentProviderTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/CachingProviderTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/FileSystemProviderTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/RCSFileProviderTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/VersioningFileProviderTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/CreoleRendererTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/WysiwygEditingRendererTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/rss/RSSGeneratorTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/search/SearchManagerTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/ui/InputValidatorTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/ui/stripes/HandlerInfoTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/url/DefaultURLConstructorTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/url/ShortURLConstructorTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/url/ShortViewURLConstructorTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/util/ClassUtilTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/util/MailUtilTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/workflow/ApprovalWorkflowTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/workflow/DecisionQueueTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/workflow/WorkflowManagerTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/xmlrpc/RPCHandlerTest.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sat Jan 3 09:17:18 2009
@@ -1,3 +1,16 @@
+2009-01-03 Harry Metske <me...@apache.org>
+
+ * 3.0.0-svn-43
+
+ * JSPWIKI-452 - The LoggerFactory is now also multi-wiki-per-JVM capable
+ Fixed a lot JUnit tests, mostly adding a m_engine.shutdown() to the tearDown()
+
+ Removed the NPE checks from LoggerImpl, the NPE's were a result of stopping
+ the webapp before stopping the background threads, this has been solved by
+ invoking engine.shutdown() from the SessionMonitor (thanks to Andrew).
+
+ Cleanup of AdminBeanManager and WikiEngine
+
2009-01-02 Harry Metske <me...@apache.org>
* 3.0.0-svn-42
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java Sat Jan 3 09:17:18 2009
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "42";
+ public static final String BUILD = "43";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiEngine.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiEngine.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiEngine.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiEngine.java Sat Jan 3 09:17:18 2009
@@ -428,25 +428,11 @@
m_startTime = new Date();
m_properties = props;
- //
- // Initialized log4j. However, make sure that
- // we don't initialize it multiple times. Also, if
- // all of the log4j statements have been removed from
- // the property file, we do not do any property setting
- // either.q
- //
-// if( !c_configured )
-// {
-// if( props.getProperty("log4j.rootCategory") != null )
-// {
-// PropertyConfigurator.configure( props );
-// }
-// c_configured = true;
-// }
+ LoggerFactory.initialize( m_properties.getProperty( PROP_APPNAME ) );
log.info("*******************************************");
log.info(Release.APPNAME+" "+Release.getVersionString()+" starting. Whee!");
-
+
fireEvent( WikiEngineEvent.INITIALIZING ); // begin initialization
log.debug("Java version: "+System.getProperty("java.runtime.version"));
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/log/LoggerFactory.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/log/LoggerFactory.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/log/LoggerFactory.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/log/LoggerFactory.java Sat Jan 3 09:17:18 2009
@@ -32,6 +32,8 @@
import org.slf4j.bridge.SLF4JBridgeHandler;
import com.ecyrd.jspwiki.Release;
+import com.ecyrd.jspwiki.WikiEngine;
+import com.ecyrd.jspwiki.parser.MarkupParser;
/**
* <p>
@@ -62,12 +64,8 @@
private static final String LOG4J_LOGGER_CLASS = "org.apache.log4j.Logger";
private static HashMap<String, LoggerImpl> c_registeredLoggers = new HashMap<String, LoggerImpl>( 200 );
-
- /**
- * @TODO We need something here to make the Logger MBeans unique across the JVM, this will not work if you
- * run multiple wiki's in the same JVM, same is true for other MBeans.
- */
- private static final String OBJECTNAME_PREFIX = Release.APPNAME + ":component=Loggers,name=";
+
+ private static String c_wikiName = null;
static
{
@@ -80,7 +78,19 @@
private LoggerFactory()
{}
-
+ /**
+ * The wikiName should be passed to us as soon as possible.
+ * This means that we cannot register all LoggerMBeans because
+ * some request for Loggers come in before we have the wikiName
+ *
+ * @param wikiName the name of the Wiki, this is necessary if we run multiple
+ * wikis in the same JVM
+ */
+ public static void initialize( String wikiName )
+ {
+ c_wikiName = MarkupParser.cleanLink( wikiName );
+ }
+
/**
* Utility method for locating a Logger based on a Class.
*
@@ -156,11 +166,20 @@
Class mbeanClass = Class.forName( "org.apache.log4j.jmx.LoggerDynamicMBean" );
Constructor constr = mbeanClass.getConstructor( loggerClass );
Object dynMBean = constr.newInstance( arglist );
- ObjectName mbeanName = new ObjectName( Release.APPNAME + ":component=Loggers,name=" + loggerName );
- MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer();
- if( !mbeanServer.isRegistered( mbeanName ) )
+ ObjectName mbeanName = new ObjectName( getObjectNamePrefix() + loggerName );
+ MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer();
+ if( c_wikiName != null )
{
- mbeanServer.registerMBean( dynMBean, mbeanName );
+ if( !mbeanServer.isRegistered( mbeanName ) )
+ {
+ mbeanServer.registerMBean( dynMBean, mbeanName );
+ }
+ else
+ {
+ throw new RuntimeException( "JMX bean named " + getObjectNamePrefix() + loggerName
+ + " is already registered. Hint: are you running 2 webapps with the same "
+ + WikiEngine.PROP_APPNAME + "?" );
+ }
}
}
catch( ClassNotFoundException cnfe )
@@ -189,7 +208,7 @@
{
try
{
- ObjectName mbeanName = new ObjectName( OBJECTNAME_PREFIX + loggerName );
+ ObjectName mbeanName = new ObjectName( getObjectNamePrefix() + loggerName );
ManagementFactory.getPlatformMBeanServer().unregisterMBean( mbeanName );
}
catch( Exception e )
@@ -198,4 +217,9 @@
}
}
}
+
+ private static String getObjectNamePrefix()
+ {
+ return Release.APPNAME + ":wiki=" + c_wikiName + ",component=Loggers,name=";
+ }
}
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/log/LoggerImpl.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/log/LoggerImpl.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/log/LoggerImpl.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/log/LoggerImpl.java Sat Jan 3 09:17:18 2009
@@ -143,24 +143,24 @@
/** {@inheritDoc} */
public boolean isErrorEnabled()
{
- return m_slf4jLogger == null ? false : m_slf4jLogger.isErrorEnabled();
+ return m_slf4jLogger.isErrorEnabled();
}
/** {@inheritDoc} */
public boolean isWarnEnabled()
{
- return m_slf4jLogger == null ? false : m_slf4jLogger.isWarnEnabled();
+ return m_slf4jLogger.isWarnEnabled();
}
/** {@inheritDoc} */
public boolean isInfoEnabled()
{
- return m_slf4jLogger == null ? false : m_slf4jLogger.isInfoEnabled();
+ return m_slf4jLogger.isInfoEnabled();
}
/** {@inheritDoc} */
public boolean isDebugEnabled()
{
- return m_slf4jLogger == null ? false : m_slf4jLogger.isDebugEnabled();
+ return m_slf4jLogger.isDebugEnabled();
}
}
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/admin/AdminBeanManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/admin/AdminBeanManager.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/admin/AdminBeanManager.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/admin/AdminBeanManager.java Sat Jan 3 09:17:18 2009
@@ -59,8 +59,7 @@
public AdminBeanManager( WikiEngine engine )
{
- log.info("Using JDK 1.5 Platform MBeanServer");
- m_mbeanServer = MBeanServerFactory15.getServer();
+ m_mbeanServer = ManagementFactory.getPlatformMBeanServer();
m_engine = engine;
@@ -253,20 +252,6 @@
return null;
}
- /**
- * Provides a JDK 1.5-compliant version of the MBeanServerFactory. This
- * will simply bind to the platform MBeanServer.
- */
- private static final class MBeanServerFactory15
- {
- private MBeanServerFactory15()
- {}
-
- public static MBeanServer getServer()
- {
- return ManagementFactory.getPlatformMBeanServer();
- }
- }
/**
* Returns the type identifier for a string type.
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/ClassUtil.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/ClassUtil.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/ClassUtil.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/ClassUtil.java Sat Jan 3 09:17:18 2009
@@ -311,7 +311,7 @@
{
log.info( "You tried to instantiate an abstract class "+requestedClass, e );
- throw new WikiException("Failed to instantiate class "+requestedClass);
+ throw new WikiException("Failed to instantiate class "+requestedClass + ", reason: " + e.getCause());
}
}
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/PageManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/PageManagerTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/PageManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/PageManagerTest.java Sat Jan 3 09:17:18 2009
@@ -50,6 +50,7 @@
public void tearDown()
{
+ engine.shutdown();
}
public void testPageCacheExists()
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/ReferenceManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/ReferenceManagerTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/ReferenceManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/ReferenceManagerTest.java Sat Jan 3 09:17:18 2009
@@ -92,6 +92,8 @@
engine.deletePage( "NewBug" );
engine.deletePage( "BugOne" );
engine.deletePage( "BugTwo" );
+
+ engine.shutdown();
}
public void testNonExistant1()
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/VariableManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/VariableManagerTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/VariableManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/VariableManagerTest.java Sat Jan 3 09:17:18 2009
@@ -36,6 +36,8 @@
WikiContext m_context;
static final String PAGE_NAME = "TestPage";
+
+ TestEngine testEngine = null;
public VariableManagerTest( String s )
{
@@ -51,7 +53,7 @@
props.load( TestEngine.findTestProperties() );
m_variableManager = new VariableManager( props );
- TestEngine testEngine = new TestEngine( props );
+ testEngine = new TestEngine( props );
m_context = testEngine.getWikiContextFactory().newViewContext( testEngine.createPage(WikiName.valueOf(PAGE_NAME)) );
}
@@ -60,6 +62,7 @@
public void tearDown()
{
+ testEngine.shutdown();
}
public void testIllegalInsert1()
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/WikiEngineTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/WikiEngineTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/WikiEngineTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/WikiEngineTest.java Sat Jan 3 09:17:18 2009
@@ -72,7 +72,8 @@
Long.toString(PAGEPROVIDER_RESCAN_PERIOD) );
TestEngine.emptyWorkDir();
- m_engine = new TestEngine(props);
+
+ m_engine = new TestEngine(props);
}
public void tearDown()
@@ -87,6 +88,8 @@
}
TestEngine.emptyWorkDir();
+
+ m_engine.shutdown();
}
public void testNonExistantDirectory()
@@ -100,7 +103,8 @@
props.setProperty( FileSystemProvider.PROP_PAGEDIR,
newdir );
- new TestEngine( props );
+ m_engine.shutdown();
+ m_engine = new TestEngine( props );
File f = new File( newdir );
@@ -108,16 +112,16 @@
assertTrue( "isn't a dir", f.isDirectory() );
f.delete();
+
}
- public void testNonExistantDirProperty()
- throws Exception
+ public void testNonExistantDirProperty() throws Exception
{
props.remove( FileSystemProvider.PROP_PAGEDIR );
-
try
{
- new TestEngine( props );
+ m_engine.shutdown();
+ m_engine = new TestEngine( props );
fail( "Wiki did not warn about missing property." );
}
@@ -264,17 +268,16 @@
m_engine.encodeName(name) );
}
- public void testEncodeNameUTF8()
- throws Exception
+ public void testEncodeNameUTF8() throws Exception
{
String name = "\u0041\u2262\u0391\u002E";
props.setProperty( WikiEngine.PROP_ENCODING, "UTF-8" );
- WikiEngine engine = new TestEngine( props );
+ m_engine.shutdown();
+ m_engine = new TestEngine( props );
- assertEquals( "A%E2%89%A2%CE%91.",
- engine.encodeName(name) );
+ assertEquals( "A%E2%89%A2%CE%91.", m_engine.encodeName( name ) );
}
public void testReadLinks()
@@ -351,77 +354,73 @@
}
*/
- public void testLatestGet()
- throws Exception
+ public void testLatestGet() throws Exception
{
- props.setProperty( "jspwiki.pageProvider",
- "com.ecyrd.jspwiki.providers.VerySimpleProvider" );
+ props.setProperty( "jspwiki.pageProvider", "com.ecyrd.jspwiki.providers.VerySimpleProvider" );
props.setProperty( "jspwiki.usePageCache", "false" );
- WikiEngine engine = new TestEngine( props );
+ m_engine.shutdown();
+ m_engine = new TestEngine( props );
- WikiPage p = engine.getPage( "test", -1 );
+ WikiPage p = m_engine.getPage( "test", -1 );
- VerySimpleProvider vsp = (VerySimpleProvider) engine.getPageManager().getProvider();
+ VerySimpleProvider vsp = (VerySimpleProvider) m_engine.getPageManager().getProvider();
assertEquals( "wrong page", "test", vsp.m_latestReq );
assertEquals( "wrong version", -1, vsp.m_latestVers );
- assertNotNull("null", p);
+ assertNotNull( "null", p );
}
- public void testLatestGet2()
- throws Exception
+ public void testLatestGet2() throws Exception
{
- props.setProperty( "jspwiki.pageProvider",
- "com.ecyrd.jspwiki.providers.VerySimpleProvider" );
- props.setProperty( "jspwiki.usePageCache", "false" );
+ props.setProperty( "jspwiki.pageProvider", "com.ecyrd.jspwiki.providers.VerySimpleProvider" );
+ props.setProperty( "jspwiki.usePageCache", "false" );
- WikiEngine engine = new TestEngine( props );
+ m_engine.shutdown();
+ m_engine = new TestEngine( props );
- String p = engine.getText( "test", -1 );
+ String p = m_engine.getText( "test", -1 );
- VerySimpleProvider vsp = (VerySimpleProvider) engine.getPageManager().getProvider();
+ VerySimpleProvider vsp = (VerySimpleProvider) m_engine.getPageManager().getProvider();
- assertEquals( "wrong page", "test", vsp.m_latestReq );
- assertEquals( "wrong version", -1, vsp.m_latestVers );
- assertNotNull("null", p);
- }
+ assertEquals( "wrong page", "test", vsp.m_latestReq );
+ assertEquals( "wrong version", -1, vsp.m_latestVers );
+ assertNotNull( "null", p );
+ }
- public void testLatestGet3()
- throws Exception
+ public void testLatestGet3() throws Exception
{
- props.setProperty( "jspwiki.pageProvider",
- "com.ecyrd.jspwiki.providers.VerySimpleProvider" );
- props.setProperty( "jspwiki.usePageCache", "false" );
+ props.setProperty( "jspwiki.pageProvider", "com.ecyrd.jspwiki.providers.VerySimpleProvider" );
+ props.setProperty( "jspwiki.usePageCache", "false" );
- WikiEngine engine = new TestEngine( props );
+ m_engine.shutdown();
+ m_engine = new TestEngine( props );
- String p = engine.getHTML( "test", -1 );
+ String p = m_engine.getHTML( "test", -1 );
- VerySimpleProvider vsp = (VerySimpleProvider) engine.getPageManager().getProvider();
+ VerySimpleProvider vsp = (VerySimpleProvider) m_engine.getPageManager().getProvider();
- assertEquals( "wrong page", "test", vsp.m_latestReq );
- assertEquals( "wrong version", 5, vsp.m_latestVers );
- assertNotNull("null", p);
- }
+ assertEquals( "wrong page", "test", vsp.m_latestReq );
+ assertEquals( "wrong version", 5, vsp.m_latestVers );
+ assertNotNull( "null", p );
+ }
- public void testLatestGet4()
- throws Exception
+ public void testLatestGet4() throws Exception
{
- props.setProperty( "jspwiki.pageProvider",
- "com.ecyrd.jspwiki.providers.VerySimpleProvider" );
+ props.setProperty( "jspwiki.pageProvider", "com.ecyrd.jspwiki.providers.VerySimpleProvider" );
props.setProperty( "jspwiki.usePageCache", "true" );
- WikiEngine engine = new TestEngine( props );
+ m_engine.shutdown();
+ m_engine = new TestEngine( props );
- String p = engine.getHTML( VerySimpleProvider.PAGENAME, -1 );
+ String p = m_engine.getHTML( VerySimpleProvider.PAGENAME, -1 );
- CachingProvider cp = (CachingProvider)engine.getPageManager().getProvider();
+ CachingProvider cp = (CachingProvider) m_engine.getPageManager().getProvider();
VerySimpleProvider vsp = (VerySimpleProvider) cp.getRealProvider();
assertEquals( "wrong page", VerySimpleProvider.PAGENAME, vsp.m_latestReq );
assertEquals( "wrong version", -1, vsp.m_latestVers );
- assertNotNull("null", p);
+ assertNotNull( "null", p );
}
/**
@@ -696,49 +695,50 @@
assertNull( "referrers", refs );
}
- public void testDeleteVersion()
- throws Exception
+ public void testDeleteVersion() throws Exception
{
props.setProperty( "jspwiki.pageProvider", "VersioningFileProvider" );
-
- TestEngine engine = new TestEngine( props );
- engine.saveText( NAME1, "Test1" );
- engine.saveText( NAME1, "Test2" );
- engine.saveText( NAME1, "Test3" );
- WikiPage page = engine.getPage( NAME1, 3 );
+ m_engine.shutdown();
+ m_engine = new TestEngine( props );
+ m_engine.saveText( NAME1, "Test1" );
+ m_engine.saveText( NAME1, "Test2" );
+ m_engine.saveText( NAME1, "Test3" );
+
+ WikiPage page = m_engine.getPage( NAME1, 3 );
+
+ m_engine.deleteVersion( page );
+
+ assertNull( "got page", m_engine.getPage( NAME1, 3 ) );
+
+ String content = m_engine.getText( NAME1, WikiProvider.LATEST_VERSION );
- engine.deleteVersion( page );
-
- assertNull( "got page", engine.getPage( NAME1, 3 ) );
-
- String content = engine.getText( NAME1, WikiProvider.LATEST_VERSION );
-
assertEquals( "content", "Test2", content.trim() );
}
- public void testDeleteVersion2()
- throws Exception
+ public void testDeleteVersion2() throws Exception
{
- props.setProperty( "jspwiki.pageProvider", "VersioningFileProvider" );
-
- TestEngine engine = new TestEngine( props );
- engine.saveText( NAME1, "Test1" );
- engine.saveText( NAME1, "Test2" );
- engine.saveText( NAME1, "Test3" );
+ props.setProperty( "jspwiki.pageProvider", "VersioningFileProvider" );
- WikiPage page = engine.getPage( NAME1, 1 );
-
- engine.deleteVersion( page );
-
- assertNull( "got page", engine.getPage( NAME1, 1 ) );
-
- String content = engine.getText( NAME1, WikiProvider.LATEST_VERSION );
-
- assertEquals( "content", "Test3", content.trim() );
-
- assertEquals( "content1", "", engine.getText(NAME1, 1).trim() );
- }
+ m_engine.shutdown();
+ m_engine = new TestEngine( props );
+ m_engine.saveText( NAME1, "Test1" );
+ m_engine.saveText( NAME1, "Test2" );
+ m_engine.saveText( NAME1, "Test3" );
+
+ WikiPage page = m_engine.getPage( NAME1, 1 );
+
+ m_engine.deleteVersion( page );
+
+ assertNull( "got page", m_engine.getPage( NAME1, 1 ) );
+
+ String content = m_engine.getText( NAME1, WikiProvider.LATEST_VERSION );
+
+ assertEquals( "content", "Test3", content.trim() );
+
+ assertEquals( "content1", "", m_engine.getText( NAME1, 1 ).trim() );
+ }
+
/**
* Assumes that CachingProvider is in use.
@@ -853,34 +853,35 @@
}
/**
- * Tests BugReadingOfVariableNotWorkingForOlderVersions
+ * Tests BugReadingOfVariableNotWorkingForOlderVersions
+ *
* @throws Exception
*/
- public void testOldVersionVars()
- throws Exception
- {
- Properties pr = new Properties();
- pr.load( TestEngine.findTestProperties("/jspwiki_vers.properties"));
-
- pr.setProperty( PageManager.PROP_USECACHE, "true" );
-
- TestEngine engine = new TestEngine( pr );
-
- engine.saveText( NAME1, "[{SET foo=bar}]" );
-
- engine.saveText( NAME1, "[{SET foo=notbar}]");
-
- WikiPage v1 = engine.getPage( NAME1, 1 );
-
- WikiPage v2 = engine.getPage( NAME1, 2 );
-
- assertEquals( "V1", "bar", v1.getAttribute("foo") );
-
- // FIXME: The following must run as well
- assertEquals( "V2", "notbar", v2.getAttribute("foo") );
-
- engine.deletePage( NAME1 );
- }
+ public void testOldVersionVars() throws Exception
+ {
+ Properties pr = new Properties();
+ pr.load( TestEngine.findTestProperties( "/jspwiki_vers.properties" ) );
+
+ pr.setProperty( PageManager.PROP_USECACHE, "true" );
+
+ m_engine.shutdown();
+ m_engine = new TestEngine( pr );
+
+ m_engine.saveText( NAME1, "[{SET foo=bar}]" );
+
+ m_engine.saveText( NAME1, "[{SET foo=notbar}]" );
+
+ WikiPage v1 = m_engine.getPage( NAME1, 1 );
+
+ WikiPage v2 = m_engine.getPage( NAME1, 2 );
+
+ assertEquals( "V1", "bar", v1.getAttribute( "foo" ) );
+
+ // FIXME: The following must run as well
+ assertEquals( "V2", "notbar", v2.getAttribute( "foo" ) );
+
+ m_engine.deletePage( NAME1 );
+ }
public void testSpacedNames1()
throws Exception
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/WikiSessionTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/WikiSessionTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/WikiSessionTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/WikiSessionTest.java Sat Jan 3 09:17:18 2009
@@ -63,6 +63,7 @@
protected void tearDown() throws Exception
{
super.tearDown();
+ m_engine.shutdown();
}
public void testRoles() throws Exception
@@ -202,6 +203,8 @@
Properties props = new Properties();
props.load( TestEngine.findTestProperties() );
props.setProperty( AuthenticationManager.PROP_ALLOW_COOKIE_AUTH, "true");
+
+ m_engine.shutdown();
m_engine = new TestEngine( props );
MockHttpServletRequest request;
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/action/GroupActionBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/action/GroupActionBeanTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/action/GroupActionBeanTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/action/GroupActionBeanTest.java Sat Jan 3 09:17:18 2009
@@ -66,6 +66,8 @@
public void tearDown()
{
deleteGroup( "TestGroup" );
+
+ m_engine.shutdown();
}
public void testView() throws Exception
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/action/LoginActionBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/action/LoginActionBeanTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/action/LoginActionBeanTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/action/LoginActionBeanTest.java Sat Jan 3 09:17:18 2009
@@ -61,6 +61,11 @@
}
}
+ public void tearDown()
+ {
+ m_engine.shutdown();
+ }
+
public void testLogin() throws Exception
{
MockRoundtrip trip;
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/action/RenameActionBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/action/RenameActionBeanTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/action/RenameActionBeanTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/action/RenameActionBeanTest.java Sat Jan 3 09:17:18 2009
@@ -52,6 +52,11 @@
throw new RuntimeException("Could not set up TestEngine: " + e.getMessage());
}
}
+
+ public void tearDown()
+ {
+ m_engine.shutdown();
+ }
public void testValidation() throws Exception {
// Save test page
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/action/UserPreferencesActionBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/action/UserPreferencesActionBeanTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/action/UserPreferencesActionBeanTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/action/UserPreferencesActionBeanTest.java Sat Jan 3 09:17:18 2009
@@ -55,6 +55,12 @@
}
}
+ public void tearDown()
+ {
+ m_engine.shutdown();
+ }
+
+
public void testCreateAssertedName() throws Exception
{
MockRoundtrip trip;
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/action/UserProfileActionBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/action/UserProfileActionBeanTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/action/UserProfileActionBeanTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/action/UserProfileActionBeanTest.java Sat Jan 3 09:17:18 2009
@@ -54,6 +54,12 @@
}
}
+ public void tearDown()
+ {
+ m_engine.shutdown();
+ }
+
+
public void testMissingParameters() throws Exception
{
MockRoundtrip trip;
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/action/ViewActionBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/action/ViewActionBeanTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/action/ViewActionBeanTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/action/ViewActionBeanTest.java Sat Jan 3 09:17:18 2009
@@ -49,6 +49,12 @@
throw new RuntimeException("Could not set up TestEngine: " + e.getMessage());
}
}
+
+ public void tearDown()
+ {
+ m_engine.shutdown();
+ }
+
public void testView() throws Exception {
// Save page Main
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/action/WikiContextFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/action/WikiContextFactoryTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/action/WikiContextFactoryTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/action/WikiContextFactoryTest.java Sat Jan 3 09:17:18 2009
@@ -62,6 +62,8 @@
protected void tearDown() throws Exception
{
m_engine.deletePage( "TestPage" );
+
+ m_engine.shutdown();
}
public void testNewActionBean() throws WikiException
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/attachment/AttachmentManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/attachment/AttachmentManagerTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/attachment/AttachmentManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/attachment/AttachmentManagerTest.java Sat Jan 3 09:17:18 2009
@@ -86,6 +86,8 @@
TestEngine.deleteAttachments(NAMEU);
TestEngine.emptyWorkDir();
+
+ m_engine.shutdown();
}
public void testEnabled()
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/AuthenticationManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/AuthenticationManagerTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/AuthenticationManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/AuthenticationManagerTest.java Sat Jan 3 09:17:18 2009
@@ -29,7 +29,6 @@
import junit.framework.TestSuite;
import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.WikiEngine;
import com.ecyrd.jspwiki.WikiSession;
import com.ecyrd.jspwiki.WikiSessionTest;
import com.ecyrd.jspwiki.auth.authorize.Group;
@@ -65,7 +64,13 @@
m_groupMgr = m_engine.getGroupManager();
m_session = WikiSessionTest.adminSession( m_engine );
}
-
+
+ protected void tearDown() throws Exception
+ {
+ super.tearDown();
+ m_engine.shutdown();
+ }
+
public void testIsUserPrincipal()
{
assertTrue( AuthenticationManager.isUserPrincipal( new WikiPrincipal( "Foo" ) ) );
@@ -83,8 +88,9 @@
props.put( "jspwiki.loginModule.class", "com.ecyrd.jspwiki.auth.login.CookieAssertionLoginModule" );
// Init the engine and verify that we initialized with a custom auth login module
- WikiEngine engine = new TestEngine( props );
- AuthenticationManager authMgr= engine.getAuthenticationManager();
+ m_engine.shutdown();
+ m_engine = new TestEngine( props );
+ AuthenticationManager authMgr= m_engine.getAuthenticationManager();
assertEquals( CookieAssertionLoginModule.class, authMgr.m_loginModuleClass );
}
@@ -99,8 +105,9 @@
props.put( "jspwiki.loginModule.options.key3", "value3" );
// Init the engine and verify that we initialized with the correct options
- WikiEngine engine = new TestEngine( props );
- AuthenticationManager authMgr= engine.getAuthenticationManager();
+ m_engine.shutdown();
+ m_engine = new TestEngine( props );
+ AuthenticationManager authMgr= m_engine.getAuthenticationManager();
Map<String,String> options = authMgr.m_loginModuleOptions;
assertEquals( 3, options.size() );
assertTrue( options.containsKey( "key1" ) );
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/AuthorizationManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/AuthorizationManagerTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/AuthorizationManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/AuthorizationManagerTest.java Sat Jan 3 09:17:18 2009
@@ -102,6 +102,12 @@
m_session = WikiSessionTest.adminSession( m_engine );
}
+ protected void tearDown() throws Exception
+ {
+ super.tearDown();
+ m_engine.shutdown();
+ }
+
/**
* Tests the default policy. Anonymous users can read, Authenticated can
* edit, etc. Uses the default tests/etc/jspwiki.policy file installed by
@@ -696,6 +702,7 @@
props.put( AuthorizationManager.POLICY, "jspwiki-testUserPolicy.policy" );
// Initialize the test engine
+ m_engine.shutdown();
m_engine = new TestEngine( props );
m_auth = m_engine.getAuthorizationManager();
m_groupMgr = m_engine.getGroupManager();
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/GroupManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/GroupManagerTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/GroupManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/GroupManagerTest.java Sat Jan 3 09:17:18 2009
@@ -95,6 +95,8 @@
m_groupMgr.removeGroup( "Test" );
m_groupMgr.removeGroup( "Test2" );
m_groupMgr.removeGroup( "Test3" );
+
+ m_engine.shutdown();
}
public void testParseGroup() throws WikiSecurityException
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/UserManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/UserManagerTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/UserManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/UserManagerTest.java Sat Jan 3 09:17:18 2009
@@ -36,8 +36,6 @@
import com.ecyrd.jspwiki.auth.user.*;
import com.ecyrd.jspwiki.workflow.*;
-
-
/**
* @author Andrew Jaquith
*/
@@ -76,6 +74,8 @@
{
groupManager.removeGroup( m_groupName );
}
+
+ m_engine.shutdown();
}
/** Call this setup program to use the save-profile workflow. */
@@ -89,6 +89,7 @@
// Make sure we are using the XML user database
props.put( XMLUserDatabase.PROP_USERDATABASE, "tests/etc/userdatabase.xml" );
+ m_engine.shutdown();
m_engine = new TestEngine( props );
m_mgr = m_engine.getUserManager();
m_db = m_mgr.getUserDatabase();
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/acl/AclImplTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/acl/AclImplTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/acl/AclImplTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/acl/AclImplTest.java Sat Jan 3 09:17:18 2009
@@ -53,6 +53,8 @@
private GroupManager m_groupMgr;
private WikiSession m_session;
+
+ private TestEngine m_engine = null;
public AclImplTest( String s )
{
@@ -69,9 +71,9 @@
super.setUp();
Properties props = new Properties();
props.load( TestEngine.findTestProperties() );
- TestEngine engine = new TestEngine( props );
- m_groupMgr = engine.getGroupManager();
- m_session = WikiSessionTest.adminSession( engine );
+ m_engine = new TestEngine( props );
+ m_groupMgr = m_engine.getGroupManager();
+ m_session = WikiSessionTest.adminSession( m_engine );
m_acl = new AclImpl();
m_aclGroup = new AclImpl();
@@ -136,6 +138,8 @@
{
m_groupMgr.removeGroup( "FooGroup" );
m_groupMgr.removeGroup( "BarGroup" );
+
+ m_engine.shutdown();
}
private boolean inArray( Object[] array, Object key )
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/acl/DefaultAclManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/acl/DefaultAclManagerTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/acl/DefaultAclManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/acl/DefaultAclManagerTest.java Sat Jan 3 09:17:18 2009
@@ -70,6 +70,8 @@
catch ( ProviderException e )
{
}
+
+ m_engine.shutdown();
}
public void testGetPermissions()
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/authorize/GroupTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/authorize/GroupTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/authorize/GroupTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/authorize/GroupTest.java Sat Jan 3 09:17:18 2009
@@ -36,6 +36,8 @@
Group m_group;
String m_wiki;
+ WikiEngine m_engine = null;
+
public GroupTest( String s )
{
super( s );
@@ -45,11 +47,17 @@
{
Properties props = new Properties();
props.load( TestEngine.findTestProperties() );
- WikiEngine engine = new TestEngine( props );
- m_wiki = engine.getApplicationName();
+ m_engine = new TestEngine( props );
+ m_wiki = m_engine.getApplicationName();
m_group = new Group( "TestGroup", m_wiki );
}
+
+ protected void tearDown() throws Exception
+ {
+ super.tearDown();
+ m_engine.shutdown();
+ }
public void testAdd1()
{
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/authorize/JDBCGroupDatabaseTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/authorize/JDBCGroupDatabaseTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/authorize/JDBCGroupDatabaseTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/authorize/JDBCGroupDatabaseTest.java Sat Jan 3 09:17:18 2009
@@ -49,6 +49,8 @@
private JDBCGroupDatabase m_db = null;
private String m_wiki;
+
+ private TestEngine m_engine = null;
/**
* @see junit.framework.TestCase#setUp()
@@ -59,8 +61,8 @@
Properties props = new Properties();
props.load( TestEngine.findTestProperties() );
- WikiEngine engine = new TestEngine( props );
- m_wiki = engine.getApplicationName();
+ m_engine = new TestEngine( props );
+ m_wiki = m_engine.getApplicationName();
// Set up the mock JNDI initial context
TestJNDIContext.initialize();
@@ -87,7 +89,7 @@
// Initialize the user database
m_db = new JDBCGroupDatabase();
- m_db.initialize( engine, new Properties() );
+ m_db.initialize( m_engine, new Properties() );
}
public void tearDown() throws Exception
@@ -96,6 +98,8 @@
{
m_conn.close();
}
+
+ m_engine.shutdown();
}
public void testDelete() throws WikiException
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/authorize/WebContainerAuthorizerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/authorize/WebContainerAuthorizerTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/authorize/WebContainerAuthorizerTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/authorize/WebContainerAuthorizerTest.java Sat Jan 3 09:17:18 2009
@@ -58,6 +58,12 @@
}
}
+ protected void tearDown() throws Exception
+ {
+ super.tearDown();
+ m_engine.shutdown();
+ }
+
public void testConstraints() throws Exception
{
assertTrue( m_authorizer.isConstrained( "/Delete.jsp", new Role( "Admin" ) ) );
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/authorize/XMLGroupDatabaseTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/authorize/XMLGroupDatabaseTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/authorize/XMLGroupDatabaseTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/authorize/XMLGroupDatabaseTest.java Sat Jan 3 09:17:18 2009
@@ -27,7 +27,6 @@
import junit.framework.TestCase;
import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.WikiEngine;
import com.ecyrd.jspwiki.auth.NoSuchPrincipalException;
import com.ecyrd.jspwiki.auth.WikiPrincipal;
import com.ecyrd.jspwiki.auth.WikiSecurityException;
@@ -43,6 +42,8 @@
private XMLGroupDatabase m_db;
private String m_wiki;
+
+ private TestEngine m_engine = null;
/**
* @see junit.framework.TestCase#setUp()
@@ -52,10 +53,16 @@
super.setUp();
Properties props = new Properties();
props.load( TestEngine.findTestProperties() );
- WikiEngine engine = new TestEngine( props );
+ m_engine = new TestEngine( props );
m_db = new XMLGroupDatabase();
- m_db.initialize( engine, props );
- m_wiki = engine.getApplicationName();
+ m_db.initialize( m_engine, props );
+ m_wiki = m_engine.getApplicationName();
+ }
+
+ protected void tearDown() throws Exception
+ {
+ super.tearDown();
+ m_engine.shutdown();
}
public void testDelete() throws WikiException
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/login/AnonymousLoginModuleTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/login/AnonymousLoginModuleTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/login/AnonymousLoginModuleTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/login/AnonymousLoginModuleTest.java Sat Jan 3 09:17:18 2009
@@ -129,4 +129,10 @@
}
}
+ protected void tearDown() throws Exception
+ {
+ super.tearDown();
+ m_engine.shutdown();
+ }
+
}
\ No newline at end of file
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/login/CookieAssertionLoginModuleTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/login/CookieAssertionLoginModuleTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/login/CookieAssertionLoginModuleTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/login/CookieAssertionLoginModuleTest.java Sat Jan 3 09:17:18 2009
@@ -141,4 +141,10 @@
}
}
+ protected void tearDown() throws Exception
+ {
+ super.tearDown();
+ m_engine.shutdown();
+ }
+
}
\ No newline at end of file
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/login/UserDatabaseLoginModuleTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/login/UserDatabaseLoginModuleTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/login/UserDatabaseLoginModuleTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/login/UserDatabaseLoginModuleTest.java Sat Jan 3 09:17:18 2009
@@ -33,7 +33,6 @@
import com.ecyrd.jspwiki.NoRequiredPropertyException;
import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.WikiEngine;
import com.ecyrd.jspwiki.auth.WikiPrincipal;
import com.ecyrd.jspwiki.auth.authorize.Role;
import com.ecyrd.jspwiki.auth.user.UserDatabase;
@@ -47,6 +46,8 @@
UserDatabase db;
Subject subject;
+
+ private TestEngine m_engine = null;
public final void testLogin()
{
@@ -122,7 +123,7 @@
Properties props = new Properties();
props.load( TestEngine.findTestProperties() );
props.put(XMLUserDatabase.PROP_USERDATABASE, "tests/etc/userdatabase.xml");
- WikiEngine m_engine = new TestEngine(props);
+ m_engine = new TestEngine(props);
db = new XMLUserDatabase();
subject = new Subject();
try
@@ -136,4 +137,9 @@
}
}
+ protected void tearDown() throws Exception
+ {
+ super.tearDown();
+ m_engine.shutdown();
+ }
}
\ No newline at end of file
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/login/WebContainerLoginModuleTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/login/WebContainerLoginModuleTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/login/WebContainerLoginModuleTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/login/WebContainerLoginModuleTest.java Sat Jan 3 09:17:18 2009
@@ -169,5 +169,11 @@
assertTrue( false );
}
}
+
+ protected void tearDown() throws Exception
+ {
+ super.tearDown();
+ m_engine.shutdown();
+ }
}
\ No newline at end of file
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/user/UserProfileTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/user/UserProfileTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/user/UserProfileTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/user/UserProfileTest.java Sat Jan 3 09:17:18 2009
@@ -28,7 +28,6 @@
import junit.framework.TestSuite;
import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.WikiEngine;
/**
* Tests the DefaultUserProfile class.
@@ -38,17 +37,20 @@
{
private UserDatabase m_db;
+ private TestEngine m_engine = null;
+
public void setUp()
throws Exception
{
Properties props = new Properties();
props.load( TestEngine.findTestProperties() );
- WikiEngine engine = new TestEngine(props);
- m_db = engine.getUserManager().getUserDatabase();
+ m_engine = new TestEngine(props);
+ m_db = m_engine.getUserManager().getUserDatabase();
}
public void tearDown()
{
+ m_engine.shutdown();
}
public void testSetAttribute()
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/user/XMLUserDatabaseTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/user/XMLUserDatabaseTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/user/XMLUserDatabaseTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/user/XMLUserDatabaseTest.java Sat Jan 3 09:17:18 2009
@@ -29,7 +29,6 @@
import junit.framework.TestCase;
import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.WikiEngine;
import com.ecyrd.jspwiki.auth.NoSuchPrincipalException;
import com.ecyrd.jspwiki.auth.Users;
import com.ecyrd.jspwiki.auth.WikiPrincipal;
@@ -45,6 +44,8 @@
{
private XMLUserDatabase m_db;
+
+ private TestEngine m_engine = null;
/**
* @see junit.framework.TestCase#setUp()
@@ -55,9 +56,15 @@
Properties props = new Properties();
props.load( TestEngine.findTestProperties() );
props.put(XMLUserDatabase.PROP_USERDATABASE, "tests/etc/userdatabase.xml");
- WikiEngine engine = new TestEngine(props);
+ m_engine = new TestEngine(props);
m_db = new XMLUserDatabase();
- m_db.initialize(engine, props);
+ m_db.initialize(m_engine, props);
+ }
+
+ protected void tearDown() throws Exception
+ {
+ super.tearDown();
+ m_engine.shutdown();
}
public void testDeleteByLoginName() throws WikiSecurityException
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/content/PageRenamerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/content/PageRenamerTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/content/PageRenamerTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/content/PageRenamerTest.java Sat Jan 3 09:17:18 2009
@@ -73,6 +73,8 @@
TestEngine.deleteTestPage("Link two");
TestEngine.emptyWorkDir();
+
+ m_engine.shutdown();
}
public void testSimpleRename()
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/dav/AttachmentDavProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/dav/AttachmentDavProviderTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/dav/AttachmentDavProviderTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/dav/AttachmentDavProviderTest.java Sat Jan 3 09:17:18 2009
@@ -35,7 +35,7 @@
{
Properties props = new Properties();
- TestEngine engine;
+ private TestEngine m_engine = null;
AttachmentDavProvider m_provider;
@@ -43,24 +43,26 @@
{
props.load( TestEngine.findTestProperties() );
- engine = new TestEngine(props);
+ m_engine = new TestEngine(props);
- m_provider = new AttachmentDavProvider(engine);
+ m_provider = new AttachmentDavProvider(m_engine);
}
protected void tearDown() throws Exception
{
TestEngine.deleteAttachments( "TestPage" );
TestEngine.deleteTestPage("TestPage");
+
+ m_engine.shutdown();
}
public void testGetPageURL()
throws Exception
{
- engine.saveText("TestPage", "foobar");
- Attachment att = new Attachment(engine,"TestPage","deceit of the tribbles.txt");
+ m_engine.saveText("TestPage", "foobar");
+ Attachment att = new Attachment(m_engine,"TestPage","deceit of the tribbles.txt");
- engine.getAttachmentManager().storeAttachment( att, engine.makeAttachmentFile() );
+ m_engine.getAttachmentManager().storeAttachment( att, m_engine.makeAttachmentFile() );
DavItem di = m_provider.getItem( new DavPath("TestPage/deceit of the tribbles.txt") );
@@ -72,7 +74,7 @@
public void testDirURL()
throws Exception
{
- engine.saveText("TestPage", "foobar");
+ m_engine.saveText("TestPage", "foobar");
DavItem di = m_provider.getItem( new DavPath("") );
@@ -84,7 +86,7 @@
public void testDirURL2()
throws Exception
{
- engine.saveText("TestPage", "foobar");
+ m_engine.saveText("TestPage", "foobar");
DavItem di = m_provider.getItem( new DavPath("TestPage/") );
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/dav/HTMLPagesDavProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/dav/HTMLPagesDavProviderTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/dav/HTMLPagesDavProviderTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/dav/HTMLPagesDavProviderTest.java Sat Jan 3 09:17:18 2009
@@ -35,7 +35,7 @@
Properties props = new Properties();
- TestEngine engine;
+ private TestEngine m_engine = null;
HTMLPagesDavProvider m_provider;
@@ -43,20 +43,22 @@
{
props.load( TestEngine.findTestProperties() );
- engine = new TestEngine(props);
+ m_engine = new TestEngine(props);
- m_provider = new HTMLPagesDavProvider(engine);
+ m_provider = new HTMLPagesDavProvider(m_engine);
}
protected void tearDown() throws Exception
{
TestEngine.deleteTestPage("TestPage");
+
+ m_engine.shutdown();
}
public void testGetPageURL()
throws Exception
{
- engine.saveText("TestPage", "foobar");
+ m_engine.saveText("TestPage", "foobar");
DavItem di = m_provider.getItem( new DavPath("t/TestPage.html") );
@@ -67,7 +69,7 @@
public void testDirURL()
throws Exception
{
- engine.saveText("TestPage", "foobar");
+ m_engine.saveText("TestPage", "foobar");
DavItem di = m_provider.getItem( new DavPath("") );
@@ -79,7 +81,7 @@
public void testDirURL2()
throws Exception
{
- engine.saveText("TestPage", "foobar");
+ m_engine.saveText("TestPage", "foobar");
DavItem di = m_provider.getItem( new DavPath("t/") );
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/dav/RawPagesDavProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/dav/RawPagesDavProviderTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/dav/RawPagesDavProviderTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/dav/RawPagesDavProviderTest.java Sat Jan 3 09:17:18 2009
@@ -34,7 +34,7 @@
{
Properties props = new Properties();
- TestEngine engine;
+ private TestEngine m_engine = null;
RawPagesDavProvider m_provider;
@@ -42,20 +42,22 @@
{
props.load( TestEngine.findTestProperties() );
- engine = new TestEngine(props);
+ m_engine = new TestEngine(props);
- m_provider = new RawPagesDavProvider(engine);
+ m_provider = new RawPagesDavProvider(m_engine);
}
protected void tearDown() throws Exception
{
TestEngine.deleteTestPage("TestPage");
+
+ m_engine.shutdown();
}
public void testGetPageURL()
throws Exception
{
- engine.saveText("TestPage", "foobar");
+ m_engine.saveText("TestPage", "foobar");
DavItem di = m_provider.getItem( new DavPath("t/TestPage.txt") );
@@ -66,7 +68,7 @@
public void testDirURL()
throws Exception
{
- engine.saveText("TestPage", "foobar");
+ m_engine.saveText("TestPage", "foobar");
DavItem di = m_provider.getItem( new DavPath("") );
@@ -78,7 +80,7 @@
public void testDirURL2()
throws Exception
{
- engine.saveText("TestPage", "foobar");
+ m_engine.saveText("TestPage", "foobar");
DavItem di = m_provider.getItem( new DavPath("t/") );
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/diff/ContextualDiffProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/diff/ContextualDiffProviderTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/diff/ContextualDiffProviderTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/diff/ContextualDiffProviderTest.java Sat Jan 3 09:17:18 2009
@@ -33,6 +33,23 @@
public class ContextualDiffProviderTest extends TestCase
{
+ private TestEngine m_engine = null;
+
+ public void setUp() throws Exception
+ {
+ Properties props = new Properties();
+ props.load( TestEngine.findTestProperties() );
+ m_engine = new TestEngine(props);
+ }
+
+ protected void tearDown() throws Exception
+ {
+ super.tearDown();
+ m_engine.shutdown();
+ }
+
+
+
/**
* Sets up some shorthand notation for writing test cases.
* <p>
@@ -199,9 +216,10 @@
diff.initialize(null, props);
props.load( TestEngine.findTestProperties() );
- TestEngine engine = new TestEngine(props);
+ m_engine.shutdown();
+ m_engine = new TestEngine(props);
- WikiContext ctx = engine.getWikiContextFactory().newViewContext( engine.createPage( "Dummy" ) );
+ WikiContext ctx = m_engine.getWikiContextFactory().newViewContext( m_engine.createPage( "Dummy" ) );
String actualDiff = diff.makeDiffHtml( ctx, oldText, newText);
assertEquals(expectedDiff, actualDiff);
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/filters/FilterManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/filters/FilterManagerTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/filters/FilterManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/filters/FilterManagerTest.java Sat Jan 3 09:17:18 2009
@@ -30,7 +30,7 @@
{
Properties props = new Properties();
- TestEngine engine;
+ private TestEngine m_engine = null;
public FilterManagerTest( String s )
{
@@ -41,18 +41,19 @@
throws Exception
{
props.load( TestEngine.findTestProperties() );
- engine = new TestEngine(props);
+ m_engine = new TestEngine(props);
}
public void tearDown()
{
+ m_engine.shutdown();
}
@SuppressWarnings("deprecation")
public void testInitFilters()
throws Exception
{
- FilterManager m = new FilterManager( engine, props );
+ FilterManager m = new FilterManager( m_engine, props );
List l = m.getFilterList();
@@ -71,7 +72,7 @@
public void testInitParams()
throws Exception
{
- FilterManager m = new FilterManager( engine, props );
+ FilterManager m = new FilterManager( m_engine, props );
List l = m.getFilterList();
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java Sat Jan 3 09:17:18 2009
@@ -53,7 +53,7 @@
static final String PAGE_NAME = "testpage";
- TestEngine testEngine;
+ private TestEngine testEngine;
public JSPWikiMarkupParserTest( String s )
@@ -73,6 +73,8 @@
public void tearDown()
{
deleteCreatedPages();
+
+ testEngine.shutdown();
}
private void newPage( String name )
@@ -144,6 +146,7 @@
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 ) );
@@ -690,7 +693,7 @@
{
props.setProperty( "jspwiki.encoding", "ISO-8859-1" );
- //TODO
+ testEngine.shutdown();
TestEngine testEngine2 = new TestEngine( props );
testEngine2.saveText( "Test", "foo ");
@@ -714,41 +717,37 @@
public void testAttachmentLink3()
throws Exception
{
- TestEngine testEngine2 = new TestEngine( props );
-
- testEngine2.saveText( "TestPage", "foo ");
+ testEngine.saveText( "TestPage", "foo ");
created.addElement( "TestPage" );
- Attachment att = new Attachment( testEngine2, "TestPage", "TestAtt.txt" );
+ Attachment att = new Attachment( testEngine, "TestPage", "TestAtt.txt" );
att.setAuthor( "FirstPost" );
- testEngine2.getAttachmentManager().storeAttachment( att, testEngine.makeAttachmentFile() );
+ testEngine.getAttachmentManager().storeAttachment( att, testEngine.makeAttachmentFile() );
String src = "[Test page/TestAtt.txt]";
assertEquals( "<a class=\"attachment\" href=\"/attach/TestPage/TestAtt.txt\">Test page/TestAtt.txt</a>"+
"<a href=\"/PageInfo.jsp?page=TestPage/TestAtt.txt\" class=\"infolink\"><img src=\"/images/attachment_small.png\" border=\"0\" alt=\"(info)\" /></a>",
- translate(testEngine2,src));
+ translate(testEngine,src));
}
public void testAttachmentLink4()
throws Exception
{
- TestEngine testEngine2 = new TestEngine( props );
-
- testEngine2.saveText( "TestPage", "foo ");
+ testEngine.saveText( "TestPage", "foo ");
created.addElement( "TestPage" );
- Attachment att = new Attachment( testEngine2, "TestPage", "TestAtt.txt" );
+ Attachment att = new Attachment( testEngine, "TestPage", "TestAtt.txt" );
att.setAuthor( "FirstPost" );
- testEngine2.getAttachmentManager().storeAttachment( att, testEngine.makeAttachmentFile() );
+ testEngine.getAttachmentManager().storeAttachment( att, testEngine.makeAttachmentFile() );
- String src = "["+testEngine2.beautifyTitle("TestPage/TestAtt.txt")+"]";
+ String src = "["+testEngine.beautifyTitle("TestPage/TestAtt.txt")+"]";
assertEquals( "<a class=\"attachment\" href=\"/attach/TestPage/TestAtt.txt\">Test Page/TestAtt.txt</a>"+
"<a href=\"/PageInfo.jsp?page=TestPage/TestAtt.txt\" class=\"infolink\"><img src=\"/images/attachment_small.png\" border=\"0\" alt=\"(info)\" /></a>",
- translate(testEngine2,src));
+ translate(testEngine,src));
}
public void testNoHyperlink()
@@ -1198,6 +1197,7 @@
String src = "<p>";
props.setProperty( "jspwiki.translatorReader.allowHTML", "true" );
+ testEngine.shutdown();
testEngine = new TestEngine( props );
WikiPage page = testEngine.createPage( WikiName.valueOf( PAGE_NAME ) );
@@ -1213,6 +1213,7 @@
String src = "{{{ <br /> }}}";
props.setProperty( "jspwiki.translatorReader.allowHTML", "true" );
+ testEngine.shutdown();
testEngine = new TestEngine( props );
WikiPage page = testEngine.createPage( WikiName.valueOf( PAGE_NAME ) );
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/CounterPluginTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/CounterPluginTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/CounterPluginTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/CounterPluginTest.java Sat Jan 3 09:17:18 2009
@@ -60,6 +60,7 @@
public void tearDown()
{
+ testEngine.shutdown();
}
private String translate( String src )
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/DenouncePluginTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/DenouncePluginTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/DenouncePluginTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/DenouncePluginTest.java Sat Jan 3 09:17:18 2009
@@ -82,6 +82,7 @@
TestEngine.deleteTestPage("TestPage");
TestEngine.deleteTestPage("Foobar");
TestEngine.emptyWorkDir();
+ engine.shutdown();
}
public void testSLURPBot() throws Exception {
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/InsertPageTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/InsertPageTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/InsertPageTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/InsertPageTest.java Sat Jan 3 09:17:18 2009
@@ -47,6 +47,8 @@
TestEngine.deleteTestPage( "Test_Page" );
TestEngine.deleteTestPage( "TestPage" );
TestEngine.deleteTestPage( "Test Page" );
+
+ testEngine.shutdown();
}
public void testRecursive() throws Exception
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/PluginIndexPluginTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/PluginIndexPluginTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/PluginIndexPluginTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/PluginIndexPluginTest.java Sat Jan 3 09:17:18 2009
@@ -49,6 +49,8 @@
public void tearDown()
{
TestEngine.emptyWorkDir();
+
+ engine.shutdown();
}
public static Test suite()
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/PluginManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/PluginManagerTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/PluginManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/PluginManagerTest.java Sat Jan 3 09:17:18 2009
@@ -64,6 +64,8 @@
public void tearDown() throws ProviderException
{
engine.deletePage("Testpage");
+
+ engine.shutdown();
}
public void testSimpleInsert()
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/ReferredPagesPluginTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/ReferredPagesPluginTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/ReferredPagesPluginTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/ReferredPagesPluginTest.java Sat Jan 3 09:17:18 2009
@@ -70,6 +70,8 @@
TestEngine.deleteTestPage( "IPointToTwoPages" );
TestEngine.emptyWorkDir();
+
+ engine.shutdown();
}
/**
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/ReferringPagesPluginTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/ReferringPagesPluginTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/ReferringPagesPluginTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/ReferringPagesPluginTest.java Sat Jan 3 09:17:18 2009
@@ -76,6 +76,8 @@
TestEngine.deleteTestPage( "Foobar5" );
TestEngine.deleteTestPage( "Foobar6" );
TestEngine.deleteTestPage( "Foobar7" );
+
+ engine.shutdown();
}
private String mkLink( String page )
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/TableOfContentsTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/TableOfContentsTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/TableOfContentsTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/TableOfContentsTest.java Sat Jan 3 09:17:18 2009
@@ -64,6 +64,8 @@
super.tearDown();
testEngine.deletePage( "Test" );
+
+ testEngine.shutdown();
}
public void testHeadingVariables()
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/UndefinedPagesPluginTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/UndefinedPagesPluginTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/UndefinedPagesPluginTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/UndefinedPagesPluginTest.java Sat Jan 3 09:17:18 2009
@@ -63,6 +63,7 @@
TestEngine.deleteTestPage( "TestPage" );
TestEngine.deleteTestPage( "Foobar" );
TestEngine.emptyWorkDir();
+ engine.shutdown();
}
private String wikitize( String s )
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/BasicAttachmentProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/BasicAttachmentProviderTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/BasicAttachmentProviderTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/BasicAttachmentProviderTest.java Sat Jan 3 09:17:18 2009
@@ -111,6 +111,8 @@
TestEngine.deleteAll( f );
TestEngine.emptyWorkDir();
+
+ m_engine.shutdown();
}
public void testExtension()
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/CachingProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/CachingProviderTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/CachingProviderTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/CachingProviderTest.java Sat Jan 3 09:17:18 2009
@@ -35,7 +35,11 @@
import com.ecyrd.jspwiki.util.FileUtil;
public class CachingProviderTest extends TestCase
+
{
+ private Properties props = new Properties();
+ private TestEngine m_engine = null;
+
public CachingProviderTest( String s )
{
super( s );
@@ -44,6 +48,9 @@
public void setUp()
throws Exception
{
+ props.load( TestEngine.findTestProperties() );
+ m_engine = new TestEngine( props );
+
TestEngine.emptyWorkDir();
}
@@ -51,6 +58,8 @@
{
TestEngine.emptyWorkDir();
TestEngine.deleteTestPage("Testi");
+
+ m_engine.shutdown();
}
/**
@@ -66,9 +75,10 @@
props.setProperty( "jspwiki.pageProvider", "com.ecyrd.jspwiki.providers.CounterProvider" );
props.setProperty( "jspwiki.cachingProvider.capacity", "100" );
- TestEngine engine = new TestEngine( props );
+ m_engine.shutdown();
+ m_engine = new TestEngine( props );
- CounterProvider p = (CounterProvider)((CachingProvider)engine.getPageManager().getProvider()).getRealProvider();
+ CounterProvider p = (CounterProvider)((CachingProvider)m_engine.getPageManager().getProvider()).getRealProvider();
assertEquals("init", 1, p.m_initCalls);
assertEquals("getAllPages", 1, p.m_getAllPagesCalls);
@@ -76,7 +86,7 @@
assertEquals("getPage", 2, p.m_getPageCalls); // These two are for non-existant pages (with and without s)
assertEquals("getPageText", 4, p.m_getPageTextCalls);
- engine.getPage( "Foo" );
+ m_engine.getPage( "Foo" );
assertEquals("pageExists2", 0, p.m_pageExistsCalls);
assertEquals("getPage2", 2, p.m_getPageCalls);
@@ -90,7 +100,8 @@
props.setProperty( "jspwiki.cachingProvider.cacheCheckInterval", "2" );
- TestEngine engine = new TestEngine( props );
+ m_engine.shutdown();
+ m_engine = new TestEngine( props );
String dir = props.getProperty( FileSystemProvider.PROP_PAGEDIR );
@@ -103,10 +114,10 @@
Thread.sleep( 4000L ); // Make sure we wait long enough
- WikiPage p = engine.getPage( "Testi" );
+ WikiPage p = m_engine.getPage( "Testi" );
assertNotNull( "page did not exist?", p );
- String text = engine.getText( "Testi");
+ String text = m_engine.getText( "Testi");
assertEquals("text", "[fuufaa]", text );
// TODO: ReferenceManager check as well
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/FileSystemProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/FileSystemProviderTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/FileSystemProviderTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/FileSystemProviderTest.java Sat Jan 3 09:17:18 2009
@@ -67,6 +67,8 @@
public void tearDown()
{
TestEngine.deleteAll( new File(m_pagedir) );
+
+ m_engine.shutdown();
}
public void testScandinavianLetters()
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/RCSFileProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/RCSFileProviderTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/RCSFileProviderTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/RCSFileProviderTest.java Sat Jan 3 09:17:18 2009
@@ -76,6 +76,8 @@
f = new File( files, "RCS" );
f.delete();
+
+ engine.shutdown();
}
/**
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/VersioningFileProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/VersioningFileProviderTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/VersioningFileProviderTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/VersioningFileProviderTest.java Sat Jan 3 09:17:18 2009
@@ -65,6 +65,8 @@
f = new File( files, "OLD" );
TestEngine.deleteAll(f);
+
+ engine.shutdown();
}
/**
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/CreoleRendererTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/CreoleRendererTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/CreoleRendererTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/CreoleRendererTest.java Sat Jan 3 09:17:18 2009
@@ -47,6 +47,12 @@
super.setUp();
}
+ protected void tearDown() throws Exception
+ {
+ super.tearDown();
+ m_testEngine.shutdown();
+ }
+
private String render(String s) throws IOException
{
WikiPage dummyPage = m_testEngine.createPage("TestPage");
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/WysiwygEditingRendererTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/WysiwygEditingRendererTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/WysiwygEditingRendererTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/WysiwygEditingRendererTest.java Sat Jan 3 09:17:18 2009
@@ -54,6 +54,8 @@
{
TestEngine.deleteTestPage( "WysiwygEditingRendererTest" );
TestEngine.deleteTestPage( "This Pagename Has Spaces" );
+
+ m_testEngine.shutdown();
}
private String render(String s) throws IOException
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/rss/RSSGeneratorTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/rss/RSSGeneratorTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/rss/RSSGeneratorTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/rss/RSSGeneratorTest.java Sat Jan 3 09:17:18 2009
@@ -66,6 +66,8 @@
protected void tearDown() throws Exception
{
TestEngine.deleteAll( new File(props.getProperty( FileSystemProvider.PROP_PAGEDIR )) );
+
+ m_testEngine.shutdown();
}
public void testBlogRSS()
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/search/SearchManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/search/SearchManagerTest.java?rev=731025&r1=731024&r2=731025&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/search/SearchManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/search/SearchManagerTest.java Sat Jan 3 09:17:18 2009
@@ -63,6 +63,8 @@
super.tearDown();
TestEngine.deleteTestPage("TestPage");
+
+ m_engine.shutdown();
}
public void testDefaultProvider()