From cf23877e8ce0bf2dd502f48397a93a241c9db045 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Wed, 4 Nov 2009 21:14:09 +0100
Subject: [PATCH] ItEr33S14CUCreacionUnidadesPlanificacion: Using assertTrue
 instead of checkValid for TaskMilestone

---
 .../business/planner/entities/TaskMilestone.java  | 15 ++++++---------
 .../test/planner/daos/TaskElementDAOTest.java     |  1 -
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskMilestone.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskMilestone.java
index f55d2aec7..a653008fa 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskMilestone.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskMilestone.java
@@ -26,16 +26,15 @@ import java.util.List;
 import java.util.Set;
 
 import org.apache.commons.lang.Validate;
+import org.hibernate.validator.AssertTrue;
 import org.joda.time.DateTime;
 import org.joda.time.Days;
-import org.navalplanner.business.common.IValidable;
-import org.navalplanner.business.common.exceptions.ValidationException;
 import org.navalplanner.business.orders.entities.OrderElement;
 
 /**
  * @author Lorenzo Tilve Álvaro <ltilve@igalia.com>
  */
-public class TaskMilestone extends TaskElement implements IValidable {
+public class TaskMilestone extends TaskElement {
 
     public static TaskMilestone create() {
         TaskMilestone milestone = new TaskMilestone();
@@ -112,12 +111,10 @@ public class TaskMilestone extends TaskElement implements IValidable {
         return Integer.valueOf(0);
     }
 
-    @Override
-    public void checkValid() throws ValidationException {
-        if (super.getOrderElement() != null) {
-            throw new ValidationException("Not null milestone orderelement");
-        }
-
+    @SuppressWarnings("unused")
+    @AssertTrue(message = "order element associated to a milestone must be null")
+    private boolean theOrderElementMustBeNull() {
+        return getOrderElement() == null;
     }
 
     @Override
diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/daos/TaskElementDAOTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/daos/TaskElementDAOTest.java
index 9f7836abd..61841be1f 100644
--- a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/daos/TaskElementDAOTest.java
+++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/daos/TaskElementDAOTest.java
@@ -109,7 +109,6 @@ public class TaskElementDAOTest {
         order.setCode("code");
         order.add(orderLine);
         try {
-            order.checkValid();
             orderDAO.save(order);
             sessionFactory.getCurrentSession().flush();
         } catch (ValidationException e) {