Changed calls to .OfType on System.Data collections in equivalency st…

…eps and unit tests to use .Cast instead.
fluentassertions · Feb 21, 2022 · 5db93d5 · 5db93d5
1 parent 1b7ef07
commit 5db93d5
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/Src/FluentAssertions/Equivalency/Steps/DataRowEquivalencyStep.cs b/Src/FluentAssertions/Equivalency/Steps/DataRowEquivalencyStep.cs
@@ -91,10 +91,10 @@ private static void CompareScalarProperties(DataRow subject, DataRow expectation
             DataRow subject, DataRow expectation, DataEquivalencyAssertionOptions<DataSet> dataSetConfig,
             DataEquivalencyAssertionOptions<DataTable> dataTableConfig, DataEquivalencyAssertionOptions<DataRow> dataRowConfig)
         {
-            IEnumerable<string> expectationColumnNames = expectation.Table.Columns.OfType<DataColumn>()
+            IEnumerable<string> expectationColumnNames = expectation.Table.Columns.Cast<DataColumn>()
                 .Select(col => col.ColumnName);
 
-            IEnumerable<string> subjectColumnNames = subject.Table.Columns.OfType<DataColumn>()
+            IEnumerable<string> subjectColumnNames = subject.Table.Columns.Cast<DataColumn>()
                 .Select(col => col.ColumnName);
 
             bool ignoreUnmatchedColumns =

diff --git a/Src/FluentAssertions/Equivalency/Steps/DataSetEquivalencyStep.cs b/Src/FluentAssertions/Equivalency/Steps/DataSetEquivalencyStep.cs
@@ -185,9 +185,9 @@ private static void CompareTables(IEquivalencyValidationContext context, IEquiva
                     }
                 }
 
-                IEnumerable<string> expectationTableNames = expectation.Tables.OfType<DataTable>()
+                IEnumerable<string> expectationTableNames = expectation.Tables.Cast<DataTable>()
                     .Select(table => table.TableName);
-                IEnumerable<string> subjectTableNames = subject.Tables.OfType<DataTable>()
+                IEnumerable<string> subjectTableNames = subject.Tables.Cast<DataTable>()
                     .Select(table => table.TableName);
 
                 foreach (string tableName in expectationTableNames.Union(subjectTableNames))

diff --git a/Tests/FluentAssertions.Equivalency.Specs/DataRowSpecs.cs b/Tests/FluentAssertions.Equivalency.Specs/DataRowSpecs.cs
@@ -343,7 +343,7 @@ public void When_data_row_has_column_then_asserting_that_it_has_that_column_shou
 
             var dataRow = dataSet.TypedDataTable1[0];
 
-            string expectedColumnName = dataSet.TypedDataTable1.Columns.OfType<DataColumn>().Last().ColumnName;
+            string expectedColumnName = dataSet.TypedDataTable1.Columns.Cast<DataColumn>().Last().ColumnName;
 
             // Act & Assert
             dataRow.Should().HaveColumn(expectedColumnName);
@@ -373,7 +373,7 @@ public void When_data_row_data_has_all_columns_being_asserted_then_it_should_suc
 
             var dataRow = dataSet.TypedDataTable1[0];
 
-            var subsetOfColumnNames = dataRow.Table.Columns.OfType<DataColumn>()
+            var subsetOfColumnNames = dataRow.Table.Columns.Cast<DataColumn>()
                 .Take(dataRow.Table.Columns.Count - 2)
                 .Select(column => column.ColumnName);
 
@@ -389,7 +389,7 @@ public void When_data_row_data_has_only_some_of_the_columns_being_asserted_then_
 
             var dataRow = dataSet.TypedDataTable1[0];
 
-            var subsetOfColumnNamesWithUnicorn = dataRow.Table.Columns.OfType<DataColumn>()
+            var subsetOfColumnNamesWithUnicorn = dataRow.Table.Columns.Cast<DataColumn>()
                 .Take(dataRow.Table.Columns.Count - 2)
                 .Select(column => column.ColumnName)
                 .Concat(new[] { "Unicorn" });

diff --git a/Tests/FluentAssertions.Equivalency.Specs/DataSetSpecs.cs b/Tests/FluentAssertions.Equivalency.Specs/DataSetSpecs.cs
@@ -679,7 +679,7 @@ public void When_data_set_has_all_expected_tables_asserting_that_it_has_them_sho
             // Arrange
             var dataSet = CreateDummyDataSet<TypedDataSetSubclass>();
 
-            var existingTableNames = dataSet.Tables.OfType<DataTable>()
+            var existingTableNames = dataSet.Tables.Cast<DataTable>()
                 .Select(table => table.TableName);
 
             // Act & Assert
@@ -692,7 +692,7 @@ public void When_data_set_has_some_of_the_expected_tables_but_not_all_then_asser
             // Arrange
             var dataSet = CreateDummyDataSet<TypedDataSetSubclass>();
 
-            var tableNames = dataSet.Tables.OfType<DataTable>()
+            var tableNames = dataSet.Tables.Cast<DataTable>()
                 .Select(table => table.TableName)
                 .Concat(new[] { "Unicorn" });
 

diff --git a/Tests/FluentAssertions.Equivalency.Specs/DataSpecs.cs b/Tests/FluentAssertions.Equivalency.Specs/DataSpecs.cs
@@ -525,7 +525,7 @@ private static void InsertDummyRow(DataTable table, DataRow foreignRow = null)
         {
             var row = table.NewRow();
 
-            foreach (var column in table.Columns.OfType<DataColumn>())
+            foreach (var column in table.Columns.Cast<DataColumn>())
             {
                 if (column.ColumnName.StartsWith("Foreign", StringComparison.Ordinal))
                 {

diff --git a/Tests/FluentAssertions.Equivalency.Specs/DataTableSpecs.cs b/Tests/FluentAssertions.Equivalency.Specs/DataTableSpecs.cs
@@ -565,11 +565,11 @@ difference switch
                     _ => throw new Exception("Sanity failure")
                 };
 
-            var dataTable1ColumnsForConstraint = dataTable1.Columns.OfType<DataColumn>()
+            var dataTable1ColumnsForConstraint = dataTable1.Columns.Cast<DataColumn>()
                 .Take(dataTable1.Columns.Count - differenceCount)
                 .ToArray();
 
-            var dataTable2ColumnsForConstraint = dataTable2.Columns.OfType<DataColumn>()
+            var dataTable2ColumnsForConstraint = dataTable2.Columns.Cast<DataColumn>()
                 .Skip(differenceCount)
                 .ToArray();
 
@@ -808,7 +808,7 @@ public void When_data_table_has_all_expected_columns_it_should_succeed()
 
             var dataTable = dataSet.TypedDataTable1;
 
-            var existingColumnNames = dataTable.Columns.OfType<DataColumn>()
+            var existingColumnNames = dataTable.Columns.Cast<DataColumn>()
                 .Select(column => column.ColumnName);
 
             // Act & Assert
@@ -823,7 +823,7 @@ public void When_data_table_has_only_some_expected_columns_then_asserting_that_i
 
             var dataTable = dataSet.TypedDataTable1;
 
-            var columnNames = dataTable.Columns.OfType<DataColumn>()
+            var columnNames = dataTable.Columns.Cast<DataColumn>()
                 .Select(column => column.ColumnName)
                 .Concat(new[] { "Unicorn" });