This is an automated email from the ASF dual-hosted git repository. erans pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-numbers.git
commit f5837b75a81704ed32262eb94e57407d73cee210 Author: Schamschi <[email protected]> AuthorDate: Sun Jun 9 23:29:37 2019 +0200 Migrate commons-numbers-combinatorics to JUnit 5: 3 classes Migrate the following classes: BinomialCoefficientDoubleTest BinomialCoefficientTest CombinationsTest --- .../BinomialCoefficientDoubleTest.java | 37 +++++++++------ .../combinatorics/BinomialCoefficientTest.java | 49 ++++++++++--------- .../numbers/combinatorics/CombinationsTest.java | 55 +++++++++++----------- 3 files changed, 76 insertions(+), 65 deletions(-) diff --git a/commons-numbers-combinatorics/src/test/java/org/apache/commons/numbers/combinatorics/BinomialCoefficientDoubleTest.java b/commons-numbers-combinatorics/src/test/java/org/apache/commons/numbers/combinatorics/BinomialCoefficientDoubleTest.java index 4f6252c..fd38458 100644 --- a/commons-numbers-combinatorics/src/test/java/org/apache/commons/numbers/combinatorics/BinomialCoefficientDoubleTest.java +++ b/commons-numbers-combinatorics/src/test/java/org/apache/commons/numbers/combinatorics/BinomialCoefficientDoubleTest.java @@ -16,7 +16,6 @@ */ package org.apache.commons.numbers.combinatorics; -import org.junit.Assert; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -27,7 +26,7 @@ public class BinomialCoefficientDoubleTest { /** Verify that b(0,0) = 1 */ @Test public void test0Choose0() { - Assert.assertEquals(1d, BinomialCoefficientDouble.value(0, 0), 0); + Assertions.assertEquals(1d, BinomialCoefficientDouble.value(0, 0), 0); } @Test @@ -37,10 +36,12 @@ public class BinomialCoefficientDoubleTest { for (int n = 1; n < 10; n++) { for (int k = 0; k <= n; k++) { - Assert.assertEquals(n + " choose " + k, - BinomialCoefficientTest.binomialCoefficient(n, k), - BinomialCoefficientDouble.value(n, k), - Double.MIN_VALUE); + Assertions.assertEquals( + BinomialCoefficientTest.binomialCoefficient(n, k), + BinomialCoefficientDouble.value(n, k), + Double.MIN_VALUE, + n + " choose " + k + ); } } @@ -48,19 +49,23 @@ public class BinomialCoefficientDoubleTest { final int[] k = { 17, 33, 10, 1500 - 4, 4 }; for (int i = 0; i < n.length; i++) { final long expected = BinomialCoefficientTest.binomialCoefficient(n[i], k[i]); - Assert.assertEquals(n[i] + " choose " + k[i], expected, - BinomialCoefficientDouble.value(n[i], k[i]), 0.0); + Assertions.assertEquals( + expected, + BinomialCoefficientDouble.value(n[i], k[i]), + 0.0, + n[i] + " choose " + k[i] + ); } } - @Test() + @Test public void testBinomialCoefficientFail1() { Assertions.assertThrows(CombinatoricsException.class, () -> BinomialCoefficientDouble.value(4, 5) ); } - @Test() + @Test public void testBinomialCoefficientFail2() { Assertions.assertThrows(CombinatoricsException.class, () -> BinomialCoefficientDouble.value(-1, -2) @@ -70,7 +75,7 @@ public class BinomialCoefficientDoubleTest { @Test public void testBinomialCoefficientFail3() { final double x = BinomialCoefficientDouble.value(1030, 515); - Assert.assertTrue("expecting infinite binomial coefficient", Double.isInfinite(x)); + Assertions.assertTrue(Double.isInfinite(x), "expecting infinite binomial coefficient"); } /** @@ -97,8 +102,12 @@ public class BinomialCoefficientDoubleTest { } if (!shouldThrow && exactResult > 1) { - Assert.assertEquals(n + " choose " + k, 1., - BinomialCoefficientDouble.value(n, k) / exactResult, 1e-10); + Assertions.assertEquals( + 1., + BinomialCoefficientDouble.value(n, k) / exactResult, + 1e-10, + n + " choose " + k + ); } } } @@ -106,6 +115,6 @@ public class BinomialCoefficientDoubleTest { final int n = 10000; final double actualOverExpected = BinomialCoefficientDouble.value(n, 3) / BinomialCoefficientTest.binomialCoefficient(n, 3); - Assert.assertEquals(1, actualOverExpected, 1e-10); + Assertions.assertEquals(1, actualOverExpected, 1e-10); } } diff --git a/commons-numbers-combinatorics/src/test/java/org/apache/commons/numbers/combinatorics/BinomialCoefficientTest.java b/commons-numbers-combinatorics/src/test/java/org/apache/commons/numbers/combinatorics/BinomialCoefficientTest.java index 9abf1b6..ad87d12 100644 --- a/commons-numbers-combinatorics/src/test/java/org/apache/commons/numbers/combinatorics/BinomialCoefficientTest.java +++ b/commons-numbers-combinatorics/src/test/java/org/apache/commons/numbers/combinatorics/BinomialCoefficientTest.java @@ -21,7 +21,6 @@ import java.util.ArrayList; import java.util.Map; import java.util.HashMap; -import org.junit.Assert; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -38,7 +37,7 @@ public class BinomialCoefficientTest { /** Verify that b(0,0) = 1 */ @Test public void test0Choose0() { - Assert.assertEquals(BinomialCoefficient.value(0, 0), 1); + Assertions.assertEquals(BinomialCoefficient.value(0, 0), 1); } @Test @@ -47,17 +46,19 @@ public class BinomialCoefficientTest { final long[] bcoef6 = { 1, 6, 15, 20, 15, 6, 1 }; for (int i = 0; i < 6; i++) { - Assert.assertEquals("5 choose " + i, bcoef5[i], BinomialCoefficient.value(5, i)); + Assertions.assertEquals(bcoef5[i], BinomialCoefficient.value(5, i), "5 choose " + i); } for (int i = 0; i < 7; i++) { - Assert.assertEquals("6 choose " + i, bcoef6[i], BinomialCoefficient.value(6, i)); + Assertions.assertEquals(bcoef6[i], BinomialCoefficient.value(6, i), "6 choose " + i); } for (int n = 1; n < 10; n++) { for (int k = 0; k <= n; k++) { - Assert.assertEquals(n + " choose " + k, - binomialCoefficient(n, k), - BinomialCoefficient.value(n, k)); + Assertions.assertEquals( + binomialCoefficient(n, k), + BinomialCoefficient.value(n, k), + n + " choose " + k + ); } } @@ -65,27 +66,29 @@ public class BinomialCoefficientTest { final int[] k = { 17, 33, 10, 1500 - 4, 4 }; for (int i = 0; i < n.length; i++) { final long expected = binomialCoefficient(n[i], k[i]); - Assert.assertEquals(n[i] + " choose " + k[i], - expected, - BinomialCoefficient.value(n[i], k[i])); + Assertions.assertEquals( + expected, + BinomialCoefficient.value(n[i], k[i]), + n[i] + " choose " + k[i] + ); } } - @Test() + @Test public void testBinomialCoefficientFail1() { Assertions.assertThrows(CombinatoricsException.class, () -> BinomialCoefficient.value(4, 5) ); } - @Test() + @Test public void testBinomialCoefficientFail2() { Assertions.assertThrows(CombinatoricsException.class, () -> BinomialCoefficient.value(-1, -2) ); } - @Test() + @Test public void testBinomialCoefficientFail3() { Assertions.assertThrows(ArithmeticException.class, @@ -93,14 +96,14 @@ public class BinomialCoefficientTest { ); } - @Test() + @Test public void testBinomialCoefficientFail4() { Assertions.assertThrows(ArithmeticException.class, () -> BinomialCoefficient.value(67, 34) ); } - @Test() + @Test public void testBinomialCoefficientFail5() { Assertions.assertThrows(ArithmeticException.class, () -> BinomialCoefficient.value(700, 300) @@ -130,35 +133,35 @@ public class BinomialCoefficientTest { } catch (ArithmeticException ex) { shouldThrow = true; } - Assert.assertEquals(n + " choose " + k, exactResult, ourResult); - Assert.assertEquals(n + " choose " + k, shouldThrow, didThrow); - Assert.assertTrue(n + " choose " + k, (n > 66 || !didThrow)); + Assertions.assertEquals(exactResult, ourResult, n + " choose " + k); + Assertions.assertEquals(shouldThrow, didThrow, n + " choose " + k); + Assertions.assertTrue((n > 66 || !didThrow), n + " choose " + k); } } long ourResult = BinomialCoefficient.value(300, 3); long exactResult = binomialCoefficient(300, 3); - Assert.assertEquals(exactResult, ourResult); + Assertions.assertEquals(exactResult, ourResult); ourResult = BinomialCoefficient.value(700, 697); exactResult = binomialCoefficient(700, 697); - Assert.assertEquals(exactResult, ourResult); + Assertions.assertEquals(exactResult, ourResult); final int n = 10000; ourResult = BinomialCoefficient.value(n, 3); exactResult = binomialCoefficient(n, 3); - Assert.assertEquals(exactResult, ourResult); + Assertions.assertEquals(exactResult, ourResult); } - @Test() + @Test public void checkNLessThanOne() { Assertions.assertThrows(CombinatoricsException.class, () -> BinomialCoefficient.checkBinomial(-1, -2) ); } - @Test() + @Test public void checkKGreaterThanN() { Assertions.assertThrows(CombinatoricsException.class, () -> BinomialCoefficient.checkBinomial(4, 5) diff --git a/commons-numbers-combinatorics/src/test/java/org/apache/commons/numbers/combinatorics/CombinationsTest.java b/commons-numbers-combinatorics/src/test/java/org/apache/commons/numbers/combinatorics/CombinationsTest.java index 227c7cb..ee27e89 100644 --- a/commons-numbers-combinatorics/src/test/java/org/apache/commons/numbers/combinatorics/CombinationsTest.java +++ b/commons-numbers-combinatorics/src/test/java/org/apache/commons/numbers/combinatorics/CombinationsTest.java @@ -19,7 +19,6 @@ package org.apache.commons.numbers.combinatorics; import java.util.Iterator; import java.util.Comparator; -import org.junit.Assert; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -31,13 +30,13 @@ public class CombinationsTest { public void testAccessor1() { final int n = 5; final int k = 3; - Assert.assertEquals(n, new Combinations(n, k).getN()); + Assertions.assertEquals(n, new Combinations(n, k).getN()); } @Test public void testAccessor2() { final int n = 5; final int k = 3; - Assert.assertEquals(k, new Combinations(n, k).getK()); + Assertions.assertEquals(k, new Combinations(n, k).getK()); } @Test @@ -54,7 +53,7 @@ public class CombinationsTest { checkLexicographicIterator(new Combinations.LexicographicComparator(123, 2)); } - @Test() + @Test public void testLexicographicComparatorWrongIterate1() { final int n = 5; final int k = 3; @@ -64,7 +63,7 @@ public class CombinationsTest { ); } - @Test() + @Test public void testLexicographicComparatorWrongIterate2() { final int n = 5; final int k = 3; @@ -74,7 +73,7 @@ public class CombinationsTest { ); } - @Test() + @Test public void testLexicographicComparatorWrongIterate3() { final int n = 5; final int k = 3; @@ -84,7 +83,7 @@ public class CombinationsTest { ); } - @Test() + @Test public void testLexicographicComparatorWrongIterate4() { final int n = 5; final int k = 3; @@ -100,8 +99,8 @@ public class CombinationsTest { final int k = 6; final Combinations.LexicographicComparator comp = new Combinations.LexicographicComparator(n, k); - Assert.assertEquals(n, comp.getN()); - Assert.assertEquals(k, comp.getK()); + Assertions.assertEquals(n, comp.getN()); + Assertions.assertEquals(k, comp.getK()); } @Test @@ -109,11 +108,11 @@ public class CombinationsTest { final int n = 5; final int k = 3; final Comparator<int[]> comp = new Combinations.LexicographicComparator(n, k); - Assert.assertEquals(1, comp.compare(new int[] {1, 2, 4}, + Assertions.assertEquals(1, comp.compare(new int[] {1, 2, 4}, new int[] {1, 2, 3})); - Assert.assertEquals(-1, comp.compare(new int[] {0, 1, 4}, + Assertions.assertEquals(-1, comp.compare(new int[] {0, 1, 4}, new int[] {0, 2, 4})); - Assert.assertEquals(0, comp.compare(new int[] {1, 3, 4}, + Assertions.assertEquals(0, comp.compare(new int[] {1, 3, 4}, new int[] {1, 3, 4})); } @@ -125,36 +124,36 @@ public class CombinationsTest { final int n = 5; final int k = 3; final Comparator<int[]> comp = new Combinations.LexicographicComparator(n, k); - Assert.assertEquals(1, comp.compare(new int[] {1, 4, 2}, + Assertions.assertEquals(1, comp.compare(new int[] {1, 4, 2}, new int[] {1, 3, 2})); - Assert.assertEquals(-1, comp.compare(new int[] {0, 4, 1}, + Assertions.assertEquals(-1, comp.compare(new int[] {0, 4, 1}, new int[] {0, 4, 2})); - Assert.assertEquals(0, comp.compare(new int[] {1, 4, 3}, + Assertions.assertEquals(0, comp.compare(new int[] {1, 4, 3}, new int[] {1, 3, 4})); } @Test public void testEmptyCombination() { final Iterator<int[]> iter = new Combinations(12345, 0).iterator(); - Assert.assertTrue(iter.hasNext()); + Assertions.assertTrue(iter.hasNext()); final int[] c = iter.next(); - Assert.assertEquals(0, c.length); - Assert.assertFalse(iter.hasNext()); + Assertions.assertEquals(0, c.length); + Assertions.assertFalse(iter.hasNext()); } @Test public void testFullSetCombination() { final int n = 67; final Iterator<int[]> iter = new Combinations(n, n).iterator(); - Assert.assertTrue(iter.hasNext()); + Assertions.assertTrue(iter.hasNext()); final int[] c = iter.next(); - Assert.assertEquals(n, c.length); + Assertions.assertEquals(n, c.length); for (int i = 0; i < n; i++) { - Assert.assertEquals(i, c[i]); + Assertions.assertEquals(i, c[i]); } - Assert.assertFalse(iter.hasNext()); + Assertions.assertFalse(iter.hasNext()); } /** @@ -172,16 +171,16 @@ public class CombinationsTest { long numIterates = 0; for (int[] iterate : new Combinations(n, k)) { - Assert.assertEquals(k, iterate.length); + Assertions.assertEquals(k, iterate.length); // Check that the sequence of iterates is ordered. if (lastIterate != null) { - Assert.assertTrue(comp.compare(iterate, lastIterate) == 1); + Assertions.assertTrue(comp.compare(iterate, lastIterate) == 1); } // Check that each iterate is ordered. for (int i = 1; i < iterate.length; i++) { - Assert.assertTrue(iterate[i] > iterate[i - 1]); + Assertions.assertTrue(iterate[i] > iterate[i - 1]); } lastIterate = iterate; @@ -189,16 +188,16 @@ public class CombinationsTest { } // Check the number of iterates. - Assert.assertEquals(BinomialCoefficient.value(n, k), numIterates); + Assertions.assertEquals(BinomialCoefficient.value(n, k), numIterates); } - @Test() + @Test public void testCombinationsIteratorFail1() { Assertions.assertThrows(IllegalArgumentException.class, () -> new Combinations(4, 5).iterator() ); } - @Test() + @Test public void testCombinationsIteratorFail2() { Assertions.assertThrows(IllegalArgumentException.class, () -> new Combinations(-1, -2).iterator()
