fluentassertions · jnyrup · Apr 22, 2023 · Apr 12, 2023 · Apr 12, 2023 · Apr 21, 2023
diff --git a/Src/FluentAssertions/Equivalency/Steps/GenericDictionaryEquivalencyStep.cs b/Src/FluentAssertions/Equivalency/Steps/GenericDictionaryEquivalencyStep.cs
@@ -114,11 +114,6 @@ private static bool AssertSameLength<TSubjectKey, TSubjectValue, TExpectedKey, T
         // the AssertSameLength method.
         where TExpectedKey : TSubjectKey
     {
-        if (expectation.Count == subject.Count)
-        {
-            return true;
-        }
-
         KeyDifference<TSubjectKey, TExpectedKey> keyDifference = CalculateKeyDifference(subject, expectation);
 
         bool hasMissingKeys = keyDifference.MissingKeys.Count > 0;

diff --git a/Tests/FluentAssertions.Equivalency.Specs/DataColumnSpecs.cs b/Tests/FluentAssertions.Equivalency.Specs/DataColumnSpecs.cs
@@ -78,6 +78,24 @@ public void When_DataColumn_has_changes_but_is_excluded_it_should_succeed()
             .ExcludingColumn(dataColumn2));
     }
 
+    [Fact]
+    public void Can_exclude_a_column_from_all_tables()
+    {
+        // Arrange
+        var subjectDataSet = CreateDummyDataSet<TypedDataSetSubclass>();
+        var expectationDataSet = new TypedDataSetSubclass(subjectDataSet);
+
+        var subject = subjectDataSet.TypedDataTable1.DecimalColumn;
+        var expectation = expectationDataSet.TypedDataTable1.DecimalColumn;
+
+        expectation.Unique = true;
+        expectation.Caption = "Test";
+
+        // Act & Assert
+        subject.Should().BeEquivalentTo(expectation, options => options
+            .ExcludingColumnInAllTables(expectation.ColumnName));
+    }
+
     [Fact]
     public void When_DataColumn_has_changes_but_is_excluded_as_params_it_should_succeed()
     {

diff --git a/Tests/FluentAssertions.Equivalency.Specs/DataTableSpecs.cs b/Tests/FluentAssertions.Equivalency.Specs/DataTableSpecs.cs
@@ -237,6 +237,24 @@ public void When_data_table_name_does_not_match_and_the_corresponding_property_i
             .WithMessage("Expected dataTable1 to have TableName *different*, but found *TypedDataTable1* instead*");
     }
 
+    [Fact]
+    public void When_excluding_invalid_constraint_it_should_throw()
+    {
+        // Arrange
+        var typedDataSet = CreateDummyDataSet<TypedDataSetSubclass>();
+
+        var subject = typedDataSet.ToUntypedDataSet().Tables["TypedDataTable1"];
+        var expectation = typedDataSet.ToUntypedDataSet().Tables["TypedDataTable1"];
+
+        // Act
+        Action action = () => subject.Should().BeEquivalentTo(expectation, options => options
+            .ExcludingRelated((Constraint constraint) => new object()));
+
+        // Assert
+        action.Should().Throw<ArgumentException>().WithMessage(
+            "*Expression must be a simple member access*");
+    }
+
     [Fact]
     public void When_data_table_name_does_not_match_but_the_corresponding_property_is_excluded_equivalence_test_should_succeed()
     {