From fa39c9f30a7d4eff28215082fb1d959a6dd82223 Mon Sep 17 00:00:00 2001
From: Michael Krisper <michael.krisper@tugraz.at>
Date: Tue, 19 Jul 2016 15:10:28 +0200
Subject: [PATCH] Replaced Assert.IsTrue(...SequenceEqual...) by
CollectionAssert.AreEqual(...)
---
.../VectoCoreTest/FileIO/VectoCSVFileTest.cs | 34 ++++++++-----------
.../Models/Declaration/DeclarationDataTest.cs | 6 ++--
.../VectoCoreTest/Utils/ResultFileHelper.cs | 4 +--
3 files changed, 20 insertions(+), 24 deletions(-)
diff --git a/VectoCore/VectoCoreTest/FileIO/VectoCSVFileTest.cs b/VectoCore/VectoCoreTest/FileIO/VectoCSVFileTest.cs
index de6b768412..450e460d61 100644
--- a/VectoCore/VectoCoreTest/FileIO/VectoCSVFileTest.cs
+++ b/VectoCore/VectoCoreTest/FileIO/VectoCSVFileTest.cs
@@ -48,11 +48,11 @@ namespace TUGraz.VectoCore.Tests.FileIO
{
var table = VectoCSVFile.Read(@"TestData\test.csv");
Assert.AreEqual(3, table.Columns.Count);
- Assert.IsTrue(new[] { "a", "b", "c" }.SequenceEqual(table.Columns.Cast<DataColumn>().Select(c => c.ColumnName)));
+ CollectionAssert.AreEqual(new[] { "a", "b", "c" }, table.Columns.Cast<DataColumn>().Select(c => c.ColumnName));
Assert.AreEqual(2, table.Rows.Count);
- Assert.IsTrue(new[] { "1", "2", "3" }.SequenceEqual(table.Rows[0].ItemArray));
- Assert.IsTrue(new[] { "4", "5", "6" }.SequenceEqual(table.Rows[1].ItemArray));
+ CollectionAssert.AreEqual(new[] { "1", "2", "3" }, table.Rows[0].ItemArray);
+ CollectionAssert.AreEqual(new[] { "4", "5", "6" }, table.Rows[1].ItemArray);
}
[Test]
@@ -60,9 +60,8 @@ namespace TUGraz.VectoCore.Tests.FileIO
{
var table = VectoCSVFile.Read(@"TestData\Components\Axle.vtlm");
Assert.AreEqual(3, table.Columns.Count);
- Assert.IsTrue(
- new[] { "Input Speed", "Input Torque", "Torque Loss" }.SequenceEqual(
- table.Columns.Cast<DataColumn>().Select(c => c.ColumnName)));
+ CollectionAssert.AreEqual(
+ new[] { "Input Speed", "Input Torque", "Torque Loss" }, table.Columns.Cast<DataColumn>().Select(c => c.ColumnName));
Assert.AreEqual(285, table.Rows.Count);
}
@@ -72,12 +71,11 @@ namespace TUGraz.VectoCore.Tests.FileIO
var stream = "a,b,c\n1,2,3\n4,5,6".GetStream();
var table = VectoCSVFile.ReadStream(stream);
- Assert.AreEqual(3, table.Columns.Count);
- Assert.IsTrue(new[] { "a", "b", "c" }.SequenceEqual(table.Columns.Cast<DataColumn>().Select(c => c.ColumnName)));
+ CollectionAssert.AreEqual(new[] { "a", "b", "c" }, table.Columns.Cast<DataColumn>().Select(c => c.ColumnName));
Assert.AreEqual(2, table.Rows.Count);
- Assert.IsTrue(new[] { "1", "2", "3" }.SequenceEqual(table.Rows[0].ItemArray));
- Assert.IsTrue(new[] { "4", "5", "6" }.SequenceEqual(table.Rows[1].ItemArray));
+ CollectionAssert.AreEqual(new[] { "1", "2", "3" }, table.Rows[0].ItemArray);
+ CollectionAssert.AreEqual(new[] { "4", "5", "6" }, table.Rows[1].ItemArray);
}
[Test]
@@ -86,12 +84,11 @@ namespace TUGraz.VectoCore.Tests.FileIO
var stream = "1,2,3\n4,5,6".GetStream();
var table = VectoCSVFile.ReadStream(stream);
- Assert.AreEqual(3, table.Columns.Count);
- Assert.IsTrue(new[] { "0", "1", "2" }.SequenceEqual(table.Columns.Cast<DataColumn>().Select(c => c.ColumnName)));
+ CollectionAssert.AreEqual(new[] { "0", "1", "2" }, table.Columns.Cast<DataColumn>().Select(c => c.ColumnName));
Assert.AreEqual(2, table.Rows.Count);
- Assert.IsTrue(new[] { "1", "2", "3" }.SequenceEqual(table.Rows[0].ItemArray));
- Assert.IsTrue(new[] { "4", "5", "6" }.SequenceEqual(table.Rows[1].ItemArray));
+ CollectionAssert.AreEqual(new[] { "1", "2", "3" }, table.Rows[0].ItemArray);
+ CollectionAssert.AreEqual(new[] { "4", "5", "6" }, table.Rows[1].ItemArray);
}
[Test]
@@ -101,7 +98,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
var table = VectoCSVFile.ReadStream(stream);
Assert.AreEqual(3, table.Columns.Count);
- Assert.IsTrue(new[] { "a", "b", "c" }.SequenceEqual(table.Columns.Cast<DataColumn>().Select(c => c.ColumnName)));
+ CollectionAssert.AreEqual(new[] { "a", "b", "c" }, table.Columns.Cast<DataColumn>().Select(c => c.ColumnName));
Assert.AreEqual(0, table.Rows.Count);
}
@@ -123,12 +120,11 @@ namespace TUGraz.VectoCore.Tests.FileIO
4,5,6".GetStream();
var table = VectoCSVFile.ReadStream(stream);
- Assert.AreEqual(3, table.Columns.Count);
- Assert.IsTrue(new[] { "a", "b", "c" }.SequenceEqual(table.Columns.Cast<DataColumn>().Select(c => c.ColumnName)));
+ CollectionAssert.AreEqual(new[] { "a", "b", "c" }, table.Columns.Cast<DataColumn>().Select(c => c.ColumnName));
Assert.AreEqual(2, table.Rows.Count);
- Assert.IsTrue(new[] { "1", "2", "3" }.SequenceEqual(table.Rows[0].ItemArray));
- Assert.IsTrue(new[] { "4", "5", "6" }.SequenceEqual(table.Rows[1].ItemArray));
+ CollectionAssert.AreEqual(new[] { "1", "2", "3" }, table.Rows[0].ItemArray);
+ CollectionAssert.AreEqual(new[] { "4", "5", "6" }, table.Rows[1].ItemArray);
}
[Test]
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs
index 53a69e10c7..d270790a3b 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs
@@ -146,7 +146,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(expected, lookup, 1e-8);
}
- [Test]
+ [TestCase]
public void WHTCLookupTestRegionalDelivery()
{
var expected = 1.02708700;
@@ -677,10 +677,10 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
{
Assert.AreEqual(missionType, m.MissionType);
Assert.AreEqual(cosswindCorrection, m.CrossWindCorrection);
- Assert.IsTrue(axleWeightDistribution.SequenceEqual(m.AxleWeightDistribution),
+ CollectionAssert.AreEqual(axleWeightDistribution, m.AxleWeightDistribution,
"Axle distribution not equal.\nexpected: {0}\nactual: {1}", string.Join(",", axleWeightDistribution),
string.Join(",", m.AxleWeightDistribution));
- Assert.IsTrue(trailerAxleWeightDistribution.SequenceEqual(m.TrailerAxleWeightDistribution),
+ CollectionAssert.AreEqual(trailerAxleWeightDistribution, m.TrailerAxleWeightDistribution,
"Trailer axle distribution not equal.\nexpected: {0}\nactual: {1}", string.Join(",", trailerAxleWeightDistribution),
string.Join(",", m.TrailerAxleWeightDistribution));
Assert.AreEqual(bodyCurbWeight.SI<Kilogram>(), m.BodyCurbWeight);
diff --git a/VectoCore/VectoCoreTest/Utils/ResultFileHelper.cs b/VectoCore/VectoCoreTest/Utils/ResultFileHelper.cs
index 442b3c699c..1a3443823a 100644
--- a/VectoCore/VectoCoreTest/Utils/ResultFileHelper.cs
+++ b/VectoCore/VectoCoreTest/Utils/ResultFileHelper.cs
@@ -91,7 +91,7 @@ namespace TUGraz.VectoCore.Tests.Utils
.ToList();
}
- Assert.IsTrue(expectedCols.SequenceEqual(actualCols),
+ CollectionAssert.AreEqual(expectedCols, actualCols,
string.Format("Moddata {3}: Columns differ:\nExpected: {0}\nMissing:{1},\nToo Much:{2}",
", ".Join(expectedCols),
", ".Join(expectedCols.Except(actualCols)),
@@ -123,7 +123,7 @@ namespace TUGraz.VectoCore.Tests.Utils
var actualCols = actual.Columns.Cast<DataColumn>().Select(x => x.ColumnName).OrderBy(x => x).ToList();
var expectedCols = expected.Columns.Cast<DataColumn>().Select(x => x.ColumnName).OrderBy(x => x).ToList();
- Assert.IsTrue(expectedCols.SequenceEqual(actualCols),
+ CollectionAssert.AreEqual(expectedCols, actualCols,
string.Format("SUM FILE {3}: Columns differ:\nExpected: {0}\nMissing:{1},\nToo Much:{2}",
", ".Join(expectedCols),
", ".Join(expectedCols.Except(actualCols)),
--
GitLab