convert NextProbablePrimeTest into unit and performance test

Author: TilmanNeumann

src/main/java/de/tilman_neumann/jml/primes/probable/NextProbablePrimeTest.java src/test/java/de/tilman_neumann/jml/primes/probable/NextProbablePrimePerformanceTest.java

@@ -22,52 +22,21 @@
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 
-import de.tilman_neumann.util.Ensure;
 import de.tilman_neumann.util.ConfigUtil;
 
-import static de.tilman_neumann.jml.base.BigIntConstants.*;
-
 /**
- * Performance test of nextProbablePrime() implementations.
+ * Performance test of nextProbablePrime() implementations (currently only Java vs. BPSW).
  * 
  * @author Tilman Neumann
  */
-public class NextProbablePrimeTest {
-	private static final Logger LOG = LogManager.getLogger(NextProbablePrimeTest.class);
+public class NextProbablePrimePerformanceTest {
+	private static final Logger LOG = LogManager.getLogger(NextProbablePrimePerformanceTest.class);
 	private static final SecureRandom RNG = new SecureRandom();
 
 	/** Number of test numbers for the performance test. */
 	private static final int NCOUNT = 1000;
 
 	private static final BPSWTest bpsw = new BPSWTest();
-	
-	/**
-	 * Verify that the corrected lower/upper integers of sqrt(N) are computed.
-	 */
-	@SuppressWarnings("unused")
-	private static void testCorrectness() {
-		for (int nBits = 20; ; nBits+=10) {
-			LOG.info("Test correctness of " + NCOUNT + " N with " + nBits + " bits:");
-			int i = 0;
-			while (i < NCOUNT) {
-				BigInteger n = new BigInteger(nBits, RNG);
-				if (n.equals(I_0)) continue; // exclude 0 from test set
-				
-				// supposed correct value:
-				BigInteger nextProbablePrime = n.nextProbablePrime();
-				
-				// check others
-				try {
-					BigInteger nextProbablePrime_bpsw = bpsw.nextProbablePrime(n);
-					Ensure.ensureEquals(nextProbablePrime, nextProbablePrime_bpsw);
-				} catch (AssertionError ae) {
-					LOG.error("Failure at n=" + n + ": " + ae, ae);
-				}
-				i++;
-			}
-			LOG.info("    Tested " + NCOUNT + " next probable primes...");
-		}
-	}
 
 	/**
 	 * Performance test.
@@ -134,8 +103,7 @@ private static void logMap(TreeMap<Long, List<String>> duration_2_algLists) {
 	 * @param args ignored
 	 */
 	public static void main(String[] args) {
-		ConfigUtil.initProject(); // set up logger
-		//testCorrectness();
+		ConfigUtil.initProject();
 		testPerformance();
 	}
 }

src/test/java/de/tilman_neumann/jml/primes/probable/NextProbablePrimeTest.java

@@ -0,0 +1,66 @@
+/*
+ * java-math-library is a Java library focused on number theory, but not necessarily limited to it. It is based on the PSIQS 4.0 factoring project.
+ * Copyright (C) 2018-2024 Tilman Neumann - [email protected]
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with this program;
+ * if not, see <http://www.gnu.org/licenses/>.
+ */
+package de.tilman_neumann.jml.primes.probable;
+
+import java.math.BigInteger;
+import java.security.SecureRandom;
+
+import org.apache.logging.log4j.Logger;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.apache.logging.log4j.LogManager;
+
+import de.tilman_neumann.util.ConfigUtil;
+
+import static de.tilman_neumann.jml.base.BigIntConstants.*;
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Test of BPSW.nextProbablePrime().
+ * 
+ * @author Tilman Neumann
+ */
+public class NextProbablePrimeTest {
+	private static final Logger LOG = LogManager.getLogger(NextProbablePrimeTest.class);
+	private static final SecureRandom RNG = new SecureRandom();
+	
+	private static final int NCOUNT = 1000;
+	private static final int MAX_BITS = 150;
+
+	private static final BPSWTest bpsw = new BPSWTest();
+	
+	@BeforeClass
+	public static void setup() {
+		ConfigUtil.initProject();
+	}
+
+	@Test
+	public void testNextProbablePrime() {
+		for (int nBits = 20; nBits<=MAX_BITS; nBits+=10) {
+			LOG.info("Test correctness of " + NCOUNT + " N with " + nBits + " bits:");
+			int i = 0;
+			while (i < NCOUNT) {
+				BigInteger n = new BigInteger(nBits, RNG);
+				if (n.equals(I_0)) continue; // exclude 0 from test set
+				
+				BigInteger correctValue = n.nextProbablePrime();
+				BigInteger bpswValue = bpsw.nextProbablePrime(n);
+				assertEquals(correctValue, bpswValue);
+
+				i++;
+			}
+			LOG.info("    Tested " + NCOUNT + " next probable primes...");
+		}
+	}
+}