diff --git a/.gitignore b/.gitignore index 2e89782..79b888c 100644 --- a/.gitignore +++ b/.gitignore @@ -282,3 +282,4 @@ paket-files/ /pkgs/_tmp /coverage +/test-results \ No newline at end of file diff --git a/build.cake b/build.cake index 0b07abd..9a8b485 100644 --- a/build.cake +++ b/build.cake @@ -1,22 +1,17 @@ #tool nuget:?package=ReportGenerator&version=4.8.13 -#addin nuget:?package=Cake.Coverlet&version=3.0.2 -#addin nuget:?package=Cake.Incubator&version=8.0.0 var target = Argument("target", "Default"); var configuration = Argument("configuration", "Debug"); var solution = "./src/mcpride-markdig-extensions.sln"; -bool IsTestProject(SolutionProject project) -{ - return (project.Path.HasExtension && project.Name.ToString().EndsWith("Tests")); -} - Task("Clean") .Does(() => { - Information(string.Format("Cleaning files for configuration {0}...", configuration)); - CleanDirectories(string.Format("./src/**/obj/{0}", configuration)); - CleanDirectories(string.Format("./src/**/bin/{0}", configuration)); + Information("Cleaning files..."); + CleanDirectories("./src/**/obj"); + CleanDirectories("./src/**/bin"); + CleanDirectories("./test-results"); + CleanDirectories("./coverage"); }); Task("Restore") @@ -47,7 +42,7 @@ Task("Test") var projectFiles = GetFiles("./src/**/*.Tests.csproj"); foreach(var file in projectFiles) { - var testResultsDirectory = MakeAbsolute(Directory($"./coverage/{file.GetFilenameWithoutExtension()}")); + var testResultsDirectory = MakeAbsolute(Directory($"./test-results/{file.GetFilenameWithoutExtension()}")); EnsureDirectoryExists(testResultsDirectory); CleanDirectory(testResultsDirectory); @@ -60,8 +55,7 @@ Task("Test") Verbosity = DotNetVerbosity.Normal, Loggers = new [] { - "console;verbosity=normal", - $"trx;LogFileName={testResultsDirectory}/results.trx" + "console;verbosity=normal" }, ResultsDirectory = testResultsDirectory, Collectors = new [] @@ -70,15 +64,7 @@ Task("Test") } }; - var coverletSettings = new CoverletSettings - { - CollectCoverage = true, - CoverletOutputFormat = CoverletOutputFormat.cobertura, - CoverletOutputDirectory = testResultsDirectory, - CoverletOutputName = $"coverage" - }; - - DotNetTest(file, testSettings, coverletSettings); + DotNetTest(file.FullPath, testSettings); } }); @@ -93,10 +79,12 @@ Task("Coverage") { ReportTypes = new [] { - ReportGeneratorReportType.Html + ReportGeneratorReportType.Html, ReportGeneratorReportType.TextSummary } }; - ReportGenerator(new GlobPattern("./coverage/**/coverage.cobertura.xml"), coverageDirectory, reportSettings); + ReportGenerator(new GlobPattern("./test-results/**/coverage.cobertura.xml"), coverageDirectory, reportSettings); + var summary = System.IO.File.ReadAllText("./coverage/Summary.txt"); + Information(summary); }); diff --git a/src/McPride.Markdig.AsciiDoc.Tests/Renderers/AsciiDoc/ExpectedAsciiDoc/ali01.adoc b/src/McPride.Markdig.AsciiDoc.Tests/Renderers/AsciiDoc/ExpectedAsciiDoc/ali01.adoc index d865058..13a3ee1 100644 --- a/src/McPride.Markdig.AsciiDoc.Tests/Renderers/AsciiDoc/ExpectedAsciiDoc/ali01.adoc +++ b/src/McPride.Markdig.AsciiDoc.Tests/Renderers/AsciiDoc/ExpectedAsciiDoc/ali01.adoc @@ -1 +1 @@ -http://a +http://a \ No newline at end of file diff --git a/src/McPride.Markdig.AsciiDoc.Tests/Renderers/AsciiDoc/ExpectedAsciiDoc/code04.adoc b/src/McPride.Markdig.AsciiDoc.Tests/Renderers/AsciiDoc/ExpectedAsciiDoc/code04.adoc index b7a6ab1..8838fe3 100644 --- a/src/McPride.Markdig.AsciiDoc.Tests/Renderers/AsciiDoc/ExpectedAsciiDoc/code04.adoc +++ b/src/McPride.Markdig.AsciiDoc.Tests/Renderers/AsciiDoc/ExpectedAsciiDoc/code04.adoc @@ -17,4 +17,4 @@ g = Greeter.new("world") g.salute ---- -The end! +The end! \ No newline at end of file diff --git a/src/McPride.Markdig.AsciiDoc.Tests/Renderers/AsciiDoc/ExpectedAsciiDoc/he01.adoc b/src/McPride.Markdig.AsciiDoc.Tests/Renderers/AsciiDoc/ExpectedAsciiDoc/he01.adoc index ed16c94..c193c1d 100644 --- a/src/McPride.Markdig.AsciiDoc.Tests/Renderers/AsciiDoc/ExpectedAsciiDoc/he01.adoc +++ b/src/McPride.Markdig.AsciiDoc.Tests/Renderers/AsciiDoc/ExpectedAsciiDoc/he01.adoc @@ -1 +1 @@ - + \ No newline at end of file diff --git a/src/McPride.Markdig.AsciiDoc.Tests/Renderers/AsciiDoc/ExpectedAsciiDoc/hr02.adoc b/src/McPride.Markdig.AsciiDoc.Tests/Renderers/AsciiDoc/ExpectedAsciiDoc/hr02.adoc index 4bf5bab..1dd1a38 100644 --- a/src/McPride.Markdig.AsciiDoc.Tests/Renderers/AsciiDoc/ExpectedAsciiDoc/hr02.adoc +++ b/src/McPride.Markdig.AsciiDoc.Tests/Renderers/AsciiDoc/ExpectedAsciiDoc/hr02.adoc @@ -2,4 +2,4 @@ Before thematic break ''' -After thematic break +After thematic break \ No newline at end of file diff --git a/src/McPride.Markdig.AsciiDoc.Tests/Renderers/AsciiDoc/ExpectedAsciiDoc/lbi01.adoc b/src/McPride.Markdig.AsciiDoc.Tests/Renderers/AsciiDoc/ExpectedAsciiDoc/lbi01.adoc index cba6506..e560b1f 100644 --- a/src/McPride.Markdig.AsciiDoc.Tests/Renderers/AsciiDoc/ExpectedAsciiDoc/lbi01.adoc +++ b/src/McPride.Markdig.AsciiDoc.Tests/Renderers/AsciiDoc/ExpectedAsciiDoc/lbi01.adoc @@ -2,4 +2,4 @@ this breaks + this also breaks + {empty} + and this + -too +too \ No newline at end of file diff --git a/src/McPride.Markdig.AsciiDoc.Tests/Renderers/AsciiDoc/ExpectedAsciiDoc/lnk01.adoc b/src/McPride.Markdig.AsciiDoc.Tests/Renderers/AsciiDoc/ExpectedAsciiDoc/lnk01.adoc index f1314af..94eaa68 100644 --- a/src/McPride.Markdig.AsciiDoc.Tests/Renderers/AsciiDoc/ExpectedAsciiDoc/lnk01.adoc +++ b/src/McPride.Markdig.AsciiDoc.Tests/Renderers/AsciiDoc/ExpectedAsciiDoc/lnk01.adoc @@ -2,4 +2,4 @@ image::http://git-scm.com/figures/18333fig0319-tn.png["Branching Concepts", titl This is link:http://example.com/["an example", title="Title"] inline link. -link:http://example.net/[This link] has no title attribute. +link:http://example.net/[This link] has no title attribute. \ No newline at end of file diff --git a/src/McPride.Markdig.AsciiDoc.Tests/Renderers/AsciiDoc/ExpectedAsciiDoc/txt01.adoc b/src/McPride.Markdig.AsciiDoc.Tests/Renderers/AsciiDoc/ExpectedAsciiDoc/txt01.adoc index 386460b..9480269 100644 --- a/src/McPride.Markdig.AsciiDoc.Tests/Renderers/AsciiDoc/ExpectedAsciiDoc/txt01.adoc +++ b/src/McPride.Markdig.AsciiDoc.Tests/Renderers/AsciiDoc/ExpectedAsciiDoc/txt01.adoc @@ -10,4 +10,5 @@ _Italic Text_ is done using `+*Italic Text*+` + ~+Subscript Text+~ is done using `+Subscript Text+` + ^+Superscript Text+^ is done using `+^Superscript Text^+` + ^+Superscript Text+^ is done using `+Superscript Text+` + -[.underline]#Inserted Text# is done using `pass:[++Inserted Text++]` +[.underline]#Inserted Text# is done using `pass:[++Inserted Text++]` + +[.underline]#Underline Text# is done using `+Underline Text+` \ No newline at end of file diff --git a/src/McPride.Markdig.AsciiDoc.Tests/Renderers/AsciiDoc/MarkdownResources/txt01.md b/src/McPride.Markdig.AsciiDoc.Tests/Renderers/AsciiDoc/MarkdownResources/txt01.md index 34fdd49..6d0d4b1 100644 --- a/src/McPride.Markdig.AsciiDoc.Tests/Renderers/AsciiDoc/MarkdownResources/txt01.md +++ b/src/McPride.Markdig.AsciiDoc.Tests/Renderers/AsciiDoc/MarkdownResources/txt01.md @@ -10,4 +10,5 @@ __*Bold Italic Text*__ is done using `__*Bold Italic Text*__` Subscript Text is done using `Subscript Text` ^Superscript Text^ is done using `^Superscript Text^` Superscript Text is done using `Superscript Text` -++Inserted Text++ is done using `++Inserted Text++` \ No newline at end of file +++Inserted Text++ is done using `++Inserted Text++` +Underline Text is done using `Underline Text` \ No newline at end of file diff --git a/src/McPride.Markdig.AsciiDoc/Renderers/AsciiDoc/ParagraphRenderer.cs b/src/McPride.Markdig.AsciiDoc/Renderers/AsciiDoc/ParagraphRenderer.cs index e2a6797..178976a 100644 --- a/src/McPride.Markdig.AsciiDoc/Renderers/AsciiDoc/ParagraphRenderer.cs +++ b/src/McPride.Markdig.AsciiDoc/Renderers/AsciiDoc/ParagraphRenderer.cs @@ -19,7 +19,11 @@ protected override void Write(AsciiDocRenderer renderer, ParagraphBlock obj) } renderer.WriteLeafInline(obj); - renderer.EnsureLine(); + + if (!(renderer.IsLastInContainer && obj.Parent is MarkdownDocument)) + { + renderer.EnsureLine(); + } } } }