initialize factorizer in setup() to avoid constructor cost for each test

method

Author: TilmanNeumann

src/test/java/de/tilman_neumann/jml/factor/CombinedFactorAlgorithm1ThreadTest.java

@@ -26,13 +26,10 @@ public class CombinedFactorAlgorithm1ThreadTest extends FactorTestBase {
 
 	private boolean RUN_SLOW_TESTS_TOO = false;
 
-	public CombinedFactorAlgorithm1ThreadTest() {
-		super(new CombinedFactorAlgorithm(1, null, true));
-	}
-
 	@BeforeClass
 	public static void setup() {
 		ConfigUtil.initProject();
+		setFactorizer(new CombinedFactorAlgorithm(1, null, true));
 	}
 
 	@Test

src/test/java/de/tilman_neumann/jml/factor/CombinedFactorAlgorithm2ThreadsTest.java

@@ -26,16 +26,13 @@ public class CombinedFactorAlgorithm2ThreadsTest extends FactorTestBase {
 
 	private boolean RUN_SLOW_TESTS_TOO = false;
 
-	public CombinedFactorAlgorithm2ThreadsTest() {
-		// gitgub CI results for the 236 bit test number:
-		// 1 thread -> 22s, 2 threads -> 12s, 4 threads -> 14s.
-		// Using 2 threads looks best so far.
-		super(new CombinedFactorAlgorithm(2, null, true));
-	}
-
 	@BeforeClass
 	public static void setup() {
 		ConfigUtil.initProject();
+		// gitgub CI results for the 236 bit test number:
+		// 1 thread -> 22s, 2 threads -> 12s, 4 threads -> 14s.
+		// Using 2 threads looks best so far.
+		setFactorizer(new CombinedFactorAlgorithm(2, null, true));
 	}
 
 	@Test

src/test/java/de/tilman_neumann/jml/factor/FactorTestBase.java

@@ -40,15 +40,16 @@ public class FactorTestBase {
 
 	private static final BPSWTest bpsw = new BPSWTest();
 
-	private FactorAlgorithm factorizer, verificationFactorizer;
+	private static FactorAlgorithm factorizer;
+	private static FactorAlgorithm verificationFactorizer;
 
-	public FactorTestBase(FactorAlgorithm factorizer) {
-		this(factorizer, FactorAlgorithm.getDefault());
+	protected static void setFactorizer(FactorAlgorithm factorizer) {
+		FactorTestBase.setFactorizer(factorizer, FactorAlgorithm.getDefault());
 	}
 
-	public FactorTestBase(FactorAlgorithm factorizer, FactorAlgorithm verificationFactorizer) {
-		this.factorizer = factorizer;
-		this.verificationFactorizer = verificationFactorizer;
+	protected static void setFactorizer(FactorAlgorithm factorizer, FactorAlgorithm verificationFactorizer) {
+		FactorTestBase.factorizer = factorizer;
+		FactorTestBase.verificationFactorizer = verificationFactorizer;
 	}
 
 	/**

src/test/java/de/tilman_neumann/jml/factor/cfrac/CFrac63Test.java

@@ -41,13 +41,10 @@
  */
 public class CFrac63Test extends FactorTestBase {
 
-	public CFrac63Test() {
-		super(new CFrac63(true, 5, 1.5F, 0.152F, 0.25F, new TDiv_CF63_01(), new MatrixSolverGauss02(), 3));
-	}
-
 	@BeforeClass
 	public static void setup() {
 		ConfigUtil.initProject();
+		setFactorizer(new CFrac63(true, 5, 1.5F, 0.152F, 0.25F, new TDiv_CF63_01(), new MatrixSolverGauss02(), 3));
 	}
 
 	@Test

src/test/java/de/tilman_neumann/jml/factor/cfrac/CFracTest.java

@@ -41,13 +41,10 @@
  */
 public class CFracTest extends FactorTestBase {
 
-	public CFracTest() {
-		super(new CFrac(true, 5, 1.5F, 0.152F, 0.253F, new TDiv_CF01(), new MatrixSolverGauss02(), 5));
-	}
-
 	@BeforeClass
 	public static void setup() {
 		ConfigUtil.initProject();
+		setFactorizer(new CFrac(true, 5, 1.5F, 0.152F, 0.253F, new TDiv_CF01(), new MatrixSolverGauss02(), 5));
 	}
 
 	@Test

src/test/java/de/tilman_neumann/jml/factor/ecm/EllipticCurveMethodTest.java

@@ -21,13 +21,10 @@
 
 public class EllipticCurveMethodTest extends FactorTestBase {
 
-	public EllipticCurveMethodTest() {
-		super(new EllipticCurveMethod(-1));
-	}
-
 	@BeforeClass
 	public static void setup() {
 		ConfigUtil.initProject();
+		setFactorizer(new EllipticCurveMethod(-1));
 	}
 
 	@Test

src/test/java/de/tilman_neumann/jml/factor/ecm/TinyEcm64MHInlinedTest.java

@@ -25,13 +25,10 @@
 
 public class TinyEcm64MHInlinedTest extends FactorTestBase {
 
-	public TinyEcm64MHInlinedTest() {
-		super(new TinyEcm64MHInlined());
-	}
-
 	@BeforeClass
 	public static void setup() {
 		ConfigUtil.initProject();
+		setFactorizer(new TinyEcm64MHInlined());
 	}
 
 	@Test

src/test/java/de/tilman_neumann/jml/factor/ecm/TinyEcm64MHTest.java

@@ -25,13 +25,10 @@
 
 public class TinyEcm64MHTest extends FactorTestBase {
 
-	public TinyEcm64MHTest() {
-		super(new TinyEcm64MH());
-	}
-
 	@BeforeClass
 	public static void setup() {
 		ConfigUtil.initProject();
+		setFactorizer(new TinyEcm64MH());
 	}
 
 	@Test

src/test/java/de/tilman_neumann/jml/factor/ecm/TinyEcm64Test.java

@@ -25,13 +25,10 @@
 
 public class TinyEcm64Test extends FactorTestBase {
 
-	public TinyEcm64Test() {
-		super(new TinyEcm64());
-	}
-
 	@BeforeClass
 	public static void setup() {
 		ConfigUtil.initProject();
+		setFactorizer(new TinyEcm64());
 	}
 
 	@Test

src/test/java/de/tilman_neumann/jml/factor/hart/HartFast2Mult2Test.java

@@ -36,13 +36,10 @@
  */
 public class HartFast2Mult2Test extends FactorTestBase {
 
-	public HartFast2Mult2Test() {
-		super(new HartFast2Mult2(false));
-	}
-
 	@BeforeClass
 	public static void setup() {
 		ConfigUtil.initProject();
+		setFactorizer(new HartFast2Mult2(false));
 	}
 
 	@Test