Implemented expression conversion, tests now pass

1 files changed, 29 insertions, 7 deletions

diff --git a/src/main/java/sevenUnitsGUI/ViewBot.java b/src/main/java/sevenUnitsGUI/ViewBot.java
index bc5302b..43d73bb 100644
--- a/src/main/java/sevenUnitsGUI/ViewBot.java
+++ b/src/main/java/sevenUnitsGUI/ViewBot.java
@@ -16,6 +16,7 @@
  */
 package sevenUnitsGUI;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
@@ -25,6 +26,7 @@ import java.util.Set;
 
 import sevenUnits.unit.BaseDimension;
 import sevenUnits.unit.Unit;
+import sevenUnits.unit.UnitValue;
 import sevenUnits.utils.NamedObjectProduct;
 import sevenUnits.utils.ObjectProduct;
 
@@ -59,8 +61,12 @@ final class ViewBot implements UnitConversionView, ExpressionConversionView {
 	private Set<? extends Unit> fromUnits;
 	/** The units available in the To selection */
 	private Set<? extends Unit> toUnits;
+	/** Saved input values of all unit conversions */
+	private final List<UnitValue> unitConversionInputValues;
 	/** Saved output values of all unit conversions */
-	private List<String> unitConversionOutputValues;
+	private final List<UnitValue> unitConversionOutputValues;
+	/** Saved outputs of all unit expressions */
+	private final List<String> expressionConversionOutputs;
 	
 	/**
 	 * Creates a new {@code ViewBot} with a new presenter.
@@ -69,6 +75,10 @@ final class ViewBot implements UnitConversionView, ExpressionConversionView {
 	 */
 	public ViewBot() {
 		this.presenter = new Presenter(this);
+		
+		this.unitConversionInputValues = new ArrayList<>();
+		this.unitConversionOutputValues = new ArrayList<>();
+		this.expressionConversionOutputs = new ArrayList<>();
 	}
 	
 	/**
@@ -81,7 +91,7 @@ final class ViewBot implements UnitConversionView, ExpressionConversionView {
 	}
 	
 	public List<String> getExpressionConversionOutputs() {
-		throw new UnsupportedOperationException("Not implemented yet");
+		return this.expressionConversionOutputs;
 	}
 	
 	@Override
@@ -139,10 +149,18 @@ final class ViewBot implements UnitConversionView, ExpressionConversionView {
 	}
 	
 	/**
+	 * @return the unitConversionInputValues
+	 * @since 2022-02-26
+	 */
+	public List<UnitValue> getUnitConversionInputValues() {
+		return this.unitConversionInputValues;
+	}
+	
+	/**
 	 * @return the unitConversionOutputValues
 	 * @since 2022-02-10
 	 */
-	public List<String> getUnitConversionOutputValues() {
+	public List<UnitValue> getUnitConversionOutputValues() {
 		return this.unitConversionOutputValues;
 	}
 	
@@ -247,13 +265,17 @@ final class ViewBot implements UnitConversionView, ExpressionConversionView {
 	@Override
 	public void showExpressionConversionOutput(String fromExpression,
 			String toExpression, double value) {
-		System.out.printf("Expression Conversion: %s = %d * (%s)%n",
-				fromExpression, value, toExpression);
+		final String output = String.format("%s = %s %s", fromExpression, value,
+				toExpression);
+		this.expressionConversionOutputs.add(output);
+		System.out.println("Expression Conversion: " + output);
 	}
 	
 	@Override
-	public void showUnitConversionOutput(String outputString) {
-		System.out.println("Unit conversion: " + outputString);
+	public void showUnitConversionOutput(UnitValue input, UnitValue output) {
+		this.unitConversionInputValues.add(input);
+		this.unitConversionOutputValues.add(output);
+		System.out.println("Unit conversion: " + input + " = " + output);
 	}
 	
 	@Override