Release 6.0.1 - Fixed issue #58 ToListAsync() returns empty list after package update to 6.0.0

ramantsitou · ramantsitou · commit 2c30611b142d · 2022-03-28T10:12:51.000+02:00
diff --git a/src/MockQueryable/MockQueryable.Core/MockQueryable.Core.csproj b/src/MockQueryable/MockQueryable.Core/MockQueryable.Core.csproj
@@ -13,10 +13,10 @@
 	  <RepositoryUrl>https://github.com/romantitov/MockQueryable</RepositoryUrl>
 	  <PackageTags>Mock EntityFrameworkCore Queryable mock EF UnitTests EntityFrameworkCore</PackageTags>
 	  <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-	  <PackageReleaseNotes> .Net 6 supported</PackageReleaseNotes>
-	  <Version>6.0.0</Version>
-	  <AssemblyVersion>6.0.0.0</AssemblyVersion>
-	  <FileVersion>6.0.0.0</FileVersion>
+	  <PackageReleaseNotes> Fixed issue #58 ToListAsync() returns empty list after package update to 6.0.0 </PackageReleaseNotes>
+	  <Version>6.0.1</Version>
+	  <AssemblyVersion>6.0.0.1</AssemblyVersion>
+	  <FileVersion>6.0.0.1</FileVersion>
 	  <Company></Company>
 	  <PackageLicenseFile>LICENSE</PackageLicenseFile>
 	  <PackageIcon>logo.png</PackageIcon>
diff --git a/src/MockQueryable/MockQueryable.EntityFrameworkCore/MockQueryable.EntityFrameworkCore.csproj b/src/MockQueryable/MockQueryable.EntityFrameworkCore/MockQueryable.EntityFrameworkCore.csproj
@@ -14,10 +14,10 @@
 		<RepositoryUrl>https://github.com/romantitov/MockQueryable</RepositoryUrl>
 		<PackageTags>Mock EntityFrameworkCore Queryable mock EF UnitTests EntityFrameworkCore</PackageTags>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-		<PackageReleaseNotes>  .Net 6 supported </PackageReleaseNotes>
-		<Version>6.0.0</Version>
-		<AssemblyVersion>6.0.0.0</AssemblyVersion>
-		<FileVersion>6.0.0.0</FileVersion>
+		<PackageReleaseNotes> Fixed issue #58 ToListAsync() returns empty list after package update to 6.0.0 </PackageReleaseNotes>
+		<Version>6.0.1</Version>
+		<AssemblyVersion>6.0.0.1</AssemblyVersion>
+		<FileVersion>6.0.0.1</FileVersion>
 		<Company></Company>
 		<PackageLicenseFile>LICENSE</PackageLicenseFile>
 		<PackageIcon>logo.png</PackageIcon>
diff --git a/src/MockQueryable/MockQueryable.FakeItEasy/FakeItEasyExtensions.cs b/src/MockQueryable/MockQueryable.FakeItEasy/FakeItEasyExtensions.cs
@@ -22,6 +22,10 @@ public static DbSet<TEntity> BuildMockDbSet<TEntity>(this IQueryable<TEntity> da
             mock.ConfigureQueryableCalls(enumerable, data);
             mock.ConfigureAsyncEnumerableCalls(enumerable);
             mock.ConfigureDbSetCalls(data);
+            if (mock is IAsyncEnumerable<TEntity> asyncEnumerable)
+            {
+                A.CallTo(() => asyncEnumerable.GetAsyncEnumerator(A<CancellationToken>.Ignored)).Returns(enumerable.GetAsyncEnumerator());
+            }
             return mock;
         }
 
