Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/EnglishPluralsPageNameResolverTest.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/EnglishPluralsPageNameResolverTest.java?rev=764449&r1=764448&r2=764449&view=diff ============================================================================== --- incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/EnglishPluralsPageNameResolverTest.java (original) +++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/EnglishPluralsPageNameResolverTest.java Mon Apr 13 13:28:07 2009 @@ -55,20 +55,20 @@ public void testFinalPageName() throws Exception { - WikiName page; - page = resolver.resolve( WikiName.valueOf("SinglePage") ); + WikiPath page; + page = resolver.resolve( WikiPath.valueOf("SinglePage") ); assertEquals( "SinglePage", page ); - page = resolver.resolve( WikiName.valueOf("SinglePages") ); + page = resolver.resolve( WikiPath.valueOf("SinglePages") ); assertEquals( "SinglePage", page ); - page = resolver.resolve( WikiName.valueOf("PluralPages") ); + page = resolver.resolve( WikiPath.valueOf("PluralPages") ); assertEquals( "PluralPages", page ); - page = resolver.resolve( WikiName.valueOf( "PluralPage" ) ); + page = resolver.resolve( WikiPath.valueOf( "PluralPage" ) ); assertEquals( "PluralPages", page ); - page = resolver.resolve( WikiName.valueOf("NonExistentPage") ); + page = resolver.resolve( WikiPath.valueOf("NonExistentPage") ); assertNull( page ); }
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/PageRenamerTest.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/PageRenamerTest.java?rev=764449&r1=764448&r2=764449&view=diff ============================================================================== --- incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/PageRenamerTest.java (original) +++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/PageRenamerTest.java Mon Apr 13 13:28:07 2009 @@ -78,9 +78,9 @@ m_engine.shutdown(); } - private Set<WikiName> findReferrers(String path) throws ProviderException + private Set<WikiPath> findReferrers(String path) throws ProviderException { - return m_engine.getReferenceManager().findReferrers( WikiName.valueOf(path) ); + return m_engine.getReferenceManager().findReferrers( WikiPath.valueOf(path) ); } public void testSimpleRename() @@ -127,13 +127,13 @@ assertEquals( "no rename", "[FooTest]", data.trim() ); - Collection<WikiName> refs = findReferrers("TestPage"); + Collection<WikiPath> refs = findReferrers("TestPage"); assertNull( "oldpage", refs ); refs = findReferrers( "FooTest" ); assertEquals( "new size", 1, refs.size() ); - assertEquals( "wrong ref", "TestPage2", (WikiName)refs.iterator().next() ); + assertEquals( "wrong ref", "TestPage2", (WikiPath)refs.iterator().next() ); } public void testReferrerChangeCC() @@ -151,13 +151,13 @@ String data = m_engine.getPureText("TestPage2", WikiProvider.LATEST_VERSION); assertEquals( "no rename", "FooTest", data.trim() ); - Collection<WikiName> refs = findReferrers("TestPage"); + Collection<WikiPath> refs = findReferrers("TestPage"); assertNull( "oldpage", refs ); refs = findReferrers( "FooTest" ); assertEquals( "new size", 1, refs.size() ); - assertEquals( "wrong ref", "TestPage2", (WikiName)refs.iterator().next() ); + assertEquals( "wrong ref", "TestPage2", (WikiPath)refs.iterator().next() ); } public void testReferrerChangeAnchor() @@ -175,7 +175,7 @@ String data = m_engine.getPureText("TestPage2", WikiProvider.LATEST_VERSION); assertEquals( "no rename", "[FooTest#heading1]", data.trim() ); - Collection<WikiName> refs = findReferrers("TestPage"); + Collection<WikiPath> refs = findReferrers("TestPage"); assertNull( "oldpage", refs ); @@ -202,7 +202,7 @@ "[FooTest] [FooTest] [linktext|FooTest] FooTest [linktext|FooTest] [FooTest#Anchor] [FooTest] FooTest [FooTest]", data.trim() ); - Collection<WikiName> refs = findReferrers("TestPage"); + Collection<WikiPath> refs = findReferrers("TestPage"); assertNull( "oldpage", refs ); @@ -260,7 +260,7 @@ att = m_engine.getAttachmentManager().getAttachmentInfo("TestPage/foo.txt"); assertNull("testpage/foo.txt exists",att); - Collection<WikiName> refs = findReferrers("TestPage/bar.jpg"); + Collection<WikiPath> refs = findReferrers("TestPage/bar.jpg"); assertNull( "oldpage", refs ); Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/WikiNameTest.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/WikiNameTest.java?rev=764449&r1=764448&r2=764449&view=diff ============================================================================== --- incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/WikiNameTest.java (original) +++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/content/WikiNameTest.java Mon Apr 13 13:28:07 2009 @@ -21,7 +21,7 @@ package org.apache.wiki.content; import org.apache.wiki.content.ContentManager; -import org.apache.wiki.content.WikiName; +import org.apache.wiki.content.WikiPath; import junit.framework.Test; import junit.framework.TestCase; @@ -31,7 +31,7 @@ { public void testParse1() { - WikiName wn = WikiName.valueOf( "Foo:Bar/Blob 2" ); + WikiPath wn = WikiPath.valueOf( "Foo:Bar/Blob 2" ); assertEquals("space", "Foo", wn.getSpace() ); assertEquals("path", "Bar/Blob 2", wn.getPath() ); @@ -39,7 +39,7 @@ public void testParse2() { - WikiName wn = WikiName.valueOf( "BarBrian" ); + WikiPath wn = WikiPath.valueOf( "BarBrian" ); assertEquals("space", ContentManager.DEFAULT_SPACE, wn.getSpace() ); assertEquals("path", "BarBrian", wn.getPath() ); @@ -47,18 +47,18 @@ public void testResolve1() { - WikiName wn = new WikiName("Test","TestPage"); + WikiPath wn = new WikiPath("Test","TestPage"); - WikiName newname = wn.resolve("Barbapapa"); + WikiPath newname = wn.resolve("Barbapapa"); assertEquals( "Test:Barbapapa", newname.toString() ); } public void testResolveAbsolute() { - WikiName wn = new WikiName("Test","TestPage"); + WikiPath wn = new WikiPath("Test","TestPage"); - WikiName newname = wn.resolve("Foo:Barbapapa"); + WikiPath newname = wn.resolve("Foo:Barbapapa"); assertEquals( "Foo:Barbapapa", newname.toString() ); } Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java?rev=764449&r1=764448&r2=764449&view=diff ============================================================================== --- incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java (original) +++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java Mon Apr 13 13:28:07 2009 @@ -37,7 +37,7 @@ import org.apache.wiki.*; import org.apache.wiki.api.WikiException; import org.apache.wiki.api.WikiPage; -import org.apache.wiki.content.WikiName; +import org.apache.wiki.content.WikiPath; import org.apache.wiki.render.XHTMLRenderer; import org.apache.wiki.util.TextUtil; @@ -98,12 +98,12 @@ private String translate( String src ) throws Exception { - return translate( testEngine.createPage( WikiName.valueOf( PAGE_NAME ) ), src ); + return translate( testEngine.createPage( WikiPath.valueOf( PAGE_NAME ) ), src ); } private String translate( WikiEngine e, String src ) throws Exception { - return translate( e, e.createPage( WikiName.valueOf( PAGE_NAME ) ), src ); + return translate( e, e.createPage( WikiPath.valueOf( PAGE_NAME ) ), src ); } private String translate( WikiPage p, String src ) throws Exception @@ -1081,7 +1081,7 @@ testEngine.shutdown(); testEngine = new TestEngine( props ); - WikiPage page = testEngine.createPage( WikiName.valueOf( PAGE_NAME ) ); + WikiPage page = testEngine.createPage( WikiPath.valueOf( PAGE_NAME ) ); String out = translate( testEngine, page, src ); @@ -1096,7 +1096,7 @@ testEngine.shutdown(); testEngine = new TestEngine( props ); - WikiPage page = testEngine.createPage( WikiName.valueOf( PAGE_NAME ) ); + WikiPage page = testEngine.createPage( WikiPath.valueOf( PAGE_NAME ) ); String out = translate( testEngine, page, src ); @@ -2052,7 +2052,7 @@ { String src = "Foobar.[{SET name=foo}]"; - WikiPage p = testEngine.createPage( WikiName.valueOf( PAGE_NAME ) ); + WikiPage p = testEngine.createPage( WikiPath.valueOf( PAGE_NAME ) ); String res = translate( p, src ); @@ -2065,7 +2065,7 @@ { String src = "Foobar.[{SET name = foo}]"; - WikiPage p = testEngine.createPage( WikiName.valueOf( PAGE_NAME ) ); + WikiPage p = testEngine.createPage( WikiPath.valueOf( PAGE_NAME ) ); String res = translate( p, src ); @@ -2078,7 +2078,7 @@ { String src = "Foobar.[{SET name= Janne Jalkanen}]"; - WikiPage p = testEngine.createPage( WikiName.valueOf( PAGE_NAME ) ); + WikiPage p = testEngine.createPage( WikiPath.valueOf( PAGE_NAME ) ); String res = translate( p, src ); @@ -2091,7 +2091,7 @@ { String src = "Foobar.[{SET name='Janne Jalkanen'}][{SET too='{$name}'}]"; - WikiPage p = testEngine.createPage( WikiName.valueOf( PAGE_NAME ) ); + WikiPage p = testEngine.createPage( WikiPath.valueOf( PAGE_NAME ) ); String res = translate( p, src ); @@ -2105,7 +2105,7 @@ { String src = "Foobar.[{SET name='<b>danger</b>'}] [{$name}]"; - WikiPage p = testEngine.createPage( WikiName.valueOf( PAGE_NAME ) ); + WikiPage p = testEngine.createPage( WikiPath.valueOf( PAGE_NAME ) ); String res = translate( p, src );
