diff options
| author | Michael Williamson <mike@zwobble.org> | 2016-04-30 16:53:16 +0100 |
|---|---|---|
| committer | Michael Williamson <mike@zwobble.org> | 2016-04-30 16:53:16 +0100 |
| commit | d71b9ef7b2ed7d72df132b5e38448fbbac7036be (patch) | |
| tree | b872d6a4aeac5f043a61bb0a856ec85e202469a3 /dotnet | |
| parent | ff98a9a2804d5e7c042d6bb400cd9265cf00fa85 (diff) | |
Produce nicer error messages in C#
Diffstat (limited to 'dotnet')
5 files changed, 41 insertions, 1 deletions
diff --git a/dotnet/Mammoth.Tests/DocumentConverterTests.cs b/dotnet/Mammoth.Tests/DocumentConverterTests.cs index 89ade1c..92a3adf 100644 --- a/dotnet/Mammoth.Tests/DocumentConverterTests.cs +++ b/dotnet/Mammoth.Tests/DocumentConverterTests.cs @@ -151,13 +151,24 @@ namespace Mammoth.Tests { } [Fact] - public void RulesFromPreviouslyAddedStyleMapsStillTakeEffectIfNotOverriden() { + public void RulesFromPreviouslyAddedStyleMapsStillTakeEffectIfNotOverridden() { AssertSuccessfulConversion( ConvertToHtml("underline.docx", mammoth => mammoth.AddStyleMap("u => em").AddStyleMap("strike => del")), "<p><strong>The <em>Sunset</em> Tree</strong></p>"); } [Fact] + public void ErrorIsRaisedIfStyleMapCannotBeParsed() { + var exception = Assert.ThrowsAny<Exception>(() => + new DocumentConverter().AddStyleMap("p =>\np[style-name=] =>")); + Assert.Equal( + "error reading style map at line 2, character 14: expected token of type _STRING but was of type _CLOSE_SQUARE_BRACKET\n\n" + + "p[style-name=] =>\n" + + " ^", + exception.Message); + } + + [Fact] public void CanDisableDefaultStyleMap() { var result = ConvertToHtml("simple-list.docx", mammoth => mammoth.DisableDefaultStyleMap()); Assert.Equal(new[]{"Unrecognised paragraph style: List Paragraph (Style ID: ListParagraph)"}, result.Warnings); diff --git a/dotnet/Mammoth/Couscous/HorribleHacks.cs b/dotnet/Mammoth/Couscous/HorribleHacks.cs index 9f1ac30..c97dc0a 100644 --- a/dotnet/Mammoth/Couscous/HorribleHacks.cs +++ b/dotnet/Mammoth/Couscous/HorribleHacks.cs @@ -26,5 +26,9 @@ namespace Mammoth.Couscous { internal static bool equals(this TokenType first, TokenType second) { return first == second; } + + internal static string getMessage(this System.Exception exception) { + return exception.Message; + } } } diff --git a/dotnet/Mammoth/Couscous/mammoth/internal/styles/parsing/LineParseException.cs b/dotnet/Mammoth/Couscous/mammoth/internal/styles/parsing/LineParseException.cs new file mode 100644 index 0000000..6ca9381 --- /dev/null +++ b/dotnet/Mammoth/Couscous/mammoth/internal/styles/parsing/LineParseException.cs @@ -0,0 +1,15 @@ +using Mammoth.Couscous.java.lang; + +namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing { + internal class LineParseException : RuntimeException { + private readonly Token _token; + + internal LineParseException(Token token, string message) : base(message) { + _token = token; + } + + internal Token getToken() { + return _token; + } + } +} diff --git a/dotnet/Mammoth/Couscous/mammoth/internal/styles/parsing/ParseException.cs b/dotnet/Mammoth/Couscous/mammoth/internal/styles/parsing/ParseException.cs new file mode 100644 index 0000000..73f349c --- /dev/null +++ b/dotnet/Mammoth/Couscous/mammoth/internal/styles/parsing/ParseException.cs @@ -0,0 +1,8 @@ +using Mammoth.Couscous.java.lang; + +namespace Mammoth.Couscous.org.zwobble.mammoth.@internal.styles.parsing { + internal class ParseException : RuntimeException { + internal ParseException(string message) : base(message) { + } + } +} diff --git a/dotnet/Mammoth/Mammoth.csproj b/dotnet/Mammoth/Mammoth.csproj index 4e945d0..6e2c473 100644 --- a/dotnet/Mammoth/Mammoth.csproj +++ b/dotnet/Mammoth/Mammoth.csproj @@ -81,6 +81,8 @@ <Compile Include="Couscous\java\util\Set.cs" /> <Compile Include="Couscous\mammoth\internal\docx\InMemoryDocxFile.cs" /> <Compile Include="Couscous\mammoth\internal\docx\ZippedDocxFile.cs" /> + <Compile Include="Couscous\mammoth\internal\styles\parsing\LineParseException.cs" /> + <Compile Include="Couscous\mammoth\internal\styles\parsing\ParseException.cs" /> <Compile Include="Couscous\mammoth\internal\util\Base64Encoding.cs" /> <Compile Include="Couscous\mammoth\internal\util\Casts.cs" /> <Compile Include="Couscous\mammoth\internal\util\Lists.cs" /> |
