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 2014/03/03 20:34:59 UTC
svn commit: r1573688 - in /jspwiki/trunk: ChangeLog
jspwiki-it-tests/jspwiki-selenium-tests/jspwiki-selenium-tests.iml
jspwiki-war/src/main/java/org/apache/wiki/Release.java
jspwiki-war/src/test/java/org/apache/wiki/ReferenceManagerTest.java
Author: metskem
Date: Mon Mar 3 19:34:58 2014
New Revision: 1573688
URL: http://svn.apache.org/r1573688
Log:
2014-03-03 Harry Metske (metskem@apache.org)
* 2.10.1-svn-11
* Fixed JSPWIKI-813 - ReferenceManagerTest - two cases fail (thanks to Brian Burch)
Added:
jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/jspwiki-selenium-tests.iml
Modified:
jspwiki/trunk/ChangeLog
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/ReferenceManagerTest.java
Modified: jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1573688&r1=1573687&r2=1573688&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Mon Mar 3 19:34:58 2014
@@ -1,3 +1,9 @@
+2014-03-03 Harry Metske (metskem@apache.org)
+
+ * 2.10.1-svn-11
+
+ * Fixed JSPWIKI-813 - ReferenceManagerTest - two cases fail (thanks to Brian Burch)
+
2014-03-02 Dirk Frederickx (brushed AT apache DOT org)
* 2.10.1-svn-10
Added: jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/jspwiki-selenium-tests.iml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/jspwiki-selenium-tests.iml?rev=1573688&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/jspwiki-selenium-tests.iml (added)
+++ jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/jspwiki-selenium-tests.iml Mon Mar 3 19:34:58 2014
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="jspwiki-war" />
+ </component>
+</module>
+
Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1573688&r1=1573687&r2=1573688&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java Mon Mar 3 19:34:58 2014
@@ -72,7 +72,7 @@ public final class Release {
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "10";
+ public static final String BUILD = "11";
/**
* This is the generic version string you should use when printing out the version. It is of
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/ReferenceManagerTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/ReferenceManagerTest.java?rev=1573688&r1=1573687&r2=1573688&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/ReferenceManagerTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/ReferenceManagerTest.java Mon Mar 3 19:34:58 2014
@@ -41,6 +41,7 @@ public class ReferenceManagerTest extend
super( s );
}
+ @Override
public void setUp()
throws Exception
{
@@ -48,7 +49,6 @@ public class ReferenceManagerTest extend
// make sure that the reference manager cache is cleaned first
TestEngine.emptyWorkDir(null);
- CacheManager.getInstance().removalAll();
engine = new TestEngine(props);
@@ -60,11 +60,17 @@ public class ReferenceManagerTest extend
mgr = engine.getReferenceManager();
}
+ @Override
public void tearDown()
throws Exception
{
// any wiki page that was created must be deleted!
TestEngine.emptyWikiDir();
+
+ // jspwiki always uses a singleton CacheManager, so
+ // clear the cache at the end of every test case to avoid
+ // polluting another test case
+ CacheManager.getInstance().removalAll();
}
public void testNonExistant1()