Skip to content

Commit

Permalink
Update test dependencies.
Browse files Browse the repository at this point in the history
  • Loading branch information
soroshsabz committed Jan 13, 2024
1 parent c56948a commit 25f9966
Show file tree
Hide file tree
Showing 10 changed files with 273 additions and 260 deletions.
426 changes: 213 additions & 213 deletions Build/build.cake

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
[assembly: AssemblyDescription("ORM Helpers for using entity framework in enterprise application")]
[assembly: AssemblyCompany("BSN Company")]
[assembly: AssemblyProduct("BSN.Commons.Orm.EntityFramework")]
[assembly: AssemblyVersion("1.13.1")]
[assembly: AssemblyFileVersion("1.13.1")]
[assembly: AssemblyInformationalVersion("1.13.1")]
[assembly: AssemblyVersion("1.14.0")]
[assembly: AssemblyFileVersion("1.14.0")]
[assembly: AssemblyInformationalVersion("1.14.0")]
[assembly: AssemblyCopyright("Copyright © 2020-2023 BSN Co.")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyConfiguration("")]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<AssemblyVersion>1.13.0</AssemblyVersion>
<FileVersion>1.13.0</FileVersion>
<AssemblyVersion>1.14.0</AssemblyVersion>
<FileVersion>1.14.0</FileVersion>
<Authors>BSN Developers</Authors>
<Company>BSN Company</Company>
<Description>ORM Helpers for using entity framework core in enterprise application</Description>
Expand All @@ -13,7 +13,7 @@
<RepositoryUrl>https://github.com/BSVN/Commons.git</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageReleaseNotes>Please see CHANGELOG.md</PackageReleaseNotes>
<Version>1.13.0</Version>
<Version>1.14.0</Version>
<ProduceReferenceAssembly>True</ProduceReferenceAssembly>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<Title>BSN.Commons.Orm.EntityFrameworkCore</Title>
Expand Down Expand Up @@ -56,7 +56,7 @@
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.1" />
<PackageReference Include="Sieve" Version="2.5.5" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Description>Presentation infrastructure layer of BSN.Commons library for enterprise application.</Description>
<AssemblyVersion>1.13.1</AssemblyVersion>
<FileVersion>1.13.1</FileVersion>
<Version>1.13.1</Version>
<AssemblyVersion>1.14.0</AssemblyVersion>
<FileVersion>1.14.0</FileVersion>
<Version>1.14.0</Version>
<Authors>BSN Developers</Authors>
<Company>BSN Company</Company>
<Copyright>BSN Co 2019-2023</Copyright>
Expand Down
6 changes: 3 additions & 3 deletions Source/BSN.Commons.Users/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
[assembly: AssemblyDescription("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("BSN.Commons.Users")]
[assembly: AssemblyVersion("1.13.1")]
[assembly: AssemblyFileVersion("1.13.1")]
[assembly: AssemblyInformationalVersion("1.13.1")]
[assembly: AssemblyVersion("1.14.0")]
[assembly: AssemblyFileVersion("1.14.0")]
[assembly: AssemblyInformationalVersion("1.14.0")]
[assembly: AssemblyCopyright("Copyright © 2022 BSN Co.")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyConfiguration("")]
Expand Down
6 changes: 3 additions & 3 deletions Source/BSN.Commons/BSN.Commons.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<AssemblyVersion>1.13.1</AssemblyVersion>
<FileVersion>1.13.1</FileVersion>
<AssemblyVersion>1.14.0</AssemblyVersion>
<FileVersion>1.14.0</FileVersion>
<Company>BSN Company</Company>
<Authors>BSN Developers</Authors>
<Copyright>BSN Co 2019-2023</Copyright>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Version>1.13.1</Version>
<Version>1.14.0</Version>
<PackageProjectUrl>https://github.com/BSVN/Commons</PackageProjectUrl>
<PackageLicenseUrl></PackageLicenseUrl>
<Description>Commons library for enterprise application</Description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="coverlet.msbuild" Version="2.9.0">
<PackageReference Include="coverlet.msbuild" Version="6.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Effort.EF6" Version="2.2.10" />
<PackageReference Include="Effort.EF6" Version="2.2.17" />
<PackageReference Include="EntityFramework" Version="6.4.4" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
<PackageReference Include="nunit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0">
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="nunit" Version="4.0.1" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.1" />
<PackageReference Include="nunit" Version="4.0.1" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
Expand Down
14 changes: 9 additions & 5 deletions Test/BSN.Commons.Tests/BSN.Commons.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,21 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="coverlet.msbuild" Version="2.9.0">
<PackageReference Include="coverlet.msbuild" Version="6.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
<PackageReference Include="nunit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="nunit" Version="4.0.1" />
<PackageReference Include="NUnit.Analyzers" Version="3.10.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
41 changes: 25 additions & 16 deletions Test/BSN.Commons.Tests/UnitOfWorkTestBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ public void SetUp()
_userRepository = abstractFactory.CreateUserRepository(_databaseFactory);
}

[TearDown]
public void TearDown()
{
_databaseFactory.Dispose();
}

[Test]
public void AddUserToDataBaseAndNullQueue_CorrectInput_UsereShouldBeCorectlyAddedToDatabase()
{
Expand All @@ -36,7 +42,7 @@ public void AddUserToDataBaseAndNullQueue_CorrectInput_UsereShouldBeCorectlyAdde
_userRepository.Add(User);
unitOfWork.Commit();

Assert.IsNotEmpty(_userRepository.GetMany(x => x.FirstName == "Reza"));
Assert.That(_userRepository.GetMany(x => x.FirstName == "Reza"), Is.Not.Empty);
}

[Test]
Expand All @@ -62,8 +68,8 @@ public void AddTaskAndDataForDatabase_CorrectInput_UsereShouldBeAddedToDatabaseA
unitOfWork.AddToQueue(secondEnlistTask);
unitOfWork.Commit();

Assert.AreEqual(Names.Where(P => P == "Gholi").FirstOrDefault(), "Gholi");
Assert.AreEqual(Names.Where(P => P == "Qamar").FirstOrDefault(), "Qamar");
Assert.That(Names.Where(P => P == "Gholi").FirstOrDefault(), Is.EqualTo("Gholi"));
Assert.That(Names.Where(P => P == "Qamar").FirstOrDefault(), Is.EqualTo("Qamar"));
}

