From 2af4da477e9b55ff24da0fed787f214979b4f0eb Mon Sep 17 00:00:00 2001 From: Mattrixwv Date: Wed, 7 Dec 2022 00:20:15 -0500 Subject: [PATCH] Updated tests --- .../project_euler/problems/Problem18.java | 17 ++++++++--------- .../{BaseTest.java => ProblemBaseTest.java} | 2 +- .../project_euler/problems/TestProblem1.java | 2 +- .../project_euler/problems/TestProblem10.java | 2 +- .../project_euler/problems/TestProblem11.java | 2 +- .../project_euler/problems/TestProblem12.java | 2 +- .../project_euler/problems/TestProblem13.java | 4 ++-- .../project_euler/problems/TestProblem14.java | 2 +- .../project_euler/problems/TestProblem15.java | 2 +- .../project_euler/problems/TestProblem16.java | 2 +- .../project_euler/problems/TestProblem17.java | 2 +- .../project_euler/problems/TestProblem18.java | 4 +++- .../project_euler/problems/TestProblem19.java | 2 +- .../project_euler/problems/TestProblem2.java | 2 +- .../project_euler/problems/TestProblem20.java | 2 +- .../project_euler/problems/TestProblem21.java | 2 +- .../project_euler/problems/TestProblem22.java | 3 ++- .../project_euler/problems/TestProblem23.java | 2 +- .../project_euler/problems/TestProblem24.java | 2 +- .../project_euler/problems/TestProblem25.java | 2 +- .../project_euler/problems/TestProblem26.java | 2 +- .../project_euler/problems/TestProblem27.java | 2 +- .../project_euler/problems/TestProblem28.java | 2 +- .../project_euler/problems/TestProblem29.java | 2 +- .../project_euler/problems/TestProblem3.java | 2 +- .../project_euler/problems/TestProblem30.java | 2 +- .../project_euler/problems/TestProblem31.java | 2 +- .../project_euler/problems/TestProblem32.java | 2 +- .../project_euler/problems/TestProblem33.java | 2 +- .../project_euler/problems/TestProblem34.java | 2 +- .../project_euler/problems/TestProblem35.java | 2 +- .../project_euler/problems/TestProblem36.java | 2 +- .../project_euler/problems/TestProblem37.java | 2 +- .../project_euler/problems/TestProblem38.java | 2 +- .../project_euler/problems/TestProblem39.java | 2 +- .../project_euler/problems/TestProblem4.java | 2 +- .../project_euler/problems/TestProblem40.java | 2 +- .../project_euler/problems/TestProblem41.java | 2 +- .../project_euler/problems/TestProblem42.java | 2 +- .../project_euler/problems/TestProblem43.java | 2 +- .../project_euler/problems/TestProblem44.java | 2 +- .../project_euler/problems/TestProblem45.java | 2 +- .../project_euler/problems/TestProblem46.java | 2 +- .../project_euler/problems/TestProblem47.java | 2 +- .../project_euler/problems/TestProblem48.java | 2 +- .../project_euler/problems/TestProblem49.java | 2 +- .../project_euler/problems/TestProblem5.java | 2 +- .../project_euler/problems/TestProblem50.java | 2 +- .../project_euler/problems/TestProblem6.java | 2 +- .../project_euler/problems/TestProblem67.java | 2 +- .../project_euler/problems/TestProblem7.java | 2 +- .../project_euler/problems/TestProblem8.java | 2 +- .../project_euler/problems/TestProblem9.java | 2 +- 53 files changed, 64 insertions(+), 62 deletions(-) rename src/test/java/com/mattrixwv/project_euler/problems/{BaseTest.java => ProblemBaseTest.java} (98%) diff --git a/src/main/java/com/mattrixwv/project_euler/problems/Problem18.java b/src/main/java/com/mattrixwv/project_euler/problems/Problem18.java index c903adf..b5a90f0 100644 --- a/src/main/java/com/mattrixwv/project_euler/problems/Problem18.java +++ b/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 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 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 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)); - if(loc.yLocation < (list.size() - 1)){ - results.append("->"); - } + results.add(list.get(loc.yLocation).get(loc.xLocation).toString()); } return results.toString(); diff --git a/src/test/java/com/mattrixwv/project_euler/problems/BaseTest.java b/src/test/java/com/mattrixwv/project_euler/problems/ProblemBaseTest.java similarity index 98% rename from src/test/java/com/mattrixwv/project_euler/problems/BaseTest.java rename to src/test/java/com/mattrixwv/project_euler/problems/ProblemBaseTest.java index 247f68c..ae7fdca 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/BaseTest.java +++ b/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; diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem1.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem1.java index 638ad0a..61752c7 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem1.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem10.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem10.java index aa45ea4..afc592b 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem10.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem11.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem11.java index 8ceb2e7..4024e6c 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem11.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem12.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem12.java index 793f3cb..44524f5 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem12.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem13.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem13.java index 32858a4..ad16bc1 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem13.java +++ b/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()); diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem14.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem14.java index fcf1261..69dec98 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem14.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem15.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem15.java index 4267d45..874affc 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem15.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem16.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem16.java index afb28c9..d78a1eb 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem16.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem17.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem17.java index 0c3b8c1..e315221 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem17.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem18.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem18.java index 4e8e8eb..310305d 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem18.java +++ b/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 diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem19.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem19.java index d527a74..ac3bc80 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem19.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem2.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem2.java index 52de66c..53cf795 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem2.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem20.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem20.java index 377172a..11a579c 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem20.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem21.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem21.java index 8906070..078d1c1 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem21.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem22.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem22.java index 4c798b9..6b74ef7 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem22.java +++ b/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()); } diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem23.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem23.java index 30a5965..6dcb4a3 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem23.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem24.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem24.java index aa5978e..0e6c077 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem24.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem25.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem25.java index 435a142..3461ca4 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem25.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem26.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem26.java index 481cec1..e210e02 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem26.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem27.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem27.java index 7204ab0..ce0adce 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem27.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem28.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem28.java index 70f9602..6b9949b 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem28.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem29.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem29.java index a561279..f53ffa5 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem29.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem3.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem3.java index 0556897..3fe404f 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem3.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem30.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem30.java index 7df22a0..d026596 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem30.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem31.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem31.java index 8e5925b..21a6352 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem31.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem32.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem32.java index ffea88a..9d5641f 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem32.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem33.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem33.java index 76cd77a..efb3111 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem33.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem34.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem34.java index 07ab8b4..cd5f13f 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem34.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem35.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem35.java index d4ed75d..2722211 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem35.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem36.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem36.java index 4d95c61..fa148e7 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem36.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem37.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem37.java index 034b792..1484fff 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem37.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem38.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem38.java index d48a14a..bc6b22a 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem38.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem39.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem39.java index 5de0ba8..9a57c51 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem39.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem4.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem4.java index a2bb916..613f19d 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem4.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem40.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem40.java index 86bd04c..cd63a97 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem40.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem41.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem41.java index 470ff5a..c0edac7 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem41.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem42.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem42.java index 6d33ae1..d37e4a3 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem42.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem43.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem43.java index 64dab13..ecd9399 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem43.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem44.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem44.java index cec0af2..0d0f2ce 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem44.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem45.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem45.java index 47ffe74..0952f1f 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem45.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem46.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem46.java index 008d573..c02b001 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem46.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem47.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem47.java index d86c15b..4a6e23d 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem47.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem48.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem48.java index b2e8611..2087d6f 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem48.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem49.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem49.java index 3f461c3..b5df146 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem49.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem5.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem5.java index 7136317..0518fe2 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem5.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem50.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem50.java index 7dd1a99..58082bc 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem50.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem6.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem6.java index 454b88d..934f0bf 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem6.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem67.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem67.java index da30a28..fff2694 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem67.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem7.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem7.java index 912755c..1c1fee1 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem7.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem8.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem8.java index 47bcd81..748ac44 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem8.java +++ b/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{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem9.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem9.java index 9d2e7c8..8927518 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem9.java +++ b/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{