Merge branch 'release-1.0.0' into developdevelop

1 files changed, 16 insertions, 29 deletions

diff --git a/src/test/java/sevenUnits/unit/UnitDatabaseTest.java b/src/test/java/sevenUnits/unit/UnitDatabaseTest.java
index 800d13d..3d6d663 100644
--- a/src/test/java/sevenUnits/unit/UnitDatabaseTest.java
+++ b/src/test/java/sevenUnits/unit/UnitDatabaseTest.java
@@ -58,7 +58,6 @@ class UnitDatabaseTest {
 		private V value;
 
 		/**
-		 *
 		 * @since 2021-10-07
 		 * @since v0.3.2
 		 */
@@ -190,7 +189,7 @@ class UnitDatabaseTest {
 	}
 
 	private static final Stream<Arguments> testEvaluateExpressionValid() {
-		UncertainDouble uncertainTwoThirds = UncertainDouble.of(2.0, 1.0)
+		final var uncertainTwoThirds = UncertainDouble.of(2.0, 1.0)
 				.dividedBy(UncertainDouble.of(3.0, 1.0));
 		return Stream.of(
 				Arguments.of("J + (2 * 3) J + (20 / 4) J",
@@ -206,19 +205,14 @@ class UnitDatabaseTest {
 				Arguments.of("2 J / 3 J",
 						LinearUnitValue.of(J.dividedBy(J), uncertainTwoThirds)));
 	}
-	
+
 	private static final Stream<Arguments> testFormatExpression() {
-		return Stream.of(
-				Arguments.of("1*2", "1 * 2"),
-				Arguments.of("1/2", "1 / 2"),
-				Arguments.of("1|2", "1 | 2"),
-				Arguments.of("1^2", "1 ^ 2"),
-				Arguments.of("1  *   2", "1 * 2"),
-				Arguments.of("+1", "+1"),
-				Arguments.of("-1", "-1"),
+		return Stream.of(Arguments.of("1*2", "1 * 2"),
+				Arguments.of("1/2", "1 / 2"), Arguments.of("1|2", "1 | 2"),
+				Arguments.of("1^2", "1 ^ 2"), Arguments.of("1  *   2", "1 * 2"),
+				Arguments.of("+1", "+1"), Arguments.of("-1", "-1"),
 				Arguments.of("1.1e+5", "1.1e+5"),
-				Arguments.of("1.25e-5", "1.25e-5")
-				);
+				Arguments.of("1.25e-5", "1.25e-5"));
 	}
 
 	/**
@@ -266,15 +260,14 @@ class UnitDatabaseTest {
 		database.addPrefix("B", B);
 		database.addPrefix("C", C);
 
-		final var actual = database
-				.evaluateUnitExpression(expression);
+		final var actual = database.evaluateUnitExpression(expression);
 		assertEquals(expected, actual);
 
 		final var expectedU = expected.getUnit().times(expected.getValueExact());
 		final var actualU = database.getUnitFromExpression(expression);
 		assertEquals(expectedU, actualU);
 	}
-	
+
 	@ParameterizedTest
 	@MethodSource
 	public void testFormatExpression(String expression, String expected) {
@@ -335,8 +328,7 @@ class UnitDatabaseTest {
 		infiniteDatabase.addPrefix("B", B);
 		infiniteDatabase.addPrefix("C", C);
 
-		final var entrySet = infiniteDatabase.unitMap()
-				.entrySet();
+		final var entrySet = infiniteDatabase.unitMap().entrySet();
 		final var keySet = infiniteDatabase.unitMap().keySet();
 		assertThrows(IllegalStateException.class, () -> entrySet.toArray());
 		assertThrows(IllegalStateException.class, () -> keySet.toArray());
@@ -376,8 +368,7 @@ class UnitDatabaseTest {
 	@ValueSource(ints = { 1, 2, 3, 4, 5 })
 	public void testLoadingInvalidUnitFile(int num) {
 		final var database = new UnitDatabase();
-		final var filename = String.format("/test-unitsfile-invalid%d.txt",
-				num);
+		final var filename = String.format("/test-unitsfile-invalid%d.txt", num);
 		final var errs = loadUnitsFile(database, filename);
 		assertFalse(errs.isEmpty(), "no error from invalid file " + filename);
 		final var e = errs.get(0).problem();
@@ -418,7 +409,7 @@ class UnitDatabaseTest {
 		assertEquals(7, database.getPrefix("A").getMultiplier());
 		assertEquals(11, database.getPrefix("B").getMultiplier());
 		assertEquals(13, database.getPrefix("C").getMultiplier());
-		
+
 		// test invalid prefixes
 		assertThrows(NoSuchElementException.class,
 				() -> database.getPrefix("N/A"));
@@ -487,8 +478,7 @@ class UnitDatabaseTest {
 
 		final var map1 = database1.unitMap();
 		final var keyIterator1 = map1.keySet().iterator();
-		final var entryIterator1 = map1.entrySet()
-				.iterator();
+		final var entryIterator1 = map1.entrySet().iterator();
 
 		final Set<String> expectedKeys = Set.of("U", "V", "W");
 		final Set<String> actualKeys = new HashSet<>();
@@ -552,8 +542,7 @@ class UnitDatabaseTest {
 	@Test
 	public void testPrefixlessUnitMap() {
 		final var database = new UnitDatabase();
-		final var prefixlessUnits = database
-				.unitMapPrefixless(true);
+		final var prefixlessUnits = database.unitMapPrefixless(true);
 
 		database.addUnit("U", U);
 		database.addUnit("V", V);
@@ -690,10 +679,8 @@ class UnitDatabaseTest {
 		final var NUM_UNITS = database.unitMapPrefixless(true).size();
 		final var NUM_PREFIXES = database.prefixMap(true).size();
 
-		final var nameIterator = database.unitMap().keySet()
-				.iterator();
-		final var entryIterator = database.unitMap()
-				.entrySet().iterator();
+		final var nameIterator = database.unitMap().keySet().iterator();
+		final var entryIterator = database.unitMap().entrySet().iterator();
 
 		var expectedLength = 1;
 		var unitsWithThisLengthSoFar = 0;