You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by er...@apache.org on 2019/06/18 13:16:53 UTC

[commons-numbers] 08/34: re-add one and zero

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 ad2d9284f24fdb68ab7158cc2529fcab14719f57
Author: Eitan Adler <li...@eitanadler.com>
AuthorDate: Fri Jun 7 19:12:21 2019 -0700

    re-add one and zero
---
 .../commons/numbers/field/FieldParametricTest.java | 29 +++++++---------------
 .../apache/commons/numbers/fraction/Fraction.java  | 12 +++++++++
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/commons-numbers-field/src/test/java/org/apache/commons/numbers/field/FieldParametricTest.java b/commons-numbers-field/src/test/java/org/apache/commons/numbers/field/FieldParametricTest.java
index 36d6ba2..d68af63 100644
--- a/commons-numbers-field/src/test/java/org/apache/commons/numbers/field/FieldParametricTest.java
+++ b/commons-numbers-field/src/test/java/org/apache/commons/numbers/field/FieldParametricTest.java
@@ -18,10 +18,8 @@ package org.apache.commons.numbers.field;
 
 import org.junit.Assert;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
 
 /**
  * Tests for fields.
@@ -29,29 +27,20 @@ import org.junit.runners.Parameterized.Parameters;
 @RunWith(value=Parameterized.class)
 public class FieldParametricTest {
     /** Field under test. */
-    private final Field field;
-    private final Object a;
-    private final Object b;
-    private final Object c;
+    @Parameterized.Parameter(0)
+    private Field field;
+    @Parameterized.Parameter(1)
+    private Object a;
+    @Parameterized.Parameter(2)
+    private Object b;
+    @Parameterized.Parameter(3)
+    private Object c;
 
-    /**
-     * Initializes data instance.
-     *
-     * @param data Field data to be tested.
-     */
-    public FieldParametricTest(FieldTestData data) {
-        this.field = data.getField();
-        this.a = data.getA();
-        this.b = data.getB();
-        this.c = data.getC();
-    }
-
-    @Parameters(name = "{index}: data={0}")
+    @Parameterized.Parameters()
     public static Iterable<FieldTestData[]> getList() {
         return FieldsList.list();
     }
 
-    @ParameterizedTest
     public void testAdditionAssociativity() {
         final Object r1 = field.add(field.add(a, b), c);
         final Object r2 = field.add(a, field.add(b, c));
diff --git a/commons-numbers-fraction/src/main/java/org/apache/commons/numbers/fraction/Fraction.java b/commons-numbers-fraction/src/main/java/org/apache/commons/numbers/fraction/Fraction.java
index 3fbf96f..74beb3b 100644
--- a/commons-numbers-fraction/src/main/java/org/apache/commons/numbers/fraction/Fraction.java
+++ b/commons-numbers-fraction/src/main/java/org/apache/commons/numbers/fraction/Fraction.java
@@ -625,6 +625,18 @@ public class Fraction
         return str;
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public Fraction zero() {
+        return ZERO;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Fraction one() {
+        return ONE;
+    }
+
     /**
      * Parses a string that would be produced by {@link #toString()}
      * and instantiates the corresponding object.