From f8d44af5391b942f01f202819cae62817d81de0c Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Sat, 9 Jan 2021 21:30:30 +0000 Subject: [PATCH] Fix expected vs result in tests. --- Aaru.Tests/Images/Alcohol120.cs | 19 ++++++++----------- Aaru.Tests/Images/BlindWrite4.cs | 19 ++++++++----------- Aaru.Tests/Images/BlindWrite5.cs | 19 ++++++++----------- Aaru.Tests/Images/BlindWrite6.cs | 22 ++++++++-------------- Aaru.Tests/Images/BlindWrite7.cs | 19 ++++++++----------- Aaru.Tests/Images/CDRWin.cs | 19 ++++++++----------- Aaru.Tests/Images/CloneCD.cs | 19 ++++++++----------- 7 files changed, 56 insertions(+), 80 deletions(-) diff --git a/Aaru.Tests/Images/Alcohol120.cs b/Aaru.Tests/Images/Alcohol120.cs index b87ab1f83..e1eda0f97 100644 --- a/Aaru.Tests/Images/Alcohol120.cs +++ b/Aaru.Tests/Images/Alcohol120.cs @@ -1986,23 +1986,20 @@ namespace Aaru.Tests.Images Assert.AreEqual(_tracks[i], images[i].Tracks.Count, $"Tracks: {_testFiles[i]}"); for(int i = 0; i < _testFiles.Length; i++) - _trackSessions[i].Should(). - BeEquivalentTo(images[i].Tracks.Select(t => t.TrackSession), - $"Track session: {_testFiles[i]}"); + images[i].Tracks.Select(t => t.TrackSession).Should(). + BeEquivalentTo(_trackSessions[i], $"Track session: {_testFiles[i]}"); for(int i = 0; i < _testFiles.Length; i++) - _trackStarts[i].Should().BeEquivalentTo(images[i].Tracks.Select(t => t.TrackStartSector), - $"Track start: {_testFiles[i]}"); + images[i].Tracks.Select(t => t.TrackStartSector).Should(). + BeEquivalentTo(_trackStarts[i], $"Track start: {_testFiles[i]}"); for(int i = 0; i < _testFiles.Length; i++) - _trackEnds[i].Should(). - BeEquivalentTo(images[i].Tracks.Select(t => t.TrackEndSector), - $"Track end: {_testFiles[i]}"); + images[i].Tracks.Select(t => t.TrackEndSector).Should(). + BeEquivalentTo(_trackEnds[i], $"Track end: {_testFiles[i]}"); for(int i = 0; i < _testFiles.Length; i++) - _trackPregaps[i].Should(). - BeEquivalentTo(images[i].Tracks.Select(t => t.TrackPregap), - $"Track pregap: {_testFiles[i]}"); + images[i].Tracks.Select(t => t.TrackPregap).Should(). + BeEquivalentTo(_trackPregaps[i], $"Track pregap: {_testFiles[i]}"); for(int i = 0; i < _testFiles.Length; i++) { diff --git a/Aaru.Tests/Images/BlindWrite4.cs b/Aaru.Tests/Images/BlindWrite4.cs index 9d1236c47..446fe6c07 100644 --- a/Aaru.Tests/Images/BlindWrite4.cs +++ b/Aaru.Tests/Images/BlindWrite4.cs @@ -1038,23 +1038,20 @@ namespace Aaru.Tests.Images Assert.AreEqual(_tracks[i], images[i].Tracks.Count, $"Tracks: {_testFiles[i]}"); for(int i = 0; i < _testFiles.Length; i++) - _trackSessions[i].Should(). - BeEquivalentTo(images[i].Tracks.Select(t => t.TrackSession), - $"Track session: {_testFiles[i]}"); + images[i].Tracks.Select(t => t.TrackSession).Should(). + BeEquivalentTo(_trackSessions[i], $"Track session: {_testFiles[i]}"); for(int i = 0; i < _testFiles.Length; i++) - _trackStarts[i].Should().BeEquivalentTo(images[i].Tracks.Select(t => t.TrackStartSector), - $"Track start: {_testFiles[i]}"); + images[i].Tracks.Select(t => t.TrackStartSector).Should(). + BeEquivalentTo(_trackStarts[i], $"Track start: {_testFiles[i]}"); for(int i = 0; i < _testFiles.Length; i++) - _trackEnds[i].Should(). - BeEquivalentTo(images[i].Tracks.Select(t => t.TrackEndSector), - $"Track end: {_testFiles[i]}"); + images[i].Tracks.Select(t => t.TrackEndSector).Should(). + BeEquivalentTo(_trackEnds[i], $"Track end: {_testFiles[i]}"); for(int i = 0; i < _testFiles.Length; i++) - _trackPregaps[i].Should(). - BeEquivalentTo(images[i].Tracks.Select(t => t.TrackPregap), - $"Track pregap: {_testFiles[i]}"); + images[i].Tracks.Select(t => t.TrackPregap).Should(). + BeEquivalentTo(_trackPregaps[i], $"Track pregap: {_testFiles[i]}"); for(int i = 0; i < _testFiles.Length; i++) { diff --git a/Aaru.Tests/Images/BlindWrite5.cs b/Aaru.Tests/Images/BlindWrite5.cs index c07a5dc5d..0d5c57ac3 100644 --- a/Aaru.Tests/Images/BlindWrite5.cs +++ b/Aaru.Tests/Images/BlindWrite5.cs @@ -1225,23 +1225,20 @@ namespace Aaru.Tests.Images Assert.AreEqual(_tracks[i], images[i].Tracks.Count, $"Tracks: {_testFiles[i]}"); for(int i = 0; i < _testFiles.Length; i++) - _trackSessions[i].Should(). - BeEquivalentTo(images[i].Tracks.Select(t => t.TrackSession), - $"Track session: {_testFiles[i]}"); + images[i].Tracks.Select(t => t.TrackSession).Should(). + BeEquivalentTo(_trackSessions[i], $"Track session: {_testFiles[i]}"); for(int i = 0; i < _testFiles.Length; i++) - _trackStarts[i].Should().BeEquivalentTo(images[i].Tracks.Select(t => t.TrackStartSector), - $"Track start: {_testFiles[i]}"); + images[i].Tracks.Select(t => t.TrackStartSector).Should(). + BeEquivalentTo(_trackStarts[i], $"Track start: {_testFiles[i]}"); for(int i = 0; i < _testFiles.Length; i++) - _trackEnds[i].Should(). - BeEquivalentTo(images[i].Tracks.Select(t => t.TrackEndSector), - $"Track end: {_testFiles[i]}"); + images[i].Tracks.Select(t => t.TrackEndSector).Should(). + BeEquivalentTo(_trackEnds[i], $"Track end: {_testFiles[i]}"); for(int i = 0; i < _testFiles.Length; i++) - _trackPregaps[i].Should(). - BeEquivalentTo(images[i].Tracks.Select(t => t.TrackPregap), - $"Track pregap: {_testFiles[i]}"); + images[i].Tracks.Select(t => t.TrackPregap).Should(). + BeEquivalentTo(_trackPregaps[i], $"Track pregap: {_testFiles[i]}"); for(int i = 0; i < _testFiles.Length; i++) { diff --git a/Aaru.Tests/Images/BlindWrite6.cs b/Aaru.Tests/Images/BlindWrite6.cs index b80e2fb64..1d124ebd4 100644 --- a/Aaru.Tests/Images/BlindWrite6.cs +++ b/Aaru.Tests/Images/BlindWrite6.cs @@ -498,26 +498,20 @@ namespace Aaru.Tests.Images Assert.AreEqual(_mediaTypes[i], images[i].Info.MediaType, $"Media type: {_testFiles[i]}"); for(int i = 0; i < _testFiles.Length; i++) - Assert.AreEqual(_tracks[i], images[i].Tracks.Count, $"Tracks: {_testFiles[i]}"); + images[i].Tracks.Select(t => t.TrackSession).Should(). + BeEquivalentTo(_trackSessions[i], $"Track session: {_testFiles[i]}"); for(int i = 0; i < _testFiles.Length; i++) - _trackSessions[i].Should(). - BeEquivalentTo(images[i].Tracks.Select(t => t.TrackSession), - $"Track session: {_testFiles[i]}"); + images[i].Tracks.Select(t => t.TrackStartSector).Should(). + BeEquivalentTo(_trackStarts[i], $"Track start: {_testFiles[i]}"); for(int i = 0; i < _testFiles.Length; i++) - _trackStarts[i].Should().BeEquivalentTo(images[i].Tracks.Select(t => t.TrackStartSector), - $"Track start: {_testFiles[i]}"); + images[i].Tracks.Select(t => t.TrackEndSector).Should(). + BeEquivalentTo(_trackEnds[i], $"Track end: {_testFiles[i]}"); for(int i = 0; i < _testFiles.Length; i++) - _trackEnds[i].Should(). - BeEquivalentTo(images[i].Tracks.Select(t => t.TrackEndSector), - $"Track end: {_testFiles[i]}"); - - for(int i = 0; i < _testFiles.Length; i++) - _trackPregaps[i].Should(). - BeEquivalentTo(images[i].Tracks.Select(t => t.TrackPregap), - $"Track pregap: {_testFiles[i]}"); + images[i].Tracks.Select(t => t.TrackPregap).Should(). + BeEquivalentTo(_trackPregaps[i], $"Track pregap: {_testFiles[i]}"); for(int i = 0; i < _testFiles.Length; i++) { diff --git a/Aaru.Tests/Images/BlindWrite7.cs b/Aaru.Tests/Images/BlindWrite7.cs index c03ba1b77..1caed2439 100644 --- a/Aaru.Tests/Images/BlindWrite7.cs +++ b/Aaru.Tests/Images/BlindWrite7.cs @@ -259,23 +259,20 @@ namespace Aaru.Tests.Images Assert.AreEqual(_tracks[i], images[i].Tracks.Count, $"Tracks: {_testFiles[i]}"); for(int i = 0; i < _testFiles.Length; i++) - _trackSessions[i].Should(). - BeEquivalentTo(images[i].Tracks.Select(t => t.TrackSession), - $"Track session: {_testFiles[i]}"); + images[i].Tracks.Select(t => t.TrackSession).Should(). + BeEquivalentTo(_trackSessions[i], $"Track session: {_testFiles[i]}"); for(int i = 0; i < _testFiles.Length; i++) - _trackStarts[i].Should().BeEquivalentTo(images[i].Tracks.Select(t => t.TrackStartSector), - $"Track start: {_testFiles[i]}"); + images[i].Tracks.Select(t => t.TrackStartSector).Should(). + BeEquivalentTo(_trackStarts[i], $"Track start: {_testFiles[i]}"); for(int i = 0; i < _testFiles.Length; i++) - _trackEnds[i].Should(). - BeEquivalentTo(images[i].Tracks.Select(t => t.TrackEndSector), - $"Track end: {_testFiles[i]}"); + images[i].Tracks.Select(t => t.TrackEndSector).Should(). + BeEquivalentTo(_trackEnds[i], $"Track end: {_testFiles[i]}"); for(int i = 0; i < _testFiles.Length; i++) - _trackPregaps[i].Should(). - BeEquivalentTo(images[i].Tracks.Select(t => t.TrackPregap), - $"Track pregap: {_testFiles[i]}"); + images[i].Tracks.Select(t => t.TrackPregap).Should(). + BeEquivalentTo(_trackPregaps[i], $"Track pregap: {_testFiles[i]}"); for(int i = 0; i < _testFiles.Length; i++) { diff --git a/Aaru.Tests/Images/CDRWin.cs b/Aaru.Tests/Images/CDRWin.cs index bff494f3c..02637a38b 100644 --- a/Aaru.Tests/Images/CDRWin.cs +++ b/Aaru.Tests/Images/CDRWin.cs @@ -898,23 +898,20 @@ namespace Aaru.Tests.Images Assert.AreEqual(_tracks[i], images[i].Tracks.Count, $"Tracks: {_testFiles[i]}"); for(int i = 0; i < _testFiles.Length; i++) - _trackSessions[i].Should(). - BeEquivalentTo(images[i].Tracks.Select(t => t.TrackSession), - $"Track session: {_testFiles[i]}"); + images[i].Tracks.Select(t => t.TrackSession).Should(). + BeEquivalentTo(_trackSessions[i], $"Track session: {_testFiles[i]}"); for(int i = 0; i < _testFiles.Length; i++) - _trackStarts[i].Should().BeEquivalentTo(images[i].Tracks.Select(t => t.TrackStartSector), - $"Track start: {_testFiles[i]}"); + images[i].Tracks.Select(t => t.TrackStartSector).Should(). + BeEquivalentTo(_trackStarts[i], $"Track start: {_testFiles[i]}"); for(int i = 0; i < _testFiles.Length; i++) - _trackEnds[i].Should(). - BeEquivalentTo(images[i].Tracks.Select(t => t.TrackEndSector), - $"Track end: {_testFiles[i]}"); + images[i].Tracks.Select(t => t.TrackEndSector).Should(). + BeEquivalentTo(_trackEnds[i], $"Track end: {_testFiles[i]}"); for(int i = 0; i < _testFiles.Length; i++) - _trackPregaps[i].Should(). - BeEquivalentTo(images[i].Tracks.Select(t => t.TrackPregap), - $"Track pregap: {_testFiles[i]}"); + images[i].Tracks.Select(t => t.TrackPregap).Should(). + BeEquivalentTo(_trackPregaps[i], $"Track pregap: {_testFiles[i]}"); for(int i = 0; i < _testFiles.Length; i++) { diff --git a/Aaru.Tests/Images/CloneCD.cs b/Aaru.Tests/Images/CloneCD.cs index 5963b4f53..703f1c4d1 100644 --- a/Aaru.Tests/Images/CloneCD.cs +++ b/Aaru.Tests/Images/CloneCD.cs @@ -480,23 +480,20 @@ namespace Aaru.Tests.Images Assert.AreEqual(_tracks[i], images[i].Tracks.Count, $"Tracks: {_testFiles[i]}"); for(int i = 0; i < _testFiles.Length; i++) - _trackSessions[i].Should(). - BeEquivalentTo(images[i].Tracks.Select(t => t.TrackSession), - $"Track session: {_testFiles[i]}"); + images[i].Tracks.Select(t => t.TrackSession).Should(). + BeEquivalentTo(_trackSessions[i], $"Track session: {_testFiles[i]}"); for(int i = 0; i < _testFiles.Length; i++) - _trackStarts[i].Should().BeEquivalentTo(images[i].Tracks.Select(t => t.TrackStartSector), - $"Track start: {_testFiles[i]}"); + images[i].Tracks.Select(t => t.TrackStartSector).Should(). + BeEquivalentTo(_trackStarts[i], $"Track start: {_testFiles[i]}"); for(int i = 0; i < _testFiles.Length; i++) - _trackEnds[i].Should(). - BeEquivalentTo(images[i].Tracks.Select(t => t.TrackEndSector), - $"Track end: {_testFiles[i]}"); + images[i].Tracks.Select(t => t.TrackEndSector).Should(). + BeEquivalentTo(_trackEnds[i], $"Track end: {_testFiles[i]}"); for(int i = 0; i < _testFiles.Length; i++) - _trackPregaps[i].Should(). - BeEquivalentTo(images[i].Tracks.Select(t => t.TrackPregap), - $"Track pregap: {_testFiles[i]}"); + images[i].Tracks.Select(t => t.TrackPregap).Should(). + BeEquivalentTo(_trackPregaps[i], $"Track pregap: {_testFiles[i]}"); for(int i = 0; i < _testFiles.Length; i++) {