diff --git a/src/main/java/no/ntnu/idatt1002/demo/data/recipes/Ingredient.java b/src/main/java/no/ntnu/idatt1002/demo/data/recipes/Ingredient.java index 12e49cb5ded6c167696f43851b50d74d2a67a9b6..50c850574dc549e12891bc41ed2c5f512225c8bb 100644 --- a/src/main/java/no/ntnu/idatt1002/demo/data/recipes/Ingredient.java +++ b/src/main/java/no/ntnu/idatt1002/demo/data/recipes/Ingredient.java @@ -63,7 +63,7 @@ public class Ingredient { * @param amount The amount of an ingredient as double. */ public void setAmount(double amount) { - if(amount < 0.0f) { + if(amount <= 0.0f) { throw new IllegalArgumentException("The amount of an ingredient cannot be zero or negative."); } this.amount = amount; diff --git a/src/test/java/no/ntnu/idatt1002/demo/data/recipes/IngredientTest.java b/src/test/java/no/ntnu/idatt1002/demo/data/recipes/IngredientTest.java index 78a715edb2dde3175ec8ba6fb28da02ae9a696c1..79dd0439298817a773fc8ac9c6c70f19575c0957 100644 --- a/src/test/java/no/ntnu/idatt1002/demo/data/recipes/IngredientTest.java +++ b/src/test/java/no/ntnu/idatt1002/demo/data/recipes/IngredientTest.java @@ -48,7 +48,7 @@ class IngredientTest { @DisplayName("Change of food amount works for valid amount.") void setAmountWorksForValidAmount() { testIngredient.setAmount(2.5); - assertEquals(new Ingredient(FoodItem.LEMON, 2.5f, MeasuringUnit.KG), testIngredient); + assertEquals(new Ingredient(FoodItem.ONION, 2.5f, MeasuringUnit.KG), testIngredient); } @Test @@ -62,7 +62,7 @@ class IngredientTest { @DisplayName("Change of measuring unit works for valid unit.") void setUnitWorksForValidUnit() { testIngredient.setUnit(MeasuringUnit.TBS); - assertEquals(new Ingredient(FoodItem.LEMON, 0.5f, MeasuringUnit.TBS), testIngredient); + assertEquals(new Ingredient(FoodItem.ONION, 0.5f, MeasuringUnit.TBS), testIngredient); } @Test