Added Functionality of comparing value and conversion between differe…

…nt volume units

src/domain/volume/Cup.java

@@ -0,0 +1,20 @@
+package domain.volume;
+
+/**
+ * Created by aakash on 7/30/2015.
+ */
+public class Cup extends Volume{
+
+    public Cup(double volume) {
+        super(volume*48);
+    }
+
+    @Override
+    public double getVolumeValue() {
+        return super.getVolume();
+    }
+
+    public static double convert(Volume volume) {
+        return volume.getVolumeValue()/48;
+    }
+}

src/domain/volume/Ounce.java

@@ -0,0 +1,20 @@
+package domain.volume;
+
+/**
+ * Created by aakash on 7/30/2015.
+ */
+public class Ounce extends Volume{
+
+    public Ounce(double volume) {
+        super(volume*6);
+    }
+
+    @Override
+    public double getVolumeValue() {
+        return super.getVolume();
+    }
+
+    public static double convert(Volume volume) {
+        return volume.getVolumeValue()/6;
+    }
+}

src/domain/volume/TableSpoon.java

@@ -0,0 +1,20 @@
+package domain.volume;
+
+/**
+ * Created by aakash on 7/30/2015.
+ */
+public class TableSpoon extends Volume{
+
+    public TableSpoon(double volume) {
+        super(volume*3);
+    }
+
+    @Override
+    public double getVolumeValue() {
+        return super.getVolume();
+    }
+
+    public static double convert(Volume volume) {
+        return volume.getVolumeValue()/3;
+    }
+}

src/domain/volume/TeaSpoon.java

@@ -0,0 +1,21 @@
+package domain.volume;
+
+/**
+ * Created by aakash on 7/30/2015.
+ */
+public class TeaSpoon extends Volume{
+
+    public TeaSpoon(double volume) {
+        super(volume);
+    }
+
+    @Override
+    public double getVolumeValue() {
+        return super.getVolume();
+    }
+
+    public static double convert(Volume volume) {
+        return volume.getVolumeValue();
+    }
+
+}

src/domain/volume/Volume.java

@@ -5,23 +5,27 @@
 /**
  * Created by aakash on 7/30/2015.
  */
-public class Volume {
+public abstract class Volume {
 
     private double volume;
 
     public Volume(double volume) {
         this.volume = volume;
     }
 
+    public double getVolume() {
+        return volume;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (!(o instanceof Volume )) return false;
 
         Volume volume1 = (Volume) o;
 
         return Double.compare(volume1.volume, volume) == 0;
-
     }
 
+    public abstract double getVolumeValue();
 }

src/tests/LengthTest.java

@@ -15,20 +15,16 @@ public class LengthTest {
 
     @Test
     public void checkComparisonBetweenMetreAndCentimetre() {
-        Metres metres = new Metres(3);
-        Centimetres centimetres = new Centimetres(300);
 
-        assertTrue(metres.equals(centimetres));
+        assertTrue(new Metres(3).equals(new Centimetres(300)));
     }
 
     @Test
     public void checkConversionFromCentimetreToFeet() {
-        Feet feet = new Feet(3);
-        double inches = Inch.convert(feet);
-        Inch inch = new Inch(inches);
+        double inches = Inch.convert(new Feet(3));
 
         assertEquals(36,inches,0.00001);
-        assertTrue(inch.equals(feet));
+        assertTrue(new Inch(inches).equals(new Feet(3)));
     }
 
 }

src/tests/VolumeTest.java

@@ -0,0 +1,32 @@
+package tests;
+
+import domain.volume.Cup;
+import domain.volume.Ounce;
+import domain.volume.TableSpoon;
+import domain.volume.TeaSpoon;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Created by aakash on 7/30/2015.
+ */
+public class VolumeTest {
+
+    @Test
+    public void checkComparisonBetweenTbspAndCup() {
+
+        assertTrue(new TableSpoon(16).equals(new Cup(1)));
+    }
+
+    @Test
+    public void checkConversionFromOunceToTeaspoon() {
+        Ounce onz = new Ounce(2);
+        double tsp = TeaSpoon.convert(onz);
+
+        TeaSpoon teaSpoon = new TeaSpoon(tsp);
+
+        assertEquals(12,tsp,0.00001);
+        assertTrue(teaSpoon.equals(onz));
+    }
+}