✨ add Expect(collection).To.Include(...)

- which, after it was built, does pretty-much what Expect(collection).To.Contain(...) does :| but I'm all for different grammar that works the same
fluffynuts · Feb 15, 2024 · 78bbae7 · 78bbae7
1 parent 2efc8f1
commit 78bbae7
Show file tree

Hide file tree

Showing 90 changed files with 346 additions and 167 deletions.
diff --git a/src/NExpect.Tests/ArbitraryBehaviorTests.cs b/src/NExpect.Tests/ArbitraryBehaviorTests.cs
@@ -11,8 +11,6 @@
 using NUnit.Framework;
 using PeanutButter.RandomGenerators;
 using PeanutButter.Utils;
-using static NExpect.Expectations;
-using static PeanutButter.RandomGenerators.RandomValueGen;
 
 // ReSharper disable MemberCanBePrivate.Global
 // ReSharper disable UnusedMethodReturnValue.Global

diff --git a/src/NExpect.Tests/BetterStringErrors.cs b/src/NExpect.Tests/BetterStringErrors.cs
@@ -1,8 +1,5 @@
 using NUnit.Framework;
-using NExpect;
 using NExpect.Exceptions;
-using static NExpect.Expectations;
-using static PeanutButter.RandomGenerators.RandomValueGen;
 
 namespace NExpect.Tests
 {

diff --git a/src/NExpect.Tests/BetterStringHandling.cs b/src/NExpect.Tests/BetterStringHandling.cs
@@ -1,6 +1,5 @@
 using NUnit.Framework;
 using NExpect.Exceptions;
-using static NExpect.Expectations;
 
 namespace NExpect.Tests
 {

diff --git a/src/NExpect.Tests/CatchingIncompleteExpectations.cs b/src/NExpect.Tests/CatchingIncompleteExpectations.cs
@@ -9,8 +9,6 @@
 using NExpect.Implementations;
 using NExpect.Interfaces;
 using NExpect.MatcherLogic;
-using static NExpect.Expectations;
-using static PeanutButter.RandomGenerators.RandomValueGen;
 
 namespace NExpect.Tests;
 

diff --git a/src/NExpect.Tests/Collections/All.cs b/src/NExpect.Tests/Collections/All.cs
@@ -2,8 +2,6 @@
 using NExpect.Exceptions;
 using NUnit.Framework;
 using PeanutButter.Utils;
-using static PeanutButter.RandomGenerators.RandomValueGen;
-using static NExpect.Expectations;
 
 namespace NExpect.Tests.Collections
 {

diff --git a/src/NExpect.Tests/Collections/Any.cs b/src/NExpect.Tests/Collections/Any.cs
@@ -2,8 +2,7 @@
 using NExpect.Exceptions;
 using NUnit.Framework;
 using PeanutButter.Utils;
-using static PeanutButter.RandomGenerators.RandomValueGen;
-using static NExpect.Expectations;
+
 // ReSharper disable PossibleMultipleEnumeration
 
 namespace NExpect.Tests.Collections

diff --git a/src/NExpect.Tests/Collections/AtLeast.cs b/src/NExpect.Tests/Collections/AtLeast.cs
@@ -1,12 +1,9 @@
-using System;
-using System.Linq;
+using System.Linq;
 using NExpect.Exceptions;
 using NExpect.Implementations;
 using NUnit.Framework;
 using PeanutButter.RandomGenerators;
 using PeanutButter.Utils;
-using static PeanutButter.RandomGenerators.RandomValueGen;
-using static NExpect.Expectations;
 
 // ReSharper disable InconsistentNaming
 // ReSharper disable RedundantAnonymousTypePropertyName

diff --git a/src/NExpect.Tests/Collections/AtMost.cs b/src/NExpect.Tests/Collections/AtMost.cs
@@ -1,8 +1,6 @@
 using NExpect.Exceptions;
 using NUnit.Framework;
 using PeanutButter.RandomGenerators;
-using static PeanutButter.RandomGenerators.RandomValueGen;
-using static NExpect.Expectations;
 
 namespace NExpect.Tests.Collections
 {

diff --git a/src/NExpect.Tests/Collections/CollectionSetMatching.cs b/src/NExpect.Tests/Collections/CollectionSetMatching.cs
@@ -1,6 +1,5 @@
 using NExpect.Exceptions;
 using NUnit.Framework;
-using static NExpect.Expectations;
 
 namespace NExpect.Tests.Collections;
 

diff --git a/src/NExpect.Tests/Collections/CountMatchContinuationExtensionsForTesting.cs b/src/NExpect.Tests/Collections/CountMatchContinuationExtensionsForTesting.cs
@@ -4,7 +4,6 @@
 using NExpect.Implementations;
 using NExpect.Interfaces;
 using NExpect.MatcherLogic;
-using NUnit.Framework.Internal;
 
 // ReSharper disable PossibleMultipleEnumeration
 

diff --git a/src/NExpect.Tests/Collections/CustomEqualityTesting.cs b/src/NExpect.Tests/Collections/CustomEqualityTesting.cs
@@ -1,6 +1,4 @@
 using NUnit.Framework;
-using static NExpect.Expectations;
-using static PeanutButter.RandomGenerators.RandomValueGen;
 
 namespace NExpect.Tests.Collections
 {

diff --git a/src/NExpect.Tests/Collections/CustomEquivalenceTesting.cs b/src/NExpect.Tests/Collections/CustomEquivalenceTesting.cs
@@ -1,7 +1,6 @@
 using NExpect.Exceptions;
 using NUnit.Framework;
-using static NExpect.Expectations;
-using static PeanutButter.RandomGenerators.RandomValueGen;
+
 // ReSharper disable ExpressionIsAlwaysNull
 
 namespace NExpect.Tests.Collections

diff --git a/src/NExpect.Tests/Collections/DeepEqualityTesting.cs b/src/NExpect.Tests/Collections/DeepEqualityTesting.cs
@@ -3,8 +3,6 @@
 using NExpect.Exceptions;
 using PeanutButter.DuckTyping.Extensions;
 using PeanutButter.Utils;
-using static NExpect.Expectations;
-using static PeanutButter.RandomGenerators.RandomValueGen;
 
 // ReSharper disable MemberHidesStaticFromOuterClass
 // ReSharper disable MemberCanBePrivate.Global

diff --git a/src/NExpect.Tests/Collections/DictionaryTesting.cs b/src/NExpect.Tests/Collections/DictionaryTesting.cs
@@ -1,11 +1,9 @@
 using System;
 using System.Collections.Generic;
 using NUnit.Framework;
-using static PeanutButter.RandomGenerators.RandomValueGen;
 using NExpect.Exceptions;
 using NExpect.Implementations;
 using PeanutButter.Utils;
-using static NExpect.Expectations;
 
 // ReSharper disable InconsistentNaming
 // ReSharper disable ExpressionIsAlwaysNull

diff --git a/src/NExpect.Tests/Collections/DifferentTypesOfCollections.cs b/src/NExpect.Tests/Collections/DifferentTypesOfCollections.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using NUnit.Framework;
-using static NExpect.Expectations;
 
 // ReSharper disable UnusedAutoPropertyAccessor.Global
 // ReSharper disable UnusedMember.Global

diff --git a/src/NExpect.Tests/Collections/Distinct.cs b/src/NExpect.Tests/Collections/Distinct.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using NExpect.Exceptions;
 using NUnit.Framework;
-using static NExpect.Expectations;
 
 namespace NExpect.Tests.Collections
 {

diff --git a/src/NExpect.Tests/Collections/Emptiness.cs b/src/NExpect.Tests/Collections/Emptiness.cs
@@ -2,8 +2,6 @@
 using System.Collections.Generic;
 using NExpect.Exceptions;
 using NUnit.Framework;
-using static NExpect.Expectations;
-using static PeanutButter.RandomGenerators.RandomValueGen;
 
 namespace NExpect.Tests.Collections
 {

diff --git a/src/NExpect.Tests/Collections/Equivalence.cs b/src/NExpect.Tests/Collections/Equivalence.cs
@@ -3,8 +3,7 @@
 using NExpect.Exceptions;
 using NUnit.Framework;
 using PeanutButter.RandomGenerators;
-using static PeanutButter.RandomGenerators.RandomValueGen;
-using static NExpect.Expectations;
+
 // ReSharper disable InconsistentNaming
 
 namespace NExpect.Tests.Collections

diff --git a/src/NExpect.Tests/Collections/Exactly.cs b/src/NExpect.Tests/Collections/Exactly.cs
@@ -3,8 +3,6 @@
 using NExpect.Exceptions;
 using NUnit.Framework;
 using PeanutButter.RandomGenerators;
-using static PeanutButter.RandomGenerators.RandomValueGen;
-using static NExpect.Expectations;
 
 namespace NExpect.Tests.Collections
 {

diff --git a/src/NExpect.Tests/Collections/Include.cs b/src/NExpect.Tests/Collections/Include.cs
@@ -0,0 +1,90 @@
+using NExpect.Exceptions;
+using NUnit.Framework;
+
+namespace NExpect.Tests.Collections
+{
+    [TestFixture]
+    public class Include
+    {
+        [Test]
+        public void ShouldBeAbleToQuicklyTestIfCollectionIncludesValue()
+        {
+            // Arrange
+            var collection = new[]
+            {
+                1,
+                2,
+                3
+            };
+            // Act
+            Assert.That(
+                () =>
+                {
+                    Expect(collection)
+                        .To.Include(1);
+                },
+                Throws.Nothing
+            );
+
+            Assert.That(
+                () =>
+                {
+                    Expect(collection)
+                        .Not.To.Include(1);
+                },
+                Throws.Exception.InstanceOf<UnmetExpectationException>()
+            );
+
+            Assert.That(
+                () =>
+                {
+                    Expect(collection)
+                        .To.Not.Include(1);
+                },
+                Throws.Exception.InstanceOf<UnmetExpectationException>()
+            );
+
+            Assert.That(
+                () =>
+                {
+                    Expect(collection)
+                        .To.Include(-1);
+                },
+                Throws.Exception.InstanceOf<UnmetExpectationException>()
+            );
+
+            // Assert
+        }
+
+        [Test]
+        public void ShouldEmitUsefulAndGrammaticallyCorrectErrors()
+        {
+            // Arrange
+            // Act
+            Assert.That(
+                () =>
+                {
+                    Expect(3, 4, 5)
+                        .To.Include(1);
+                },
+                Throws.Exception.InstanceOf<UnmetExpectationException>()
+                    .With.Message.Contains(
+                        "Expected to find value 1 in collection"
+                    )
+            );
+
+            Assert.That(
+                () =>
+                {
+                    Expect(1, 2, 3)
+                        .Not.To.Include(1);
+                },
+                Throws.Exception.InstanceOf<UnmetExpectationException>()
+                    .With.Message.Contains(
+                        "Expected not to find value 1 in collection"
+                    )
+            );
+            // Assert
+        }
+    }
+}
diff --git a/src/NExpect.Tests/Collections/NameValueCollectionTesting.cs b/src/NExpect.Tests/Collections/NameValueCollectionTesting.cs
@@ -1,9 +1,7 @@
 using System.Collections.Specialized;
 using NUnit.Framework;
-using static PeanutButter.RandomGenerators.RandomValueGen;
 using NExpect.Exceptions;
 using NExpect.Implementations;
-using static NExpect.Expectations;
 
 // ReSharper disable InconsistentNaming
 // ReSharper disable ExpressionIsAlwaysNull

diff --git a/src/NExpect.Tests/Collections/OfType.cs b/src/NExpect.Tests/Collections/OfType.cs
@@ -1,8 +1,6 @@
 using System.Collections.Generic;
 using NUnit.Framework;
-using static PeanutButter.RandomGenerators.RandomValueGen;
-using NExpect;
-using static NExpect.Expectations;
+
 namespace NExpect.Tests.Collections;
 
 [TestFixture]

diff --git a/src/NExpect.Tests/Collections/Only.cs b/src/NExpect.Tests/Collections/Only.cs
@@ -1,8 +1,6 @@
 using NExpect.Exceptions;
 using NUnit.Framework;
-using static PeanutButter.RandomGenerators.RandomValueGen;
 using PeanutButter.RandomGenerators;
-using static NExpect.Expectations;
 
 // ReSharper disable InconsistentNaming
 

diff --git a/src/NExpect.Tests/Collections/PartialCollectionMatching.cs b/src/NExpect.Tests/Collections/PartialCollectionMatching.cs
@@ -1,6 +1,5 @@
 using NExpect.Exceptions;
 using NUnit.Framework;
-using static NExpect.Expectations;
 
 namespace NExpect.Tests.Collections;
 

diff --git a/src/NExpect.Tests/Collections/Sequences.cs b/src/NExpect.Tests/Collections/Sequences.cs
@@ -1,13 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
+using System.Linq;
 using NUnit.Framework;
-using static PeanutButter.RandomGenerators.RandomValueGen;
-using NExpect;
 using NExpect.Exceptions;
-using NExpect.Implementations;
-using static NExpect.Expectations;
 
 namespace NExpect.Tests.Collections
 {

diff --git a/src/NExpect.Tests/Collections/SetTesting.cs b/src/NExpect.Tests/Collections/SetTesting.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using NExpect.Exceptions;
 using NUnit.Framework;
-using static NExpect.Expectations;
 
 namespace NExpect.Tests.Collections
 {

diff --git a/src/NExpect.Tests/Collections/TestAgainstReadOnlyCollections.cs b/src/NExpect.Tests/Collections/TestAgainstReadOnlyCollections.cs
@@ -1,7 +1,6 @@
 using System.Collections.ObjectModel;
 using NExpect.Exceptions;
 using NUnit.Framework;
-using static NExpect.Expectations;
 
 namespace NExpect.Tests.Collections
 {

diff --git a/src/NExpect.Tests/Collections/TestAgainstReadOnlyDictionary.cs b/src/NExpect.Tests/Collections/TestAgainstReadOnlyDictionary.cs
@@ -2,7 +2,6 @@
 using System.Collections.ObjectModel;
 using NUnit.Framework;
 using NExpect.Exceptions;
-using static NExpect.Expectations;
 
 namespace NExpect.Tests.Collections;
 

diff --git a/src/NExpect.Tests/ComposingExpectations.cs b/src/NExpect.Tests/ComposingExpectations.cs
@@ -5,8 +5,6 @@
 using NExpect.MatcherLogic;
 using NUnit.Framework;
 using PeanutButter.Utils;
-using static NExpect.Expectations;
-using static PeanutButter.RandomGenerators.RandomValueGen;
 
 namespace NExpect.Tests
 {

diff --git a/src/NExpect.Tests/DanglingPrepositions/A.cs b/src/NExpect.Tests/DanglingPrepositions/A.cs
@@ -3,7 +3,6 @@
 using NExpect.MatcherLogic;
 using NUnit.Framework;
 using NExpect.Interfaces;
-using static NExpect.Expectations;
 
 namespace NExpect.Tests.DanglingPrepositions
 {

diff --git a/src/NExpect.Tests/DanglingPrepositions/An.cs b/src/NExpect.Tests/DanglingPrepositions/An.cs
@@ -2,7 +2,6 @@
 using NExpect.MatcherLogic;
 using NUnit.Framework;
 using NExpect.Interfaces;
-using static NExpect.Expectations;
 
 namespace NExpect.Tests.DanglingPrepositions
 {

diff --git a/src/NExpect.Tests/DanglingPrepositions/Contain.cs b/src/NExpect.Tests/DanglingPrepositions/Contain.cs
@@ -1,12 +1,8 @@
 using System.Drawing;
-using System.Linq;
 using NExpect.Exceptions;
 using NUnit.Framework;
-using static PeanutButter.RandomGenerators.RandomValueGen;
-using static NExpect.Expectations;
 using NExpect.Interfaces;
 using NExpect.MatcherLogic;
-using PeanutButter.Utils;
 using NExpect.Implementations;
 
 namespace NExpect.Tests.DanglingPrepositions

diff --git a/src/NExpect.Tests/DanglingPrepositions/For.cs b/src/NExpect.Tests/DanglingPrepositions/For.cs
@@ -5,8 +5,6 @@
 using NExpect.MatcherLogic;
 using NUnit.Framework;
 using PeanutButter.Utils;
-using static PeanutButter.RandomGenerators.RandomValueGen;
-using static NExpect.Expectations;
 
 // ReSharper disable ClassNeverInstantiated.Global
 // ReSharper disable UnusedAutoPropertyAccessor.Global

diff --git a/src/NExpect.Tests/DanglingPrepositions/Have.cs b/src/NExpect.Tests/DanglingPrepositions/Have.cs
@@ -5,7 +5,6 @@
 using NExpect.MatcherLogic;
 using NUnit.Framework;
 using PeanutButter.RandomGenerators;
-using static NExpect.Expectations;
 
 namespace NExpect.Tests.DanglingPrepositions
 {

diff --git a/src/NExpect.Tests/DanglingPrepositions/Mostly.cs b/src/NExpect.Tests/DanglingPrepositions/Mostly.cs
@@ -1,6 +1,5 @@
 using NExpect.Exceptions;
 using NUnit.Framework;
-using static NExpect.Expectations;
 
 namespace NExpect.Tests.DanglingPrepositions;