Add claim test and add type to line item

Author: paulrayner

src/warranty/ClaimTest.java

@@ -0,0 +1,40 @@
+package warranty;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.Date;
+import java.util.UUID;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class ClaimTest {
+
+    @Test
+    public void TestClaimIsSetupCorrectly()
+    {
+        LineItem lineItem1 = new LineItem("PARTS", 45.0, "Replacement part for soap dispenser");
+        LineItem lineItem2 = new LineItem("LABOR", 50.0, "1 hour repair");
+        RepairPO repairPO  = new RepairPO();
+        repairPO.lineItems.add(lineItem1);
+        repairPO.lineItems.add(lineItem2);
+
+        Claim claim = new Claim(100.0, new Date(2010, 5, 8));
+        claim.repairPO.add(repairPO);
+
+        assertEquals(100.0, claim.amount);
+        assertEquals(new Date(2010, 5, 8), claim.failureDate);
+        assertEquals("PARTS", claim.repairPO.get(0).lineItems.get(0).type);
+        assertEquals(45.0, claim.repairPO.get(0).lineItems.get(0).amount);
+        assertEquals("Replacement part for soap dispenser", claim.repairPO.get(0).lineItems.get(0).description);
+        assertEquals("LABOR", claim.repairPO.get(0).lineItems.get(1).type);
+        assertEquals(50.0, claim.repairPO.get(0).lineItems.get(1).amount);
+        assertEquals("1 hour repair", claim.repairPO.get(0).lineItems.get(1).description);
+    }
+
+    // Entities compare by unique IDs, not properties
+    @Test
+    public void TestClaimEquality()
+    {
+    }
+
+}

src/warranty/LineItem.java

@@ -1,43 +1,28 @@
 package warranty;
 
+import java.util.Objects;
+
 public class LineItem {
+	public final String type;
 	public final double amount;
 	public final String description;
 
-	public LineItem(double amount, String description) {
-		this.amount = amount;
+	public LineItem(String type, double amount, String description) {
+		this.type        = type;
+		this.amount      = amount;
 		this.description = description;
 	}
 
 	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		long temp;
-		temp = Double.doubleToLongBits(amount);
-		result = prime * result + (int) (temp ^ (temp >>> 32));
-		result = prime * result
-				+ ((description == null) ? 0 : description.hashCode());
-		return result;
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (o == null || getClass() != o.getClass()) return false;
+		LineItem lineItem = (LineItem) o;
+		return Double.compare(lineItem.amount, amount) == 0 && Objects.equals(type, lineItem.type) && Objects.equals(description, lineItem.description);
 	}
+
 	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
-		LineItem other = (LineItem) obj;
-		if (Double.doubleToLongBits(amount) != Double
-				.doubleToLongBits(other.amount))
-			return false;
-		if (description == null) {
-			if (other.description != null)
-				return false;
-		} else if (!description.equals(other.description))
-			return false;
-		return true;
+	public int hashCode() {
+		return Objects.hash(type, amount, description);
 	}
-
 }