Merge pull request #58 from kendaleiv/fix-test-warnings

Fix test warnings
ritterim · Sep 25, 2018 · 9fbdda2 · 9fbdda2
2 parents 614f2a9 + 8b89400
commit 9fbdda2
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 36 deletions.
diff --git a/tests/Filter.Nest.Tests/QueryContainerDescriptorExtensionsTests.cs b/tests/Filter.Nest.Tests/QueryContainerDescriptorExtensionsTests.cs
@@ -60,7 +60,7 @@ public void Can_query_using_single_value()
                         q => q.Filter(new { Name = new[] { "camaro" } })));
 
                     Assert.NotNull(results);
-                    Assert.Equal(1, results.Hits.Count());
+                    Assert.Single(results.Hits);
                     Assert.Equal("Camaro", results.Hits.First().Source.Name);
                 }
             }
@@ -86,7 +86,7 @@ public void Multiple_filter_properties_queried_as_collection_of_and_operators()
                         q => q.Filter(new { Name = new[] { "camaro", "monte carlo" }, Year = 2016 })));
 
                     Assert.NotNull(noResults);
-                    Assert.Equal(0, noResults.Hits.Count());
+                    Assert.Empty(noResults.Hits);
 
                     var twoResults = elasticClient
                         .Search<Car>(x => x.Index("vehicles")
@@ -168,7 +168,7 @@ public void Nullable_boolean_true_returns_expected_results()
                         q => q.Filter(new { IsElectric = true })));
 
                     Assert.NotNull(results);
-                    Assert.Equal(1, results.Hits.Count());
+                    Assert.Single(results.Hits);
                     Assert.Equal("Volt", results.Hits.First().Source.Name);
                 }
             }
@@ -192,10 +192,10 @@ public void Nullable_boolean_false_returns_expected_results()
                         q => q.Filter(new { IsElectric = false })));
 
                     Assert.NotNull(results);
-                    Assert.Equal(1, results.Hits.Count());
+                    Assert.Single(results.Hits);
                     Assert.Equal("Camaro", results.Hits.First().Source.Name);
                 }
             }
         }
     }
-}
+}
diff --git a/tests/Filter.Nest.Tests/SearchDescriptorExtensionsTests.cs b/tests/Filter.Nest.Tests/SearchDescriptorExtensionsTests.cs
@@ -59,7 +59,7 @@ public void Can_query_using_single_value()
                         .PostFilter(new { Name = "camaro" }));
 
                     Assert.NotNull(results);
-                    Assert.Equal(1, results.Hits.Count());
+                    Assert.Single(results.Hits);
                     Assert.Equal("Camaro", results.Hits.First().Source.Name);
                 }
             }
@@ -86,7 +86,7 @@ public void Multiple_filter_properties_queried_as_collection_of_and_operators()
                         .PostFilter(new { Name = new[] { "camaro", "monte carlo" }, Year = 2016 }));
 
                     Assert.NotNull(noResults);
-                    Assert.Equal(0, noResults.Hits.Count());
+                    Assert.Empty(noResults.Hits);
 
                     var twoResults = elasticClient
                         .Search<Car>(x => x.Index("vehicles")
@@ -171,7 +171,7 @@ public void Nullable_boolean_true_returns_expected_results()
                         .PostFilter(new { IsElectric = true }));
 
                     Assert.NotNull(results);
-                    Assert.Equal(1, results.Hits.Count());
+                    Assert.Single(results.Hits);
                     Assert.Equal("Volt", results.Hits.First().Source.Name);
                 }
             }
@@ -196,7 +196,7 @@ public void Nullable_boolean_false_returns_expected_results()
                         .PostFilter(new { IsElectric = false }));
 
                     Assert.NotNull(results);
-                    Assert.Equal(1, results.Hits.Count());
+                    Assert.Single(results.Hits);
                     Assert.Equal("Camaro", results.Hits.First().Source.Name);
                 }
             }

diff --git a/tests/Filter.Tests/Generic/IEnumerable`1ExtensionsTests.cs b/tests/Filter.Tests/Generic/IEnumerable`1ExtensionsTests.cs
@@ -87,7 +87,7 @@ public void Should_filter_multiple_properties()
                 });
 
                 Assert.NotNull(@return);
