From 28224f65f37289af0278b4c162e45af8e672667e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Mon, 8 Jun 2009 17:58:58 +0200
Subject: [PATCH]  ItEr12S10ProbasModuloRecursosItEr11S13: Fixed bug at
 Resource#finishEnforcedAt. Changing signature to reflect better its meaning.

---
 .../business/resources/entities/Resource.java      | 14 +++++++-------
 .../test/resources/entities/ResourceTest.java      |  6 ++----
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java
index fd6d2a6d5..6b0c1e13d 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java
@@ -336,14 +336,14 @@ public abstract class Resource {
 
     public List<CriterionSatisfaction> finish(
             CriterionWithItsType criterionWithItsType) {
-        return finishEnforcedAt(criterionWithItsType, new Date());
+        return finishEnforcedAt(criterionWithItsType.getCriterion(), new Date());
     }
 
-    public List<CriterionSatisfaction> finishEnforcedAt(
-            CriterionWithItsType criterionWithItsType, Date date) {
+    public List<CriterionSatisfaction> finishEnforcedAt(Criterion criterion,
+            Date date) {
         ArrayList<CriterionSatisfaction> result = new ArrayList<CriterionSatisfaction>();
         for (CriterionSatisfaction criterionSatisfaction : query().from(
-                criterionWithItsType.getType()).at(date).result()) {
+                criterion).at(date).result()) {
             criterionSatisfaction.finish(date);
             result.add(criterionSatisfaction);
         }
@@ -368,9 +368,9 @@ public abstract class Resource {
 
     public boolean canAddSatisfaction(ICriterionType<?> type,
             CriterionSatisfaction satisfaction) {
-        EnsureSatisfactionIsCorrect ensureSatisfactionIsCorrect = new EnsureSatisfactionIsCorrect(this, type, satisfaction);
-        return ensureSatisfactionIsCorrect
-                .canAddSatisfaction();
+        EnsureSatisfactionIsCorrect ensureSatisfactionIsCorrect = new EnsureSatisfactionIsCorrect(
+                this, type, satisfaction);
+        return ensureSatisfactionIsCorrect.canAddSatisfaction();
     }
 
     private CriterionSatisfaction getNext(ICriterionType<?> type,
diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/resources/entities/ResourceTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/resources/entities/ResourceTest.java
index d562b126e..cafe00c1b 100644
--- a/navalplanner-business/src/test/java/org/navalplanner/business/test/resources/entities/ResourceTest.java
+++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/resources/entities/ResourceTest.java
@@ -54,8 +54,7 @@ public class ResourceTest {
     public void getSatisfactionsForWrongIntervalThrowsException() {
         Worker worker = new Worker("firstName", "surName", "2333232", 10);
         worker.query().from(CriterionDAOTest.createValidCriterion())
-                .enforcedInAll(Interval.range(year(2000), year(1999)))
-                .result();
+                .enforcedInAll(Interval.range(year(2000), year(1999))).result();
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -213,8 +212,7 @@ public class ResourceTest {
         assertThat(worker.query().from(criterionType).enforcedInAll(fromNow)
                 .result().size(), equalTo(1));
         List<CriterionSatisfaction> finished = worker.finishEnforcedAt(
-                new CriterionWithItsType(criterionType, criterion), fromNow
-                        .getStart());
+                criterion, fromNow.getStart());
         assertThat(finished.size(), equalTo(1));
         assertTrue("all satisfactions are finished", worker.query().from(
                 criterionType).enforcedInAll(fromNow).result().isEmpty());