From efd65cca4d176d4ac41210fb654f583cff329eb9 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <mrego@igalia.com>
Date: Wed, 4 May 2011 13:55:36 +0200
Subject: [PATCH] Changed tests and fixed issue with CHILDREN advance.

FEA: ItEr74S07WBSTreeRefactoring
---
 .../orders/entities/OrderLineGroup.java         |  3 ++-
 .../web/orders/OrderElementTreeModelTest.java   | 17 +++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java
index 7b15aa7b6..9d8427224 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java
@@ -263,7 +263,8 @@ public class OrderLineGroup extends OrderElement implements
             }
         }
 
-        if (indirectAdvanceAssignments.isEmpty()) {
+        if (indirectAdvanceAssignments.isEmpty()
+                && !orderElement.getAllDirectAdvanceAssignments().isEmpty()) {
             addChildrenAdvanceOrderLineGroup();
         }
     }
diff --git a/navalplanner-webapp/src/test/java/org/navalplanner/web/orders/OrderElementTreeModelTest.java b/navalplanner-webapp/src/test/java/org/navalplanner/web/orders/OrderElementTreeModelTest.java
index 5441c92ca..25847e0f7 100644
--- a/navalplanner-webapp/src/test/java/org/navalplanner/web/orders/OrderElementTreeModelTest.java
+++ b/navalplanner-webapp/src/test/java/org/navalplanner/web/orders/OrderElementTreeModelTest.java
@@ -251,6 +251,9 @@ public class OrderElementTreeModelTest {
 
         model.addElement("element", 100);
 
+        assertThat(order.getDirectAdvanceAssignments().size(), equalTo(1));
+        assertTrue(order.getIndirectAdvanceAssignments().isEmpty());
+
         OrderLine element = (OrderLine) model.getRoot().getChildren().get(0);
         assertTrue(element.getDirectAdvanceAssignments().isEmpty());
 
@@ -1296,7 +1299,7 @@ public class OrderElementTreeModelTest {
         assertNotNull(order.getAdvanceAssignmentByType(advanceType2));
 
         assertThat(container.getDirectAdvanceAssignments().size(), equalTo(1));
-        assertThat(container.getIndirectAdvanceAssignments().size(), equalTo(2));
+        assertThat(container.getIndirectAdvanceAssignments().size(), equalTo(1));
         assertNotNull(container.getAdvanceAssignmentByType(advanceType));
         assertNull(container.getIndirectAdvanceAssignment(advanceType));
         assertNotNull(container.getIndirectAdvanceAssignment(advanceType2));
@@ -1329,7 +1332,7 @@ public class OrderElementTreeModelTest {
         assertNotNull(order.getAdvanceAssignmentByType(advanceType2));
 
         assertThat(container.getDirectAdvanceAssignments().size(), equalTo(1));
-        assertThat(container.getIndirectAdvanceAssignments().size(), equalTo(2));
+        assertThat(container.getIndirectAdvanceAssignments().size(), equalTo(1));
         assertNotNull(container.getAdvanceAssignmentByType(advanceType));
         assertNull(container.getIndirectAdvanceAssignment(advanceType));
         assertNotNull(container.getIndirectAdvanceAssignment(advanceType2));
@@ -1362,7 +1365,7 @@ public class OrderElementTreeModelTest {
         assertNotNull(order.getAdvanceAssignmentByType(advanceType2));
 
         assertThat(container.getDirectAdvanceAssignments().size(), equalTo(1));
-        assertThat(container.getIndirectAdvanceAssignments().size(), equalTo(2));
+        assertThat(container.getIndirectAdvanceAssignments().size(), equalTo(1));
         assertNotNull(container.getAdvanceAssignmentByType(advanceType));
         assertNull(container.getIndirectAdvanceAssignment(advanceType));
         assertNotNull(container.getIndirectAdvanceAssignment(advanceType2));
@@ -1372,8 +1375,7 @@ public class OrderElementTreeModelTest {
         assertNull(element.getAdvanceAssignmentByType(advanceType2));
 
         assertFalse(container2.getDirectAdvanceAssignments().isEmpty());
-        assertThat(container2.getIndirectAdvanceAssignments().size(),
-                equalTo(1));
+        assertTrue(container2.getIndirectAdvanceAssignments().isEmpty());
         assertNull(container2.getAdvanceAssignmentByType(advanceType));
         assertNotNull(container2.getAdvanceAssignmentByType(advanceType2));
         assertNull(container2.getIndirectAdvanceAssignment(advanceType2));
@@ -1406,7 +1408,7 @@ public class OrderElementTreeModelTest {
         assertNotNull(order.getAdvanceAssignmentByType(advanceType2));
 
         assertThat(container.getDirectAdvanceAssignments().size(), equalTo(1));
-        assertThat(container.getIndirectAdvanceAssignments().size(), equalTo(2));
+        assertThat(container.getIndirectAdvanceAssignments().size(), equalTo(1));
         assertNotNull(container.getAdvanceAssignmentByType(advanceType));
         assertNull(container.getIndirectAdvanceAssignment(advanceType));
         assertNotNull(container.getIndirectAdvanceAssignment(advanceType2));
@@ -1416,8 +1418,7 @@ public class OrderElementTreeModelTest {
         assertNull(element.getAdvanceAssignmentByType(advanceType2));
 
         assertFalse(container2.getDirectAdvanceAssignments().isEmpty());
-        assertThat(container2.getIndirectAdvanceAssignments().size(),
-                equalTo(1));
+        assertTrue(container2.getIndirectAdvanceAssignments().isEmpty());
         assertNull(container2.getAdvanceAssignmentByType(advanceType));
         assertNotNull(container2.getAdvanceAssignmentByType(advanceType2));
         assertNull(container2.getIndirectAdvanceAssignment(advanceType2));