Code cleanup, reduced duplication.

Author: kurtanr

SimpleSudokuSolver.Tests/DefaultSolverTests.cs

@@ -1,6 +1,5 @@
 using NUnit.Framework;
 using SimpleSudokuSolver.Strategy;
-using System.Linq;
 
 namespace SimpleSudokuSolver.Tests
 {
@@ -38,7 +37,7 @@ public void DefaultSolverWithOnlyEliminationStrategies_CannotSolvePuzzle_Test()
     }
 
     [Test]
-    public void SolveSingleStepForSolvedPuzle_ReturnsNull_Test()
+    public void SolveSingleStepForSolvedPuzzle_ReturnsNull_Test()
     {
       var defaultSolver = new DefaultSolver();
       var sudokuPuzzle = defaultSolver.Solve(_sudoku);

SimpleSudokuSolver.Tests/Model/RowTests.cs

@@ -38,7 +38,7 @@ public void ToStringTest()
       row.Cells[3] = new Cell(4);
       row.Cells[8] = new Cell(0);
       toString = row.ToString();
-      Assert.That(toString, Is.EqualTo($"1     4         0"));
+      Assert.That(toString, Is.EqualTo("1     4         0"));
     }
   }
 }

SimpleSudokuSolver.Tests/Strategy/HiddenPairTests.cs

