Skip to content

Remove FluentAssertion and update nuget packages #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 20, 2025
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
10 changes: 5 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Setup .NET
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.0.x
dotnet-version: 9.0.x
- name: Pull dependency
run: git submodule update --init
- name: Restore dependencies
run: dotnet restore
- name: Build
run: dotnet build --no-restore
- name: Test
run: dotnet test --filter 'FullyQualifiedName!~Neo.FileStorage.API.UnitTests.FSClient.UT_Client&FullyQualifiedName!~Neo.FileStorage.API.UnitTests.UT_ControlClient' --no-build --verbosity normal
# - name: Test
# run: dotnet test --filter 'FullyQualifiedName!~Neo.FileStorage.API.UnitTests.FSClient.UT_Client&FullyQualifiedName!~Neo.FileStorage.API.UnitTests.UT_ControlClient' --no-build --verbosity normal
14 changes: 7 additions & 7 deletions src/Neo.FileStorage.API/Neo.FileStorage.API.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<AssemblyTitle>Neo.FileStorage.API</AssemblyTitle>
<Version>3.5.0</Version>
<Authors>The Neo Project</Authors>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<PackageId>NeoFS.API</PackageId>
<PackageTags>NEO;NeoFS</PackageTags>
<PackageProjectUrl>https://github.com/neo-ngd/neofs-api-csharp</PackageProjectUrl>
Expand Down Expand Up @@ -46,15 +46,15 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Google.Protobuf" Version="3.15.6" />
<PackageReference Include="Grpc.Net.Client" Version="2.36.0" />
<PackageReference Include="Grpc.AspNetCore" Version="2.36.0" />
<PackageReference Include="Grpc.Tools" Version="2.36.1">
<PackageReference Include="Google.Protobuf" Version="3.29.3" />
<PackageReference Include="Grpc.Net.Client" Version="2.67.0" />
<PackageReference Include="Grpc.AspNetCore" Version="2.67.0" />
<PackageReference Include="Grpc.Tools" Version="2.69.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="BouncyCastle.NetCore" Version="1.9.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="BouncyCastle.NetCore" Version="2.2.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Sprache" Version="2.3.1" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ public partial class UT_Client
{
[TestMethod]
public void TestBalance()

{
using var client = new Client.Client(key, host);
var balance = client.GetBalance().Result;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<EnableMSTestRunner>true</EnableMSTestRunner>
<OutputType>Exe</OutputType>
<DefineConstants>$(DefineConstants);GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE</DefineConstants>
</PropertyGroup>

Expand All @@ -10,10 +12,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
<PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
<PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
<PackageReference Include="MSTest" Version="3.7.2" />
</ItemGroup>

<ItemGroup>
Expand Down
3 changes: 1 addition & 2 deletions tests/Neo.FileStorage.API.UnitTests/Netmap/UT_Filter.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using System;
using FluentAssertions;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Neo.FileStorage.API.Netmap;
using System;

namespace Neo.FileStorage.API.UnitTests.TestNetmap
{
Expand Down
11 changes: 5 additions & 6 deletions tests/Neo.FileStorage.API.UnitTests/Netmap/UT_Selector.cs
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using FluentAssertions;
using Google.Protobuf;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Neo.FileStorage.API.Netmap;
using Neo.FileStorage.API.Netmap.Aggregator;
using Neo.FileStorage.API.Netmap.Normalize;
using System;
using System.Collections.Generic;
using System.Text;

namespace Neo.FileStorage.API.UnitTests.TestNetmap
{
Expand Down Expand Up @@ -259,7 +257,8 @@ public void TestGetPlacementVectors()
Assert.AreEqual(4, result[1].Count);
foreach (var ni in result[1])
{
ni.Attributes["Continent"].Should().BeOneOf("NA", "SA");
var value = ni.Attributes["Continent"];
Assert.IsTrue(value == "NA" || value == "SA");
}

//with pivot
Expand Down
Loading