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/11/01 23:04:22 UTC
[commons-numbers] branch master updated (1a5d479 -> 97eaea3)
This is an automated email from the ASF dual-hosted git repository.
erans pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-numbers.git.
from 1a5d479 Unused API removed.
new ebab0bc Nit: Formatting (unit tests).
new 4b4bac4 Javadoc.
new b398da3 Unused class.
new f27b5da Unit tests.
new 3f1b9e4 Javadoc.
new 97eaea3 Unit tests.
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../commons/numbers/fraction/BigFraction.java | 4 +-
.../apache/commons/numbers/fraction/Fraction.java | 2 +-
.../numbers/fraction/FractionParseException.java | 43 ---------------------
.../commons/numbers/fraction/BigFractionTest.java | 22 +++++++++--
.../commons/numbers/fraction/FractionTest.java | 45 ++++++++++++++++++----
5 files changed, 59 insertions(+), 57 deletions(-)
delete mode 100644 commons-numbers-fraction/src/main/java/org/apache/commons/numbers/fraction/FractionParseException.java
[commons-numbers] 01/06: Nit: Formatting (unit tests).
Posted by er...@apache.org.
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 ebab0bcab8893aa29fa1e82c475d50320b6a147b
Author: Gilles Sadowski <gi...@harfang.homelinux.org>
AuthorDate: Fri Nov 1 23:32:55 2019 +0100
Nit: Formatting (unit tests).
---
.../commons/numbers/fraction/FractionTest.java | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/commons-numbers-fraction/src/test/java/org/apache/commons/numbers/fraction/FractionTest.java b/commons-numbers-fraction/src/test/java/org/apache/commons/numbers/fraction/FractionTest.java
index e7390a6..6b867b6 100644
--- a/commons-numbers-fraction/src/test/java/org/apache/commons/numbers/fraction/FractionTest.java
+++ b/commons-numbers-fraction/src/test/java/org/apache/commons/numbers/fraction/FractionTest.java
@@ -495,25 +495,29 @@ public class FractionTest {
Fraction.of(-5, 2)
};
for (Fraction fraction : fractions) {
- Assertions.assertEquals(fraction, TestUtils.serializeAndRecover(fraction));
+ Assertions.assertEquals(fraction,
+ TestUtils.serializeAndRecover(fraction));
}
}
@Test
public void testParse() {
String[] validExpressions = new String[] {
- "1 / 2", "15 / 16", "-2 / 3", "8 / 7"
+ "1 / 2",
+ "15 / 16",
+ "-2 / 3",
+ "8 / 7"
};
Fraction[] fractions = {
- Fraction.of(1, 2),
- Fraction.of(15, 16),
- Fraction.of(-2, 3),
- Fraction.of(8, 7),
+ Fraction.of(1, 2),
+ Fraction.of(15, 16),
+ Fraction.of(-2, 3),
+ Fraction.of(8, 7),
};
int inc = 0;
- for (Fraction fraction: fractions) {
+ for (Fraction fraction : fractions) {
Assertions.assertEquals(fraction,
- Fraction.parse(validExpressions[inc]));
+ Fraction.parse(validExpressions[inc]));
inc++;
}
}
[commons-numbers] 06/06: Unit tests.
Posted by er...@apache.org.
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 97eaea379c9f9b6a4ee752827badadc6cec12f83
Author: Gilles Sadowski <gi...@harfang.homelinux.org>
AuthorDate: Sat Nov 2 00:03:25 2019 +0100
Unit tests.
---
.../commons/numbers/fraction/BigFractionTest.java | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/commons-numbers-fraction/src/test/java/org/apache/commons/numbers/fraction/BigFractionTest.java b/commons-numbers-fraction/src/test/java/org/apache/commons/numbers/fraction/BigFractionTest.java
index f44b123..2efa0f6 100644
--- a/commons-numbers-fraction/src/test/java/org/apache/commons/numbers/fraction/BigFractionTest.java
+++ b/commons-numbers-fraction/src/test/java/org/apache/commons/numbers/fraction/BigFractionTest.java
@@ -627,27 +627,43 @@ public class BigFractionTest {
}
}
-
@Test
public void testParse() {
String[] validExpressions = new String[] {
"3",
"1 / 2",
+ "-1 / 2",
+ "1 / -2",
+ "-1 / -2",
"2147,483,647 / 2,147,483,648", //over largest int value
"9,223,372,036,854,775,807 / 9,223,372,036,854,775,808" //over largest long value
};
BigFraction[] fractions = {
BigFraction.of(3),
BigFraction.of(1, 2),
+ BigFraction.of(-1, 2),
+ BigFraction.of(1, -2),
+ BigFraction.of(-1, -2),
BigFraction.of(2147483647, 2147483648L),
BigFraction.of(new BigInteger("9223372036854775807"),
- new BigInteger("9223372036854775808"))
+ new BigInteger("9223372036854775808"))
};
int inc = 0;
for (BigFraction fraction: fractions) {
Assertions.assertEquals(fraction,
- BigFraction.parse(validExpressions[inc]));
+ BigFraction.parse(validExpressions[inc]));
inc++;
}
+
+ {
+ Assertions.assertThrows(NumberFormatException.class,
+ () -> BigFraction.parse("1 // 2"));
+ Assertions.assertThrows(NumberFormatException.class,
+ () -> BigFraction.parse("1 / z"));
+ Assertions.assertThrows(NumberFormatException.class,
+ () -> BigFraction.parse("1 / --2"));
+ Assertions.assertThrows(NumberFormatException.class,
+ () -> BigFraction.parse("x"));
+ }
}
}
[commons-numbers] 02/06: Javadoc.
Posted by er...@apache.org.
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 4b4bac41d3b2a437763adda4301544309a130370
Author: Gilles Sadowski <gi...@harfang.homelinux.org>
AuthorDate: Fri Nov 1 23:52:47 2019 +0100
Javadoc.
---
.../src/main/java/org/apache/commons/numbers/fraction/Fraction.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 3644e37..228f236 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
@@ -645,7 +645,7 @@ public class Fraction
*
* @param s String representation.
* @return an instance.
- * @throws FractionException if the string does not conform to the
+ * @throws NumberFormatException if the string does not conform to the
* specification.
*/
public static Fraction parse(String s) {
[commons-numbers] 04/06: Unit tests.
Posted by er...@apache.org.
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 f27b5da7dea235b2529294fb62ef40589544da52
Author: Gilles Sadowski <gi...@harfang.homelinux.org>
AuthorDate: Fri Nov 1 23:53:46 2019 +0100
Unit tests.
---
.../commons/numbers/fraction/FractionTest.java | 25 ++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/commons-numbers-fraction/src/test/java/org/apache/commons/numbers/fraction/FractionTest.java b/commons-numbers-fraction/src/test/java/org/apache/commons/numbers/fraction/FractionTest.java
index 6b867b6..aea3d01 100644
--- a/commons-numbers-fraction/src/test/java/org/apache/commons/numbers/fraction/FractionTest.java
+++ b/commons-numbers-fraction/src/test/java/org/apache/commons/numbers/fraction/FractionTest.java
@@ -504,12 +504,26 @@ public class FractionTest {
public void testParse() {
String[] validExpressions = new String[] {
"1 / 2",
+ "-1 / 2",
+ "1 / -2",
+ "-1 / -2",
+ "01 / 2",
+ "01 / 02",
+ "-01 / 02",
+ "01 / -02",
"15 / 16",
"-2 / 3",
"8 / 7"
};
Fraction[] fractions = {
Fraction.of(1, 2),
+ Fraction.of(-1, 2),
+ Fraction.of(1, -2),
+ Fraction.of(-1, -2),
+ Fraction.of(1, 2),
+ Fraction.of(1, 2),
+ Fraction.of(-1, 2),
+ Fraction.of(1, -2),
Fraction.of(15, 16),
Fraction.of(-2, 3),
Fraction.of(8, 7),
@@ -520,5 +534,16 @@ public class FractionTest {
Fraction.parse(validExpressions[inc]));
inc++;
}
+
+ {
+ Assertions.assertThrows(NumberFormatException.class,
+ () -> Fraction.parse("1 // 2"));
+ Assertions.assertThrows(NumberFormatException.class,
+ () -> Fraction.parse("1 / z"));
+ Assertions.assertThrows(NumberFormatException.class,
+ () -> Fraction.parse("1 / --2"));
+ Assertions.assertThrows(NumberFormatException.class,
+ () -> Fraction.parse("x"));
+ }
}
}
[commons-numbers] 05/06: Javadoc.
Posted by er...@apache.org.
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 3f1b9e48117a1caa81f96c0c661cb92cd8280598
Author: Gilles Sadowski <gi...@harfang.homelinux.org>
AuthorDate: Sat Nov 2 00:03:12 2019 +0100
Javadoc.
---
.../main/java/org/apache/commons/numbers/fraction/BigFraction.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/commons-numbers-fraction/src/main/java/org/apache/commons/numbers/fraction/BigFraction.java b/commons-numbers-fraction/src/main/java/org/apache/commons/numbers/fraction/BigFraction.java
index 249d42a..89a7e3d 100644
--- a/commons-numbers-fraction/src/main/java/org/apache/commons/numbers/fraction/BigFraction.java
+++ b/commons-numbers-fraction/src/main/java/org/apache/commons/numbers/fraction/BigFraction.java
@@ -1315,8 +1315,8 @@ public class BigFraction
*
* @param s String representation.
* @return an instance.
- * @throws FractionException if the string does not
- * conform to the specification.
+ * @throws NumberFormatException if the string does not conform
+ * to the specification.
*/
public static BigFraction parse(String s) {
s = s.replace(",", "");
[commons-numbers] 03/06: Unused class.
Posted by er...@apache.org.
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 b398da34918fa643f8fc8a761eb10c416f05bab3
Author: Gilles Sadowski <gi...@harfang.homelinux.org>
AuthorDate: Fri Nov 1 23:53:09 2019 +0100
Unused class.
---
.../numbers/fraction/FractionParseException.java | 43 ----------------------
1 file changed, 43 deletions(-)
diff --git a/commons-numbers-fraction/src/main/java/org/apache/commons/numbers/fraction/FractionParseException.java b/commons-numbers-fraction/src/main/java/org/apache/commons/numbers/fraction/FractionParseException.java
deleted file mode 100644
index 08886e0..0000000
--- a/commons-numbers-fraction/src/main/java/org/apache/commons/numbers/fraction/FractionParseException.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.commons.numbers.fraction;
-
-import java.text.MessageFormat;
-import java.text.ParseException;
-
-/**
- * Error thrown when a string cannot be parsed into a fraction.
- */
-class FractionParseException extends ParseException {
-
- /** Serializable version identifier. */
- private static final long serialVersionUID = 201701181879L;
-
- /**
- * Constructs an exception with specified formatted detail message.
- * Message formatting is delegated to {@link java.text.MessageFormat}.
- * @param source string being parsed
- * @param position position of error
- * @param type type of target object
- */
- FractionParseException(String source, int position, Class<?> type) {
- super(MessageFormat.format("string \"{0}\" unparseable (from position {1}) as an object of type {2}",
- source, position, type),
- position);
- }
-}