Author: jalkanen
Date: Thu Jul 10 00:08:55 2008
New Revision: 675462
URL: http://svn.apache.org/viewvc?rev=675462&view=rev
Log:
Small tweaks to fix failing unit tests.
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/CreoleToJSPWikiTranslator.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/parser/CreoleToJSPWikiTranslatorTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/BasicAttachmentProviderTest.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=675462&r1=675461&r2=675462&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Thu Jul 10 00:08:55 2008
@@ -1,3 +1,10 @@
+2008-07-10 Janne Jalkanen <[EMAIL PROTECTED]>
+
+ * 2.7.0-alpha-4
+
+ * Fixed a number of failing unit tests, and also included
+ Creole tests.
+
2008-07-03 Andrew Jaquith <ajaquith AT apache DOT org>
* 2.7.0-alpha-3
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java?rev=675462&r1=675461&r2=675462&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java Thu Jul 10
00:08:55 2008
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "3";
+ public static final String BUILD = "4";
/**
* This is the generic version string you should use
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/CreoleToJSPWikiTranslator.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/CreoleToJSPWikiTranslator.java?rev=675462&r1=675461&r2=675462&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/CreoleToJSPWikiTranslator.java
(original)
+++
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/CreoleToJSPWikiTranslator.java
Thu Jul 10 00:08:55 2008
@@ -327,6 +327,13 @@
}
counter = 0;
}
+
+ // Fixes testExtensions5
+ if( content.endsWith( "\n" ) && result.charAt( result.length()-1 ) !=
'\n' )
+ {
+ result.append( '\n' );
+ }
+
return result.toString();
}
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java?rev=675462&r1=675461&r2=675462&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java
(original)
+++
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java
Thu Jul 10 00:08:55 2008
@@ -598,7 +598,7 @@
link );
String imglink = m_context.getURL( WikiContext.NONE,
-
"images/attachment_small.gif" );
+
"images/attachment_small.png" );
el = createAnchor( ATTACHMENT, attlink, text, "" );
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java?rev=675462&r1=675461&r2=675462&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java
(original)
+++
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java
Thu Jul 10 00:08:55 2008
@@ -149,7 +149,7 @@
{
linkel = new
a().setHref(context.getURL(WikiContext.INFO,pageref.getName()));
linkel.setClass("infolink");
- linkel.addElement( new
img().setSrc(context.getURL(WikiContext.NONE, "images/attachment_small.gif")));
+ linkel.addElement( new
img().setSrc(context.getURL(WikiContext.NONE, "images/attachment_small.png")));
col.addElement( linkel );
}
Modified:
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/parser/CreoleToJSPWikiTranslatorTest.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/parser/CreoleToJSPWikiTranslatorTest.java?rev=675462&r1=675461&r2=675462&view=diff
==============================================================================
---
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/parser/CreoleToJSPWikiTranslatorTest.java
(original)
+++
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/parser/CreoleToJSPWikiTranslatorTest.java
Thu Jul 10 00:08:55 2008
@@ -500,10 +500,10 @@
"//Comment\r\n" +
"}]\r\n" +
"\r\n" +
- "[http://www.xyz.com/]";;
+ "[http://www.xyz.com/]\r\n";;
- System.out.println(src);
- System.out.println(translate(src));
+ //System.out.println(src);
+ //System.out.println(translate(src));
assertEquals(target, translate(src));
}
@@ -842,6 +842,6 @@
public static Test suite()
{
- return new TestSuite( JSPWikiMarkupParserTest.class );
+ return new TestSuite( CreoleToJSPWikiTranslatorTest.class );
}
}
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=675462&r1=675461&r2=675462&view=diff
==============================================================================
---
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java
(original)
+++
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java
Thu Jul 10 00:08:55 2008
@@ -657,7 +657,7 @@
String src = "This should be an [attachment link|Test/TestAtt.txt]";
assertEquals( "This should be an <a class=\"attachment\"
href=\"/attach/Test/TestAtt.txt\">attachment link</a>"+
- "<a href=\"/PageInfo.jsp?page=Test/TestAtt.txt\"><img
src=\"/images/attachment_small.png\" border=\"0\" alt=\"(info)\" /></a>",
+ "<a href=\"/PageInfo.jsp?page=Test/TestAtt.txt\"
class=\"infolink\"><img src=\"/images/attachment_small.png\" border=\"0\"
alt=\"(info)\" /></a>",
translate(src));
}
@@ -680,7 +680,7 @@
String src = "This should be an [attachment link|Test/TestAtt.txt]";
assertEquals( "This should be an <a class=\"attachment\"
href=\"/attach/Test/TestAtt.txt\">attachment link</a>"+
- "<a href=\"/PageInfo.jsp?page=Test/TestAtt.txt\"><img
src=\"/images/attachment_small.png\" border=\"0\" alt=\"(info)\" /></a>",
+ "<a href=\"/PageInfo.jsp?page=Test/TestAtt.txt\"
class=\"infolink\"><img src=\"/images/attachment_small.png\" border=\"0\"
alt=\"(info)\" /></a>",
translate(testEngine2,src));
}
@@ -703,7 +703,7 @@
String src = "[Test page/TestAtt.txt]";
assertEquals( "<a class=\"attachment\"
href=\"/attach/TestPage/TestAtt.txt\">Test page/TestAtt.txt</a>"+
- "<a
href=\"/PageInfo.jsp?page=TestPage/TestAtt.txt\"><img
src=\"/images/attachment_small.png\" border=\"0\" alt=\"(info)\" /></a>",
+ "<a href=\"/PageInfo.jsp?page=TestPage/TestAtt.txt\"
class=\"infolink\"><img src=\"/images/attachment_small.png\" border=\"0\"
alt=\"(info)\" /></a>",
translate(testEngine2,src));
}
@@ -723,7 +723,7 @@
String src = "["+testEngine2.beautifyTitle("TestPage/TestAtt.txt")+"]";
assertEquals( "<a class=\"attachment\"
href=\"/attach/TestPage/TestAtt.txt\">Test Page/TestAtt.txt</a>"+
- "<a
href=\"/PageInfo.jsp?page=TestPage/TestAtt.txt\"><img
src=\"/images/attachment_small.png\" border=\"0\" alt=\"(info)\" /></a>",
+ "<a href=\"/PageInfo.jsp?page=TestPage/TestAtt.txt\"
class=\"infolink\"><img src=\"/images/attachment_small.png\" border=\"0\"
alt=\"(info)\" /></a>",
translate(testEngine2,src));
}
Modified:
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/BasicAttachmentProviderTest.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/BasicAttachmentProviderTest.java?rev=675462&r1=675461&r2=675462&view=diff
==============================================================================
---
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/BasicAttachmentProviderTest.java
(original)
+++
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/BasicAttachmentProviderTest.java
Thu Jul 10 00:08:55 2008
@@ -36,6 +36,8 @@
m_engine = new TestEngine(props);
+ TestEngine.deleteAll( new File(TestEngine.getRequiredProperty( props,
BasicAttachmentProvider.PROP_STORAGEDIR )) );
+
m_provider = new BasicAttachmentProvider();
m_provider.initialize( m_engine, props );
