zydronium/screwturn-4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed extra<br> in block of code

Browse source
This commit is contained in:
Cristian Trapattoni 2011-03-01 17:13:14 +01:00
parent c950307494
commit 3680f61dfe
2 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Core-Tests/FormatterTests.cs
View file

@ -10,22 +10,38 @@ using ScrewTurn.Wiki.PluginFramework;
namespace ScrewTurn.Wiki.Tests { namespace ScrewTurn.Wiki.Tests {
[TestFixture] [TestFixture]
public class FormatterTests { public class FormatterTests {
private const string Input =
@"'''bold''' ''italic'' __underlined__ --striked-- [page1]\r\n[page2|title]
* item 1
* item 2
second line";
private const string ExpectedOutput =
@"<b>bold</b> <i>italic</i> <u>underlined</u> <strike>striked</strike> <a class=""pagelink"" href=""page1.ashx"" title=""Page 1"">page1</a>\r\n" +
"<a class=\"unknownlink\" href=\"page2.ashx\" title=\"page2\">title</a>\n<ul><li>item 1</li><li>item 2<br /></li></ul><br />second line\n";
private MockRepository mocks; private MockRepository mocks;
[Test] [Test]
public void Format() { [TestCase("@@rigatesto1\r\nriga2@@","<pre>rigatesto1\r\nriga2</pre>\n")]
[TestCase(Input,ExpectedOutput)]
public void Format(string input, string output) {
FormattingContext context = FormattingContext.PageContent; FormattingContext context = FormattingContext.PageContent;
PageInfo currentPage = null; PageInfo currentPage = null;
string[] linkedPages = null; string[] linkedPages = null;
string output = Formatter.Format(Input, false, context, currentPage, out linkedPages, false); string _input = Formatter.Format(input, false, context, currentPage, out linkedPages, false);
// Ignore \r characters // Ignore \r characters
// Ignore \n characters // Ignore \n characters
Assert.AreEqual(ExpectedOutput, output, "Formatter output is different from expected output"); Assert.AreEqual(output, _input, "Formatter output is different from expected output");
} }
[SetUp] [SetUp]
@ -81,17 +97,6 @@ namespace ScrewTurn.Wiki.Tests {
mocks.VerifyAll(); mocks.VerifyAll();
} }
private const string Input =
@"'''bold''' ''italic'' __underlined__ --striked-- [page1]\r\n[page2|title]
* item 1
* item 2
second line";
private const string ExpectedOutput =
@"<b>bold</b> <i>italic</i> <u>underlined</u> <strike>striked</strike> <a class=""pagelink"" href=""page1.ashx"" title=""Page 1"">page1</a>\r\n" +
"<a class=\"unknownlink\" href=\"page2.ashx\" title=\"page2\">title</a>\n<ul><li>item 1</li><li>item 2<br /></li></ul><br />second line\n";
} }
public class DummyRequest : System.Web.HttpWorkerRequest { public class DummyRequest : System.Web.HttpWorkerRequest {

2
Core/Formatter.cs
View file

@ -1264,7 +1264,7 @@ namespace ScrewTurn.Wiki {
sb.Replace("\n\n", "<br /><br />"); sb.Replace("\n\n", "<br /><br />");
sb.Replace(SingleBrPlaceHolder, "<br /><br />"); sb.Replace(SingleBrPlaceHolder, "\n");//Replace <br /><br /> with <br />
} }