update packages

loresoft · Dec 28, 2022 · 0eb8fb7 · 0eb8fb7
1 parent f9825e7
commit 0eb8fb7
Show file tree

Hide file tree

Showing 13 changed files with 103 additions and 137 deletions.
diff --git a/src/MongoDB.Abstracts/MongoDB.Abstracts.csproj b/src/MongoDB.Abstracts/MongoDB.Abstracts.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MongoDB.Driver" Version="2.15.0" />
+    <PackageReference Include="MongoDB.Driver" Version="2.18.0" />
   </ItemGroup>
 
 </Project>
diff --git a/test/MongoDB.Abstracts.Tests/CommentRepositoryTest.cs b/test/MongoDB.Abstracts.Tests/CommentRepositoryTest.cs
@@ -1,10 +1,15 @@
 using System.Linq;
 using System.Threading.Tasks;
-using DataGenerator;
+
+using Bogus;
+
 using FluentAssertions;
+
 using Microsoft.Extensions.DependencyInjection;
+
 using MongoDB.Abstracts.Tests.Models;
-using MongoDB.Abstracts.Tests.Profiles;
+using MongoDB.Bson;
+
 using Xunit;
 using Xunit.Abstractions;
 
@@ -17,19 +22,16 @@ public CommentRepositoryTest(ITestOutputHelper outputHelper) : base(outputHelper
         {
         }
 
-        protected override void ConfigureServices(IServiceCollection services)
-        {
-            base.ConfigureServices(services);
-
-            services.AddSingleton(_ => Generator.Create(c => c.Profile<CommentProfile>()));
-        }
-
         [Fact]
         public async Task FullTestAsync()
         {
-            var generator = Services.GetRequiredService<Generator>();
+            var generator = new Faker<Comment>()
+                .RuleFor(p => p.Id, _ => ObjectId.GenerateNewId().ToString())
+                .RuleFor(p => p.Name, f => f.Name.FullName())
+                .RuleFor(p => p.Description, f => f.Lorem.Sentence())
+                .RuleFor(p => p.OwnerId, f => f.PickRandom(Constants.Owners));
 
-            var item = generator.Single<Comment>();
+            var item = generator.Generate();
 
             var repository = Services.GetRequiredService<IMongoEntityRepository<Comment>>();
             repository.Should().NotBeNull();
@@ -72,9 +74,13 @@ public async Task FullTestAsync()
         [Fact]
         public void FullTest()
         {
-            var generator = Services.GetRequiredService<Generator>();
+            var generator = new Faker<Comment>()
+                .RuleFor(p => p.Id, _ => ObjectId.GenerateNewId().ToString())
+                .RuleFor(p => p.Name, f => f.Name.FullName())
+                .RuleFor(p => p.Description, f => f.Lorem.Sentence())
+                .RuleFor(p => p.OwnerId, f => f.PickRandom(Constants.Owners));
 
-            var item = generator.Single<Comment>();
+            var item = generator.Generate();
 
             var repository = Services.GetRequiredService<IMongoEntityRepository<Comment>>();
             repository.Should().NotBeNull();

diff --git a/test/MongoDB.Abstracts.Tests/EntryRepositoryTest.cs b/test/MongoDB.Abstracts.Tests/EntryRepositoryTest.cs
@@ -1,11 +1,15 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+
 using FluentAssertions;
+
 using Microsoft.Extensions.DependencyInjection;
+
 using MongoDB.Abstracts.Tests.Models;
 using MongoDB.Abstracts.Tests.Services;
 using MongoDB.Driver;
+
 using Xunit;
 using Xunit.Abstractions;
 

diff --git a/test/MongoDB.Abstracts.Tests/ItemRepositoryTest.cs b/test/MongoDB.Abstracts.Tests/ItemRepositoryTest.cs
@@ -1,10 +1,15 @@
 using System.Linq;
 using System.Threading.Tasks;
-using DataGenerator;
+
+using Bogus;
+
 using FluentAssertions;
+
 using Microsoft.Extensions.DependencyInjection;
+
 using MongoDB.Abstracts.Tests.Models;
-using MongoDB.Abstracts.Tests.Profiles;
+using MongoDB.Bson;
+
 using Xunit;
 using Xunit.Abstractions;
 
@@ -17,20 +22,16 @@ public ItemRepositoryTest(ITestOutputHelper outputHelper) : base(outputHelper)
         {
         }
 
-        protected override void ConfigureServices(IServiceCollection services)
-        {
-            base.ConfigureServices(services);
-
-            services.AddSingleton(_ => Generator.Create(c => c.Profile<ItemProfile>()));
-        }
-
         [Fact]
         public async Task FullTestAsync()
         {
-            var generator = Services.GetRequiredService<Generator>();
-
-            var item = generator.Single<Item>();
+            var generator = new Faker<Item>()
+                .RuleFor(p => p.Id, _ => ObjectId.GenerateNewId().ToString())
+                .RuleFor(p => p.Name, f => f.Name.FullName())
+                .RuleFor(p => p.Description, f => f.Lorem.Sentence())
+                .RuleFor(p => p.OwnerId, f => f.PickRandom(Constants.Owners));
 
+            var item = generator.Generate();
 
             var repository = Services.GetRequiredService<IMongoEntityRepository<Item>>();
             repository.Should().NotBeNull();
@@ -80,10 +81,13 @@ public async Task FullTestAsync()
         [Fact]
         public void FullTest()
         {
-            var generator = Services.GetRequiredService<Generator>();
-
-            var item = generator.Single<Item>();
+            var generator = new Faker<Item>()
+                .RuleFor(p => p.Id, _ => ObjectId.GenerateNewId().ToString())
+                .RuleFor(p => p.Name, f => f.Name.FullName())
+                .RuleFor(p => p.Description, f => f.Lorem.Sentence())
+                .RuleFor(p => p.OwnerId, f => f.PickRandom(Constants.Owners));
 
+            var item = generator.Generate();
 
             var repository = Services.GetRequiredService<IMongoEntityRepository<Item>>();
             repository.Should().NotBeNull();

diff --git a/test/MongoDB.Abstracts.Tests/MongoDB.Abstracts.Tests.csproj b/test/MongoDB.Abstracts.Tests/MongoDB.Abstracts.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net5.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 		<IsPackable>false</IsPackable>
 	</PropertyGroup>
 
@@ -12,21 +12,21 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="coverlet.collector" Version="3.1.2">
+		<PackageReference Include="Bogus" Version="34.0.2" />
+		<PackageReference Include="coverlet.collector" Version="3.2.0">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="DataGenerator" Version="5.0.0.178" />
-		<PackageReference Include="FluentAssertions" Version="6.6.0" />
-		<PackageReference Include="MartinCostello.Logging.XUnit" Version="0.2.0" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-		<PackageReference Include="Scrutor" Version="4.1.0" />
-		<PackageReference Include="xunit" Version="2.4.1" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+		<PackageReference Include="FluentAssertions" Version="6.8.0" />
+		<PackageReference Include="MartinCostello.Logging.XUnit" Version="0.3.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+		<PackageReference Include="Scrutor" Version="4.2.0" />
+		<PackageReference Include="xunit" Version="2.4.2" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>

diff --git a/test/MongoDB.Abstracts.Tests/Profiles/CommentProfile.cs b/test/MongoDB.Abstracts.Tests/Profiles/CommentProfile.cs
diff --git a/test/MongoDB.Abstracts.Tests/Profiles/ItemProfile.cs b/test/MongoDB.Abstracts.Tests/Profiles/ItemProfile.cs
diff --git a/test/MongoDB.Abstracts.Tests/Profiles/TemplateProfile.cs b/test/MongoDB.Abstracts.Tests/Profiles/TemplateProfile.cs
diff --git a/test/MongoDB.Abstracts.Tests/Profiles/UserProfile.cs b/test/MongoDB.Abstracts.Tests/Profiles/UserProfile.cs
diff --git a/test/MongoDB.Abstracts.Tests/RoleRepositoryTest.cs b/test/MongoDB.Abstracts.Tests/RoleRepositoryTest.cs
@@ -1,10 +1,14 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+
 using FluentAssertions;
+
 using Microsoft.Extensions.DependencyInjection;
+
 using MongoDB.Abstracts.Tests.Models;
 using MongoDB.Bson;
+
 using Xunit;
 using Xunit.Abstractions;
 
@@ -39,7 +43,7 @@ public async Task CreateRole()
         [Fact]
         public async Task CreateRoleBatch()
         {
-            var roles = new[] { 
+            var roles = new[] {
                 new Role
                 {
                     Id = ObjectId.GenerateNewId().ToString(),
@@ -58,7 +62,7 @@ public async Task CreateRoleBatch()
             roleRepo.Should().NotBeNull();
 
             roleRepo.InsertBatch(roles);
-            
+
             var roleQuery = Services.GetRequiredService<IMongoEntityQuery<Role>>();
             var results = await roleQuery.FindAllAsync(r => r.NormalizedName == "batchrole");
             results.Should().NotBeNull();