Author: metskem
Date: Sun Aug 30 13:13:27 2009
New Revision: 809331
URL: http://svn.apache.org/viewvc?rev=809331&view=rev
Log:
minor improvements to PageViewPlugin(Test)
Modified:
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/plugin/PageViewPlugin.java
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/com/ecyrd/jspwiki/plugin/PageViewPluginTest.java
Modified:
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/plugin/PageViewPlugin.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/plugin/PageViewPlugin.java?rev=809331&r1=809330&r2=809331&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/plugin/PageViewPlugin.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/plugin/PageViewPlugin.java
Sun Aug 30 13:13:27 2009
@@ -128,7 +128,7 @@
public void initialize( WikiEngine engine )
{
- log.error( "initializing PageViewPlugin" );
+ log.info( "initializing PageViewPlugin" );
synchronized( this )
{
@@ -148,7 +148,7 @@
private void cleanup()
{
- log.error( "cleaning up PageView Manager" );
+ log.info( "cleaning up PageView Manager" );
c_singleton = null;
}
@@ -212,7 +212,7 @@
public synchronized void initialize( WikiEngine engine )
{
- log.error( "initializing PageView Manager" );
+ log.info( "initializing PageView Manager" );
m_workDir = engine.getWorkDir();
@@ -246,7 +246,7 @@
private synchronized void handleShutdown()
{
- log.error( "handleShutdown: The counter store thread was shut
down." );
+ log.info( "handleShutdown: The counter store thread was shut
down." );
cleanup();
@@ -281,7 +281,7 @@
if( event.getType() == WikiEngineEvent.SHUTDOWN )
{
- log.error( "Detected wiki engine shutdown" );
+ log.info( "Detected wiki engine shutdown" );
handleShutdown();
}
}
@@ -579,7 +579,7 @@
if( m_counters != null && m_storage != null )
{
- log.error( "loadCounters" );
+ log.warn( "loadCounters" );
synchronized( this )
{
@@ -623,7 +623,7 @@
}
- log.error( "loadCounters: counters.size=" +
m_counters.size() );
+ log.info( "loadCounters: counters.size=" +
m_counters.size() );
}
}
}
@@ -637,8 +637,8 @@
if( m_counters != null && m_storage != null && m_dirty )
{
-
- log.error( "storeCounters: counters.size=" +
m_counters.size() );
+ log.info( "storeCounters: counters.size=" +
m_counters.size() );
+
synchronized( this )
{
Modified:
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/com/ecyrd/jspwiki/plugin/PageViewPluginTest.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/com/ecyrd/jspwiki/plugin/PageViewPluginTest.java?rev=809331&r1=809330&r2=809331&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/com/ecyrd/jspwiki/plugin/PageViewPluginTest.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/tests/com/ecyrd/jspwiki/plugin/PageViewPluginTest.java
Sun Aug 30 13:13:27 2009
@@ -160,11 +160,14 @@
WikiContext contextPV = new WikiContext( testEngine, pageviews );
String result = testEngine.getHTML( contextPV, pageviews );
- System.out.println( result );
+// System.out.println( result );
assertTrue( result.contains( "Test Page 03" ) );
assertFalse( result.contains( "Test Page 04" ) );
+
+ TestEngine.deleteTestPage( "TestPage03" );
+ TestEngine.deleteTestPage( "TestPage04" );
}
