diff options
Diffstat (limited to 'src/test/java')
| -rwxr-xr-x | src/test/java/UnitTest.java | 2 | ||||
| -rw-r--r-- | src/test/java/UnitsDatabaseTest.java | 14 |
2 files changed, 2 insertions, 14 deletions
diff --git a/src/test/java/UnitTest.java b/src/test/java/UnitTest.java index 00fcf3c..7a3f29d 100755 --- a/src/test/java/UnitTest.java +++ b/src/test/java/UnitTest.java @@ -63,7 +63,7 @@ public class UnitTest { final BaseUnit metre = SI.METRE; final Unit inch = metre.times(0.0254); - assertEquals(1.9, inch.convertToBase(75), 0.01); + assertEquals(1.9, inch.convertTo(metre, 75), 0.01); // try random stuff for (int i = 0; i < 1000; i++) { diff --git a/src/test/java/UnitsDatabaseTest.java b/src/test/java/UnitsDatabaseTest.java index 6d2247f..0d67c20 100644 --- a/src/test/java/UnitsDatabaseTest.java +++ b/src/test/java/UnitsDatabaseTest.java @@ -27,7 +27,6 @@ import java.util.Map.Entry; import org.junit.Test; import org.unitConverter.UnitsDatabase; -import org.unitConverter.unit.AbstractUnit; import org.unitConverter.unit.DefaultUnitPrefix; import org.unitConverter.unit.LinearUnit; import org.unitConverter.unit.SI; @@ -52,18 +51,7 @@ public class UnitsDatabaseTest { private static final LinearUnit J = SI.KILOGRAM.times(SI.METRE.toExponent(2)).dividedBy(SI.SECOND.toExponent(2)); private static final LinearUnit K = SI.KELVIN; - private static final Unit NONLINEAR = new AbstractUnit(SI.METRE) { - - @Override - public double convertFromBase(final double value) { - return value + 1; - } - - @Override - public double convertToBase(final double value) { - return value - 1; - } - }; + private static final Unit NONLINEAR = Unit.fromConversionFunctions(SI.METRE, o -> o + 1, o -> o - 1); // make the prefix values prime so I can tell which multiplications were made private static final UnitPrefix A = new DefaultUnitPrefix(2); |