Implemented rounding and duplicate-removal settings into the new GUI

2 files changed, 20 insertions, 5 deletions

diff --git a/src/test/java/sevenUnits/unit/UnitTest.java b/src/test/java/sevenUnits/unit/UnitTest.java
index f174e7c..d3699ca 100644
--- a/src/test/java/sevenUnits/unit/UnitTest.java
+++ b/src/test/java/sevenUnits/unit/UnitTest.java
@@ -21,6 +21,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import java.math.RoundingMode;
 import java.util.Random;
 import java.util.concurrent.ThreadLocalRandom;
 
@@ -164,8 +165,9 @@ class UnitTest {
 				UncertainDouble.of(10, 0.24));
 		
 		assertEquals("(10.0 ± 0.2) m", value.toString());
-		assertEquals("(10.0 ± 0.2) m", value.toString(true));
-		assertEquals("10.0 m", value.toString(false));
+		assertEquals("(10.0 ± 0.2) m",
+				value.toString(true, RoundingMode.HALF_EVEN));
+		assertEquals("10.0 m", value.toString(false, RoundingMode.HALF_EVEN));
 	}
 	
 	/**
@@ -179,8 +181,9 @@ class UnitTest {
 				UncertainDouble.of(10, 0));
 		
 		assertEquals("10.0 m", value.toString());
-		assertEquals("(10.0 ± 0.0) m", value.toString(true));
-		assertEquals("10.0 m", value.toString(false));
+		assertEquals("(10.0 ± 0.0) m",
+				value.toString(true, RoundingMode.HALF_EVEN));
+		assertEquals("10.0 m", value.toString(false, RoundingMode.HALF_EVEN));
 	}
 	
 	/**
@@ -194,7 +197,8 @@ class UnitTest {
 				Metric.METRE.withName(NameSymbol.EMPTY),
 				UncertainDouble.of(10, 0.24));
 		
-		assertEquals("10.0 unnamed unit (= 10.0 m)", value.toString(false));
+		assertEquals("10.0 unnamed unit (= 10.0 m)",
+				value.toString(false, RoundingMode.HALF_EVEN));
 	}
 	
 	/**
diff --git a/src/test/java/sevenUnits/utils/UncertainDoubleTest.java b/src/test/java/sevenUnits/utils/UncertainDoubleTest.java
index c891f20..0e18461 100644
--- a/src/test/java/sevenUnits/utils/UncertainDoubleTest.java
+++ b/src/test/java/sevenUnits/utils/UncertainDoubleTest.java
@@ -19,6 +19,7 @@ package sevenUnits.utils;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static sevenUnits.utils.UncertainDouble.fromRoundedString;
 import static sevenUnits.utils.UncertainDouble.fromString;
 import static sevenUnits.utils.UncertainDouble.of;
 
@@ -66,6 +67,16 @@ class UncertainDoubleTest {
 				x.toExponentExact(Math.E).value());
 	}
 	
+	/**
+	 * Test for {@link UncertainDouble#fromRoundedString}
+	 * 
+	 * @since 2022-04-18
+	 */
+	@Test
+	final void testFromRoundedString() {
+		assertEquals(of(12345.678, 0.001), fromRoundedString("12345.678"));
+	}
+	
 	@Test
 	final void testFromString() {
 		// valid strings