Named the metric dimensions & fixed NameSymbol.toString

1 files changed, 13 insertions, 16 deletions

diff --git a/src/test/java/sevenUnitsGUI/PresenterTest.java b/src/test/java/sevenUnitsGUI/PresenterTest.java
index deb16d7..82842d8 100644
--- a/src/test/java/sevenUnitsGUI/PresenterTest.java
+++ b/src/test/java/sevenUnitsGUI/PresenterTest.java
@@ -32,7 +32,6 @@ import sevenUnits.unit.BaseDimension;
 import sevenUnits.unit.Metric;
 import sevenUnits.unit.Unit;
 import sevenUnits.unit.UnitValue;
-import sevenUnits.utils.NameSymbol;
 import sevenUnits.utils.NamedObjectProduct;
 
 /**
@@ -41,19 +40,18 @@ import sevenUnits.utils.NamedObjectProduct;
  * @since 2022-02-10
  */
 public final class PresenterTest {
+	static final Set<Unit> testUnits = Set.of(Metric.METRE, Metric.KILOMETRE,
+			Metric.METRE_PER_SECOND, Metric.KILOMETRE_PER_HOUR);
+	
+	static final Set<NamedObjectProduct<BaseDimension>> testDimensions = Set
+			.of(Metric.Dimensions.LENGTH, Metric.Dimensions.VELOCITY);
+	
 	private static final List<String> unitNames(
 			Collection<? extends Unit> units) {
 		return units.stream().map(Unit::getShortName)
 				.collect(Collectors.toList());
 	}
 	
-	Set<Unit> testUnits = Set.of(Metric.METRE, Metric.KILOMETRE,
-			Metric.METRE_PER_SECOND, Metric.KILOMETRE_PER_HOUR);
-	
-	Set<NamedObjectProduct<BaseDimension>> testDimensions = Set.of(
-			Metric.Dimensions.LENGTH.withName(NameSymbol.ofName("Length")),
-			Metric.Dimensions.VELOCITY.withName(NameSymbol.ofName("Velocity")));
-	
 	/**
 	 * Test method for {@link Presenter#convertExpressions}
 	 * 
@@ -87,8 +85,8 @@ public final class PresenterTest {
 		final ViewBot viewBot = new ViewBot();
 		final Presenter presenter = new Presenter(viewBot);
 		
-		viewBot.setFromUnits(this.testUnits);
-		viewBot.setToUnits(this.testUnits);
+		viewBot.setFromUnits(testUnits);
+		viewBot.setToUnits(testUnits);
 		viewBot.setFromSelection(Optional.of(Metric.METRE));
 		viewBot.setToSelection(Optional.of(Metric.KILOMETRE));
 		viewBot.setInputValue(OptionalDouble.of(10000.0));
@@ -124,16 +122,15 @@ public final class PresenterTest {
 		
 		// override default database units
 		presenter.database.clear();
-		for (final Unit unit : this.testUnits) {
+		for (final Unit unit : testUnits) {
 			presenter.database.addUnit(unit.getPrimaryName().orElseThrow(), unit);
 		}
 		
 		// set from and to units
-		viewBot.setFromUnits(this.testUnits);
-		viewBot.setToUnits(this.testUnits);
-		viewBot.setDimensions(this.testDimensions);
-		viewBot.setSelectedDimension(
-				Optional.of(this.testDimensions.iterator().next()));
+		viewBot.setFromUnits(testUnits);
+		viewBot.setToUnits(testUnits);
+		viewBot.setDimensions(testDimensions);
+		viewBot.setSelectedDimension(Optional.of(Metric.Dimensions.LENGTH));
 		
 		// filter to length units only, then get the filtered sets of units
 		presenter.updateView();