6 files changed, 44 insertions, 20 deletions
diff --git a/src/test/java/org/unitConverter/math/ConditionalExistenceCollectionsTest.java b/src/test/java/sevenUnits/math/ConditionalExistenceCollectionsTest.java
index 311ace5..a35dc5a 100644
--- a/src/test/java/org/unitConverter/math/ConditionalExistenceCollectionsTest.java
+++ b/src/test/java/sevenUnits/math/ConditionalExistenceCollectionsTest.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.unitConverter.math;
+package sevenUnits.math;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -30,7 +30,9 @@ import java.util.Map.Entry;
 import java.util.NoSuchElementException;
 
 import org.junit.jupiter.api.Test;
-import org.unitConverter.math.ConditionalExistenceCollections.ConditionalExistenceIterator;
+
+import sevenUnits.math.ConditionalExistenceCollections;
+import sevenUnits.math.ConditionalExistenceCollections.ConditionalExistenceIterator;
 
 /**
  * Tests the {@link #ConditionalExistenceCollections}.
diff --git a/src/test/java/org/unitConverter/math/ExpressionParserTest.java b/src/test/java/sevenUnits/math/ExpressionParserTest.java
index f3180c1..4801233 100644
--- a/src/test/java/org/unitConverter/math/ExpressionParserTest.java
+++ b/src/test/java/sevenUnits/math/ExpressionParserTest.java
@@ -14,12 +14,14 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.unitConverter.math;
+package sevenUnits.math;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.Test;
 
+import sevenUnits.math.ExpressionParser;
+
 /**
  * A test for the {@code ExpressionParser} class. This is NOT part of this program's public API.
  * 
@@ -34,7 +36,7 @@ class ExpressionParserTest {
 			.addBinaryOperator("^", (o1, o2) -> (int) Math.pow(o1, o2), 2).build();
 
 	/**
-	 * Test method for {@link org.unitConverter.math.ExpressionParser#parseExpression(java.lang.String)}.
+	 * Test method for {@link sevenUnits.math.ExpressionParser#parseExpression(java.lang.String)}.
 	 */
 	@Test
 	public void testParseExpression() {
diff --git a/src/test/java/org/unitConverter/math/ObjectProductTest.java b/src/test/java/sevenUnits/math/ObjectProductTest.java
index afd18b7..1734f26 100644
--- a/src/test/java/org/unitConverter/math/ObjectProductTest.java
+++ b/src/test/java/sevenUnits/math/ObjectProductTest.java
@@ -14,21 +14,23 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.unitConverter.math;
+package sevenUnits.math;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.unitConverter.unit.SI.Dimensions.AREA;
-import static org.unitConverter.unit.SI.Dimensions.ENERGY;
-import static org.unitConverter.unit.SI.Dimensions.LENGTH;
-import static org.unitConverter.unit.SI.Dimensions.MASS;
-import static org.unitConverter.unit.SI.Dimensions.MASS_DENSITY;
-import static org.unitConverter.unit.SI.Dimensions.QUANTITY;
-import static org.unitConverter.unit.SI.Dimensions.TIME;
-import static org.unitConverter.unit.SI.Dimensions.VOLUME;
+import static sevenUnits.unit.SI.Dimensions.AREA;
+import static sevenUnits.unit.SI.Dimensions.ENERGY;
+import static sevenUnits.unit.SI.Dimensions.LENGTH;
+import static sevenUnits.unit.SI.Dimensions.MASS;
+import static sevenUnits.unit.SI.Dimensions.MASS_DENSITY;
+import static sevenUnits.unit.SI.Dimensions.QUANTITY;
+import static sevenUnits.unit.SI.Dimensions.TIME;
+import static sevenUnits.unit.SI.Dimensions.VOLUME;
 
 import org.junit.jupiter.api.Test;
-import org.unitConverter.unit.SI;
+
+import sevenUnits.math.ObjectProduct;
+import sevenUnits.unit.SI;
 
 /**
  * Tests for {@link ObjectProduct} using BaseDimension as a test object. This is NOT part of this program's public API.
diff --git a/src/test/java/org/unitConverter/unit/MultiUnitTest.java b/src/test/java/sevenUnits/unit/MultiUnitTest.java
index 5ea9d07..82722af 100644
--- a/src/test/java/org/unitConverter/unit/MultiUnitTest.java
+++ b/src/test/java/sevenUnits/unit/MultiUnitTest.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.unitConverter.unit;
+package sevenUnits.unit;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -25,6 +25,10 @@ import java.util.concurrent.ThreadLocalRandom;
 
 import org.junit.jupiter.api.Test;
 
+import sevenUnits.unit.BritishImperial;
+import sevenUnits.unit.MultiUnit;
+import sevenUnits.unit.SI;
+
 /**
  * Tests related to the {@code MultiUnit}.
  *
@@ -55,7 +59,7 @@ class MultiUnitTest {
 	
 	/**
 	 * Test method for
-	 * {@link org.unitConverter.unit.MultiUnit#convertFromBase(double)}.
+	 * {@link sevenUnits.unit.MultiUnit#convertFromBase(double)}.
 	 */
 	@Test
 	final void testConvertFromBase() {
@@ -82,7 +86,7 @@ class MultiUnitTest {
 	
 	/**
 	 * Test method for
-	 * {@link org.unitConverter.unit.MultiUnit#convertToBase(java.util.List)}.
+	 * {@link sevenUnits.unit.MultiUnit#convertToBase(java.util.List)}.
 	 */
 	@Test
 	final void testConvertToBase() {
diff --git a/src/test/java/org/unitConverter/unit/UnitDatabaseTest.java b/src/test/java/sevenUnits/unit/UnitDatabaseTest.java
index 7f957f3..c706b5c 100644
--- a/src/test/java/org/unitConverter/unit/UnitDatabaseTest.java
+++ b/src/test/java/sevenUnits/unit/UnitDatabaseTest.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.unitConverter.unit;
+package sevenUnits.unit;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -31,6 +31,13 @@ import java.util.Set;
 
 import org.junit.jupiter.api.Test;
 
+import sevenUnits.unit.LinearUnit;
+import sevenUnits.unit.NameSymbol;
+import sevenUnits.unit.SI;
+import sevenUnits.unit.Unit;
+import sevenUnits.unit.UnitDatabase;
+import sevenUnits.unit.UnitPrefix;
+
 /**
  * A test for the {@link UnitDatabase} class. This is NOT part of this program's
  * public API.
diff --git a/src/test/java/org/unitConverter/unit/UnitTest.java b/src/test/java/sevenUnits/unit/UnitTest.java
index 3b594f2..d216ae8 100644
--- a/src/test/java/org/unitConverter/unit/UnitTest.java
+++ b/src/test/java/sevenUnits/unit/UnitTest.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.unitConverter.unit;
+package sevenUnits.unit;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -25,7 +25,14 @@ import java.util.Random;
 import java.util.concurrent.ThreadLocalRandom;
 
 import org.junit.jupiter.api.Test;
-import org.unitConverter.math.DecimalComparison;
+
+import sevenUnits.math.DecimalComparison;
+import sevenUnits.unit.LinearUnit;
+import sevenUnits.unit.LinearUnitValue;
+import sevenUnits.unit.NameSymbol;
+import sevenUnits.unit.SI;
+import sevenUnits.unit.Unit;
+import sevenUnits.unit.UnitValue;
 
 /**
  * Testing the various Unit classes. This is NOT part of this program's public