Changed test methods

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

@@ -2,58 +2,48 @@ package com.mattrixwv.project_euler.problems;
 
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
+import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
-import org.mockito.junit.jupiter.MockitoExtension;
 
 import com.mattrixwv.project_euler.exceptions.Unsolved;
 
 
-@ExtendWith(MockitoExtension.class)
 public class TestProblem23 extends BaseTest{
 	@InjectMocks
 	private Problem23Override problem;
+	static{
+		description = "Find the sum of all the positive integers which cannot be written as the sum of two abundant numbers";
+		result = "The answer is 2035227";
+	}
 
 
 	@Test
+	@Order(1)
 	@Override
 	public void testDescription(){
-		assertEquals("Find the sum of all the positive integers which cannot be written as the sum of two abundant numbers", problem.getDescription());
-		assertFalse(problem.getSolved());
+		super.testDescription(problem);
 	}
 
 	@Test
+	@Order(2)
 	@Override
 	public void testSolve(){
 		assertThrows(Unsolved.class, () -> { problem.getSum(); });
 
-		problem.solve();
+		super.testSolve(problem);
 
 		//Verify result
 		assertEquals(2035227, problem.getSum());
-		assertEquals("The answer is 2035227", problem.getResult());
-		//Verify the problem variables and functions were called
-		verifyProblem(problem);
-
-		//Verify the problem won't be run again
-		verifyProblemSecondRun(problem);
 	}
 
 	@Test
+	@Order(3)
 	@Override
 	public void testReset(){
-		problem.reset();
-
-		//Verify solved was reset
-		assertFalse(problem.getSolved());
-		super.testReset();
-
-		//Verify the problem can be solved again
-		testSolve();
+		super.testReset(problem);
 	}