You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by aj...@apache.org on 2008/12/03 05:35:08 UTC

svn commit: r722763 - in /incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki: attachment/ diff/ parser/ plugin/ providers/ render/ rss/

Author: ajaquith
Date: Tue Dec  2 20:35:07 2008
New Revision: 722763

URL: http://svn.apache.org/viewvc?rev=722763&view=rev
Log:
Checked in the Stripes code (about 220 classes, tests, JSPs and other files. All code compiles clean, but the JSPs do NOT work at the moment. Unit tests run clean except for some stray failing Stripes-related unit tests. See the file doc/README - Stripes Migration for some (repeat, SOME) details of what it all means. I'll sort out the JSP issues later this week.

Modified:
    incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/attachment/AttachmentManagerTest.java   (contents, props changed)
    incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/diff/ContextualDiffProviderTest.java   (contents, props changed)
    incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java   (contents, props changed)
    incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/CounterPluginTest.java   (contents, props changed)
    incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/PluginManagerTest.java   (contents, props changed)
    incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/ReferringPagesPluginTest.java   (contents, props changed)
    incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/UndefinedPagesPluginTest.java   (contents, props changed)
    incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/RCSFileProviderTest.java   (contents, props changed)
    incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/VersioningFileProviderTest.java   (contents, props changed)
    incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/CreoleRendererTest.java   (contents, props changed)
    incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/RenderingManagerTest.java   (contents, props changed)
    incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/WysiwygEditingRendererTest.java   (contents, props changed)
    incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/rss/RSSGeneratorTest.java   (contents, props changed)

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/attachment/AttachmentManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/attachment/AttachmentManagerTest.java?rev=722763&r1=722762&r2=722763&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/attachment/AttachmentManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/attachment/AttachmentManagerTest.java Tue Dec  2 20:35:07 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,8 +83,8 @@
 
         m_manager.storeAttachment( att, makeAttachmentFile() );
 
-        Attachment att2 = m_manager.getAttachmentInfo( new WikiContext(m_engine,
-                                                                       new WikiPage(m_engine, NAME1)), 
+        Attachment att2 = m_manager.getAttachmentInfo( m_engine.getWikiContextFactory().newViewContext(
+                                                       null, null, new WikiPage(m_engine, NAME1)), 
                                                        "test1.txt" );
 
         assertNotNull( "attachment disappeared", att2 );
@@ -115,8 +114,8 @@
 
         m_manager.storeAttachment( att, makeAttachmentFile() );
 
-        Attachment att2 = m_manager.getAttachmentInfo( new WikiContext(m_engine,
-                                                                       new WikiPage(m_engine, NAME1)), 
+        Attachment att2 = m_manager.getAttachmentInfo( m_engine.getWikiContextFactory().newViewContext(
+                                                                          null, null, new WikiPage(m_engine, NAME1)), 
                                                        "test file.txt" );
 
         assertNotNull( "attachment disappeared", att2 );
@@ -146,8 +145,8 @@
 
         m_manager.storeAttachment( att, makeAttachmentFile() );
 
-        Attachment att2 = m_manager.getAttachmentInfo( new WikiContext(m_engine,
-                                                                       new WikiPage(m_engine, NAME1)), 
+        Attachment att2 = m_manager.getAttachmentInfo( m_engine.getWikiContextFactory().newViewContext(
+                                                                          null, null, new WikiPage(m_engine, NAME1)), 
                                                        "test1.txt", 1 );
 
         assertNotNull( "attachment disappeared", att2 );
@@ -181,8 +180,8 @@
         att.setAuthor( "FooBar" );
         m_manager.storeAttachment( att, makeAttachmentFile() );        
 
-        Attachment att2 = m_manager.getAttachmentInfo( new WikiContext(m_engine,
-                                                                       new WikiPage(m_engine, NAME1)), 
+        Attachment att2 = m_manager.getAttachmentInfo( m_engine.getWikiContextFactory().newViewContext(
+                                                                          null, null, new WikiPage(m_engine, NAME1)), 
                                                        "test1.txt" );
 
         assertNotNull( "attachment disappeared", att2 );
@@ -207,8 +206,8 @@
         // Check that first author did not disappear
         //
 
-        Attachment att3 = m_manager.getAttachmentInfo( new WikiContext(m_engine,
-                                                                       new WikiPage(m_engine, NAME1)), 
+        Attachment att3 = m_manager.getAttachmentInfo( m_engine.getWikiContextFactory().newViewContext(
+                                                                          null, null, new WikiPage(m_engine, NAME1)), 
                                                        "test1.txt",
                                                        1 );
         assertEquals( "version of v1", 1, att3.getVersion() );
@@ -242,8 +241,8 @@
 
         m_manager.storeAttachment( att, makeAttachmentFile() );
 
-        Attachment att2 = m_manager.getAttachmentInfo( new WikiContext(m_engine,
-                                                                       new WikiPage(m_engine, NAME1)),
+        Attachment att2 = m_manager.getAttachmentInfo( m_engine.getWikiContextFactory().newViewContext(
+                                                                          null, null, new WikiPage(m_engine, NAME1)),
                                                        "test1" );
 
         assertNotNull( "attachment disappeared", att2 );

Propchange: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/attachment/AttachmentManagerTest.java
            ('svn:eol-style' removed)

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/diff/ContextualDiffProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/diff/ContextualDiffProviderTest.java?rev=722763&r1=722762&r2=722763&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/diff/ContextualDiffProviderTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/diff/ContextualDiffProviderTest.java Tue Dec  2 20:35:07 2008
@@ -179,7 +179,7 @@
         props.load( TestEngine.findTestProperties() );
         TestEngine engine = new TestEngine(props);
         
-        WikiContext ctx = new WikiContext( engine, new WikiPage(engine,"Dummy") );
+        WikiContext ctx = engine.getWikiContextFactory().newViewContext( null, null, new WikiPage(engine,"Dummy") );
         String actualDiff = diff.makeDiffHtml( ctx, oldText, newText);
 
         assertEquals(expectedDiff, actualDiff);

Propchange: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/diff/ContextualDiffProviderTest.java
            ('svn:eol-style' removed)

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java?rev=722763&r1=722762&r2=722763&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java Tue Dec  2 20:35:07 2008
@@ -101,7 +101,7 @@
                NoRequiredPropertyException,
                ServletException
     {
-        WikiContext context = new WikiContext( e, p );
+        WikiContext context = e.getWikiContextFactory().newViewContext( 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 = new WikiContext( testEngine2,
+        WikiContext context = testEngine2.getWikiContextFactory().newViewContext( 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 = new WikiContext( testEngine,
+        WikiContext context = testEngine.getWikiContextFactory().newViewContext( 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 = new WikiContext( testEngine,
+        WikiContext context = testEngine.getWikiContextFactory().newViewContext( 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 = new WikiContext( testEngine,
+            WikiContext context = testEngine.getWikiContextFactory().newViewContext( null, null,
                                                    new WikiPage(testEngine,PAGE_NAME) );
 
             MarkupParser p = new JSPWikiMarkupParser( context,

Propchange: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java
            ('svn:eol-style' removed)

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/CounterPluginTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/CounterPluginTest.java?rev=722763&r1=722762&r2=722763&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/CounterPluginTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/CounterPluginTest.java Tue Dec  2 20:35:07 2008
@@ -48,7 +48,7 @@
                NoRequiredPropertyException,
                ServletException
     {
-        WikiContext context = new WikiContext( testEngine,
+        WikiContext context = testEngine.getWikiContextFactory().newViewContext( null, null,
                                                new WikiPage(testEngine, "TestPage") );
         
         MarkupParser p = new JSPWikiMarkupParser( context, new StringReader(src) );

Propchange: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/CounterPluginTest.java
            ('svn:eol-style' removed)

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/PluginManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/PluginManagerTest.java?rev=722763&r1=722762&r2=722763&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/PluginManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/PluginManagerTest.java Tue Dec  2 20:35:07 2008
@@ -38,7 +38,7 @@
         props.load( TestEngine.findTestProperties() );
 
         engine = new TestEngine(props);
-        context = new WikiContext( engine, new WikiPage(engine, "Testpage") );
+        context = engine.getWikiContextFactory().newViewContext( null, null, new WikiPage(engine, "Testpage") );
         manager = new PluginManager( engine, props );
     }
 

Propchange: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/PluginManagerTest.java
            ('svn:eol-style' removed)

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/ReferringPagesPluginTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/ReferringPagesPluginTest.java?rev=722763&r1=722762&r2=722763&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/ReferringPagesPluginTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/ReferringPagesPluginTest.java Tue Dec  2 20:35:07 2008
@@ -41,7 +41,7 @@
         engine.saveText( "Foobar6", "Reference to [TestPage]." );
         engine.saveText( "Foobar7", "Reference to [TestPage]." );
 
-        context = new WikiContext( engine, new WikiPage(engine,"TestPage") );
+        context = engine.getWikiContextFactory().newViewContext( null, null, new WikiPage(engine,"TestPage") );
         manager = new PluginManager( engine, props );
     }
 
@@ -70,7 +70,7 @@
     public void testSingleReferral()
         throws Exception
     {
-        WikiContext context2 = new WikiContext( engine, new WikiPage(engine, "Foobar") );
+        WikiContext context2 = engine.getWikiContextFactory().newViewContext( 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 = new WikiContext( engine, new WikiPage(engine, "Foobar") );
+        WikiContext context2 = engine.getWikiContextFactory().newViewContext( null, null, new WikiPage(engine, "Foobar") );
 
         String res = manager.execute( context2,
                                       "{INSERT com.ecyrd.jspwiki.plugin.ReferringPagesPlugin WHERE maxwidth=5}");

Propchange: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/ReferringPagesPluginTest.java
            ('svn:eol-style' removed)

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/UndefinedPagesPluginTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/UndefinedPagesPluginTest.java?rev=722763&r1=722762&r2=722763&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/UndefinedPagesPluginTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/UndefinedPagesPluginTest.java Tue Dec  2 20:35:07 2008
@@ -33,7 +33,7 @@
         engine.saveText( "TestPage", "Reference to [Foobar]." );
         engine.saveText( "Foobar", "Reference to [Foobar 2], [Foobars]" );
 
-        context = new WikiContext( engine, new WikiPage(engine, "TestPage") );
+        context = engine.getWikiContextFactory().newViewContext( null, null, new WikiPage(engine, "TestPage") );
         manager = new PluginManager( engine, props );
     }
 
@@ -57,7 +57,7 @@
     public void testSimpleUndefined()
         throws Exception
     {
-        WikiContext context2 = new WikiContext( engine, new WikiPage(engine, "Foobar") );
+        WikiContext context2 = engine.getWikiContextFactory().newViewContext( null, null, new WikiPage(engine, "Foobar") );
 
         String res = manager.execute( context2,
                                       "{INSERT com.ecyrd.jspwiki.plugin.UndefinedPagesPlugin");

Propchange: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/UndefinedPagesPluginTest.java
            ('svn:eol-style' removed)

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/RCSFileProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/RCSFileProviderTest.java?rev=722763&r1=722762&r2=722763&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/RCSFileProviderTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/RCSFileProviderTest.java Tue Dec  2 20:35:07 2008
@@ -200,7 +200,7 @@
     {
         WikiPage p = new WikiPage( engine, NAME1 );
         p.setAttribute(WikiPage.CHANGENOTE, "Test change" );
-        WikiContext context = new WikiContext(engine,p);
+        WikiContext context = engine.getWikiContextFactory().newViewContext(null, null, p);
         
         engine.saveText( context, "test" );
         
@@ -213,7 +213,7 @@
         throws Exception
     {
         WikiPage p = new WikiPage( engine, NAME1 );
-        WikiContext context = new WikiContext(engine,p);
+        WikiContext context = engine.getWikiContextFactory().newViewContext(null, null, p);
 
         context.getPage().setAttribute(WikiPage.CHANGENOTE, "Test change" );
         engine.saveText( context, "test" );

Propchange: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/RCSFileProviderTest.java
            ('svn:eol-style' removed)

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/VersioningFileProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/VersioningFileProviderTest.java?rev=722763&r1=722762&r2=722763&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/VersioningFileProviderTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/VersioningFileProviderTest.java Tue Dec  2 20:35:07 2008
@@ -272,7 +272,7 @@
     {
         WikiPage p = new WikiPage( engine, NAME1 );
         p.setAttribute(WikiPage.CHANGENOTE, "Test change" );
-        WikiContext context = new WikiContext(engine,p);
+        WikiContext context = engine.getWikiContextFactory().newViewContext(null, null, p);
         
         engine.saveText( context, "test" );
         
@@ -287,7 +287,7 @@
         WikiPage p = new WikiPage( engine, NAME1 );
         
         
-        WikiContext context = new WikiContext(engine,p);
+        WikiContext context = engine.getWikiContextFactory().newViewContext(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 = new WikiContext(engine,p);
+        WikiContext context = engine.getWikiContextFactory().newViewContext( null, null, p );
 
         context.getPage().setAttribute( WikiPage.CHANGENOTE, "Test change" );
         

Propchange: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/VersioningFileProviderTest.java
            ('svn:eol-style' removed)

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/CreoleRendererTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/CreoleRendererTest.java?rev=722763&r1=722762&r2=722763&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/CreoleRendererTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/CreoleRendererTest.java Tue Dec  2 20:35:07 2008
@@ -29,7 +29,7 @@
     private String render(String s) throws IOException
     {
         WikiPage dummyPage = new WikiPage(m_testEngine,"TestPage");
-        WikiContext ctx = new WikiContext(m_testEngine,dummyPage);
+        WikiContext ctx = m_testEngine.getWikiContextFactory().newViewContext( null, null, dummyPage );
         
         StringReader in = new StringReader(s);
         

Propchange: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/CreoleRendererTest.java
            ('svn:eol-style' removed)

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/RenderingManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/RenderingManagerTest.java?rev=722763&r1=722762&r2=722763&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/RenderingManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/RenderingManagerTest.java Tue Dec  2 20:35:07 2008
@@ -55,7 +55,7 @@
             WikiPage page = m_engine.getPage( "TestPage" );
             String pagedata = m_engine.getPureText( page );
             
-            WikiContext context = new WikiContext( m_engine, page );
+            WikiContext context = m_engine.getWikiContextFactory().newViewContext( 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 = new WikiContext( m_engine, page );
+            WikiContext context = m_engine.getWikiContextFactory().newViewContext( null, null, page );
             
             String html = m_manager.getHTML( context, pagedata );
             

Propchange: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/RenderingManagerTest.java
            ('svn:eol-style' removed)

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/WysiwygEditingRendererTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/WysiwygEditingRendererTest.java?rev=722763&r1=722762&r2=722763&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/WysiwygEditingRendererTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/WysiwygEditingRendererTest.java Tue Dec  2 20:35:07 2008
@@ -38,7 +38,7 @@
     private String render(String s) throws IOException
     {
         WikiPage dummyPage = new WikiPage(m_testEngine,"TestPage");
-        WikiContext ctx = new WikiContext(m_testEngine,dummyPage);
+        WikiContext ctx = m_testEngine.getWikiContextFactory().newViewContext( null, null, dummyPage );
 
         StringReader in = new StringReader(s);
 

Propchange: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/render/WysiwygEditingRendererTest.java
            ('svn:eol-style' removed)

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/rss/RSSGeneratorTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/rss/RSSGeneratorTest.java?rev=722763&r1=722762&r2=722763&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/rss/RSSGeneratorTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/rss/RSSGeneratorTest.java Tue Dec  2 20:35:07 2008
@@ -62,7 +62,7 @@
 
         RSSGenerator gen = m_testEngine.getRSSGenerator();
 
-        WikiContext context = new WikiContext( m_testEngine, m_testEngine.getPage("TestBlog") );
+        WikiContext context = m_testEngine.getWikiContextFactory().newViewContext( null, null, m_testEngine.getPage("TestBlog") );
 
         WeblogPlugin blogplugin = new WeblogPlugin();
 
@@ -92,7 +92,7 @@
 
         RSSGenerator gen = m_testEngine.getRSSGenerator();
 
-        WikiContext context = new WikiContext( m_testEngine, m_testEngine.getPage("TestBlog") );
+        WikiContext context = m_testEngine.getWikiContextFactory().newViewContext( null, null, m_testEngine.getPage("TestBlog") );
 
         WeblogPlugin blogplugin = new WeblogPlugin();
 

Propchange: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/rss/RSSGeneratorTest.java
            ('svn:eol-style' removed)