Merge branch 'feature-new-units-def' into develop

1 files changed, 6 insertions, 15 deletions

diff --git a/src/org/unitConverter/unit/UnitTest.java b/src/org/unitConverter/unit/UnitTest.java
index 7ae5fbf..c078cfc 100644
--- a/src/org/unitConverter/unit/UnitTest.java
+++ b/src/org/unitConverter/unit/UnitTest.java
@@ -22,7 +22,6 @@ import java.util.Random;
 import java.util.concurrent.ThreadLocalRandom;
 
 import org.junit.jupiter.api.Test;
-import org.unitConverter.dimension.StandardDimensions;
 import org.unitConverter.math.DecimalComparison;
 
 /**
@@ -46,16 +45,8 @@ class UnitTest {
 	}
 
 	@Test
-	public void testBaseUnitExclusives() {
-		// this test should have a compile error if I am doing something wrong
-		final BaseUnit metrePerSecondSquared = SI.METRE.dividedBy(SI.SECOND.toExponent(2));
-
-		assertEquals(metrePerSecondSquared, SI.SI.getBaseUnit(StandardDimensions.ACCELERATION));
-	}
-
-	@Test
 	public void testConversion() {
-		final BaseUnit metre = SI.METRE;
+		final LinearUnit metre = SI.METRE;
 		final Unit inch = metre.times(0.0254);
 
 		assertEquals(1.9, inch.convertTo(metre, 75), 0.01);
@@ -77,8 +68,8 @@ class UnitTest {
 
 	@Test
 	public void testEquals() {
-		final BaseUnit metre = SI.METRE;
-		final Unit meter = SI.SI.getBaseUnit(StandardDimensions.LENGTH);
+		final LinearUnit metre = SI.METRE;
+		final Unit meter = SI.BaseUnits.METRE.asLinearUnit();
 
 		assertEquals(metre, meter);
 	}
@@ -87,7 +78,7 @@ class UnitTest {
 	public void testMultiplicationAndDivision() {
 		// test unit-times-unit multiplication
 		final LinearUnit generatedJoule = SI.KILOGRAM.times(SI.METRE.toExponent(2)).dividedBy(SI.SECOND.toExponent(2));
-		final LinearUnit actualJoule = SI.SI.getBaseUnit(StandardDimensions.ENERGY);
+		final LinearUnit actualJoule = SI.JOULE;
 
 		assertEquals(generatedJoule, actualJoule);
 
@@ -96,14 +87,14 @@ class UnitTest {
 		final LinearUnit hour = SI.SECOND.times(3600);
 		final LinearUnit generatedKPH = kilometre.dividedBy(hour);
 
-		final LinearUnit actualKPH = SI.SI.getBaseUnit(StandardDimensions.VELOCITY).dividedBy(3.6);
+		final LinearUnit actualKPH = SI.METRE.dividedBy(SI.SECOND).dividedBy(3.6);
 
 		assertEquals(generatedKPH, actualKPH);
 	}
 
 	@Test
 	public void testPrefixes() {
-		final LinearUnit generatedKilometre = SI.METRE.withPrefix(SIPrefix.KILO);
+		final LinearUnit generatedKilometre = SI.METRE.withPrefix(SI.KILO);
 		final LinearUnit actualKilometre = SI.METRE.times(1000);
 
 		assertEquals(generatedKilometre, actualKilometre);