@@ -11,7 +11,7 @@ public class HiddenPairTests : BaseStrategyTest
     [Test]
     public void HiddenPairTest1()
     {
-      var sudoku = new int[,]
+      var sudoku = new [,]
       {
         // From: http://www.sudokuwiki.org/Hidden_Candidates
         { 0,0,0,0,0,0,0,0,0 },
@@ -43,7 +43,7 @@ public void HiddenPairTest1()
     [Test]
     public void HiddenPairTest2()
     {
-      var sudoku = new int[,]
+      var sudoku = new [,]
       {
         // From: http://www.sudokuwiki.org/Hidden_Candidates
         { 7,2,0,4,0,8,0,3,0 },

SimpleSudokuSolver.Tests/Strategy/HiddenQuadTests.cs

@@ -11,7 +11,7 @@ public class HiddenQuadTests : BaseStrategyTest
     [Test]
     public void HiddenQuadTest1()
     {
-      var sudoku = new int[,]
+      var sudoku = new [,]
       {
         // From: http://www.sudokuwiki.org/Hidden_Candidates
         { 6,5,0,0,8,7,0,2,4 },
@@ -45,7 +45,7 @@ public void HiddenQuadTest1()
     [Test]
     public void HiddenQuadTest2()
     {
-      var sudoku = new int[,]
+      var sudoku = new [,]
       {
         // From: http://www.sudokuwiki.org/Hidden_Candidates
         { 9,0,1,5,0,0,0,4,6 },

SimpleSudokuSolver.Tests/Strategy/HiddenSingleTests.cs

@@ -11,7 +11,7 @@ public class HiddenSingleTests : BaseStrategyTest
     [Test]
     public void HiddenSingleTest1()
     {
-      var sudoku = new int[,]
+      var sudoku = new [,]
       {
         // From: http://www.sudokuwiki.org/Getting_Started
         { 2,0,0,0,7,0,0,3,8 },
@@ -34,7 +34,7 @@ public void HiddenSingleTest1()
     [Test]
     public void HiddenSingleTest2()
     {
-      var sudoku = new int[,]
+      var sudoku = new [,]
       {
         // From: https://sudoku9x9.com/hidden_single.html
         { 0,0,0,0,0,0,0,0,0 },
@@ -53,27 +53,5 @@ public void HiddenSingleTest2()
 
       Assert.That(sudokuPuzzle.Cells[4, 1].Value, Is.EqualTo(2));
     }
-
-    [Test]
-    public void HiddenSingleTest3()
-    {
-      var sudoku = new int[,]
-      {
-        { 0,0,0,0,3,0,0,8,6 },
-        { 0,0,0,0,2,0,0,4,0 },
-        { 0,0,0,0,7,8,5,2,0 },
-        { 3,7,1,8,5,6,2,9,4 },
-        { 9,0,0,1,4,2,3,7,5 },
-        { 4,0,0,3,9,7,6,1,8 },
-        { 2,0,0,7,0,3,8,5,9 },
-        { 0,3,9,2,0,5,4,6,7 },
-        { 7,0,0,9,0,4,1,3,2 }
-      };
-
-      var sudokuPuzzle = new SudokuPuzzle(sudoku);
-      SolveUsingStrategy(sudokuPuzzle, _strategy);
-
-      Assert.That(sudokuPuzzle.Cells[2, 1].Value, Is.EqualTo(9));
-    }
   }
 }

SimpleSudokuSolver.Tests/Strategy/HiddenTripleTests.cs

@@ -11,7 +11,7 @@ public class HiddenTripleTests : BaseStrategyTest
     [Test]
     public void HiddenTripleTest1()
     {
-      var sudoku = new int[,]
+      var sudoku = new [,]
       {
         // From: http://www.sudokuwiki.org/Hidden_Candidates
         { 0,0,0,0,0,1,0,3,0 },

SimpleSudokuSolver.Tests/Strategy/LockedCandidatesPointingTests.cs

@@ -11,7 +11,7 @@ public class LockedCandidatesPointingTests : BaseStrategyTest
     [Test]
     public void LockedCandidatesPointingInColumnTest()
     {
-      var sudoku = new int[,]
+      var sudoku = new [,]
       {
         // From: https://sudoku9x9.com/locked_candidates.html
         { 0,1,2,0,0,0,0,0,0 },
@@ -40,7 +40,7 @@ public void LockedCandidatesPointingInColumnTest()
     public void LockedCandidatesPointingInRowTest()
     {
       // From: https://sudoku9x9.com/locked_candidates.html, transposed
-      var sudoku = new int[,]
+      var sudoku = new [,]
       {
         { 0,0,0,0,0,0,0,0,0 },
         { 1,0,5,0,0,0,0,0,0 },
@@ -67,7 +67,7 @@ public void LockedCandidatesPointingInRowTest()
     [Test]
     public void LockedCandidatesPointingTest1()
     {
-      var sudoku = new int[,]
+      var sudoku = new [,]
       {
         // From: http://www.sudokuwiki.org/Intersection_Removal
         { 0,1,7,9,0,3,6,0,0 },
@@ -97,7 +97,7 @@ public void LockedCandidatesPointingTest1()
     [Test]
     public void LockedCandidatesPointingTest2()
     {
-      var sudoku = new int[,]
+      var sudoku = new [,]
       {
         // From: http://www.sudokuwiki.org/Intersection_Removal
         { 0,3,2,0,0,6,1,0,0 },
@@ -151,7 +151,7 @@ public void LockedCandidatesPointingTest2()
     [Test]
     public void LockedCandidatesPointingTest3()
     {
-      var sudoku = new int[,]
+      var sudoku = new [,]
       {
         // From: http://www.sudokuwiki.org/Intersection_Removal
         { 9,3,0,0,5,0,0,0,0 },

SimpleSudokuSolver.Tests/Strategy/NakedPairTests.cs

@@ -12,7 +12,7 @@ public class NakedPairTests : BaseStrategyTest
     public void NakedPairInRowTest()
     {
       // From: https://sudoku9x9.com/naked_pair.html
-      var sudoku = new int[,]
+      var sudoku = new [,]
       {
         { 9,0,0,4,0,0,1,0,0 },
         { 0,5,6,0,0,0,0,0,0 },
@@ -37,7 +37,7 @@ public void NakedPairInRowTest()
     public void NakedPairInColumnTest()
     {
       // From: https://sudoku9x9.com/naked_pair.html, transposed
-      var sudoku = new int[,]
+      var sudoku = new [,]
       {
         { 9,0,0,0,0,0,0,0,0 },
         { 0,5,7,0,0,0,0,0,0 },
@@ -61,7 +61,7 @@ public void NakedPairInColumnTest()
     [Test]
     public void NakedPairTest1()
     {
-      var sudoku = new int[,]
+      var sudoku = new [,]
       {
         // From: http://www.sudokuwiki.org/Naked_Candidates
         { 4,0,0,0,0,0,9,3,8 },
@@ -92,7 +92,7 @@ public void NakedPairTest1()
     [Test]
     public void NakedPairTest2()
     {
-      var sudoku = new int[,]
+      var sudoku = new [,]
       {
         // From: http://www.sudokuwiki.org/Naked_Candidates
         { 0,8,0,0,9,0,0,3,0 },

SimpleSudokuSolver.Tests/Strategy/NakedQuadTests.cs

@@ -11,7 +11,7 @@ public class NakedQuadTests : BaseStrategyTest
     [Test]
     public void NakedQuadTest1()
     {
-      var sudoku = new int[,]
+      var sudoku = new [,]
       {
         // From: http://www.sudokuwiki.org/Naked_Candidates
         // Contains one naked quad in block, and after that, one naked quad in row
@@ -41,7 +41,7 @@ public void NakedQuadTest1()
     [Test]
     public void NakedQuadTest2()
     {
-      var sudoku = new int[,]
+      var sudoku = new [,]
       {
         // From: http://www.manifestmaster.com/jetsudoku/nakedQuad.html
         // Naked quad in column - must first use LockedCandidatesPointing to eliminate some candidates

SimpleSudokuSolver.Tests/Strategy/NakedSingleTests.cs

@@ -11,7 +11,7 @@ public class NakedSingleTests : BaseStrategyTest
     [Test]
     public void NakedSingleTest1()
     {
-      var sudoku = new int[,]
+      var sudoku = new [,]
       {
         // From: http://www.sudokuwiki.org/Getting_Started
         { 2,4,6,0,7,0,0,3,8 },
@@ -34,7 +34,7 @@ public void NakedSingleTest1()
     [Test]
     public void NakedSingleTest2()
     {
-      var sudoku = new int[,]
+      var sudoku = new [,]
       {
         // From: https://sudoku9x9.com/naked_single.html
         { 0,0,0,1,0,2,0,0,0 },