Author: ajaquith
Date: Wed Oct 28 03:06:59 2009
New Revision: 830427
URL: http://svn.apache.org/viewvc?rev=830427&view=rev
Log:
Fixed Janne's slightly dodgy LDAP-server-existence-checking code. ;) Tweaked
unit test names and order to match the command line (ant tests) version.
Removed redundant 2nd execution of TextUtilTest inside its package's AllTests
class, and added in the ui.stripes.AllTests suite. These two changes mean that
all 3 test methods: guitests, tests, and Eclipse all report 1024 tests. Eclipse
tests show a classpath error in HtmlStringToWikiTranslatorTest that is throwing
14 errors. I'm too tired at this point to fix this. Other than that, we are
cleaner than Janne's baby's bottom after a diaper change. That is to say, not
perfect but perfectly presentable.
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/build.xml
incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/AllTests.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/attachment/AllTests.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/AllTests.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/acl/AllTests.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/AllTests.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/LdapAuthorizerTest.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/AllTests.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/permissions/AllTests.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/AllTests.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/LdapUserDatabaseTest.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/AllTests.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/inspect/AllTests.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/resolver/AllTests.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/diff/AllTests.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/filters/AllTests.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/htmltowiki/AllTests.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/AllTests.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/AllTests.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/render/AllTests.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/search/AllTests.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/AllTests.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/AllTests.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/stripes/AllTests.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/url/AllTests.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/AllTests.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/web/AllTests.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/AllTests.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/xmlrpc/AllTests.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=830427&r1=830426&r2=830427&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Wed Oct 28 03:06:59 2009
@@ -1,3 +1,25 @@
+2009-10-27 Andrew Jaquith <ajaquith AT apache DOT org>
+
+ * 3.0.0-svn-175
+
+ * Tweaked the svn:ignore property for the etc/ and tests/etc/
+ directories. This should allow the trunk .xml files to
+ update working copies properly.
+
+ * Fixed Janne's slightly dodgy LDAP-server-existence-checking
+ code. ;) Tweaked unit test names and order to match the command
+ line (ant tests) version. Removed redundant 2nd execution of
+ TextUtilTest inside its package's AllTests class, and added
+ in the ui.stripes.AllTests suite. These two changes mean that
+ all 3 test methods: guitests, tests, and Eclipse all report
+ 1024 tests. Eclipse tests show a classpath error in
+ HtmlStringToWikiTranslatorTest that is throwing 14 errors.
+ I'm too tired at this point to fix this. Other than that,
+ we are cleaner than Janne's baby's bottom after a diaper change.
+ That is to say, not perfect but perfectly presentable.
+
+ * Now, on to the JSP and War issues...
+
2009-10-26 Janne Jalkanen <[email protected]>
* 3.0.0-svn-174
Modified: incubator/jspwiki/trunk/build.xml
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=830427&r1=830426&r2=830427&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Wed Oct 28 03:06:59 2009
@@ -789,34 +789,6 @@
</target>
- <target name="tests-auth" depends="jar,tests-init,jartests"
- description="Runs the AuthorizationManager tests, with JDPA">
-
- <junit printsummary="yes" haltonfailure="no" fork="yes">
- <classpath>
- <path refid="path.tests" />
- </classpath>
- <sysproperty key="jspwiki.tests.auth" value="true" />
- <jvmarg value="-Xdebug" />
- <jvmarg
value="-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y" />
- <formatter type="plain" />
- <formatter type="xml" usefile="yes" />
- <batchtest todir="${tests.reports}">
- <fileset dir="${tests}">
- <include name="**/AuthorizationManagerTest.java" />
- </fileset>
- </batchtest>
- </junit>
-
- <junitreport todir="${build}/tests">
- <fileset dir="${tests.reports}">
- <include name="**/TEST-*.xml" />
- </fileset>
- <report format="noframes" todir="${build}/tests" />
- </junitreport>
-
- </target>
-
<target name="guitests" depends="jar,tests-init,jartests,tests-db-init"
description="Runs the tests in a pretty window.">
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=830427&r1=830426&r2=830427&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Wed Oct 28
03:06:59 2009
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "174";
+ public static final String BUILD = "175";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/AllTests.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/AllTests.java?rev=830427&r1=830426&r2=830427&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/AllTests.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/AllTests.java Wed Oct 28
03:06:59 2009
@@ -35,18 +35,23 @@
public static Test suite()
{
- TestSuite suite = new TestSuite("JSPWiki Unit Tests");
+ TestSuite suite = new TestSuite("JSPWiki top-level tests");
suite.addTest( ReleaseTest.suite() );
suite.addTest( VariableManagerTest.suite() );
- // This is obsolete and not maintained anymore
- // suite.addTest( TranslatorReaderTest.suite() );
- suite.addTest( WikiSessionTest.suite() );
suite.addTest( WikiEngineTest.suite() );
+ suite.addTest( WikiSessionTest.suite() );
suite.addTest( org.apache.wiki.action.AllTests.suite() );
- suite.addTest( org.apache.wiki.content.AllTests.suite() );
suite.addTest( org.apache.wiki.attachment.AllTests.suite() );
suite.addTest( org.apache.wiki.auth.AllTests.suite() );
+ suite.addTest( org.apache.wiki.auth.acl.AllTests.suite() );
+ suite.addTest( org.apache.wiki.auth.authorize.AllTests.suite() );
+ suite.addTest( org.apache.wiki.auth.login.AllTests.suite() );
+ suite.addTest( org.apache.wiki.auth.permissions.AllTests.suite() );
+ suite.addTest( org.apache.wiki.auth.user.AllTests.suite() );
+ suite.addTest( org.apache.wiki.content.AllTests.suite() );
+ suite.addTest( org.apache.wiki.content.inspect.AllTests.suite() );
+ suite.addTest( org.apache.wiki.content.resolver.AllTests.suite() );
suite.addTest( org.apache.wiki.diff.AllTests.suite() );
suite.addTest( org.apache.wiki.filters.AllTests.suite() );
suite.addTest( org.apache.wiki.htmltowiki.AllTests.suite() );
@@ -56,10 +61,10 @@
suite.addTest( org.apache.wiki.rss.AllTests.suite() );
suite.addTest( org.apache.wiki.search.AllTests.suite() );
suite.addTest( org.apache.wiki.ui.AllTests.suite() );
+ suite.addTest( org.apache.wiki.ui.migrator.AllTests.suite() );
+ suite.addTest( org.apache.wiki.ui.stripes.AllTests.suite() );
suite.addTest( org.apache.wiki.url.AllTests.suite() );
suite.addTest( org.apache.wiki.util.AllTests.suite() );
- // These are not runnable without a running tomcat
- //suite.addTest( org.apache.wiki.web.AllTests.suite() );
suite.addTest( org.apache.wiki.workflow.AllTests.suite() );
suite.addTest( org.apache.wiki.xmlrpc.AllTests.suite() );
Modified:
incubator/jspwiki/trunk/tests/java/org/apache/wiki/attachment/AllTests.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/attachment/AllTests.java?rev=830427&r1=830426&r2=830427&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/attachment/AllTests.java
(original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/attachment/AllTests.java
Wed Oct 28 03:06:59 2009
@@ -32,7 +32,7 @@
public static Test suite()
{
- TestSuite suite = new TestSuite("Attachment package");
+ TestSuite suite = new TestSuite("Attachment package tests");
suite.addTest( AttachmentManagerTest.suite() );
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/AllTests.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/AllTests.java?rev=830427&r1=830426&r2=830427&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/AllTests.java
(original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/AllTests.java Wed
Oct 28 03:06:59 2009
@@ -34,16 +34,11 @@
public static Test suite()
{
- TestSuite suite = new TestSuite("AAA package tests");
+ TestSuite suite = new TestSuite("Auth: top-level package tests");
suite.addTest( AuthenticationManagerTest.suite() );
suite.addTest( AuthorizationManagerTest.suite() );
suite.addTest( GroupManagerTest.suite() );
- suite.addTest( org.apache.wiki.auth.acl.AllTests.suite() );
- suite.addTest( org.apache.wiki.auth.authorize.AllTests.suite() );
- suite.addTest( org.apache.wiki.auth.login.AllTests.suite() );
- suite.addTest( org.apache.wiki.auth.permissions.AllTests.suite() );
- suite.addTest( org.apache.wiki.auth.user.AllTests.suite() );
suite.addTestSuite( UserManagerTest.class );
return suite;
Modified:
incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/acl/AllTests.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/acl/AllTests.java?rev=830427&r1=830426&r2=830427&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/acl/AllTests.java
(original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/acl/AllTests.java
Wed Oct 28 03:06:59 2009
@@ -33,7 +33,7 @@
public static Test suite()
{
- TestSuite suite = new TestSuite("ACL tests");
+ TestSuite suite = new TestSuite("Auth: ACL tests");
suite.addTest( AclEntryImplTest.suite() );
suite.addTest( AclImplTest.suite() );
Modified:
incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/AllTests.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/AllTests.java?rev=830427&r1=830426&r2=830427&view=diff
==============================================================================
---
incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/AllTests.java
(original)
+++
incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/authorize/AllTests.java
Wed Oct 28 03:06:59 2009
@@ -35,12 +35,14 @@
public static Test suite()
{
- TestSuite suite = new TestSuite( "Authorizer, group and group database
tests" );
+ TestSuite suite = new TestSuite( "Auth: authorizer, group and group
database tests" );
+
suite.addTestSuite( GroupTest.class );
suite.addTestSuite( JDBCGroupDatabaseTest.class );
- suite.addTestSuite( XMLGroupDatabaseTest.class );
suite.addTestSuite( LdapAuthorizerTest.class );
suite.addTestSuite( WebContainerAuthorizerTest.class );
+ suite.addTestSuite( XMLGroupDatabaseTest.class );
+
return suite;
}
}
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=830427&r1=830426&r2=830427&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
Wed Oct 28 03:06:59 2009
@@ -60,7 +60,10 @@
try
{
Socket socket = new Socket( LDAP_HOST, LDAP_PORT );
- socket.connect( new InetSocketAddress(0) );
+ if ( !socket.isConnected() )
+ {
+ socket.connect( new InetSocketAddress(0) );
+ }
socket.close();
}
catch( ConnectException e )
Modified:
incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/AllTests.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/AllTests.java?rev=830427&r1=830426&r2=830427&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/AllTests.java
(original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/login/AllTests.java
Wed Oct 28 03:06:59 2009
@@ -35,11 +35,13 @@
public static Test suite()
{
- TestSuite suite = new TestSuite( "Login module tests" );
+ TestSuite suite = new TestSuite( "Auth: login module tests" );
+
suite.addTestSuite( AnonymousLoginModuleTest.class );
suite.addTestSuite( CookieAssertionLoginModuleTest.class );
suite.addTestSuite( UserDatabaseLoginModuleTest.class );
suite.addTestSuite( WebContainerLoginModuleTest.class );
+
return suite;
}
}
Modified:
incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/permissions/AllTests.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/permissions/AllTests.java?rev=830427&r1=830426&r2=830427&view=diff
==============================================================================
---
incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/permissions/AllTests.java
(original)
+++
incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/permissions/AllTests.java
Wed Oct 28 03:06:59 2009
@@ -35,12 +35,14 @@
public static Test suite()
{
- TestSuite suite = new TestSuite( "Permissions tests" );
- suite.addTestSuite( AllPermissionTest.class );
+ TestSuite suite = new TestSuite( "Auth: permission tests" );
+
suite.addTestSuite( AllPermissionCollectionTest.class );
+ suite.addTestSuite( AllPermissionTest.class );
suite.addTestSuite( GroupPermissionTest.class );
suite.addTestSuite( PagePermissionTest.class );
suite.addTestSuite( WikiPermissionTest.class );
+
return suite;
}
}
Modified:
incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/AllTests.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/AllTests.java?rev=830427&r1=830426&r2=830427&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/AllTests.java
(original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/AllTests.java
Wed Oct 28 03:06:59 2009
@@ -35,11 +35,13 @@
public static Test suite()
{
- TestSuite suite = new TestSuite( "User profile and database tests" );
- suite.addTestSuite( UserProfileTest.class );
+ TestSuite suite = new TestSuite( "Auth: user profile and database
tests" );
+
suite.addTestSuite( JDBCUserDatabaseTest.class );
suite.addTestSuite( LdapUserDatabaseTest.class );
+ suite.addTestSuite( UserProfileTest.class );
suite.addTestSuite( XMLUserDatabaseTest.class );
+
return suite;
}
}
Modified:
incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/LdapUserDatabaseTest.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/LdapUserDatabaseTest.java?rev=830427&r1=830426&r2=830427&view=diff
==============================================================================
---
incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/LdapUserDatabaseTest.java
(original)
+++
incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/user/LdapUserDatabaseTest.java
Wed Oct 28 03:06:59 2009
@@ -57,7 +57,10 @@
try
{
Socket socket = new Socket( LDAP_HOST, LDAP_PORT );
- socket.connect( new InetSocketAddress(0) );
+ if ( !socket.isConnected() )
+ {
+ socket.connect( new InetSocketAddress(0) );
+ }
socket.close();
}
catch( ConnectException e )
Modified:
incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/AllTests.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/AllTests.java?rev=830427&r1=830426&r2=830427&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/AllTests.java
(original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/AllTests.java
Wed Oct 28 03:06:59 2009
@@ -34,14 +34,12 @@
public static Test suite()
{
- TestSuite suite = new TestSuite("JSPWiki content unit tests");
+ TestSuite suite = new TestSuite("Content manager tests");
- suite.addTest( PageRenamerTest.suite() );
- suite.addTest( WikiPathTest.suite() );
suite.addTest( ContentManagerTest.suite() );
+ suite.addTest( PageRenamerTest.suite() );
suite.addTest( ReferenceManagerTest.suite() );
- suite.addTest( org.apache.wiki.content.inspect.AllTests.suite() );
- suite.addTest( org.apache.wiki.content.resolver.AllTests.suite() );
+ suite.addTest( WikiPathTest.suite() );
return suite;
}
Modified:
incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/inspect/AllTests.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/inspect/AllTests.java?rev=830427&r1=830426&r2=830427&view=diff
==============================================================================
---
incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/inspect/AllTests.java
(original)
+++
incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/inspect/AllTests.java
Wed Oct 28 03:06:59 2009
@@ -34,11 +34,13 @@
public static Test suite()
{
- TestSuite suite = new TestSuite("JSPWiki content inspector tests");
- suite.addTest( InspectionTest.suite() );
+ TestSuite suite = new TestSuite("Content inspection tests");
+
suite.addTest( InspectionPlanTest.suite() );
+ suite.addTest( InspectionTest.suite() );
suite.addTest( ReputationManagerTest.suite() );
suite.addTest( SpamInspectionFactoryTest.suite() );
+
return suite;
}
}
Modified:
incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/resolver/AllTests.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/resolver/AllTests.java?rev=830427&r1=830426&r2=830427&view=diff
==============================================================================
---
incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/resolver/AllTests.java
(original)
+++
incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/resolver/AllTests.java
Wed Oct 28 03:06:59 2009
@@ -34,10 +34,10 @@
public static Test suite()
{
- TestSuite suite = new TestSuite("JSPWiki Content Resolver Unit Tests");
+ TestSuite suite = new TestSuite("Content resolver tests");
- suite.addTest( SpecialPageNameResolverTest.suite() );
suite.addTest( EnglishPluralsPageNameResolverTest.suite() );
+ suite.addTest( SpecialPageNameResolverTest.suite() );
return suite;
}
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/diff/AllTests.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/diff/AllTests.java?rev=830427&r1=830426&r2=830427&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/diff/AllTests.java
(original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/diff/AllTests.java Wed
Oct 28 03:06:59 2009
@@ -33,7 +33,7 @@
{
public static Test suite()
{
- TestSuite suite = new TestSuite("DIFF tests");
+ TestSuite suite = new TestSuite("Diff tests");
suite.addTest( ContextualDiffProviderTest.suite() );
Modified:
incubator/jspwiki/trunk/tests/java/org/apache/wiki/filters/AllTests.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/filters/AllTests.java?rev=830427&r1=830426&r2=830427&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/filters/AllTests.java
(original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/filters/AllTests.java
Wed Oct 28 03:06:59 2009
@@ -32,8 +32,10 @@
public static Test suite()
{
- TestSuite suite = new TestSuite("PageFilter tests");
+ TestSuite suite = new TestSuite("Filter tests");
+
suite.addTest( FilterManagerTest.suite() );
+
return suite;
}
}
Modified:
incubator/jspwiki/trunk/tests/java/org/apache/wiki/htmltowiki/AllTests.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/htmltowiki/AllTests.java?rev=830427&r1=830426&r2=830427&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/htmltowiki/AllTests.java
(original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/htmltowiki/AllTests.java
Wed Oct 28 03:06:59 2009
@@ -31,7 +31,7 @@
public static Test suite()
{
- TestSuite suite = new TestSuite("HtmlStringToWikiTranslatorTest
tests");
+ TestSuite suite = new TestSuite("Html-to-wiki translator tests");
suite.addTest( HtmlStringToWikiTranslatorTest.suite() );
Modified:
incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/AllTests.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/AllTests.java?rev=830427&r1=830426&r2=830427&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/AllTests.java
(original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/AllTests.java Wed
Oct 28 03:06:59 2009
@@ -39,9 +39,10 @@
{
TestSuite suite = new TestSuite("Parser tests");
+ suite.addTest( CreoleToJSPWikiTranslatorTest.suite() );
suite.addTest( JSPWikiMarkupParserTest.suite() );
suite.addTest( MarkupParserTest.suite() );
- suite.addTest( CreoleToJSPWikiTranslatorTest.suite() );
+
return suite;
}
}
Modified:
incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/AllTests.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/AllTests.java?rev=830427&r1=830426&r2=830427&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/AllTests.java
(original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/AllTests.java Wed
Oct 28 03:06:59 2009
@@ -36,22 +36,22 @@
public static Test suite()
{
- TestSuite suite = new TestSuite("JSPWiki plugins");
+ TestSuite suite = new TestSuite("Plugin tests");
suite.addTest( CounterPluginTest.suite() );
+ suite.addTest( DenouncePluginTest.suite() );
suite.addTest( GroupsTest.suite() );
+ suite.addTest( IndexPluginTest.suite() );
suite.addTest( InsertPageTest.suite() );
+ suite.addTest( InterWikiLinksPluginTest.suite() );
+ suite.addTest( PageViewPluginTest.suite() );
suite.addTest( PluginIndexPluginTest.suite() );
suite.addTest( PluginManagerTest.suite() );
+ suite.addTest( RecentChangesPluginTest.suite() );
+ suite.addTest( ReferredPagesPluginTest.suite() );
suite.addTest( ReferringPagesPluginTest.suite() );
suite.addTest( TableOfContentsTest.suite() );
suite.addTest( UndefinedPagesPluginTest.suite() );
- suite.addTest( DenouncePluginTest.suite() );
- suite.addTest( ReferredPagesPluginTest.suite() );
- suite.addTest( RecentChangesPluginTest.suite() );
- suite.addTest( IndexPluginTest.suite() );
- suite.addTest( InterWikiLinksPluginTest.suite() );
- suite.addTest( PageViewPluginTest.suite() );
return suite;
}
Modified:
incubator/jspwiki/trunk/tests/java/org/apache/wiki/render/AllTests.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/render/AllTests.java?rev=830427&r1=830426&r2=830427&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/render/AllTests.java
(original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/render/AllTests.java Wed
Oct 28 03:06:59 2009
@@ -37,7 +37,7 @@
public static Test suite()
{
- TestSuite suite = new TestSuite("rendering tests");
+ TestSuite suite = new TestSuite("Rendering tests");
suite.addTest( CreoleRendererTest.suite() );
suite.addTest( RenderingManagerTest.suite() );
Modified:
incubator/jspwiki/trunk/tests/java/org/apache/wiki/search/AllTests.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/search/AllTests.java?rev=830427&r1=830426&r2=830427&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/search/AllTests.java
(original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/search/AllTests.java Wed
Oct 28 03:06:59 2009
@@ -33,7 +33,7 @@
public static Test suite()
{
- TestSuite suite = new TestSuite("Search engines");
+ TestSuite suite = new TestSuite("Search engine tests");
suite.addTest( SearchManagerTest.suite() );
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/AllTests.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/AllTests.java?rev=830427&r1=830426&r2=830427&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/AllTests.java
(original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/AllTests.java Wed Oct
28 03:06:59 2009
@@ -32,8 +32,10 @@
{
public static Test suite()
{
- TestSuite suite = new TestSuite("UI tests");
+ TestSuite suite = new TestSuite("UI: top-level tests");
+
suite.addTest( InputValidatorTest.suite() );
+
return suite;
}
Modified:
incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/AllTests.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/AllTests.java?rev=830427&r1=830426&r2=830427&view=diff
==============================================================================
---
incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/AllTests.java
(original)
+++
incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/migrator/AllTests.java
Wed Oct 28 03:06:59 2009
@@ -28,13 +28,15 @@
{
public static Test suite()
{
- TestSuite suite = new TestSuite("JSP migration tests");
+ TestSuite suite = new TestSuite("UI: Stripes JSP migration tests");
+
suite.addTest( BundleMigratorTest.suite() );
+ suite.addTest( JSPWikiJspTransformerTest.suite() );
suite.addTest( JspDocumentTest.suite() );
suite.addTest( JspParserTest.suite() );
- suite.addTest( JSPWikiJspTransformerTest.suite() );
suite.addTest( StripesJspTransformerTest.suite() );
suite.addTest( TagTest.suite() );
+
return suite;
}
Modified:
incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/stripes/AllTests.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/stripes/AllTests.java?rev=830427&r1=830426&r2=830427&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/stripes/AllTests.java
(original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/stripes/AllTests.java
Wed Oct 28 03:06:59 2009
@@ -28,12 +28,14 @@
{
public static Test suite()
{
- TestSuite suite = new TestSuite("Stripes UI tests");
+ TestSuite suite = new TestSuite("UI: Stripes support package tests");
+
suite.addTest( FileBasedActionResolverTest.suite() );
suite.addTest( HandlerInfoTest.suite() );
suite.addTest( IsOneOfTest.suite() );
suite.addTest( ShortUrlRedirectFilterTest.suite() );
suite.addTest( SpamInterceptorTest.suite() );
+
return suite;
}
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/url/AllTests.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/url/AllTests.java?rev=830427&r1=830426&r2=830427&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/url/AllTests.java
(original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/url/AllTests.java Wed
Oct 28 03:06:59 2009
@@ -34,9 +34,9 @@
{
TestSuite suite = new TestSuite("URL constructor tests");
- suite.addTest( ShortViewURLConstructorTest.suite() );
- suite.addTest( ShortURLConstructorTest.suite() );
suite.addTest( DefaultURLConstructorTest.suite() );
+ suite.addTest( ShortURLConstructorTest.suite() );
+ suite.addTest( ShortViewURLConstructorTest.suite() );
return suite;
}
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/AllTests.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/AllTests.java?rev=830427&r1=830426&r2=830427&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/AllTests.java
(original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/util/AllTests.java Wed
Oct 28 03:06:59 2009
@@ -37,15 +37,13 @@
{
TestSuite suite = new TestSuite("Utility suite tests");
- suite.addTest( FileUtilTest.suite() );
- suite.addTest( TextUtilTest.suite() );
- suite.addTest( PropertyReaderTest.suite() );
-
suite.addTest( ClassUtilTest.suite() );
suite.addTest( CommentedPropertiesTest.suite() );
suite.addTest( CryptoUtilTest.suite() );
+ suite.addTest( FileUtilTest.suite() );
suite.addTest( MailUtilTest.suite() );
suite.addTest( PriorityListTest.suite() );
+ suite.addTest( PropertyReaderTest.suite() );
suite.addTest( SerializerTest.suite() );
suite.addTest( TextUtilTest.suite() );
suite.addTest( TimedCounterListTest.suite() );
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/web/AllTests.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/web/AllTests.java?rev=830427&r1=830426&r2=830427&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/web/AllTests.java
(original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/web/AllTests.java Wed
Oct 28 03:06:59 2009
@@ -34,7 +34,7 @@
public static Test suite()
{
- TestSuite suite = new TestSuite("JSPWiki web unit tests");
+ TestSuite suite = new TestSuite("Web unit tests");
return suite;
}
}
Modified:
incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/AllTests.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/AllTests.java?rev=830427&r1=830426&r2=830427&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/AllTests.java
(original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/workflow/AllTests.java
Wed Oct 28 03:06:59 2009
@@ -36,6 +36,7 @@
public static Test suite()
{
TestSuite suite = new TestSuite( "Workflow tests" );
+
suite.addTestSuite( ApprovalWorkflowTest.class );
suite.addTestSuite( DecisionQueueTest.class );
suite.addTestSuite( FactTest.class );
@@ -44,6 +45,7 @@
suite.addTestSuite( TaskTest.class );
suite.addTestSuite( WorkflowManagerTest.class );
suite.addTestSuite( WorkflowTest.class );
+
return suite;
}
}
Modified:
incubator/jspwiki/trunk/tests/java/org/apache/wiki/xmlrpc/AllTests.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/xmlrpc/AllTests.java?rev=830427&r1=830426&r2=830427&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/xmlrpc/AllTests.java
(original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/xmlrpc/AllTests.java Wed
Oct 28 03:06:59 2009
@@ -32,7 +32,7 @@
public static Test suite()
{
- TestSuite suite = new TestSuite("XMLRPC tests");
+ TestSuite suite = new TestSuite("XML-RPC tests");
suite.addTest( RPCHandlerTest.suite() );
