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.java6
-rw-r--r--src/test/java/sevenUnits/unit/UnitDatabaseTest.java16
-rw-r--r--src/test/java/sevenUnits/unit/UnitTest.java50
3 files changed, 36 insertions, 36 deletions
diff --git a/src/test/java/sevenUnits/unit/MultiUnitTest.java b/src/test/java/sevenUnits/unit/MultiUnitTest.java
index 82722af..d632118 100644
--- a/src/test/java/sevenUnits/unit/MultiUnitTest.java
+++ b/src/test/java/sevenUnits/unit/MultiUnitTest.java
@@ -27,7 +27,7 @@ import org.junit.jupiter.api.Test;
import sevenUnits.unit.BritishImperial;
import sevenUnits.unit.MultiUnit;
-import sevenUnits.unit.SI;
+import sevenUnits.unit.Metric;
/**
* Tests related to the {@code MultiUnit}.
@@ -42,7 +42,7 @@ class MultiUnitTest {
final MultiUnit footInch = MultiUnit.of(BritishImperial.Length.FOOT,
BritishImperial.Length.INCH);
- assertEquals(1702.0, footInch.convertTo(SI.METRE.withPrefix(SI.MILLI),
+ 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++) {
@@ -50,7 +50,7 @@ class MultiUnitTest {
final double inches = rng.nextDouble() * 12;
final double millimetres = feet * 304.8 + inches * 25.4;
- final List<Double> feetAndInches = SI.METRE.withPrefix(SI.MILLI)
+ 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);
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)
diff --git a/src/test/java/sevenUnits/unit/UnitTest.java b/src/test/java/sevenUnits/unit/UnitTest.java
index bad5a31..a980054 100644
--- a/src/test/java/sevenUnits/unit/UnitTest.java
+++ b/src/test/java/sevenUnits/unit/UnitTest.java
@@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test;
import sevenUnits.unit.LinearUnit;
import sevenUnits.unit.LinearUnitValue;
import sevenUnits.unit.NameSymbol;
-import sevenUnits.unit.SI;
+import sevenUnits.unit.Metric;
import sevenUnits.unit.Unit;
import sevenUnits.unit.UnitValue;
import sevenUnits.utils.DecimalComparison;
@@ -48,19 +48,19 @@ class UnitTest {
@Test
public void testAdditionAndSubtraction() {
- final LinearUnit inch = SI.METRE.times(0.0254)
+ final LinearUnit inch = Metric.METRE.times(0.0254)
.withName(NameSymbol.of("inch", "in"));
- final LinearUnit foot = SI.METRE.times(0.3048)
+ final LinearUnit foot = Metric.METRE.times(0.3048)
.withName(NameSymbol.of("foot", "ft"));
- assertEquals(inch.plus(foot), SI.METRE.times(0.3302));
- assertEquals(foot.minus(inch), SI.METRE.times(0.2794));
+ assertEquals(inch.plus(foot), Metric.METRE.times(0.3302));
+ assertEquals(foot.minus(inch), Metric.METRE.times(0.2794));
// test with LinearUnitValue
- final LinearUnitValue value1 = LinearUnitValue.getExact(SI.METRE, 15);
+ final LinearUnitValue value1 = LinearUnitValue.getExact(Metric.METRE, 15);
final LinearUnitValue value2 = LinearUnitValue.getExact(foot, 120);
- final LinearUnitValue value3 = LinearUnitValue.getExact(SI.METRE, 0.5);
- final LinearUnitValue value4 = LinearUnitValue.getExact(SI.KILOGRAM, 60);
+ final LinearUnitValue value3 = LinearUnitValue.getExact(Metric.METRE, 0.5);
+ final LinearUnitValue value4 = LinearUnitValue.getExact(Metric.KILOGRAM, 60);
// make sure addition is done correctly
assertEquals(51.576, value1.plus(value2).getValueExact(), 0.001);
@@ -70,8 +70,8 @@ class UnitTest {
// make sure addition uses the correct unit, and is still associative
// (ignoring floating-point rounding errors)
- assertEquals(SI.METRE, value1.plus(value2).getUnit());
- assertEquals(SI.METRE, value1.plus(value2).plus(value3).getUnit());
+ assertEquals(Metric.METRE, value1.plus(value2).getUnit());
+ assertEquals(Metric.METRE, value1.plus(value2).plus(value3).getUnit());
assertEquals(foot, value2.plus(value1).getUnit());
assertTrue(value1.plus(value2).equals(value2.plus(value1), true));
@@ -81,7 +81,7 @@ class UnitTest {
@Test
public void testConversion() {
- final LinearUnit metre = SI.METRE;
+ final LinearUnit metre = Metric.METRE;
final Unit inch = metre.times(0.0254);
final UnitValue value = UnitValue.of(inch, 75);
@@ -97,7 +97,7 @@ class UnitTest {
final double expected = testValue * conversionFactor;
// test
- final Unit unit = SI.METRE.times(conversionFactor);
+ final Unit unit = Metric.METRE.times(conversionFactor);
final double actual = unit.convertToBase(testValue);
assertEquals(actual, expected,
@@ -107,17 +107,17 @@ class UnitTest {
@Test
public void testEquals() {
- final LinearUnit metre = SI.METRE;
- final Unit meter = SI.BaseUnits.METRE.asLinearUnit();
+ final LinearUnit metre = Metric.METRE;
+ final Unit meter = Metric.BaseUnits.METRE.asLinearUnit();
assertEquals(metre, meter);
}
@Test
public void testIsMetric() {
- final Unit metre = SI.METRE;
- final Unit megasecond = SI.SECOND.withPrefix(SI.MEGA);
- final Unit hour = SI.HOUR;
+ final Unit metre = Metric.METRE;
+ final Unit megasecond = Metric.SECOND.withPrefix(Metric.MEGA);
+ final Unit hour = Metric.HOUR;
assertTrue(metre.isMetric());
assertTrue(megasecond.isMetric());
@@ -127,26 +127,26 @@ class UnitTest {
@Test
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.JOULE;
+ final LinearUnit generatedJoule = Metric.KILOGRAM
+ .times(Metric.METRE.toExponent(2)).dividedBy(Metric.SECOND.toExponent(2));
+ final LinearUnit actualJoule = Metric.JOULE;
assertEquals(generatedJoule, actualJoule);
// test multiplication by conversion factors
- final LinearUnit kilometre = SI.METRE.times(1000);
- final LinearUnit hour = SI.SECOND.times(3600);
+ final LinearUnit kilometre = Metric.METRE.times(1000);
+ final LinearUnit hour = Metric.SECOND.times(3600);
final LinearUnit generatedKPH = kilometre.dividedBy(hour);
- final LinearUnit actualKPH = SI.METRE.dividedBy(SI.SECOND).dividedBy(3.6);
+ final LinearUnit actualKPH = Metric.METRE.dividedBy(Metric.SECOND).dividedBy(3.6);
assertEquals(generatedKPH, actualKPH);
}
@Test
public void testPrefixes() {
- final LinearUnit generatedKilometre = SI.METRE.withPrefix(SI.KILO);
- final LinearUnit actualKilometre = SI.METRE.times(1000);
+ final LinearUnit generatedKilometre = Metric.METRE.withPrefix(Metric.KILO);
+ final LinearUnit actualKilometre = Metric.METRE.times(1000);
assertEquals(generatedKilometre, actualKilometre);
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-03 15:23:23 +0000