[Test]
Expand Down Expand Up @@ -93,12 +99,12 @@ public void AddTaskAndNullDatabase_ExceptionInjectedInput_AllTasksShouldBeRollba
try
{
unitOfWork.Commit();
Assert.NotNull(null);
Assert.Fail();
}
catch
{
Assert.IsNull(Names.Where(P => P == "Gholi").FirstOrDefault());
Assert.IsNull(Names.Where(P => P == "Qamar").FirstOrDefault());
Assert.That(Names.Where(P => P == "Gholi").FirstOrDefault(), Is.Null);
Assert.That(Names.Where(P => P == "Qamar").FirstOrDefault(), Is.Null);
}
}

Expand Down Expand Up @@ -136,12 +142,12 @@ public void AddTaskAndDataForDatabase_ExceptionInjectedInTask_AllTasksAndDatabas
try
{
unitOfWork.Commit();
Assert.NotNull(null);
Assert.Fail();
}
catch
{
Assert.IsEmpty(_userRepository.GetMany(x => x.FirstName == "Reza"));
Assert.IsNull(Names.Where(P => P == "Gholi").FirstOrDefault());
Assert.That(_userRepository.GetMany(x => x.FirstName == "Reza"), Is.Empty);
Assert.That(Names.Where(P => P == "Gholi").FirstOrDefault(), Is.Null);
}
}

Expand Down Expand Up @@ -186,11 +192,12 @@ public void AddTaskAndDataForDatabase_ExceptionInjectedInTaskAndIncorectInput_Al
try
{
unitOfWork.Commit();
Assert.Fail();
}
catch
{
Assert.IsNull(Names.Where(P => P == "Gholi").FirstOrDefault());
Assert.IsEmpty(_userRepository.GetMany(x => x.FirstName == "Reza"));
Assert.That(Names.Where(P => P == "Gholi").FirstOrDefault(), Is.Null);
Assert.That(_userRepository.GetMany(x => x.FirstName == "Reza"), Is.Empty);
}
}

Expand Down Expand Up @@ -218,14 +225,16 @@ public void AddTaskAndDataForDatabase_ExceptionInjectedInDataBase_AllTasksAndDat

unitOfWork.AddToQueue(enlistTask);

// TODO: Fix this test

try
{
unitOfWork.Commit();
}
catch
{
Assert.IsNull(Names.Where(P => P == "Gholi").FirstOrDefault());
Assert.IsEmpty(_userRepository.GetMany(x => x.FirstName == "AliiReza"));
Assert.That(Names.Where(P => P == "Gholi").FirstOrDefault(), Is.Null);
Assert.That(_userRepository.GetMany(x => x.FirstName == "AliiReza"), Is.Empty);
}
}

Expand All @@ -248,7 +257,7 @@ public void AddUserToDataBaseAndNullQueue_IncorrectInput_UsereShouldBeAddedToDat
}
catch
{
Assert.IsEmpty(_userRepository.GetMany(x => x.FirstName == "hamidReza"));
Assert.That(_userRepository.GetMany(x => x.FirstName == "hamidReza"), Is.Empty);
}
}

Expand All @@ -265,9 +274,9 @@ public void NoTaskForQueueAndNoDataForDataBase_CorrectInput_ShouldHaveCorrectOut
}
catch
{
Assert.IsFalse(false);
Assert.Fail();
}
Assert.IsEmpty(Names);
Assert.That(Names, Is.Empty);
}

protected IRepository<User> _userRepository;
Expand Down

0 comments on commit 25f9966

Please sign in to comment.