-                Assert.Equal(0, @return.Count());
+                Assert.Empty(@return);
             }
 
             [Fact]
@@ -123,7 +123,7 @@ public void Should_filter_on_nullable_booleans()
                 });
 
                 Assert.NotNull(@return);
-                Assert.Equal(1, @return.Count());
+                Assert.Single(@return);
                 Assert.Equal("Tim", @return.First().FirstName);
             }
         }
@@ -151,7 +151,7 @@ public void Should_filter_when_property_types_match_as_enumerable_string()
                 });
 
                 Assert.NotNull(@return);
-                Assert.Equal(1, @return.Count());
+                Assert.Single(@return);
                 Assert.Equal("John", @return.First().FirstName);
             }
 
@@ -164,7 +164,7 @@ public void Should_filter_when_property_types_match_as_enumerable_integer()
                 });
 
                 Assert.NotNull(@return);
-                Assert.Equal(1, @return.Count());
+                Assert.Single(@return);
                 Assert.Equal("John", @return.First().FirstName);
             }
 
@@ -176,7 +176,7 @@ public void Should_be_able_to_handle_nullable_destination_and_primitive_filter()
                     Rating = new[] { 4.5m }
                 });
 
-                Assert.Equal(1, @return.Count());
+                Assert.Single(@return);
             }
 
             [Fact]
@@ -187,7 +187,7 @@ public void Should_be_able_to_handle_nullable_destination_and_nullable_primitive
                     Rating = new decimal?[] { 4.5m }
                 });
 
-                Assert.Equal(1, @return.Count());
+                Assert.Single(@return);
             }
 
             [Fact]
@@ -198,7 +198,7 @@ public void Should_be_able_to_handle_nullable_destination_and_nullable_primitive
                     Rating = new decimal?(4.5m)
                 });
 
-                Assert.Equal(1, @return.Count());
+                Assert.Single(@return);
             }
 
             [Fact]
@@ -212,7 +212,7 @@ public void Should_be_able_to_handle_nullable_source()
                     Rating = new decimal?[] { 4.5m }
                 });
 
-                Assert.Equal(0, @return.Count());
+                Assert.Empty(@return);
             }
         }
 
@@ -229,7 +229,7 @@ public void Should_filter_open_ended_lower_bound(string value)
                 });
 
                 Assert.NotNull(@return);
-                Assert.Equal(1, @return.Count());
+                Assert.Single(@return);
                 Assert.Equal("John", @return.First().FirstName);
             }
 
@@ -244,7 +244,7 @@ public void Should_filter_open_ended_upper_bound(string value)
                 });
 
                 Assert.NotNull(@return);
-                Assert.Equal(1, @return.Count());
+                Assert.Single(@return);
                 Assert.Equal("Tim", @return.First().FirstName);
             }
 
@@ -263,7 +263,7 @@ public void Should_filter_for_concrete_range()
                 });
 
                 Assert.NotNull(@return);
-                Assert.Equal(1, @return.Count());
+                Assert.Single(@return);
                 Assert.Equal("John", @return.First().FirstName);
             }
 
@@ -276,7 +276,7 @@ public void Should_filter_when_property_types_match_as_range_byte()
                 });
 
                 Assert.NotNull(@return);
-                Assert.Equal(1, @return.Count());
+                Assert.Single(@return);
                 Assert.Equal("John", @return.First().FirstName);
             }
 
@@ -289,7 +289,7 @@ public void Should_filter_when_property_types_match_as_range_char()
                 });
 
                 Assert.NotNull(@return);
-                Assert.Equal(1, @return.Count());
+                Assert.Single(@return);
                 Assert.Equal("John", @return.First().FirstName);
             }
 
@@ -302,7 +302,7 @@ public void Should_filter_when_property_types_match_as_range_datetime()
                 });
 
                 Assert.NotNull(@return);
-                Assert.Equal(1, @return.Count());
+                Assert.Single(@return);
                 Assert.Equal("John", @return.First().FirstName);
             }
 
@@ -315,7 +315,7 @@ public void Should_filter_when_property_types_match_as_range_datetimeoffset()
                 });
 
                 Assert.NotNull(@return);
