Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
using Deprecated.Test.V0;
using Deprecated.Test.V2;

namespace SbeCodeGenerator.IntegrationTests
{
Expand All @@ -18,7 +18,7 @@ public void DeprecatedFields_AreMarkedWithObsoleteAttribute()
var projectDir = Path.GetFullPath(Path.Combine(Directory.GetCurrentDirectory(), "..", "..", ".."));
var generatedFiles = Directory.GetFiles(
Path.Combine(projectDir, "Generated"),
"OrderWithDeprecated.cs",
"OrderWithDeprecated*.cs",
SearchOption.AllDirectories
);
Assert.NotEmpty(generatedFiles);
Expand Down Expand Up @@ -49,7 +49,7 @@ public void DeprecatedField_HasCorrectObsoleteMessage()
var projectDir = Path.GetFullPath(Path.Combine(Directory.GetCurrentDirectory(), "..", "..", ".."));
var generatedFiles = Directory.GetFiles(
Path.Combine(projectDir, "Generated"),
"OrderWithDeprecated.cs",
"OrderWithDeprecated*.cs",
SearchOption.AllDirectories
);

Expand Down Expand Up @@ -96,7 +96,7 @@ public void NonDeprecatedFields_DoNotHaveObsoleteAttribute()
var projectDir = Path.GetFullPath(Path.Combine(Directory.GetCurrentDirectory(), "..", "..", ".."));
var generatedFiles = Directory.GetFiles(
Path.Combine(projectDir, "Generated"),
"OrderWithDeprecated.cs",
"OrderWithDeprecated*.cs",
SearchOption.AllDirectories
);

Expand Down Expand Up @@ -144,7 +144,7 @@ public void DeprecatedFieldWithSinceVersion_HasCorrectMessage()
var projectDir = Path.GetFullPath(Path.Combine(Directory.GetCurrentDirectory(), "..", "..", ".."));
var generatedFiles = Directory.GetFiles(
Path.Combine(projectDir, "Generated"),
"OrderWithDeprecated.cs",
"OrderWithDeprecated*.cs",
SearchOption.AllDirectories
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
using V0 = Versioning.Test.V0;
using V1 = Versioning.Test.V1;
using V2 = Versioning.Test.V2;
using V0 = Versioning.Test.V2;
using V1 = Versioning.Test.V2.V1;
using V2 = Versioning.Test.V2.V2;

namespace SbeCodeGenerator.IntegrationTests
{
Expand All @@ -25,9 +25,9 @@ public void SinceVersion_GeneratesSeparateTypesForEachVersion()
"SbeSourceGenerator",
"SbeSourceGenerator.SBESourceGenerator");

var v0File = Path.Combine(generatorRoot, "Versioning.Test.V0", "Messages", "EvolvingOrder.cs");
var v1File = Path.Combine(generatorRoot, "Versioning.Test.V1", "Messages", "EvolvingOrderV1.cs");
var v2File = Path.Combine(generatorRoot, "Versioning.Test.V2", "Messages", "EvolvingOrderV2.cs");
var v0File = Path.Combine(generatorRoot, "versioning_test_schema_769F041A", "Versioning.Test.V2", "Messages", "EvolvingOrder.cs");
var v1File = Path.Combine(generatorRoot, "versioning_test_schema_769F041A", "Versioning.Test.V2.V1", "Messages", "EvolvingOrderV1.cs");
var v2File = Path.Combine(generatorRoot, "versioning_test_schema_769F041A", "Versioning.Test.V2.V2", "Messages", "EvolvingOrderV2.cs");

Assert.True(File.Exists(v0File), $"Expected version 0 message at {v0File}");
Assert.True(File.Exists(v1File), $"Expected version 1 message at {v1File}");
Expand Down Expand Up @@ -173,14 +173,14 @@ public void SinceVersion_DocumentationIndicatesVersion()
"SbeSourceGenerator",
"SbeSourceGenerator.SBESourceGenerator");

var v1File = Path.Combine(generatorRoot, "Versioning.Test.V1", "Messages", "EvolvingOrderV1.cs");
var v1File = Path.Combine(generatorRoot, "versioning_test_schema_769F041A", "Versioning.Test.V2.V1", "Messages", "EvolvingOrderV1.cs");
Assert.True(File.Exists(v1File), $"Expected version 1 message at {v1File}");

var v1Content = File.ReadAllText(v1File);
Assert.Contains("Since version 1", v1Content);

// V2 file should have "Since version 2" for side
var v2File = Path.Combine(generatorRoot, "Versioning.Test.V2", "Messages", "EvolvingOrderV2.cs");
var v2File = Path.Combine(generatorRoot, "versioning_test_schema_769F041A", "Versioning.Test.V2.V2", "Messages", "EvolvingOrderV2.cs");
Assert.True(File.Exists(v2File), $"Expected version 2 message at {v2File}");

var v2Content = File.ReadAllText(v2File);
Expand Down