Added tests for layers pattern
This commit is contained in:
@@ -30,9 +30,9 @@ public class CakeBakingServiceImpl implements CakeBakingService {
|
||||
|
||||
@Override
|
||||
public void bakeNewCake(CakeInfo cakeInfo) throws CakeBakingException {
|
||||
List<CakeToppingInfo> allToppings = getAvailableToppings();
|
||||
List<CakeToppingInfo> matchingToppings =
|
||||
allToppings.stream().filter((t) -> t.name.equals(cakeInfo.cakeToppingInfo.name))
|
||||
List<CakeTopping> allToppings = getAvailableToppingEntities();
|
||||
List<CakeTopping> matchingToppings =
|
||||
allToppings.stream().filter((t) -> t.getName().equals(cakeInfo.cakeToppingInfo.name))
|
||||
.collect(Collectors.toList());
|
||||
if (matchingToppings.isEmpty()) {
|
||||
throw new CakeBakingException(String.format("Topping %s is not available",
|
||||
@@ -50,7 +50,7 @@ public class CakeBakingServiceImpl implements CakeBakingService {
|
||||
}
|
||||
}
|
||||
CakeToppingDao toppingBean = context.getBean(CakeToppingDao.class);
|
||||
CakeTopping topping = toppingBean.findOne(matchingToppings.iterator().next().id.get());
|
||||
CakeTopping topping = toppingBean.findOne(matchingToppings.iterator().next().getId());
|
||||
CakeDao cakeBean = context.getBean(CakeDao.class);
|
||||
Cake cake = new Cake();
|
||||
cake.setTopping(topping);
|
||||
|
@@ -34,7 +34,7 @@ public class CakeInfo {
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return String.format("CakeInfo id=%d topping=%s layers=%s totalCalories=%d", id.get(),
|
||||
return String.format("CakeInfo id=%d topping=%s layers=%s totalCalories=%d", id.orElse(-1L),
|
||||
cakeToppingInfo, cakeLayerInfos, calculateTotalCalories());
|
||||
}
|
||||
}
|
||||
|
@@ -27,6 +27,6 @@ public class CakeLayerInfo {
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return String.format("CakeLayerInfo id=%d name=%s calories=%d", id.get(), name, calories);
|
||||
return String.format("CakeLayerInfo id=%d name=%s calories=%d", id.orElse(-1L), name, calories);
|
||||
}
|
||||
}
|
||||
|
@@ -58,7 +58,7 @@ public class CakeTopping {
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return String.format("id=%s name=%s calories=%d", name, calories);
|
||||
return String.format("id=%s name=%s calories=%d", id, name, calories);
|
||||
}
|
||||
|
||||
public Cake getCake() {
|
||||
|
@@ -27,6 +27,6 @@ public class CakeToppingInfo {
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return String.format("CakeToppingInfo id=%d name=%s calories=%d", id.get(), name, calories);
|
||||
return String.format("CakeToppingInfo id=%d name=%s calories=%d", id.orElse(-1L), name, calories);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user