cleanup..

starting/expense_reports/services-engine/src/main/java/org/springsource/examples/expenses/reports/Charge.java

@@ -29,11 +29,14 @@ public Long getId() {
 		return id;
 	}
 
-	public Charge(Long id, boolean reconciled, double amount, String category) {
-		this.reconciled = reconciled;
+	public Charge(Long id, double amount, String category) {
 		this.id = id;
 		this.amount = amount;
 		this.category = category;
 	}
 
+	public void setReconciled(){
+		this.reconciled = true ;
+	}
+
 }

starting/expense_reports/services-engine/src/main/java/org/springsource/examples/expenses/reports/DefaultExpenseValidationStrategy.java

@@ -21,7 +21,18 @@ public boolean validate(Expense item) {
 			throw new IllegalArgumentException("the item can't be null");
 		}
 		double charge = item.getAmount();
-		boolean invalid = ((item.getReceipt() == null || charge > maxAbsoluteValue));
+		boolean receiptMissing = item.getReceipt()  == null ;
+		boolean requiresReceipt = charge > maxAbsoluteValue ;
+		boolean invalid = false ;
+		if(requiresReceipt && receiptMissing)
+			invalid = true ;
+
+		if( requiresReceipt && !receiptMissing)
+			invalid = false ;
+
+		if(!requiresReceipt )
+			invalid = false;
+
 		return !invalid;
 	}
 }

starting/expense_reports/services-engine/src/main/java/org/springsource/examples/expenses/reports/ExpenseReport.java

@@ -43,7 +43,7 @@ public Expense addExpense(Charge charge) {
 	}
 
 	public boolean validate() {
-		boolean valid = true;
+		boolean valid =  getExpenses().size() > 0 ;
 		for (Expense lineItem : getExpenses()) {
 			if (!expenseValidationStrategy.validate(lineItem)) {
 				valid = false;

starting/expense_reports/services-engine/src/test/java/org/springsource/examples/expenses/TestExpenseReport.java

@@ -1,9 +1,12 @@
 package org.springsource.examples.expenses;
 
 
+import junit.framework.Assert;
 import org.apache.commons.lang.SystemUtils;
 import org.junit.Test;
+import org.springsource.examples.expenses.fs.ManagedFile;
 import org.springsource.examples.expenses.reports.Charge;
+import org.springsource.examples.expenses.reports.Expense;
 import org.springsource.examples.expenses.reports.ExpenseReport;
 
 import java.io.File;
@@ -14,23 +17,23 @@ public class TestExpenseReport {
 
 	private File desktop = new File(SystemUtils.getUserHome(), "Desktop");
 
-	Collection<Charge> charges = Arrays.asList();
+	private Charge expensiveCharge = new Charge(32L, 232.00, "category 1");
+	private Charge inexpensiveCharge = new Charge(33L, 22, "category 2");
+	private Collection<Charge> charges = Arrays.asList(expensiveCharge, inexpensiveCharge);
+
+	private ManagedFile file = new ManagedFile(new File(new File(SystemUtils.getUserHome(), "Desktop"), "coffee.jpg"));
 
 	@Test
 	public void testSubmittingExpenseReport() throws Throwable {
 
 		ExpenseReport expenseReport = new ExpenseReport();
-		for(Charge c : charges)
-			expenseReport.addExpense(c ) ;
-
-		/*
-
-
-				long counter = 0;
-
-				for (String userId : users) {
-					ExpenseReport expenseReport = new ExpenseReport(userId);*/
-
+		Assert.assertFalse( expenseReport.validate());
+		expenseReport.addExpense(inexpensiveCharge);
+		Assert.assertTrue(expenseReport.validate());
+		Expense expensiveExpense = expenseReport.addExpense(expensiveCharge);
+		Assert.assertFalse(expenseReport.validate());
+		expensiveExpense.setReceipt(file);
+		Assert.assertTrue(expenseReport.validate());
 	}
 
 	/* private File desktop = new File(SystemUtils.getUserHome(), "Desktop");