RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ItEr25S06RFControlAvancesIncompatiblesEnUnidadesTraballoItEr24S06: Fixed typo in method name.

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2009-09-10 12:05:06 +02:00 • committed by Javier Moran Rua
parent 68629dda08
commit d0c2bb4db3
3 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java
View file

@ -158,7 +158,7 @@ public abstract class OrderElement extends BaseEntity {
* @throws DuplicateValueTrueReportGlobalAdvanceException
* @throws DuplicateAdvanceAssigmentForOrderElementException
*/
public void addAvanceAssigment(AdvanceAssigment newAdvanceAssigment)
public void addAdvanceAssigment(AdvanceAssigment newAdvanceAssigment)
throws DuplicateValueTrueReportGlobalAdvanceException,
DuplicateAdvanceAssigmentForOrderElementException {
if(newAdvanceAssigment.getType().equals(AdvanceAssigment.Type.DIRECT)){

32
navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/AddAdvanceAssigmentsToOrderElementTest.java
View file

@ -120,7 +120,7 @@ public class AddAdvanceAssigmentsToOrderElementTest {
order.add(orderLine);
orderDao.save(order);
orderLine.addAvanceAssigment(advanceAssigment);
orderLine.addAdvanceAssigment(advanceAssigment);
order.add(orderLine);
orderDao.save(order);
@ -151,11 +151,11 @@ public class AddAdvanceAssigmentsToOrderElementTest {
order.add(orderLine);
orderDao.save(order);
orderLine.addAvanceAssigment(advanceAssigmentA);
orderLine.addAdvanceAssigment(advanceAssigmentA);
AdvanceAssigment advanceAssigmentB = createValidAdvanceAssigment(false);
advanceAssigmentB.setAdvanceType(advanceTypeB);
orderLine.addAvanceAssigment(advanceAssigmentB);
orderLine.addAdvanceAssigment(advanceAssigmentB);
}
@Test
@ -168,13 +168,13 @@ public class AddAdvanceAssigmentsToOrderElementTest {
AdvanceAssigment advanceAssigmentA = createValidAdvanceAssigment(true);
advanceAssigmentA.setAdvanceType(advanceTypeA);
orderLine.addAvanceAssigment(advanceAssigmentA);
orderLine.addAdvanceAssigment(advanceAssigmentA);
AdvanceAssigment advanceAssigmentB = createValidAdvanceAssigment(false);
advanceAssigmentB.setAdvanceType(advanceTypeA);
try {
orderLine.addAvanceAssigment(advanceAssigmentB);
orderLine.addAdvanceAssigment(advanceAssigmentB);
fail("It should throw an exception");
} catch (DuplicateAdvanceAssigmentForOrderElementException e) {
// Ok
@ -192,12 +192,12 @@ public class AddAdvanceAssigmentsToOrderElementTest {
advanceAssigmentA.setAdvanceType(advanceTypeA);
orderLine.addAvanceAssigment(advanceAssigmentA);
orderLine.addAdvanceAssigment(advanceAssigmentA);
AdvanceAssigment advanceAssigmentB = createValidAdvanceAssigment(true);
advanceAssigmentB.setAdvanceType(advanceTypeB);
try {
orderLine.addAvanceAssigment(advanceAssigmentB);
orderLine.addAdvanceAssigment(advanceAssigmentB);
fail("It should throw an exception ");
} catch (DuplicateValueTrueReportGlobalAdvanceException e) {
// Ok
@ -225,8 +225,8 @@ public class AddAdvanceAssigmentsToOrderElementTest {
advanceAssigmentB.getAdvanceMeasurements().add(advanceMeasurement);
container.addAvanceAssigment(advanceAssigmentA);
son.addAvanceAssigment(advanceAssigmentB);
container.addAdvanceAssigment(advanceAssigmentA);
son.addAdvanceAssigment(advanceAssigmentB);
}
@Test
@ -241,7 +241,7 @@ public class AddAdvanceAssigmentsToOrderElementTest {
AdvanceAssigment advanceAssigmentA = createValidAdvanceAssigment(true);
advanceAssigmentA.setAdvanceType(advanceTypeA);
container.addAvanceAssigment(advanceAssigmentA);
container.addAdvanceAssigment(advanceAssigmentA);
assertThat(container.getAdvanceAssigments().size(), equalTo(1));
}
@ -260,11 +260,11 @@ public class AddAdvanceAssigmentsToOrderElementTest {
AdvanceAssigment anotherAssigmentWithSameType = createValidAdvanceAssigment(false);
anotherAssigmentWithSameType.setAdvanceType(advanceTypeA);
father.addAvanceAssigment(advanceAssigmentA);
father.addAdvanceAssigment(advanceAssigmentA);
try {
OrderElement child = (OrderElement) father.getChildren().get(0);
child.addAvanceAssigment(anotherAssigmentWithSameType);
child.addAdvanceAssigment(anotherAssigmentWithSameType);
fail("It should throw an exception ");
} catch (DuplicateAdvanceAssigmentForOrderElementException e) {
// Ok
@ -293,10 +293,10 @@ public class AddAdvanceAssigmentsToOrderElementTest {
advanceAssigmentB.setAdvanceType(advanceTypeA);
advanceAssigmentB.getAdvanceMeasurements().add(advanceMeasurement);
grandSon.addAvanceAssigment(advanceAssigmentA);
grandSon.addAdvanceAssigment(advanceAssigmentA);
try {
parent.addAvanceAssigment(advanceAssigmentB);
parent.addAdvanceAssigment(advanceAssigmentB);
fail("It should throw an exception ");
} catch (DuplicateAdvanceAssigmentForOrderElementException e) {
// Ok
@ -322,8 +322,8 @@ public class AddAdvanceAssigmentsToOrderElementTest {
AdvanceAssigment assigmentWithSameType = createValidAdvanceAssigment(false);
assigmentWithSameType.setAdvanceType(typeReloaded);
line.addAvanceAssigment(assigment);
line.addAvanceAssigment(assigmentWithSameType);
line.addAdvanceAssigment(assigment);
line.addAdvanceAssigment(assigmentWithSameType);
}
private AdvanceType reloadType(AdvanceType type) {

4
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesModel.java
View file

@ -351,7 +351,7 @@ public class ManageOrderElementAdvancesModel implements
private void addAdvanceAssigment(AdvanceAssigment newAdvanceAssigment)
throws DuplicateAdvanceAssigmentForOrderElementException,
DuplicateValueTrueReportGlobalAdvanceException{
this.orderElement.addAvanceAssigment(newAdvanceAssigment);
this.orderElement.addAdvanceAssigment(newAdvanceAssigment);
}
private void removeAdvanceAssigment(AdvanceAssigment advanceAssigment){
@ -400,7 +400,7 @@ public class ManageOrderElementAdvancesModel implements
findCalculatedAdvanceInParent(parent,newAdvanceAssigmentDTO.getAdvanceType().getId());
if(indirectAdvanceAssigment == null){
indirectAdvanceAssigment = initNewCalculatedAdvanceAssigment(parent,newAdvanceAssigmentDTO);
parent.addAvanceAssigment(indirectAdvanceAssigment);
parent.addAdvanceAssigment(indirectAdvanceAssigment);
}
addIncrementMaxValueToAdvanceAssigment(newAdvanceAssigmentDTO,indirectAdvanceAssigment);
addCalculatedAdvanceMeasurements(newAdvanceAssigmentDTO,indirectAdvanceAssigment);