Cleanup gherkin dotnet

.circleci/config.yml

@@ -721,6 +721,17 @@ jobs:
             cd messages/dotnet
             make
 
+  gherkin-dotnet:
+    executor: docker-cucumber-build
+    steps:
+      - attach_workspace:
+          at: "~/cucumber"
+      - run:
+          name: gherkin/dotnet
+          command: |
+            cd gherkin/dotnet
+            make
+
 ### Python
 
   tag-expressions-python:
@@ -1014,6 +1025,10 @@ workflows:
           requires:
             - prepare-parallel
 
+      - gherkin-dotnet:
+          requires:
+            - prepare-parallel
+
 ## Python
 
       - tag-expressions-python:

gherkin/CHANGELOG.md

@@ -12,6 +12,9 @@ This document is formatted according to the principles of [Keep A CHANGELOG](htt
 ### Added
 
 ### Changed
+* [DotNet] Replaced Utf8Json with source-embedded TinyJson.
+  ([#511](https://github.com/cucumber/cucumber/pull/1511)
+   [gasparnagy])   
 
 ### Deprecated
 
@@ -22,6 +25,9 @@ This document is formatted according to the principles of [Keep A CHANGELOG](htt
   ([#1495](https://github.com/cucumber/cucumber/pull/1495)
    [#1494](https://github.com/cucumber/cucumber/issues/1494)
    [ehuelsmann])
+* [DotNet] Fixed .NET Gherkin compatibility with other Gherkin implementations.
+  ([#511](https://github.com/cucumber/cucumber/pull/1511)
+   [gasparnagy])   
 
 ## [18.1.1] - 2021-04-22
 

gherkin/Makefile

@@ -1,4 +1,4 @@
-LANGUAGES ?= go javascript ruby java python
+LANGUAGES ?= go javascript ruby java python dotnet
 include default.mk
 
 post-release: print-documentation-instructions

gherkin/dotnet/Gherkin.DotNet.sln

@@ -0,0 +1,41 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31005.135
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Gherkin", "Gherkin\Gherkin.csproj", "{2FF8C8E3-D3D1-452D-8BA7-358035FEC064}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Gherkin.Specs", "Gherkin.Specs\Gherkin.Specs.csproj", "{A0DEA4BA-3A79-4C05-87F2-7C7C9DE8B245}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7083F2CC-7F1D-40A3-8DF4-D16C090FF977}"
+	ProjectSection(SolutionItems) = preProject
+		Directory.Build.props = Directory.Build.props
+		bin\gherkin = bin\gherkin
+		gherkin-csharp.razor = gherkin-csharp.razor
+		bin\gherkin-generate-tokens = bin\gherkin-generate-tokens
+		gherkin.berp = gherkin.berp
+		Makefile = Makefile
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{2FF8C8E3-D3D1-452D-8BA7-358035FEC064}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2FF8C8E3-D3D1-452D-8BA7-358035FEC064}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2FF8C8E3-D3D1-452D-8BA7-358035FEC064}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2FF8C8E3-D3D1-452D-8BA7-358035FEC064}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A0DEA4BA-3A79-4C05-87F2-7C7C9DE8B245}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A0DEA4BA-3A79-4C05-87F2-7C7C9DE8B245}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A0DEA4BA-3A79-4C05-87F2-7C7C9DE8B245}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A0DEA4BA-3A79-4C05-87F2-7C7C9DE8B245}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {01DBBC1B-2ADE-4E49-8C44-20FF62840920}
+	EndGlobalSection
+EndGlobal

gherkin/dotnet/Gherkin.Specs/Events/AstBuildingTests.cs → gherkin/dotnet/Gherkin.Specs/AstBuildingTests.cs

@@ -1,43 +1,39 @@
 using System.Linq;
 using FluentAssertions;
-using Gherkin.Events;
+using Gherkin.CucumberMessages.Types;
 using Gherkin.Specs.Helper;
 using Xunit;
 
-namespace Gherkin.Specs.Events
+namespace Gherkin.Specs
 {
     public class AstBuildingTests : EventTestBase
     {
         [Theory, MemberData(nameof(TestFileProvider.GetValidTestFiles), MemberType = typeof(TestFileProvider))]
         public void TestSuccessfulAstBuilding(string testFeatureFile)
         {
             var testFile = GetFullPathToTestFeatureFile(testFeatureFile, "good", ".ast.ndjson");
-
             var expectedAstContent = GetExpectedContent(testFile.ExpectedFileFullPath);
 
-            var expectedGherkinDocumentEvent = NDJsonParser.Deserialize<GherkinDocumentEvent>(expectedAstContent);
-
-            var raisedEvents = StartGherkinEventQueue(testFile.FullPath, false, true, false);
+            var expectedGherkinDocumentEvent = NDJsonParser.Deserialize<Envelope>(expectedAstContent);
 
-            raisedEvents.Should().AllBeOfType<GherkinDocumentEvent>();
+            var raisedEvents = ProcessGherkinEvents(testFile.FullPath, false, true, false);
 
-            AssertEvents(testFeatureFile, raisedEvents.Cast<GherkinDocumentEvent>().ToList(), expectedGherkinDocumentEvent, testFile);
+            raisedEvents.Should().Match(list => list.All(e => e.GherkinDocument != null));
+            AssertEvents(testFeatureFile, raisedEvents, expectedGherkinDocumentEvent, testFile);
         }
 
         [Theory, MemberData(nameof(TestFileProvider.GetInvalidTestFiles), MemberType = typeof(TestFileProvider))]
         public void TestFailedAstBuilding(string testFeatureFile)
         {
             var testFile = GetFullPathToTestFeatureFile(testFeatureFile, "bad", ".errors.ndjson");
-
             var expectedAstContent = GetExpectedContent(testFile.ExpectedFileFullPath);
 
-            var expectedGherkinDocumentEvent = NDJsonParser.Deserialize<AttachmentEvent>(expectedAstContent);
-
-            var raisedEvents = StartGherkinEventQueue(testFile.FullPath, false, true, false);
+            var expectedGherkinDocumentEvent = NDJsonParser.Deserialize<Envelope>(expectedAstContent);
 
-            raisedEvents.Should().AllBeOfType<AttachmentEvent>();
+            var raisedEvents = ProcessGherkinEvents(testFile.FullPath, false, true, false);
 
-            AssertEvents(testFeatureFile, raisedEvents.Cast<AttachmentEvent>().ToList(), expectedGherkinDocumentEvent, testFile);
+            raisedEvents.Should().Match(list => list.All(e => e.ParseError != null));
+            AssertEvents(testFeatureFile, raisedEvents, expectedGherkinDocumentEvent, testFile);
         }
     }
 }