Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/WikiEngineTest.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/WikiEngineTest.java?rev=720116&r1=720115&r2=720116&view=diff ============================================================================== --- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/WikiEngineTest.java (original) +++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/WikiEngineTest.java Sun Nov 23 20:57:18 2008 @@ -889,7 +889,7 @@ Collection pages = m_engine.getReferenceManager().findReferrers( "RenameBugTestPage" ); assertEquals( "has one", "OldNameTestPage", pages.iterator().next() ); - WikiContext ctx = m_engine.getWikiActionBeanFactory().newViewActionBean( null, null, m_engine.getPage("OldNameTestPage") ); + WikiContext ctx = m_engine.getWikiActionBeanFactory().newViewWikiContext( null, null, m_engine.getPage("OldNameTestPage") ); m_engine.renamePage( ctx, "OldNameTestPage", "NewNameTestPage", true ); @@ -907,7 +907,7 @@ { WikiPage p = new WikiPage( m_engine, NAME1 ); - WikiContext context = m_engine.getWikiActionBeanFactory().newViewActionBean( null, null, p ); + WikiContext context = m_engine.getWikiActionBeanFactory().newViewWikiContext( null, null, p ); context.getPage().setAttribute( WikiPage.CHANGENOTE, "Test change" );
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/action/HandlerInfoTest.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/action/HandlerInfoTest.java?rev=720116&r1=720115&r2=720116&view=diff ============================================================================== --- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/action/HandlerInfoTest.java (original) +++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/action/HandlerInfoTest.java Sun Nov 23 20:57:18 2008 @@ -93,7 +93,7 @@ // Set up a new GroupActionBean with the real group Admin and event // "view" - trip = m_engine.guestTrip( "/Group.jsp" ); + trip = m_engine.guestTrip( "/Group.action" ); trip.getRequest().setMethod( "GET" ); trip.addParameter( "group", "Admin" ); trip.execute( "view" ); @@ -113,7 +113,7 @@ // Set up a new GroupActionBean with the real group Admin and event // "save" - trip = m_engine.guestTrip( "/Group.jsp" ); + trip = m_engine.guestTrip( "/Group.action" ); trip.addParameter( "group", "Admin" ); trip.execute( "save" ); bean = trip.getActionBean( GroupActionBean.class ); @@ -131,7 +131,7 @@ // Set up a new GroupActionBean with the real group Admin and event // "delete" - trip = m_engine.guestTrip( "/Group.jsp" ); + trip = m_engine.guestTrip( "/Group.action" ); trip.addParameter( "group", "Admin" ); trip.execute( "delete" ); bean = trip.getActionBean( GroupActionBean.class ); @@ -157,7 +157,7 @@ Permission perm; // Set up a new GroupActionBean with the non-existent group Foo - trip = m_engine.guestTrip( "/Group.jsp" ); + trip = m_engine.guestTrip( "/Group.action" ); trip.addParameter( "group", "Foo" ); trip.execute( "view" ); bean = trip.getActionBean( GroupActionBean.class ); Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/action/LoginActionBeanTest.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/action/LoginActionBeanTest.java?rev=720116&r1=720115&r2=720116&view=diff ============================================================================== --- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/action/LoginActionBeanTest.java (original) +++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/action/LoginActionBeanTest.java Sun Nov 23 20:57:18 2008 @@ -48,7 +48,7 @@ ValidationErrors errors; // Verify that the initial user is anonymous - trip = m_engine.guestTrip( "/Login.jsp" ); + trip = m_engine.guestTrip( "/Login.action" ); HttpServletRequest request = trip.getRequest(); WikiSession wikiSession = SessionMonitor.getInstance( m_engine ).find( request.getSession() ); assertNotSame( Users.JANNE, wikiSession.getLoginPrincipal().getName() ); @@ -79,7 +79,7 @@ ValidationErrors errors; // Verify that the initial user is anonymous - trip = m_engine.guestTrip( "/Login.jsp" ); + trip = m_engine.guestTrip( "/Login.action" ); HttpServletRequest request = trip.getRequest(); WikiSession wikiSession = SessionMonitor.getInstance( m_engine ).find( request.getSession() ); assertNotSame( Users.JANNE, wikiSession.getLoginPrincipal().getName() ); @@ -92,7 +92,7 @@ assertEquals( 2, errors.size() ); // Log in again with just a password; should see one error - trip = m_engine.guestTrip( "/Login.jsp" ); + trip = m_engine.guestTrip( "/Login.action" ); trip.setParameter( "j_password", Users.JANNE_PASS ); trip.execute( "login" ); bean = trip.getActionBean( LoginActionBean.class ); @@ -100,7 +100,7 @@ assertEquals( 1, errors.size() ); // Log in again with just a username; should see one error - trip = m_engine.guestTrip( "/Login.jsp" ); + trip = m_engine.guestTrip( "/Login.action" ); trip.setParameter( "j_username", Users.JANNE ); trip.execute( "login" ); bean = trip.getActionBean( LoginActionBean.class ); @@ -115,7 +115,7 @@ ValidationErrors errors; // Verify that the initial user is anonymous - trip = m_engine.guestTrip( "/Login.jsp" ); + trip = m_engine.guestTrip( "/Login.action" ); HttpServletRequest request = trip.getRequest(); WikiSession wikiSession = SessionMonitor.getInstance( m_engine ).find( request.getSession() ); assertNotSame( Users.JANNE, wikiSession.getLoginPrincipal().getName() ); @@ -141,7 +141,7 @@ ValidationErrors errors; // Verify that the initial user is anonymous - trip = m_engine.guestTrip( "/Login.jsp" ); + trip = m_engine.guestTrip( "/Login.action" ); HttpServletRequest request = trip.getRequest(); WikiSession wikiSession = SessionMonitor.getInstance( m_engine ).find( request.getSession() ); assertNotSame( Users.JANNE, wikiSession.getLoginPrincipal().getName() ); Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/action/UserPreferencesActionBeanTest.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/action/UserPreferencesActionBeanTest.java?rev=720116&r1=720115&r2=720116&view=diff ============================================================================== --- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/action/UserPreferencesActionBeanTest.java (original) +++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/action/UserPreferencesActionBeanTest.java Sun Nov 23 20:57:18 2008 @@ -41,7 +41,7 @@ UserPreferencesActionBean bean; // Create session; set 'assertion' param; verify it got saved - trip = m_engine.guestTrip( "/UserPreferences.jsp"); + trip = m_engine.guestTrip( "/UserPreferences.action"); trip.setParameter("assertedName", "MyAssertedIdentity"); trip.setParameter("createAssertedName", "true"); trip.execute(); @@ -63,7 +63,7 @@ UserPreferencesActionBean bean; // Create session; login in as Janne - trip = m_engine.guestTrip( "/UserPreferences.jsp"); + trip = m_engine.guestTrip( "/UserPreferences.action"); MockHttpServletRequest request = trip.getRequest(); WikiSession wikiSession = WikiSession.getWikiSession(m_engine, request); boolean login = m_engine.getAuthenticationManager().login(wikiSession, Users.JANNE,Users.JANNE_PASS); @@ -89,7 +89,7 @@ UserPreferencesActionBean bean; // Create session; set 'assertion' param; verify it got saved - trip = m_engine.guestTrip( "/UserPreferences.jsp"); + trip = m_engine.guestTrip( "/UserPreferences.action"); MockHttpServletRequest request = trip.getRequest(); Cookie cookie = new Cookie(CookieAssertionLoginModule.PREFS_COOKIE_NAME, "MyAssertedIdentity"); request.setCookies(new Cookie[]{cookie}); Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/action/ViewActionBeanTest.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/action/ViewActionBeanTest.java?rev=720116&r1=720115&r2=720116&view=diff ============================================================================== --- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/action/ViewActionBeanTest.java (original) +++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/action/ViewActionBeanTest.java Sun Nov 23 20:57:18 2008 @@ -36,7 +36,7 @@ assertNotNull("Did not save page Test!", page); // Set the 'page' request parameter to 'Main'... - MockRoundtrip trip = m_engine.guestTrip( "/Wiki.jsp"); + MockRoundtrip trip = m_engine.guestTrip( "/Wiki.action"); trip.setParameter("page", "Test"); trip.execute("view"); @@ -45,7 +45,7 @@ assertEquals( page, bean.getPage() ); // ...and the destination should be Wiki.jsp (aka /View.action) - assertEquals("/Wiki.jsp", trip.getDestination() ); + assertEquals("/Wiki.action", trip.getDestination() ); } public void testActionBeanNoParameter() throws Exception { @@ -55,7 +55,7 @@ assertNotNull("Did not save page Main!", page); // Execute the request without specifying a page - MockRoundtrip trip = m_engine.guestTrip( "/Wiki.jsp"); + MockRoundtrip trip = m_engine.guestTrip( "/Wiki.action"); trip.execute("view"); // ...we should automatically see Main bound to the ActionBean (nice!) @@ -64,7 +64,7 @@ assertEquals( page, bean.getPage() ); // ...and the destination should be Wiki.jsp (aka /View.action) - assertEquals("/Wiki.jsp", trip.getDestination() ); + assertEquals("/Wiki.action", trip.getDestination() ); } public static Test suite() Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/action/WikiActionBeanFactoryTest.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/action/WikiActionBeanFactoryTest.java?rev=720116&r1=720115&r2=720116&view=diff ============================================================================== --- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/action/WikiActionBeanFactoryTest.java (original) +++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/action/WikiActionBeanFactoryTest.java Sun Nov 23 20:57:18 2008 @@ -40,28 +40,28 @@ public void testNewActionBean() throws WikiException { - WikiActionBean bean; + WikiContext context; MockRoundtrip trip = m_engine.guestTrip( ViewActionBean.class ); MockHttpServletRequest request = trip.getRequest(); MockHttpServletResponse response = trip.getResponse(); // Supplying an EditActionBean means the EDIT action - bean = resolver.newActionBean( request, response, EditActionBean.class ); - assertEquals( WikiContext.EDIT, bean.getRequestContext() ); - assertNull( ((WikiContext)bean).getPage() ); + context = resolver.newWikiContext( request, response, WikiContext.EDIT ); + assertEquals( WikiContext.EDIT, context.getRequestContext() ); + assertNull( context.getPage() ); // Change the context to "preview" - bean.setRequestContext( WikiContext.PREVIEW ); - assertEquals( WikiContext.PREVIEW, bean.getRequestContext() ); + context.setRequestContext( WikiContext.PREVIEW ); + assertEquals( WikiContext.PREVIEW, context.getRequestContext() ); // Change the context to "diff" - bean.setRequestContext( WikiContext.DIFF); - assertEquals( WikiContext.DIFF, bean.getRequestContext() ); + context.setRequestContext( WikiContext.DIFF); + assertEquals( WikiContext.DIFF, context.getRequestContext() ); // Try changing the context to "comment" (but, this is an error) try { - bean.setRequestContext( WikiContext.COMMENT); + context.setRequestContext( WikiContext.COMMENT); } catch ( IllegalArgumentException e ) { @@ -69,18 +69,17 @@ } // Supplying the PrefsActionBean means the PREFS context - bean = resolver.newActionBean( request, response, UserPreferencesActionBean.class ); - assertEquals( WikiContext.PREFS, bean.getRequestContext() ); + context = resolver.newWikiContext( request, response, WikiContext.PREFS ); + assertEquals( WikiContext.PREFS, context.getRequestContext() ); // Supplying the GroupActionBean means the VIEW_GROUP context - bean = resolver.newActionBean( request, response, GroupActionBean.class ); - assertEquals( WikiContext.VIEW_GROUP, bean.getRequestContext() ); - assertNull( ((GroupActionBean)bean).getGroup() ); + context = resolver.newWikiContext( request, response, WikiContext.VIEW_GROUP ); + assertEquals( WikiContext.VIEW_GROUP, context.getRequestContext() ); } public void testNewActionBeanByJSP() throws WikiException { - WikiActionBean bean; + WikiContext context; MockRoundtrip trip = m_engine.guestTrip( ViewActionBean.class ); MockHttpServletRequest request = trip.getRequest(); MockHttpServletResponse response = trip.getResponse(); @@ -89,21 +88,21 @@ // Request for "UserPreference.jsp" should resolve to PREFS action request = new MockHttpServletRequest( m_engine.getServletContext().getServletContextName(), "/UserPreferences.jsp"); request.setSession( session ); - bean = resolver.newActionBean( request, response, UserPreferencesActionBean.class ); - assertEquals( WikiContext.PREFS, bean.getRequestContext() ); + context = resolver.newWikiContext( request, response, WikiContext.PREFS ); + assertEquals( WikiContext.PREFS, context.getRequestContext() ); // We don't care about JSPs not mapped to actions, because the bean we get only depends on the class we pass // FIXME: this won't work because WikiActionBeanResolver doesn't keep a cache of URLBindings request = new MockHttpServletRequest( m_engine.getServletContext().getServletContextName(), "/NonExistent.jsp"); request.setSession( session ); - bean = resolver.newActionBean( request, response, EditActionBean.class ); - assertEquals( WikiContext.EDIT, bean.getRequestContext() ); - assertNull( ((WikiContext)bean).getPage() ); + context = resolver.newWikiContext( request, response, WikiContext.EDIT ); + assertEquals( WikiContext.EDIT, context.getRequestContext() ); + assertNull( context.getPage() ); } public void testActionBeansWithParams() throws Exception { - WikiActionBean bean; + WikiContext context; WikiPage page = m_engine.getPage( "SinglePage" ); MockRoundtrip trip = m_engine.guestTrip( ViewActionBean.class ); MockHttpServletRequest request = trip.getRequest(); @@ -114,25 +113,24 @@ request = new MockHttpServletRequest( m_engine.getServletContext().getServletContextName(), "/Edit.jsp"); request.setSession( session ); request.getParameterMap().put( "page", new String[]{"SinglePage"} ); - bean = resolver.newActionBean( request, response, EditActionBean.class ); - assertEquals( WikiContext.EDIT, bean.getRequestContext() ); - assertEquals( page, ((WikiContext)bean).getPage()); + context = resolver.newWikiContext( request, response, WikiContext.EDIT ); + assertEquals( WikiContext.EDIT, context.getRequestContext() ); + 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 request = new MockHttpServletRequest( m_engine.getServletContext().getServletContextName(), "/Wiki.jsp"); request.setSession( session ); request.getParameterMap().put( "page", new String[]{"FindPage"} ); - bean = resolver.newActionBean( request, response, ViewActionBean.class ); - assertEquals( WikiContext.VIEW, bean.getRequestContext() ); + context = resolver.newWikiContext( request, response, WikiContext.VIEW ); + assertEquals( WikiContext.VIEW, context.getRequestContext() ); // Passing a VIEW_GROUP request with group="Art" gets a ViewGroupActionBean request = new MockHttpServletRequest( m_engine.getServletContext().getServletContextName(), "/Wiki.jsp"); request.setSession( session ); request.getParameterMap().put( "group", new String[]{"Art"} ); - bean = resolver.newActionBean( request, response, GroupActionBean.class ); - assertEquals( WikiContext.VIEW_GROUP, bean.getRequestContext() ); - assertEquals( "/Group.jsp", bean.getClass().getAnnotation(UrlBinding.class).value() ); + context = resolver.newWikiContext( request, response, WikiContext.VIEW_GROUP ); + assertEquals( WikiContext.VIEW_GROUP, context.getRequestContext() ); } public void testFinalPageName() throws Exception Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/attachment/AttachmentManagerTest.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/attachment/AttachmentManagerTest.java?rev=720116&r1=720115&r2=720116&view=diff ============================================================================== --- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/attachment/AttachmentManagerTest.java (original) +++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/attachment/AttachmentManagerTest.java Sun Nov 23 20:57:18 2008 @@ -11,7 +11,6 @@ import com.ecyrd.jspwiki.FileUtil; import com.ecyrd.jspwiki.TestEngine; -import com.ecyrd.jspwiki.WikiContext; import com.ecyrd.jspwiki.WikiPage; import com.ecyrd.jspwiki.providers.ProviderException; @@ -84,7 +83,7 @@ m_manager.storeAttachment( att, makeAttachmentFile() ); - Attachment att2 = m_manager.getAttachmentInfo( m_engine.getWikiActionBeanFactory().newViewActionBean( + Attachment att2 = m_manager.getAttachmentInfo( m_engine.getWikiActionBeanFactory().newViewWikiContext( null, null, new WikiPage(m_engine, NAME1)), "test1.txt" ); @@ -115,7 +114,7 @@ m_manager.storeAttachment( att, makeAttachmentFile() ); - Attachment att2 = m_manager.getAttachmentInfo( m_engine.getWikiActionBeanFactory().newViewActionBean( + Attachment att2 = m_manager.getAttachmentInfo( m_engine.getWikiActionBeanFactory().newViewWikiContext( null, null, new WikiPage(m_engine, NAME1)), "test file.txt" ); @@ -146,7 +145,7 @@ m_manager.storeAttachment( att, makeAttachmentFile() ); - Attachment att2 = m_manager.getAttachmentInfo( m_engine.getWikiActionBeanFactory().newViewActionBean( + Attachment att2 = m_manager.getAttachmentInfo( m_engine.getWikiActionBeanFactory().newViewWikiContext( null, null, new WikiPage(m_engine, NAME1)), "test1.txt", 1 ); @@ -181,7 +180,7 @@ att.setAuthor( "FooBar" ); m_manager.storeAttachment( att, makeAttachmentFile() ); - Attachment att2 = m_manager.getAttachmentInfo( m_engine.getWikiActionBeanFactory().newViewActionBean( + Attachment att2 = m_manager.getAttachmentInfo( m_engine.getWikiActionBeanFactory().newViewWikiContext( null, null, new WikiPage(m_engine, NAME1)), "test1.txt" ); @@ -207,7 +206,7 @@ // Check that first author did not disappear // - Attachment att3 = m_manager.getAttachmentInfo( m_engine.getWikiActionBeanFactory().newViewActionBean( + Attachment att3 = m_manager.getAttachmentInfo( m_engine.getWikiActionBeanFactory().newViewWikiContext( null, null, new WikiPage(m_engine, NAME1)), "test1.txt", 1 ); @@ -242,7 +241,7 @@ m_manager.storeAttachment( att, makeAttachmentFile() ); - Attachment att2 = m_manager.getAttachmentInfo( m_engine.getWikiActionBeanFactory().newViewActionBean( + Attachment att2 = m_manager.getAttachmentInfo( m_engine.getWikiActionBeanFactory().newViewWikiContext( null, null, new WikiPage(m_engine, NAME1)), "test1" ); Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/content/PageRenamerTest.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/content/PageRenamerTest.java?rev=720116&r1=720115&r2=720116&view=diff ============================================================================== --- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/content/PageRenamerTest.java (original) +++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/content/PageRenamerTest.java Sun Nov 23 20:57:18 2008 @@ -62,7 +62,7 @@ WikiPage p = m_engine.getPage("TestPage"); - WikiContext context = m_engine.getWikiActionBeanFactory().newViewActionBean( null, null, p ); + WikiContext context = m_engine.getWikiActionBeanFactory().newViewWikiContext( null, null, p ); m_engine.renamePage(context, "TestPage", "FooTest", false); @@ -88,7 +88,7 @@ WikiPage p = m_engine.getPage("TestPage"); - WikiContext context = m_engine.getWikiActionBeanFactory().newViewActionBean(null, null, p ); + WikiContext context = m_engine.getWikiActionBeanFactory().newViewWikiContext(null, null, p ); m_engine.renamePage(context, "TestPage", "FooTest", true); @@ -113,7 +113,7 @@ WikiPage p = m_engine.getPage("TestPage"); - WikiContext context = m_engine.getWikiActionBeanFactory().newViewActionBean( null, null, p ); + WikiContext context = m_engine.getWikiActionBeanFactory().newViewWikiContext( null, null, p ); m_engine.renamePage(context, "TestPage", "FooTest", true); @@ -137,7 +137,7 @@ WikiPage p = m_engine.getPage("TestPage"); - WikiContext context = m_engine.getWikiActionBeanFactory().newViewActionBean( null, null, p ); + WikiContext context = m_engine.getWikiActionBeanFactory().newViewWikiContext( null, null, p ); m_engine.renamePage(context, "TestPage", "FooTest", true); @@ -161,7 +161,7 @@ WikiPage p = m_engine.getPage("TestPage"); - WikiContext context = m_engine.getWikiActionBeanFactory().newViewActionBean( null, null, p ); + WikiContext context = m_engine.getWikiActionBeanFactory().newViewWikiContext( null, null, p ); m_engine.renamePage(context, "TestPage", "FooTest", true); @@ -188,7 +188,7 @@ WikiPage p = m_engine.getPage("TestPage"); - WikiContext context = m_engine.getWikiActionBeanFactory().newViewActionBean( null, null, p ); + WikiContext context = m_engine.getWikiActionBeanFactory().newViewWikiContext( null, null, p ); m_engine.renamePage(context, "Test", "TestPage", true); @@ -207,7 +207,7 @@ m_engine.addAttachment("TestPage", "bar.jpg", "pr0n".getBytes() ); WikiPage p = m_engine.getPage("TestPage"); - WikiContext context = m_engine.getWikiActionBeanFactory().newViewActionBean( null, null, p ); + WikiContext context = m_engine.getWikiActionBeanFactory().newViewWikiContext( null, null, p ); m_engine.renamePage(context, "TestPage", "FooTest", true); @@ -285,7 +285,7 @@ { WikiPage p = m_engine.getPage(src); - WikiContext context = m_engine.getWikiActionBeanFactory().newViewActionBean( null, null, p ); + WikiContext context = m_engine.getWikiActionBeanFactory().newViewWikiContext( null, null, p ); m_engine.renamePage(context, src, dst, true); } Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/diff/ContextualDiffProviderTest.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/diff/ContextualDiffProviderTest.java?rev=720116&r1=720115&r2=720116&view=diff ============================================================================== --- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/diff/ContextualDiffProviderTest.java (original) +++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/diff/ContextualDiffProviderTest.java Sun Nov 23 20:57:18 2008 @@ -182,7 +182,7 @@ PropertyConfigurator.configure(props); TestEngine engine = new TestEngine(props); - WikiContext ctx = engine.getWikiActionBeanFactory().newViewActionBean( null, null, new WikiPage(engine,"Dummy") ); + WikiContext ctx = engine.getWikiActionBeanFactory().newViewWikiContext( null, null, new WikiPage(engine,"Dummy") ); String actualDiff = diff.makeDiffHtml( ctx, oldText, newText); assertEquals(expectedDiff, actualDiff); Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java?rev=720116&r1=720115&r2=720116&view=diff ============================================================================== --- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java (original) +++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java Sun Nov 23 20:57:18 2008 @@ -101,7 +101,7 @@ NoRequiredPropertyException, ServletException { - WikiContext context = e.getWikiActionBeanFactory().newViewActionBean( null, null, p ); + WikiContext context = e.getWikiActionBeanFactory().newViewWikiContext( null, null, p ); JSPWikiMarkupParser tr = new JSPWikiMarkupParser( context, new BufferedReader( new StringReader(src)) ); @@ -121,7 +121,7 @@ props.setProperty( "jspwiki.translatorReader.useRelNofollow", "true" ); TestEngine testEngine2 = new TestEngine( props ); - WikiContext context = testEngine2.getWikiActionBeanFactory().newViewActionBean( null, null, + WikiContext context = testEngine2.getWikiActionBeanFactory().newViewWikiContext( null, null, new WikiPage(testEngine2, PAGE_NAME) ); JSPWikiMarkupParser r = new JSPWikiMarkupParser( context, new BufferedReader( new StringReader(src)) ); @@ -2299,7 +2299,7 @@ { LinkCollector coll = new LinkCollector(); String src = "[Test]"; - WikiContext context = testEngine.getWikiActionBeanFactory().newViewActionBean( null, null, + WikiContext context = testEngine.getWikiActionBeanFactory().newViewWikiContext( null, null, new WikiPage(testEngine,PAGE_NAME) ); MarkupParser p = new JSPWikiMarkupParser( context, @@ -2322,7 +2322,7 @@ LinkCollector coll = new LinkCollector(); String src = "["+PAGE_NAME+"/Test.txt]"; - WikiContext context = testEngine.getWikiActionBeanFactory().newViewActionBean( null, null, + WikiContext context = testEngine.getWikiActionBeanFactory().newViewWikiContext( null, null, new WikiPage(testEngine,PAGE_NAME) ); MarkupParser p = new JSPWikiMarkupParser( context, @@ -2356,7 +2356,7 @@ LinkCollector coll_others = new LinkCollector(); String src = "[TestAtt.txt]"; - WikiContext context = testEngine.getWikiActionBeanFactory().newViewActionBean( null, null, + WikiContext context = testEngine.getWikiActionBeanFactory().newViewWikiContext( null, null, new WikiPage(testEngine,PAGE_NAME) ); MarkupParser p = new JSPWikiMarkupParser( context, Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/plugin/CounterPluginTest.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/plugin/CounterPluginTest.java?rev=720116&r1=720115&r2=720116&view=diff ============================================================================== --- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/plugin/CounterPluginTest.java (original) +++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/plugin/CounterPluginTest.java Sun Nov 23 20:57:18 2008 @@ -48,7 +48,7 @@ NoRequiredPropertyException, ServletException { - WikiContext context = testEngine.getWikiActionBeanFactory().newViewActionBean( null, null, + WikiContext context = testEngine.getWikiActionBeanFactory().newViewWikiContext( null, null, new WikiPage(testEngine, "TestPage") ); MarkupParser p = new JSPWikiMarkupParser( context, new StringReader(src) ); Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/plugin/PluginManagerTest.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/plugin/PluginManagerTest.java?rev=720116&r1=720115&r2=720116&view=diff ============================================================================== --- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/plugin/PluginManagerTest.java (original) +++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/plugin/PluginManagerTest.java Sun Nov 23 20:57:18 2008 @@ -38,7 +38,7 @@ props.load( TestEngine.findTestProperties() ); engine = new TestEngine(props); - context = engine.getWikiActionBeanFactory().newViewActionBean( null, null, new WikiPage(engine, "Testpage") ); + context = engine.getWikiActionBeanFactory().newViewWikiContext( null, null, new WikiPage(engine, "Testpage") ); manager = new PluginManager( engine, props ); } Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/plugin/ReferringPagesPluginTest.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/plugin/ReferringPagesPluginTest.java?rev=720116&r1=720115&r2=720116&view=diff ============================================================================== --- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/plugin/ReferringPagesPluginTest.java (original) +++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/plugin/ReferringPagesPluginTest.java Sun Nov 23 20:57:18 2008 @@ -41,7 +41,7 @@ engine.saveText( "Foobar6", "Reference to [TestPage]." ); engine.saveText( "Foobar7", "Reference to [TestPage]." ); - context = engine.getWikiActionBeanFactory().newViewActionBean( null, null, new WikiPage(engine,"TestPage") ); + context = engine.getWikiActionBeanFactory().newViewWikiContext( null, null, new WikiPage(engine,"TestPage") ); manager = new PluginManager( engine, props ); } @@ -70,7 +70,7 @@ public void testSingleReferral() throws Exception { - WikiContext context2 = engine.getWikiActionBeanFactory().newViewActionBean( null, null, new WikiPage(engine, "Foobar") ); + WikiContext context2 = engine.getWikiActionBeanFactory().newViewWikiContext( null, null, new WikiPage(engine, "Foobar") ); String res = manager.execute( context2, "{INSERT com.ecyrd.jspwiki.plugin.ReferringPagesPlugin WHERE max=5}"); @@ -111,7 +111,7 @@ public void testReferenceWidth() throws Exception { - WikiContext context2 = engine.getWikiActionBeanFactory().newViewActionBean( null, null, new WikiPage(engine, "Foobar") ); + WikiContext context2 = engine.getWikiActionBeanFactory().newViewWikiContext( null, null, new WikiPage(engine, "Foobar") ); String res = manager.execute( context2, "{INSERT com.ecyrd.jspwiki.plugin.ReferringPagesPlugin WHERE maxwidth=5}"); Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/plugin/UndefinedPagesPluginTest.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/plugin/UndefinedPagesPluginTest.java?rev=720116&r1=720115&r2=720116&view=diff ============================================================================== --- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/plugin/UndefinedPagesPluginTest.java (original) +++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/plugin/UndefinedPagesPluginTest.java Sun Nov 23 20:57:18 2008 @@ -33,7 +33,7 @@ engine.saveText( "TestPage", "Reference to [Foobar]." ); engine.saveText( "Foobar", "Reference to [Foobar 2], [Foobars]" ); - context = engine.getWikiActionBeanFactory().newViewActionBean( null, null, new WikiPage(engine, "TestPage") ); + context = engine.getWikiActionBeanFactory().newViewWikiContext( null, null, new WikiPage(engine, "TestPage") ); manager = new PluginManager( engine, props ); } @@ -57,7 +57,7 @@ public void testSimpleUndefined() throws Exception { - WikiContext context2 = engine.getWikiActionBeanFactory().newViewActionBean( null, null, new WikiPage(engine, "Foobar") ); + WikiContext context2 = engine.getWikiActionBeanFactory().newViewWikiContext( null, null, new WikiPage(engine, "Foobar") ); String res = manager.execute( context2, "{INSERT com.ecyrd.jspwiki.plugin.UndefinedPagesPlugin"); Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/providers/RCSFileProviderTest.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/providers/RCSFileProviderTest.java?rev=720116&r1=720115&r2=720116&view=diff ============================================================================== --- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/providers/RCSFileProviderTest.java (original) +++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/providers/RCSFileProviderTest.java Sun Nov 23 20:57:18 2008 @@ -200,7 +200,7 @@ { WikiPage p = new WikiPage( engine, NAME1 ); p.setAttribute(WikiPage.CHANGENOTE, "Test change" ); - WikiContext context = engine.getWikiActionBeanFactory().newViewActionBean(null, null, p); + WikiContext context = engine.getWikiActionBeanFactory().newViewWikiContext(null, null, p); engine.saveText( context, "test" ); @@ -213,7 +213,7 @@ throws Exception { WikiPage p = new WikiPage( engine, NAME1 ); - WikiContext context = engine.getWikiActionBeanFactory().newViewActionBean(null, null, p); + WikiContext context = engine.getWikiActionBeanFactory().newViewWikiContext(null, null, p); context.getPage().setAttribute(WikiPage.CHANGENOTE, "Test change" ); engine.saveText( context, "test" ); Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/providers/VersioningFileProviderTest.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/providers/VersioningFileProviderTest.java?rev=720116&r1=720115&r2=720116&view=diff ============================================================================== --- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/providers/VersioningFileProviderTest.java (original) +++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/providers/VersioningFileProviderTest.java Sun Nov 23 20:57:18 2008 @@ -272,7 +272,7 @@ { WikiPage p = new WikiPage( engine, NAME1 ); p.setAttribute(WikiPage.CHANGENOTE, "Test change" ); - WikiContext context = engine.getWikiActionBeanFactory().newViewActionBean(null, null, p); + WikiContext context = engine.getWikiActionBeanFactory().newViewWikiContext(null, null, p); engine.saveText( context, "test" ); @@ -287,7 +287,7 @@ WikiPage p = new WikiPage( engine, NAME1 ); - WikiContext context = engine.getWikiActionBeanFactory().newViewActionBean(null, null, p); + WikiContext context = engine.getWikiActionBeanFactory().newViewWikiContext(null, null, p); context.getPage().setAttribute(WikiPage.CHANGENOTE, "Test change" ); engine.saveText( context, "test" ); @@ -308,7 +308,7 @@ { WikiPage p = new WikiPage( engine, NAME1 ); - WikiContext context = engine.getWikiActionBeanFactory().newViewActionBean( null, null, p ); + WikiContext context = engine.getWikiActionBeanFactory().newViewWikiContext( null, null, p ); context.getPage().setAttribute( WikiPage.CHANGENOTE, "Test change" ); Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/render/CreoleRendererTest.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/render/CreoleRendererTest.java?rev=720116&r1=720115&r2=720116&view=diff ============================================================================== --- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/render/CreoleRendererTest.java (original) +++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/render/CreoleRendererTest.java Sun Nov 23 20:57:18 2008 @@ -29,7 +29,7 @@ private String render(String s) throws IOException { WikiPage dummyPage = new WikiPage(m_testEngine,"TestPage"); - WikiContext ctx = m_testEngine.getWikiActionBeanFactory().newViewActionBean( null, null, dummyPage ); + WikiContext ctx = m_testEngine.getWikiActionBeanFactory().newViewWikiContext( null, null, dummyPage ); StringReader in = new StringReader(s); Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/render/RenderingManagerTest.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/render/RenderingManagerTest.java?rev=720116&r1=720115&r2=720116&view=diff ============================================================================== --- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/render/RenderingManagerTest.java (original) +++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/render/RenderingManagerTest.java Sun Nov 23 20:57:18 2008 @@ -55,7 +55,7 @@ WikiPage page = m_engine.getPage( "TestPage" ); String pagedata = m_engine.getPureText( page ); - WikiContext context = m_engine.getWikiActionBeanFactory().newViewActionBean( null, null, page ); + WikiContext context = m_engine.getWikiActionBeanFactory().newViewWikiContext( null, null, page ); MarkupParser p = m_manager.getParser( context, pagedata ); @@ -78,7 +78,7 @@ WikiPage page = m_engine.getPage( "TestPage" ); String pagedata = m_engine.getPureText( page ); - WikiContext context = m_engine.getWikiActionBeanFactory().newViewActionBean( null, null, page ); + WikiContext context = m_engine.getWikiActionBeanFactory().newViewWikiContext( null, null, page ); String html = m_manager.getHTML( context, pagedata ); Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/render/WysiwygEditingRendererTest.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/render/WysiwygEditingRendererTest.java?rev=720116&r1=720115&r2=720116&view=diff ============================================================================== --- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/render/WysiwygEditingRendererTest.java (original) +++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/render/WysiwygEditingRendererTest.java Sun Nov 23 20:57:18 2008 @@ -38,7 +38,7 @@ private String render(String s) throws IOException { WikiPage dummyPage = new WikiPage(m_testEngine,"TestPage"); - WikiContext ctx = m_testEngine.getWikiActionBeanFactory().newViewActionBean( null, null, dummyPage ); + WikiContext ctx = m_testEngine.getWikiActionBeanFactory().newViewWikiContext( null, null, dummyPage ); StringReader in = new StringReader(s); Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/rss/RSSGeneratorTest.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/rss/RSSGeneratorTest.java?rev=720116&r1=720115&r2=720116&view=diff ============================================================================== --- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/rss/RSSGeneratorTest.java (original) +++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/rss/RSSGeneratorTest.java Sun Nov 23 20:57:18 2008 @@ -62,7 +62,7 @@ RSSGenerator gen = m_testEngine.getRSSGenerator(); - WikiContext context = m_testEngine.getWikiActionBeanFactory().newViewActionBean( null, null, m_testEngine.getPage("TestBlog") ); + WikiContext context = m_testEngine.getWikiActionBeanFactory().newViewWikiContext( null, null, m_testEngine.getPage("TestBlog") ); WeblogPlugin blogplugin = new WeblogPlugin(); @@ -92,7 +92,7 @@ RSSGenerator gen = m_testEngine.getRSSGenerator(); - WikiContext context = m_testEngine.getWikiActionBeanFactory().newViewActionBean( null, null, m_testEngine.getPage("TestBlog") ); + WikiContext context = m_testEngine.getWikiActionBeanFactory().newViewWikiContext( null, null, m_testEngine.getPage("TestBlog") ); WeblogPlugin blogplugin = new WeblogPlugin(); Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/ui/InputValidatorTest.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/ui/InputValidatorTest.java?rev=720116&r1=720115&r2=720116&view=diff ============================================================================== --- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/ui/InputValidatorTest.java (original) +++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/ui/InputValidatorTest.java Sun Nov 23 20:57:18 2008 @@ -28,7 +28,7 @@ Properties props = new Properties(); props.load( TestEngine.findTestProperties() ); testEngine = new TestEngine( props ); - WikiContext context = testEngine.getWikiActionBeanFactory().newViewActionBean( null, null, new WikiPage(testEngine,"dummyPage") ); + WikiContext context = testEngine.getWikiActionBeanFactory().newViewWikiContext( null, null, new WikiPage(testEngine,"dummyPage") ); val = new InputValidator( TEST, context ); } Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/util/MailUtilTest.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/util/MailUtilTest.java?rev=720116&r1=720115&r2=720116&view=diff ============================================================================== --- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/util/MailUtilTest.java (original) +++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/util/MailUtilTest.java Sun Nov 23 20:57:18 2008 @@ -55,7 +55,7 @@ TestEngine testEngine = new TestEngine( m_props ); - m_context = testEngine.getWikiActionBeanFactory().newViewActionBean( null, null, new WikiPage( testEngine, PAGE_NAME ) ); + m_context = testEngine.getWikiActionBeanFactory().newViewWikiContext( null, null, new WikiPage( testEngine, PAGE_NAME ) ); } public void tearDown() Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/xmlrpc/RPCHandlerTest.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/xmlrpc/RPCHandlerTest.java?rev=720116&r1=720115&r2=720116&view=diff ============================================================================== --- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/xmlrpc/RPCHandlerTest.java (original) +++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/xmlrpc/RPCHandlerTest.java Sun Nov 23 20:57:18 2008 @@ -30,7 +30,7 @@ m_engine = new TestEngine( m_props ); m_handler = new RPCHandler(); - WikiContext ctx = m_engine.getWikiActionBeanFactory().newViewActionBean( null, null, new WikiPage(m_engine, "Dummy") ); + WikiContext ctx = m_engine.getWikiActionBeanFactory().newViewWikiContext( null, null, new WikiPage(m_engine, "Dummy") ); m_handler.initialize( ctx ); }
