Refactored TestData

LodewijkSioen · Mar 9, 2014 · 0fc0c84 · 0fc0c84
1 parent 31632c1
commit 0fc0c84
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 55 deletions.
diff --git a/src/CdRipper.Tests/DummyData.cs b/src/CdRipper.Tests/DummyData.cs
@@ -5,54 +5,65 @@ namespace CdRipper.Tests
 {
  public static class DummyData
  {
- public static TableOfContents GetTableOfContentsForJuniorEuroSong2011()
+ public static class JuniorEuroSong2011
  {
- return new TableOfContents(new List<Track>
+ public static TableOfContents GetTableOfContents()
  {
- new Track(1, 150, 12836),
- new Track(2, 12986, 12273),
- new Track(3, 25259, 12732),
- new Track(4, 37991, 11353),
- new Track(5, 49344, 12149),
- new Track(6, 61493, 12495),
- new Track(7, 73988, 12486),
- new Track(8, 86474, 12763),
- new Track(9, 99237, 12441),
- new Track(10, 111678, 13419),
- new Track(11, 125097, 12844),
- new Track(12, 137941, 12284),
- new Track(13, 150225, 12766),
- new Track(14, 162991, 11334),
- new Track(15, 174325, 12187),
- new Track(16, 186512, 12469),
- new Track(17, 198981, 12486),
- new Track(18, 211467, 12800),
- new Track(19, 224267, 12446),
- new Track(20, 236713, 13351),
- });
+ return new TableOfContents(new List<Track>
+ {
+ new Track(1, 150, 12836),
+ new Track(2, 12986, 12273),
+ new Track(3, 25259, 12732),
+ new Track(4, 37991, 11353),
+ new Track(5, 49344, 12149),
+ new Track(6, 61493, 12495),
+ new Track(7, 73988, 12486),
+ new Track(8, 86474, 12763),
+ new Track(9, 99237, 12441),
+ new Track(10, 111678, 13419),
+ new Track(11, 125097, 12844),
+ new Track(12, 137941, 12284),
+ new Track(13, 150225, 12766),
+ new Track(14, 162991, 11334),
+ new Track(15, 174325, 12187),
+ new Track(16, 186512, 12469),
+ new Track(17, 198981, 12486),
+ new Track(18, 211467, 12800),
+ new Track(19, 224267, 12446),
+ new Track(20, 236713, 13351),
+ });
+ }
+
+ public static string MusicBrainzDiscId { get { return "WMnoPf6.FF0PALnVth5jCRT1LxI-"; } }
+ public static string CdDcDiscId { get { return "290d0414"; } }
  }
 
- public static TableOfContents GetTableOfContentsForSteekJeVingerInDeLucht()
+ public static class SteekJeVingerInDeLucht
  {
- return new TableOfContents(new List<Track>
+ public static TableOfContents GetTableOfContents()
  {
- new Track(1, 150, 12771),
- new Track(2, 12921, 11398),
- new Track(3, 24319, 10543),
- new Track(4, 34862, 11730),
- new Track(5, 46592, 12497),
- new Track(6, 59089, 15848),
- new Track(7, 74937, 10851),
- new Track(8, 85788, 11458),
- new Track(9, 97246, 8963),
- new Track(10, 106209, 16946),
- new Track(11, 123155, 15943),
- new Track(12, 139098, 8336),
- new Track(13, 147434, 9688),
- new Track(14, 157122, 10506),
- });
- }
+ return new TableOfContents(new List<Track>
+ {
+ new Track(1, 150, 12771),
+ new Track(2, 12921, 11398),
+ new Track(3, 24319, 10543),
+ new Track(4, 34862, 11730),
+ new Track(5, 46592, 12497),
+ new Track(6, 59089, 15848),
+ new Track(7, 74937, 10851),
+ new Track(8, 85788, 11458),
+ new Track(9, 97246, 8963),
+ new Track(10, 106209, 16946),
+ new Track(11, 123155, 15943),
+ new Track(12, 139098, 8336),
+ new Track(13, 147434, 9688),
+ new Track(14, 157122, 10506),
+ });
+ }
 
- public static string MusicBrainzDiscIdSteekJeVingerInDeLucht { get {return "xvIXvh0ibMHH1NNGkT_txTh.2f4-";} }
+ public static string MusicBrainzDiscId { get { return "xvIXvh0ibMHH1NNGkT_txTh.2f4-"; } }
+ public static string MusicBrainzReleaseId { get { return "1477983c-5e51-4946-89a3-4f8024988056"; } }
+ public static string CdDbDiscId { get { return "c708b90e"; }}
+ }
  }
 }
diff --git a/src/CdRipper.Tests/Tagging/TestCdDbCalculator.cs b/src/CdRipper.Tests/Tagging/TestCdDbCalculator.cs
@@ -16,13 +16,13 @@ public string TestCalculationOfDiscIdWithMusicBrainz(TableOfContents toc)
 
  public IEnumerable<TestCaseData> GetTestMusicBrainz()
  {
- yield return new TestCaseData(DummyData.GetTableOfContentsForJuniorEuroSong2011())
+ yield return new TestCaseData(DummyData.JuniorEuroSong2011.GetTableOfContents())
  .SetName("Junior Eurosong 2011")
- .Returns("WMnoPf6.FF0PALnVth5jCRT1LxI-");
+ .Returns(DummyData.JuniorEuroSong2011.MusicBrainzDiscId);
 
- yield return new TestCaseData(DummyData.GetTableOfContentsForSteekJeVingerInDeLucht())
+ yield return new TestCaseData(DummyData.SteekJeVingerInDeLucht.GetTableOfContents())
  .SetName("Steek je vinger in de lucht")
- .Returns(DummyData.MusicBrainzDiscIdSteekJeVingerInDeLucht);
+ .Returns(DummyData.SteekJeVingerInDeLucht.MusicBrainzDiscId);
  }
 
  [TestCaseSource("GetTestCdDb"), Explicit("Still Failing")]
@@ -33,13 +33,13 @@ public string TestCalculationOfDiscIdWithCdDb(TableOfContents toc)
 
  public IEnumerable<TestCaseData> GetTestCdDb()
  {
- yield return new TestCaseData(DummyData.GetTableOfContentsForJuniorEuroSong2011())
+ yield return new TestCaseData(DummyData.JuniorEuroSong2011.GetTableOfContents())
  .SetName("Junior Eurosong 2011")
- .Returns("290d0414");
+ .Returns(DummyData.JuniorEuroSong2011.CdDcDiscId);
 
- yield return new TestCaseData(DummyData.GetTableOfContentsForSteekJeVingerInDeLucht())
+ yield return new TestCaseData(DummyData.SteekJeVingerInDeLucht.GetTableOfContents())
  .SetName("Steek je vinger in de lucht")
- .Returns("c708b90e");
+ .Returns(DummyData.SteekJeVingerInDeLucht.CdDbDiscId);
  }
  }
 }