Skip to content

Commit 9eaa5a8

Browse files
i4004i4004
committed
[up] tests deps to latest
[r] to NUnit 4
1 parent d46a3db commit 9eaa5a8

File tree

6 files changed

+40
-34
lines changed

6 files changed

+40
-34
lines changed

‎src/Etcd.Microsoft.Extensions.Configuration/Etcd.Microsoft.Extensions.Configuration.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</PropertyGroup>
2525
<ItemGroup>
2626
<PackageReference Include="dotnet-etcd" Version="5.2.0" />
27-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
27+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
2828
</ItemGroup>
2929
<ItemGroup>
3030
<None Include="..\..\images\icon.png" Pack="true" Visible="false" PackagePath="" />

‎tests/Integration/Etcd.Microsoft.Extensions.Configuration.IntegrationTests/ConfigurationBuilderTests.cs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using System.Collections.Generic;
22
using System.Linq;
3-
using Microsoft.Extensions.Configuration;
43
using Etcd.Microsoft.Extensions.Configuration.Auth;
54
using Etcd.Microsoft.Extensions.Configuration.Settings;
5+
using Microsoft.Extensions.Configuration;
66
using NUnit.Framework;
77

88
namespace Etcd.Microsoft.Extensions.Configuration.IntegrationTests;
@@ -32,17 +32,17 @@ public void Build_WithSettingsFromEtcd_ValuesLoaded()
3232

3333
// Assert
3434

35-
Assert.IsNotNull(config);
36-
Assert.IsTrue(config.GetChildren().Any());
37-
Assert.IsTrue(testAppSection.GetChildren().Any());
38-
39-
Assert.AreEqual("Item 1 value", testSection["Item1"]);
40-
Assert.AreEqual("Item 2 value", testSection["Item2"]);
41-
Assert.AreEqual("Sub section value 1", testSubSection["Item1"]);
42-
Assert.AreEqual("Sub section value 2", testSubSection["Item2"]);
43-
Assert.AreEqual(2, list.Count);
44-
Assert.AreEqual("Item 1", list[0]);
45-
Assert.AreEqual("Item 2", list[1]);
46-
Assert.AreEqual("1234321", testAppSection["Item1"]);
35+
Assert.That(config, Is.Not.Null);
36+
Assert.That(config.GetChildren().Any());
37+
Assert.That(testAppSection.GetChildren().Any());
38+
39+
Assert.That(testSection["Item1"], Is.EqualTo("Item 1 value"));
40+
Assert.That(testSection["Item2"], Is.EqualTo("Item 2 value"));
41+
Assert.That(testSubSection["Item1"], Is.EqualTo("Sub section value 1"));
42+
Assert.That(testSubSection["Item2"], Is.EqualTo("Sub section value 2"));
43+
Assert.That(list.Count, Is.EqualTo(2));
44+
Assert.That(list[0], Is.EqualTo("Item 1"));
45+
Assert.That(list[1], Is.EqualTo("Item 2"));
46+
Assert.That(testAppSection["Item1"], Is.EqualTo("1234321"));
4747
}
4848
}

‎tests/Integration/Etcd.Microsoft.Extensions.Configuration.IntegrationTests/Etcd.Microsoft.Extensions.Configuration.IntegrationTests.csproj‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,16 @@
1111
<ProjectReference Include="..\..\..\src\Etcd.Microsoft.Extensions.Configuration\Etcd.Microsoft.Extensions.Configuration.csproj" />
1212
</ItemGroup>
1313
<ItemGroup>
14-
<PackageReference Include="coverlet.msbuild" Version="3.1.*" />
15-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.*" />
16-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.*" />
17-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.*" />
18-
<PackageReference Include="NUnit" Version="3.13.*" />
19-
<PackageReference Include="NUnit3TestAdapter" Version="4.2.*" />
20-
<PackageReference Include="Moq" Version="4.18.*" />
14+
<PackageReference Include="coverlet.msbuild" Version="6.0.*">
15+
<PrivateAssets>all</PrivateAssets>
16+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
17+
</PackageReference>
18+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.*" />
19+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.*" />
20+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.*" />
21+
<PackageReference Include="NUnit" Version="4.1.*" />
22+
<PackageReference Include="NUnit3TestAdapter" Version="4.5.*" />
23+
<PackageReference Include="Moq" Version="4.20.*" />
2124
</ItemGroup>
2225
<ItemGroup>
2326
<None Update="appsettings.json">

‎tests/Integration/Etcd.Microsoft.Extensions.Configuration.IntegrationTests/Settings/ConfigurationBasedEtcdSettingsTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
using Microsoft.Extensions.Configuration;
2-
using Etcd.Microsoft.Extensions.Configuration.Settings;
1+
using Etcd.Microsoft.Extensions.Configuration.Settings;
2+
using Microsoft.Extensions.Configuration;
33
using NUnit.Framework;
44

55
namespace Etcd.Microsoft.Extensions.Configuration.IntegrationTests.Settings;
@@ -23,6 +23,6 @@ public void Ctor_ExistingSettings_Loaded()
2323

2424
// Assert
2525

26-
Assert.AreEqual("http://localhost:2379", settings.ConnectionString);
26+
Assert.That(settings.ConnectionString, Is.EqualTo("http://localhost:2379"));
2727
}
2828
}

‎tests/Unit/Etcd.Microsoft.Extensions.Configuration.Tests/Etcd.Microsoft.Extensions.Configuration.Tests.csproj‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,16 @@
1111
<ProjectReference Include="..\..\..\src\Etcd.Microsoft.Extensions.Configuration\Etcd.Microsoft.Extensions.Configuration.csproj" />
1212
</ItemGroup>
1313
<ItemGroup>
14-
<PackageReference Include="coverlet.msbuild" Version="3.1.*" />
15-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.*" />
16-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.*" />
17-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.*" />
18-
<PackageReference Include="NUnit" Version="3.13.*" />
19-
<PackageReference Include="NUnit3TestAdapter" Version="4.2.*" />
20-
<PackageReference Include="Moq" Version="4.18.*" />
14+
<PackageReference Include="coverlet.msbuild" Version="6.0.2">
15+
<PrivateAssets>all</PrivateAssets>
16+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
17+
</PackageReference>
18+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
19+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
20+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
21+
<PackageReference Include="NUnit" Version="4.1.0" />
22+
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
23+
<PackageReference Include="Moq" Version="4.20.70" />
2124
</ItemGroup>
2225
<ItemGroup>
2326
<None Update="appsettings.json">

‎tests/Unit/Etcd.Microsoft.Extensions.Configuration.Tests/Settings/ConfigurationBasedEtcdSettingsTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
using Microsoft.Extensions.Configuration;
2-
using Etcd.Microsoft.Extensions.Configuration.Settings;
1+
using Etcd.Microsoft.Extensions.Configuration.Settings;
2+
using Microsoft.Extensions.Configuration;
33
using NUnit.Framework;
44

55
namespace Etcd.Microsoft.Extensions.Configuration.Tests.Settings;
@@ -22,6 +22,6 @@ public void Ctor_ExistingSettings_Loaded()
2222

2323
// Assert
2424

25-
Assert.AreEqual("http://localhost:2379", settings.ConnectionString);
25+
Assert.That(settings.ConnectionString, Is.EqualTo("http://localhost:2379"));
2626
}
2727
}

0 commit comments

Comments
 (0)