summaryrefslogtreecommitdiff
path: root/src/test/java/sevenUnits/unit
diff options
context:
space:
mode:
Diffstat (limited to 'src/test/java/sevenUnits/unit')
-rw-r--r--src/test/java/sevenUnits/unit/MultiUnitTest.java16
-rw-r--r--src/test/java/sevenUnits/unit/UnitDatabaseTest.java3
-rw-r--r--src/test/java/sevenUnits/unit/UnitTest.java15
3 files changed, 22 insertions, 12 deletions
diff --git a/src/test/java/sevenUnits/unit/MultiUnitTest.java b/src/test/java/sevenUnits/unit/MultiUnitTest.java
index 39ee21c..30f2941 100644
--- a/src/test/java/sevenUnits/unit/MultiUnitTest.java
+++ b/src/test/java/sevenUnits/unit/MultiUnitTest.java
@@ -32,30 +32,34 @@ import org.junit.jupiter.api.Test;
*/
class MultiUnitTest {
+ /**
+ * Ensures that the {@code MultiUnit} can convert properly.
+ */
@Test
final void testConvert() {
final Random rng = ThreadLocalRandom.current();
final MultiUnit footInch = MultiUnit.of(BritishImperial.Length.FOOT,
BritishImperial.Length.INCH);
- assertEquals(1702.0, footInch.convertTo(Metric.METRE.withPrefix(Metric.MILLI),
- Arrays.asList(5.0, 7.0)), 1.0);
+ assertEquals(1702.0,
+ footInch.convertTo(Metric.METRE.withPrefix(Metric.MILLI),
+ Arrays.asList(5.0, 7.0)),
+ 1.0);
for (int i = 0; i < 1000; i++) {
final double feet = rng.nextInt(1000);
final double inches = rng.nextDouble() * 12;
final double millimetres = feet * 304.8 + inches * 25.4;
- final List<Double> feetAndInches = Metric.METRE.withPrefix(Metric.MILLI)
- .convertTo(footInch, millimetres);
+ final List<Double> feetAndInches = Metric.METRE
+ .withPrefix(Metric.MILLI).convertTo(footInch, millimetres);
assertEquals(feet, feetAndInches.get(0), 1e-10);
assertEquals(inches, feetAndInches.get(1), 1e-10);
}
}
/**
- * Test method for
- * {@link sevenUnits.unit.MultiUnit#convertFromBase(double)}.
+ * Test method for {@link sevenUnits.unit.MultiUnit#convertFromBase(double)}.
*/
@Test
final void testConvertFromBase() {
diff --git a/src/test/java/sevenUnits/unit/UnitDatabaseTest.java b/src/test/java/sevenUnits/unit/UnitDatabaseTest.java
index 2276d7c..4be33dd 100644
--- a/src/test/java/sevenUnits/unit/UnitDatabaseTest.java
+++ b/src/test/java/sevenUnits/unit/UnitDatabaseTest.java
@@ -39,6 +39,7 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
+import sevenUnits.utils.NameSymbol;
import sevenUnits.utils.UncertainDouble;
/**
@@ -595,7 +596,7 @@ class UnitDatabaseTest {
database.addPrefix("C", C);
final int NUM_UNITS = database.unitMapPrefixless(true).size();
- final int NUM_PREFIXES = database.prefixMap().size();
+ final int NUM_PREFIXES = database.prefixMap(true).size();
final Iterator<String> nameIterator = database.unitMap().keySet()
.iterator();
diff --git a/src/test/java/sevenUnits/unit/UnitTest.java b/src/test/java/sevenUnits/unit/UnitTest.java
index bb2e6a4..d3699ca 100644
--- a/src/test/java/sevenUnits/unit/UnitTest.java
+++ b/src/test/java/sevenUnits/unit/UnitTest.java
@@ -21,12 +21,14 @@ 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;
import org.junit.jupiter.api.Test;
import sevenUnits.utils.DecimalComparison;
+import sevenUnits.utils.NameSymbol;
import sevenUnits.utils.UncertainDouble;
/**
@@ -163,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));
}
/**
@@ -178,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));
}
/**
@@ -193,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));
}
/**