diff options
| author | Adrien Hopkins <ahopk127@my.yorku.ca> | 2021-08-26 15:09:23 -0400 |
|---|---|---|
| committer | Adrien Hopkins <ahopk127@my.yorku.ca> | 2021-08-26 15:09:23 -0400 |
| commit | 816f744169d1ecdb689aba27cb396ab452fdc3fe (patch) | |
| tree | 1eed1edbbf6f3131dfb6a26c1480d023e44f6c51 /src/test/java/sevenUnits/unit/UnitDatabaseTest.java | |
| parent | 236b497f516694929b9fe409508a7cce21ca9e6e (diff) | |
| parent | 75a5a1a2a40b0eb4361d6fc046eb8918ef6f5292 (diff) | |
Merge branch 'new-documentation-0.3.1' into develop
Diffstat (limited to 'src/test/java/sevenUnits/unit/UnitDatabaseTest.java')
| -rw-r--r-- | src/test/java/sevenUnits/unit/UnitDatabaseTest.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/test/java/sevenUnits/unit/UnitDatabaseTest.java b/src/test/java/sevenUnits/unit/UnitDatabaseTest.java index c706b5c..1d5e503 100644 --- a/src/test/java/sevenUnits/unit/UnitDatabaseTest.java +++ b/src/test/java/sevenUnits/unit/UnitDatabaseTest.java @@ -33,7 +33,7 @@ import org.junit.jupiter.api.Test; import sevenUnits.unit.LinearUnit; import sevenUnits.unit.NameSymbol; -import sevenUnits.unit.SI; +import sevenUnits.unit.Metric; import sevenUnits.unit.Unit; import sevenUnits.unit.UnitDatabase; import sevenUnits.unit.UnitPrefix; @@ -48,18 +48,18 @@ import sevenUnits.unit.UnitPrefix; */ class UnitDatabaseTest { // some linear units and one nonlinear - private static final Unit U = SI.METRE; - private static final Unit V = SI.KILOGRAM; - private static final Unit W = SI.SECOND; + private static final Unit U = Metric.METRE; + private static final Unit V = Metric.KILOGRAM; + private static final Unit W = Metric.SECOND; // used for testing expressions // J = U^2 * V / W^2 - 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 LinearUnit J = Metric.KILOGRAM.times(Metric.METRE.toExponent(2)) + .dividedBy(Metric.SECOND.toExponent(2)); + private static final LinearUnit K = Metric.KELVIN; private static final Unit NONLINEAR = Unit - .fromConversionFunctions(SI.METRE.getBase(), o -> o + 1, o -> o - 1); + .fromConversionFunctions(Metric.METRE.getBase(), o -> o + 1, o -> o - 1); // make the prefix values prime so I can tell which multiplications were made private static final UnitPrefix A = UnitPrefix.valueOf(2) |