@@ -43,6 +47,7 @@ private static void ConfigureAsyncEnumerableCalls<TEntity>(
         {
             A.CallTo(() => mock.GetAsyncEnumerator(A<CancellationToken>.Ignored))
                 .Returns(enumerable.GetAsyncEnumerator());
+           
         }
 
         private static void ConfigureDbSetCalls<TEntity>(this DbSet<TEntity> mock, IQueryable<TEntity> data)
diff --git a/src/MockQueryable/MockQueryable.FakeItEasy/MockQueryable.FakeItEasy.csproj b/src/MockQueryable/MockQueryable.FakeItEasy/MockQueryable.FakeItEasy.csproj
@@ -13,10 +13,10 @@
 	  <RepositoryUrl>https://github.com/romantitov/MockQueryable</RepositoryUrl>
     <PackageTags>Mock EntityFrameworkCore Queryable mock EF EFCore UnitTests FakeItEasy</PackageTags>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-	  <PackageReleaseNotes> .Net 6 supported</PackageReleaseNotes>
-		<Version>6.0.0</Version>
-	  <AssemblyVersion>6.0.0.0</AssemblyVersion>
-	  <FileVersion>6.0.0.0</FileVersion>
+	  <PackageReleaseNotes> Fixed issue #58 ToListAsync() returns empty list after package update to 6.0.0 </PackageReleaseNotes>
+	  <Version>6.0.1</Version>
+	  <AssemblyVersion>6.0.0.1</AssemblyVersion>
+	  <FileVersion>6.0.0.1</FileVersion>
     <Company></Company>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageIcon>logo.png</PackageIcon>
diff --git a/src/MockQueryable/MockQueryable.Moq/MockQueryable.Moq.csproj b/src/MockQueryable/MockQueryable.Moq/MockQueryable.Moq.csproj
@@ -13,10 +13,10 @@
     <RepositoryUrl>https://github.com/romantitov/MockQueryable</RepositoryUrl>
     <PackageTags>Mock EntityFrameworkCore Queryable mock EF EFCore UnitTests EntityFrameworkCore Moq</PackageTags>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-	  <PackageReleaseNotes> .Net 6 supported</PackageReleaseNotes>
-		<Version>6.0.0</Version>
-	  <AssemblyVersion>6.0.0.0</AssemblyVersion>
-	  <FileVersion>6.0.0.0</FileVersion>
+	  <PackageReleaseNotes> Fixed issue #58 ToListAsync() returns empty list after package update to 6.0.0 </PackageReleaseNotes>
+	  <Version>6.0.1</Version>
+	  <AssemblyVersion>6.0.0.1</AssemblyVersion>
+	  <FileVersion>6.0.0.1</FileVersion>
     <Company></Company>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageIcon>logo.png</PackageIcon>
diff --git a/src/MockQueryable/MockQueryable.Moq/MoqExtensions.cs b/src/MockQueryable/MockQueryable.Moq/MoqExtensions.cs
@@ -21,6 +21,9 @@ public static Mock<DbSet<TEntity>> BuildMockDbSet<TEntity>(this IQueryable<TEnti
 			var enumerable = new TestAsyncEnumerableEfCore<TEntity>(data);
 			mock.ConfigureAsyncEnumerableCalls(enumerable);
 			mock.As<IQueryable<TEntity>>().ConfigureQueryableCalls(enumerable, data);
+            mock.As<IAsyncEnumerable<TEntity>>().Setup(x => x.GetAsyncEnumerator(It.IsAny<CancellationToken>())).Returns(enumerable.GetAsyncEnumerator());
+			mock.Setup(m => m.AsQueryable()).Returns(enumerable);
+
 			mock.ConfigureDbSetCalls(data);
 			return mock;
 		}
@@ -41,6 +44,7 @@ private static void ConfigureQueryableCalls<TEntity>(
 			mock.Setup(m => m.Expression).Returns(data?.Expression);
 			mock.Setup(m => m.ElementType).Returns(data?.ElementType);
 			mock.Setup(m => m.GetEnumerator()).Returns(() => data?.GetEnumerator());
+
 		}
 
 		private static void ConfigureAsyncEnumerableCalls<TEntity>(
@@ -49,6 +53,7 @@ private static void ConfigureAsyncEnumerableCalls<TEntity>(
 		{
 			mock.Setup(d => d.GetAsyncEnumerator(It.IsAny<CancellationToken>()))
 				.Returns(() => enumerable.GetAsyncEnumerator());
+            
 		}
 
         private static async IAsyncEnumerable<TEntity> CreateAsyncMock<TEntity>(IEnumerable<TEntity> data)
diff --git a/src/MockQueryable/MockQueryable.NSubstitute/MockQueryable.NSubstitute.csproj b/src/MockQueryable/MockQueryable.NSubstitute/MockQueryable.NSubstitute.csproj
@@ -13,10 +13,10 @@
 	  <RepositoryUrl>https://github.com/romantitov/MockQueryable</RepositoryUrl>
 	  <PackageTags>Mock EntityFrameworkCore Queryable mock EF EFCore UnitTests EntityFrameworkCore NSubstitute</PackageTags>
 	  <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-	  <PackageReleaseNotes> .Net 6 supported</PackageReleaseNotes>
-	  <Version>6.0.0</Version>
-	  <AssemblyVersion>6.0.0.0</AssemblyVersion>
-	  <FileVersion>6.0.0.0</FileVersion>
+	  <PackageReleaseNotes> Fixed issue #58 ToListAsync() returns empty list after package update to 6.0.0 </PackageReleaseNotes>
+	  <Version>6.0.1</Version>
+	  <AssemblyVersion>6.0.0.1</AssemblyVersion>
+	  <FileVersion>6.0.0.1</FileVersion>
     <Company></Company>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageIcon>logo.png</PackageIcon>
diff --git a/src/MockQueryable/MockQueryable.NSubstitute/NSubstituteExtensions.cs b/src/MockQueryable/MockQueryable.NSubstitute/NSubstituteExtensions.cs
@@ -24,6 +24,11 @@ public static DbSet<TEntity> BuildMockDbSet<TEntity>(this IQueryable<TEntity> da
       mock.ConfigureQueryableCalls(enumerable, data);
       mock.ConfigureDbSetCalls(data);
 
+      if (mock is IAsyncEnumerable<TEntity> asyncEnumerable)
+      {
+          asyncEnumerable.GetAsyncEnumerator(Arg.Any<CancellationToken>()).Returns(args => enumerable.GetAsyncEnumerator());
+      }
+
       return mock;
     }
 
diff --git a/src/MockQueryable/MockQueryable.Sample/MyService.cs b/src/MockQueryable/MockQueryable.Sample/MyService.cs
@@ -86,7 +86,7 @@ public interface IUserRepository
 
     Task CreateUser(UserEntity user);
 
-    List<UserEntity> GetAll();
+    Task<List<UserEntity>> GetAll();
 
     IAsyncEnumerable<UserEntity> GetAllAsync();
   }
diff --git a/src/MockQueryable/MockQueryable.Sample/MyServiceFakeItEasyTests.cs b/src/MockQueryable/MockQueryable.Sample/MyServiceFakeItEasyTests.cs
@@ -165,6 +165,19 @@ public async Task DbSetGetAllUserEntitiesAsync()
       Assert.AreEqual(users.Count, result.Count);
     }
 
+    [TestCase]
+    public async Task DbSetGetAllUserEntity()
+    {
+        //arrange
+        var users = CreateUserList();
+        var mock = users.AsQueryable().BuildMockDbSet();
+        var userRepository = new TestDbSetRepository(mock);
+        //act
+        var result = await userRepository.GetAll();
+        //assert
+        Assert.AreEqual(users.Count, result.Count);
+    }
+
     private static List<UserEntity> CreateUserList() => new List<UserEntity>
     {
       new UserEntity
diff --git a/src/MockQueryable/MockQueryable.Sample/MyServiceMoqTests.cs b/src/MockQueryable/MockQueryable.Sample/MyServiceMoqTests.cs
@@ -144,14 +144,14 @@ public async Task DbSetGetUserReports(DateTime from, DateTime to, int expectedCo
     }
 
     [TestCase]
-    public void DbSetGetAllUserEntity()
+    public async Task DbSetGetAllUserEntity()
     {
       //arrange
       var users = CreateUserList();
       var mock = users.AsQueryable().BuildMockDbSet();
       var userRepository = new TestDbSetRepository(mock.Object);
       //act
-      var result = userRepository.GetAll();
+      var result = await userRepository.GetAll();
       //assert
       Assert.AreEqual(users.Count, result.Count);
     }
diff --git a/src/MockQueryable/MockQueryable.Sample/MyServiceNSubstituteTests.cs b/src/MockQueryable/MockQueryable.Sample/MyServiceNSubstituteTests.cs
@@ -143,6 +143,20 @@ public async Task DbSetGetUserReports(DateTime from, DateTime to, int expectedCo
             Assert.AreEqual(expectedCount, result.Count);
         }
 
+
+        [TestCase]
+        public async Task DbSetGetAllUserEntity()
+        {
+            //arrange
+            var users = CreateUserList();
+            var mock = users.AsQueryable().BuildMockDbSet();
+            var userRepository = new TestDbSetRepository(mock);
+            //act
+            var result = await userRepository.GetAll();
+            //assert
+            Assert.AreEqual(users.Count, result.Count);
+        }
+
         [TestCase]
         public async Task DbSetGetAllUserEntitiesAsync()
         {
diff --git a/src/MockQueryable/MockQueryable.Sample/TestDbSetRepository.cs b/src/MockQueryable/MockQueryable.Sample/TestDbSetRepository.cs
@@ -23,8 +23,8 @@ public async Task CreateUser(UserEntity user)
             await _dbSet.AddAsync(user);
         }
 
-        public List<UserEntity> GetAll() {
-            return _dbSet.AsQueryable().ToList();
+        public async Task<List<UserEntity>> GetAll() {
+            return await _dbSet.ToListAsync();
         }
 
         public IAsyncEnumerable<UserEntity> GetAllAsync()

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,10 @@ public static DbSet<TEntity> BuildMockDbSet<TEntity>(this IQueryable<TEntity> da`
`22`	`22`	`mock.ConfigureQueryableCalls(enumerable, data);`
`23`	`23`	`mock.ConfigureAsyncEnumerableCalls(enumerable);`
`24`	`24`	`mock.ConfigureDbSetCalls(data);`
	`25`	`+ if (mock is IAsyncEnumerable<TEntity> asyncEnumerable)`
	`26`	`+ {`
	`27`	`+ A.CallTo(() => asyncEnumerable.GetAsyncEnumerator(A<CancellationToken>.Ignored)).Returns(enumerable.GetAsyncEnumerator());`
	`28`	`+ }`
`25`	`29`	`return mock;`
`26`	`30`	`}`
`27`	`31`
`@@ -43,6 +47,7 @@ private static void ConfigureAsyncEnumerableCalls<TEntity>(`
`43`	`47`	`{`
`44`	`48`	`A.CallTo(() => mock.GetAsyncEnumerator(A<CancellationToken>.Ignored))`
`45`	`49`	`.Returns(enumerable.GetAsyncEnumerator());`
	`50`	`+`
`46`	`51`	`}`
`47`	`52`
`48`	`53`	`private static void ConfigureDbSetCalls<TEntity>(this DbSet<TEntity> mock, IQueryable<TEntity> data)`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,9 @@ public static Mock<DbSet<TEntity>> BuildMockDbSet<TEntity>(this IQueryable<TEnti`
`21`	`21`	`var enumerable = new TestAsyncEnumerableEfCore<TEntity>(data);`
`22`	`22`	`mock.ConfigureAsyncEnumerableCalls(enumerable);`
`23`	`23`	`mock.As<IQueryable<TEntity>>().ConfigureQueryableCalls(enumerable, data);`
	`24`	`+ mock.As<IAsyncEnumerable<TEntity>>().Setup(x => x.GetAsyncEnumerator(It.IsAny<CancellationToken>())).Returns(enumerable.GetAsyncEnumerator());`
	`25`	`+ mock.Setup(m => m.AsQueryable()).Returns(enumerable);`
	`26`	`+`
`24`	`27`	`mock.ConfigureDbSetCalls(data);`
`25`	`28`	`return mock;`
`26`	`29`	`}`
`@@ -41,6 +44,7 @@ private static void ConfigureQueryableCalls<TEntity>(`
`41`	`44`	`mock.Setup(m => m.Expression).Returns(data?.Expression);`
`42`	`45`	`mock.Setup(m => m.ElementType).Returns(data?.ElementType);`
`43`	`46`	`mock.Setup(m => m.GetEnumerator()).Returns(() => data?.GetEnumerator());`
	`47`	`+`
`44`	`48`	`}`
`45`	`49`
`46`	`50`	`private static void ConfigureAsyncEnumerableCalls<TEntity>(`
`@@ -49,6 +53,7 @@ private static void ConfigureAsyncEnumerableCalls<TEntity>(`
`49`	`53`	`{`
`50`	`54`	`mock.Setup(d => d.GetAsyncEnumerator(It.IsAny<CancellationToken>()))`
`51`	`55`	`.Returns(() => enumerable.GetAsyncEnumerator());`
	`56`	`+`
`52`	`57`	`}`
`53`	`58`
`54`	`59`	`private static async IAsyncEnumerable<TEntity> CreateAsyncMock<TEntity>(IEnumerable<TEntity> data)`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public interface IUserRepository`
`86`	`86`
`87`	`87`	`Task CreateUser(UserEntity user);`
`88`	`88`
`89`		`- List<UserEntity> GetAll();`
	`89`	`+ Task<List<UserEntity>> GetAll();`
`90`	`90`
`91`	`91`	`IAsyncEnumerable<UserEntity> GetAllAsync();`
`92`	`92`	`}`