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
23 changes: 23 additions & 0 deletions tests/NATS.Client.Core2.Tests/SemVerTest.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
using NATS.Client.Core.Tests;

namespace NATS.Client.Core2.Tests;

public class SemVerTest
{
[Fact]
public void TestSemVerParsing()
{
var server = new ServerInfo { Version = "2.12.0" };
var test = "2.11.0";
Assert.True(server.VersionIsGreaterThenOrEqualTo(test));
}

[Fact]
public void TestSemVerMajorMinor()
{
var server = new ServerInfo { Version = "2.12.0-preview.1" };
var test = "2.12.0";
Assert.False(server.VersionIsGreaterThenOrEqualTo(test));
Assert.True(server.VersionMajorMinorIsGreaterThenOrEqualTo(2, 12));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<ItemGroup>
<PackageReference Include="FluentAssertions" Version="[7,8)" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="SemanticVersioning" Version="3.0.0" />
<PackageReference Include="xunit.v3.extensibility.core" Version="1.0.1" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
Expand Down
27 changes: 14 additions & 13 deletions tests/NATS.Client.TestUtilities/Utils.cs
Original file line number Diff line number Diff line change
Expand Up @@ -172,20 +172,21 @@ await Retry.Until("service is found", async () =>

public static class ServerVersionUtils
{
public static bool ServerVersionIsGreaterThenOrEqualTo(this NatsConnection nats, int major, int minor)
public static bool VersionMajorMinorIsGreaterThenOrEqualTo(this INatsServerInfo? serverInfo, int major, int minor)
{
var m = Regex.Match(nats.ServerInfo!.Version, @"^(\d+)\.(\d+)");
if (m.Success && m.Groups.Count == 3)
{
if (int.TryParse(m.Groups[1].Value, out var serverMajor) && int.TryParse(m.Groups[2].Value, out var serverMinor))
{
if (serverMajor > major)
return true;
if (serverMajor == major && serverMinor >= minor)
return true;
}
}
var testVersion = new SemanticVersioning.Version($"{major}.{minor}.0");
var serverVersion = new SemanticVersioning.Version(serverInfo!.Version);
if (serverVersion.Major > testVersion.Major)
return true;
if (serverVersion.Major < testVersion.Major)
return false;
return serverVersion.Minor >= testVersion.Minor;
}

return false;
public static bool VersionIsGreaterThenOrEqualTo(this INatsServerInfo? serverInfo, string version)
{
var testVersion = new SemanticVersioning.Version(version);
var serverVersion = new SemanticVersioning.Version(serverInfo!.Version);
return serverVersion >= testVersion;
}
}
2 changes: 1 addition & 1 deletion tests/NATS.Slow.Tests/ClusterTests2.cs
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public async Task Check_JetStream_cluster_related_fields()
Assert.NotNull(s1.Info.Cluster.RaftGroup);
Assert.True(s1.Info.Cluster.RaftGroup.Length > 0);

if (nats.ServerVersionIsGreaterThenOrEqualTo(2, 12))
if (nats.ServerInfo.VersionMajorMinorIsGreaterThenOrEqualTo(2, 12))
{
var tolerance = TimeSpan.FromSeconds(10);
Assert.True(s1.Info.Cluster.LeaderSince > started - tolerance);
Expand Down
Loading