-                Assert.Equal(1, @return.Count());
+                Assert.Single(@return);
                 Assert.Equal("John", @return.First().FirstName);
             }
 
@@ -328,7 +328,7 @@ public void Should_filter_when_property_types_match_as_range_decimal()
                 });
 
                 Assert.NotNull(@return);
-                Assert.Equal(1, @return.Count());
+                Assert.Single(@return);
                 Assert.Equal("John", @return.First().FirstName);
             }
 
@@ -341,7 +341,7 @@ public void Should_filter_when_property_types_match_as_range_double()
                 });
 
                 Assert.NotNull(@return);
-                Assert.Equal(1, @return.Count());
+                Assert.Single(@return);
                 Assert.Equal("John", @return.First().FirstName);
             }
 
@@ -354,7 +354,7 @@ public void Should_filter_when_property_types_match_as_range_float()
                 });
 
                 Assert.NotNull(@return);
-                Assert.Equal(1, @return.Count());
+                Assert.Single(@return);
                 Assert.Equal("John", @return.First().FirstName);
             }
 
@@ -367,7 +367,7 @@ public void Should_filter_when_property_types_match_as_range_int()
                 });
 
                 Assert.NotNull(@return);
-                Assert.Equal(1, @return.Count());
+                Assert.Single(@return);
                 Assert.Equal("John", @return.First().FirstName);
             }
 
@@ -380,7 +380,7 @@ public void Should_filter_when_property_types_match_as_range_long()
                 });
 
                 Assert.NotNull(@return);
-                Assert.Equal(1, @return.Count());
+                Assert.Single(@return);
                 Assert.Equal("John", @return.First().FirstName);
             }
 
@@ -393,7 +393,7 @@ public void Should_filter_when_property_types_match_as_range_sbyte()
                 });
 
                 Assert.NotNull(@return);
-                Assert.Equal(1, @return.Count());
+                Assert.Single(@return);
                 Assert.Equal("John", @return.First().FirstName);
             }
 
@@ -406,7 +406,7 @@ public void Should_filter_when_property_types_match_as_range_short()
                 });
 
                 Assert.NotNull(@return);
-                Assert.Equal(1, @return.Count());
+                Assert.Single(@return);
                 Assert.Equal("John", @return.First().FirstName);
             }
 
@@ -419,7 +419,7 @@ public void Should_filter_when_property_types_match_as_range_uint()
                 });
 
                 Assert.NotNull(@return);
-                Assert.Equal(1, @return.Count());
+                Assert.Single(@return);
                 Assert.Equal("John", @return.First().FirstName);
             }
 
@@ -432,7 +432,7 @@ public void Should_filter_when_property_types_match_as_range_ulong()
                 });
 
                 Assert.NotNull(@return);
-                Assert.Equal(1, @return.Count());
+                Assert.Single(@return);
                 Assert.Equal("John", @return.First().FirstName);
             }
 
@@ -445,7 +445,7 @@ public void Should_filter_when_property_types_match_as_range_ushort()
                 });
 
                 Assert.NotNull(@return);
-                Assert.Equal(1, @return.Count());
+                Assert.Single(@return);
                 Assert.Equal("John", @return.First().FirstName);
             }
 
@@ -457,7 +457,7 @@ public void Should_be_able_to_handle_nullable_source()
                     Rating = (Range<decimal>)"[4.5,5.0]"
                 });
 
-                Assert.Equal(1, @return.Count());
+                Assert.Single(@return);
             }
         }
     }

diff --git a/tests/Filter.Tests/Generic/IQueryable`1ExtensionsTests.cs b/tests/Filter.Tests/Generic/IQueryable`1ExtensionsTests.cs
@@ -196,7 +196,7 @@ public void Should_be_able_to_handle_nullable_source()
                     Rating = new decimal?[] { 4.5m }
                 });
 
-                Assert.Equal(0, @return.Count());
+                Assert.Empty(@return);
             }
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -196,7 +196,7 @@ public void Should_be_able_to_handle_nullable_source() @@
                         Rating = new decimal?[] { 4.5m }
                     });
-                    Assert.Equal(0, @return.Count());
+                    Assert.Empty(@return);
                 }
             }
@@ Expand Down @@