Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/WikiEngineTest.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/WikiEngineTest.java?rev=755091&r1=755090&r2=755091&view=diff ============================================================================== --- incubator/jspwiki/trunk/tests/java/org/apache/wiki/WikiEngineTest.java (original) +++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/WikiEngineTest.java Tue Mar 17 02:34:29 2009 @@ -133,11 +133,11 @@ public void testNonExistantPage() throws Exception { - String pagename = "Test1"; + m_engine.deletePage( NAME1 ); assertEquals( "Page already exists", false, - m_engine.pageExists( pagename ) ); + m_engine.pageExists( NAME1 ) ); } /** @@ -146,7 +146,8 @@ public void testNonExistantPage2() throws Exception { - WikiPage page = m_engine.createPage( WikiName.valueOf( "Test1" ) ); + m_engine.deletePage( NAME1 ); + WikiPage page = m_engine.createPage( WikiName.valueOf( NAME1 ) ); assertEquals( "Page already exists", false,
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/WikiContextFactoryTest.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/WikiContextFactoryTest.java?rev=755091&r1=755090&r2=755091&view=diff ============================================================================== --- incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/WikiContextFactoryTest.java (original) +++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/WikiContextFactoryTest.java Tue Mar 17 02:34:29 2009 @@ -24,13 +24,12 @@ */ package org.apache.wiki.action; -import java.util.Locale; +import java.net.URI; import java.util.Properties; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import net.sourceforge.stripes.action.RedirectResolution; import net.sourceforge.stripes.mock.MockHttpServletRequest; import net.sourceforge.stripes.mock.MockHttpServletResponse; import net.sourceforge.stripes.mock.MockHttpSession; @@ -39,8 +38,6 @@ import org.apache.wiki.TestEngine; import org.apache.wiki.WikiContext; import org.apache.wiki.WikiEngine; -import org.apache.wiki.action.ViewActionBean; -import org.apache.wiki.action.WikiContextFactory; import org.apache.wiki.api.WikiException; import org.apache.wiki.api.WikiPage; @@ -63,8 +60,10 @@ protected void tearDown() throws Exception { - m_engine.deletePage( "TestPage" ); - + if ( m_engine.pageExists( "TestPage" ) ) + { + m_engine.deletePage( "TestPage" ); + } m_engine.shutdown(); } @@ -145,7 +144,7 @@ request.getParameterMap().put( "page", new String[]{"SinglePage"} ); context = resolver.newContext( request, response, WikiContext.EDIT ); assertEquals( WikiContext.EDIT, context.getRequestContext() ); - assertEquals( page, context.getPage()); + assertEquals( page, context.getPage() ); // Passing a VIEW request with page=FindPage yields an ordinary page name, not a special page or JSP // FIXME: this won't work because WikiActionBeanResolver doesn't keep a cache of URLBindings @@ -182,16 +181,16 @@ public void testSpecialPageReference() { - RedirectResolution r; - r = resolver.getSpecialPageResolution( "RecentChanges" ); - assertEquals( "/RecentChanges.jsp", r.getUrl( Locale.getDefault() ) ); + URI uri; + uri = resolver.getSpecialPageURI( "RecentChanges" ); + assertEquals( "/RecentChanges.jsp", uri.toString() ); - r = resolver.getSpecialPageResolution( "FindPage" ); - assertEquals( "/Search.jsp", r.getUrl( Locale.getDefault() ) ); + uri = resolver.getSpecialPageURI( "FindPage" ); + assertEquals( "/Search.jsp", uri.toString() ); // UserPrefs doesn't exist in our test properties - r = resolver.getSpecialPageResolution( "UserPrefs" ); - assertNull( r ); + uri = resolver.getSpecialPageURI( "UserPrefs" ); + assertNull( uri ); } public static Test suite() Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/acl/DefaultAclManagerTest.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/acl/DefaultAclManagerTest.java?rev=755091&r1=755090&r2=755091&view=diff ============================================================================== --- incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/acl/DefaultAclManagerTest.java (original) +++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/auth/acl/DefaultAclManagerTest.java Tue Mar 17 02:34:29 2009 @@ -32,7 +32,6 @@ import org.apache.wiki.TestEngine; import org.apache.wiki.api.WikiPage; import org.apache.wiki.auth.WikiPrincipal; -import org.apache.wiki.auth.WikiSecurityException; import org.apache.wiki.auth.permissions.PermissionFactory; import org.apache.wiki.providers.ProviderException; @@ -75,7 +74,7 @@ m_engine.shutdown(); } - public void testGetPermissions() throws ProviderException, WikiSecurityException + public void testGetPermissions() throws Exception { WikiPage page = m_engine.getPage( "TestDefaultPage" ); Acl acl = m_engine.getAclManager().getPermissions( page ); Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/IndexPluginTest.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/IndexPluginTest.java?rev=755091&r1=755090&r2=755091&view=diff ============================================================================== --- incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/IndexPluginTest.java (original) +++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/IndexPluginTest.java Tue Mar 17 02:34:29 2009 @@ -27,7 +27,6 @@ import org.apache.wiki.TestEngine; import org.apache.wiki.WikiContext; -import org.apache.wiki.attachment.Attachment; import org.apache.wiki.attachment.AttachmentManager; import org.apache.wiki.plugin.PluginManager; import org.apache.wiki.util.FileUtil; Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/TableOfContentsTest.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/TableOfContentsTest.java?rev=755091&r1=755090&r2=755091&view=diff ============================================================================== --- incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/TableOfContentsTest.java (original) +++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/TableOfContentsTest.java Tue Mar 17 02:34:29 2009 @@ -27,8 +27,6 @@ import java.util.Properties; import org.apache.wiki.TestEngine; -import org.apache.wiki.api.WikiException; - import junit.framework.Test; import junit.framework.TestCase; @@ -240,7 +238,7 @@ } - public void testSimilarNames() throws WikiException + public void testSimilarNames() throws Exception { String src = "[{TableOfContents}]\n\n!Test\n\n!Test\n\n";
