Updated tests

src/main/java/com/mattrixwv/project_euler/problems/Problem18.java

@@ -44,6 +44,7 @@ package com.mattrixwv.project_euler.problems;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
+import java.util.StringJoiner;
 
 
 public class Problem18 extends Problem{
@@ -211,13 +212,14 @@ public class Problem18 extends Problem{
 	//Returns the pyramid that was traversed as a string
 	public String getPyramid(){
 		solvedCheck("pyramid of numbers");
-		StringBuilder results = new StringBuilder();
+		StringJoiner results = new StringJoiner("\n");
 		//Loop through all elements of the list and print them
 		for(ArrayList<Integer> row : list){
+			StringJoiner rowJoiner = new StringJoiner(" ");
 			for(int column : row){
-				results.append(String.format("%2d ", column));
+				rowJoiner.add(String.format("%2d", column));
 			}
-			results.append('\n');
+			results.add(rowJoiner.toString());
 		}
 		return results.toString();
 	}
@@ -225,7 +227,7 @@ public class Problem18 extends Problem{
 	public String getTrail(){
 		solvedCheck("trail of the shortest path");
 
-		StringBuilder results = new StringBuilder();
+		StringJoiner results = new StringJoiner("->");
 		//Save the trail the algorithm took
 		ArrayList<Location> trail = new ArrayList<>();
 		trail.add(foundPoints.get(foundPoints.size() - 1));
@@ -236,7 +238,7 @@ public class Problem18 extends Problem{
 			Location toAdd = null;
 			while(!found){
 				if(loc < 0){
-					results.append("Error: Location < 0\n");
+					results.add("Error: Location < 0\n");
 					System.exit(1);
 				}
 				Iterator<Location> it = foundPoints.iterator();
@@ -272,10 +274,7 @@ public class Problem18 extends Problem{
 		}
 
 		for(Location loc : trail){
-			results.append(list.get(loc.yLocation).get(loc.xLocation));
+			results.add(list.get(loc.yLocation).get(loc.xLocation).toString());
-			if(loc.yLocation < (list.size() - 1)){
-				results.append("->");
-			}
 		}
 
 		return results.toString();

src/test/java/com/mattrixwv/project_euler/problems/ProblemBaseTest.java

@@ -24,7 +24,7 @@ import com.mattrixwv.project_euler.exceptions.Unsolved;
 @ExtendWith(MockitoExtension.class)
 @TestInstance(Lifecycle.PER_CLASS)
 @TestMethodOrder(OrderAnnotation.class)
-public abstract class BaseTest{
+public abstract class ProblemBaseTest{
 	@Spy
 	protected Stopwatch timer;
 	protected static String description;

src/test/java/com/mattrixwv/project_euler/problems/TestProblem1.java

@@ -11,7 +11,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem1 extends BaseTest{
+public class TestProblem1 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem1 problem = new Problem1();
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem10.java

@@ -11,7 +11,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem10 extends BaseTest{
+public class TestProblem10 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem10 problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem11.java

@@ -13,7 +13,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem11 extends BaseTest{
+public class TestProblem11 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem11 problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem12.java

@@ -11,7 +11,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem12 extends BaseTest{
+public class TestProblem12 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem12 problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem13.java

@@ -13,7 +13,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem13 extends BaseTest{
+public class TestProblem13 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem13 problem;
 	static{
@@ -36,7 +36,7 @@ public class TestProblem13 extends BaseTest{
 		assertThrows(Unsolved.class, () -> { problem.getNumbers(); });
 		assertThrows(Unsolved.class, () -> { problem.getSum(); });
 
-		problem.solve();
+		super.testSolve(problem);
 
 		//Verify result
 		assertEquals(100, problem.getNumbers().size());

src/test/java/com/mattrixwv/project_euler/problems/TestProblem14.java

@@ -11,7 +11,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem14 extends BaseTest{
+public class TestProblem14 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem14 problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem15.java

@@ -11,7 +11,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem15 extends BaseTest{
+public class TestProblem15 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem15Override problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem16.java

@@ -11,7 +11,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem16 extends BaseTest{
+public class TestProblem16 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem16 problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem17.java

@@ -11,7 +11,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem17 extends BaseTest{
+public class TestProblem17 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem17 problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem18.java

@@ -11,7 +11,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem18 extends BaseTest{
+public class TestProblem18 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem18 problem;
 	static{
@@ -37,6 +37,8 @@ public class TestProblem18 extends BaseTest{
 
 		//Verify result
 		assertEquals(1074, problem.getTotal());
+		assertEquals(String.format("75\n95 64\n17 47 82\n18 35 87 10\n20  4 82 47 65\n19  1 23 75  3 34\n88  2 77 73  7 63 67\n99 65  4 28  6 16 70 92\n41 41 26 56 83 40 80 70 33\n41 48 72 33 47 32 37 16 94 29\n53 71 44 65 25 43 91 52 97 51 14\n70 11 33 28 77 73 17 78 39 68 17 57\n91 71 52 38 17 14 91 43 58 50 27 29 48\n63 66  4 68 89 53 67 30 73 16 69 87 40 31\n 4 62 98 27 23  9 70 98 73 93 38 53 60  4 23"), problem.getPyramid());
+		assertEquals("75->95->47->35->4->23->73->6->40->37->91->78->58->73->93", problem.getTrail());
 	}
 
 	@Test

src/test/java/com/mattrixwv/project_euler/problems/TestProblem19.java

@@ -11,7 +11,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem19 extends BaseTest{
+public class TestProblem19 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem19 problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem2.java

@@ -11,7 +11,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem2 extends BaseTest{
+public class TestProblem2 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem2 problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem20.java

@@ -13,7 +13,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem20 extends BaseTest{
+public class TestProblem20 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem20 problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem21.java

@@ -13,7 +13,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem21 extends BaseTest{
+public class TestProblem21 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem21 problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem22.java

@@ -11,7 +11,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem22 extends BaseTest{
+public class TestProblem22 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem22 problem;
 	static{
@@ -36,6 +36,7 @@ public class TestProblem22 extends BaseTest{
 		super.testSolve(problem);
 
 		//Verify result
+		assertEquals(5163, Problem22.getNames().size());
 		assertEquals(871198282L, problem.getNameScoreSum());
 	}
 

src/test/java/com/mattrixwv/project_euler/problems/TestProblem23.java

@@ -11,7 +11,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem23 extends BaseTest{
+public class TestProblem23 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem23Override problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem24.java

@@ -11,7 +11,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem24 extends BaseTest{
+public class TestProblem24 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem24Override problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem25.java

@@ -13,7 +13,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem25 extends BaseTest{
+public class TestProblem25 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem25 problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem26.java

@@ -11,7 +11,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem26 extends BaseTest{
+public class TestProblem26 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem26 problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem27.java

@@ -11,7 +11,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem27 extends BaseTest{
+public class TestProblem27 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem27 problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem28.java

@@ -12,7 +12,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem28 extends BaseTest{
+public class TestProblem28 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem28 problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem29.java

@@ -11,7 +11,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem29 extends BaseTest{
+public class TestProblem29 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem29 problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem3.java

@@ -12,7 +12,7 @@ import com.mattrixwv.NumberAlgorithms;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem3 extends BaseTest{
+public class TestProblem3 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem3 problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem30.java

@@ -13,7 +13,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem30 extends BaseTest{
+public class TestProblem30 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem30 problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem31.java

@@ -11,7 +11,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem31 extends BaseTest{
+public class TestProblem31 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem31 problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem32.java

@@ -11,7 +11,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem32 extends BaseTest{
+public class TestProblem32 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem32 problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem33.java

@@ -13,7 +13,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem33 extends BaseTest{
+public class TestProblem33 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem33 problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem34.java

@@ -13,7 +13,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem34 extends BaseTest{
+public class TestProblem34 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem34 problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem35.java

@@ -11,7 +11,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem35 extends BaseTest{
+public class TestProblem35 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem35Override problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem36.java

@@ -11,7 +11,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem36 extends BaseTest{
+public class TestProblem36 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem36 problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem37.java

@@ -11,7 +11,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem37 extends BaseTest{
+public class TestProblem37 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem37 problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem38.java

@@ -11,7 +11,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem38 extends BaseTest{
+public class TestProblem38 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem38 problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem39.java

@@ -14,7 +14,7 @@ import com.mattrixwv.Triple;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem39 extends BaseTest{
+public class TestProblem39 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem39Override problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem4.java

@@ -11,7 +11,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem4 extends BaseTest{
+public class TestProblem4 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem4 problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem40.java

@@ -11,7 +11,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem40 extends BaseTest{
+public class TestProblem40 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem40 problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem41.java

@@ -11,7 +11,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem41 extends BaseTest{
+public class TestProblem41 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem41 problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem42.java

@@ -11,7 +11,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem42 extends BaseTest{
+public class TestProblem42 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem42 problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem43.java

@@ -13,7 +13,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem43 extends BaseTest{
+public class TestProblem43 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem43Override problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem44.java

@@ -11,7 +11,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem44 extends BaseTest{
+public class TestProblem44 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem44 problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem45.java

@@ -11,7 +11,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem45 extends BaseTest{
+public class TestProblem45 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem45 problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem46.java

@@ -11,7 +11,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem46 extends BaseTest{
+public class TestProblem46 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem46 problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem47.java

@@ -11,7 +11,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem47 extends BaseTest{
+public class TestProblem47 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem47 problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem48.java

@@ -13,7 +13,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem48 extends BaseTest{
+public class TestProblem48 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem48 problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem49.java

@@ -11,7 +11,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem49 extends BaseTest{
+public class TestProblem49 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem49 problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem5.java

@@ -11,7 +11,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem5 extends BaseTest{
+public class TestProblem5 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem5 problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem50.java

@@ -11,7 +11,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem50 extends BaseTest{
+public class TestProblem50 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem50 problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem6.java

@@ -11,7 +11,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem6 extends BaseTest{
+public class TestProblem6 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem6 problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem67.java

@@ -9,7 +9,7 @@ import org.mockito.InjectMocks;
 
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
-public class TestProblem67 extends BaseTest{
+public class TestProblem67 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem67 problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem7.java

@@ -11,7 +11,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem7 extends BaseTest{
+public class TestProblem7 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem7 problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem8.java

@@ -11,7 +11,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem8 extends BaseTest{
+public class TestProblem8 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem8 problem;
 	static{

src/test/java/com/mattrixwv/project_euler/problems/TestProblem9.java

@@ -11,7 +11,7 @@ import org.mockito.InjectMocks;
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-public class TestProblem9 extends BaseTest{
+public class TestProblem9 extends ProblemBaseTest{
 	@InjectMocks
 	private Problem9 problem;
 	static{