From 9aafff31df1d7a93a10cca1629e42a2d82be7e58 Mon Sep 17 00:00:00 2001
From: HSoreide <sofie.scisly@gmail.com>
Date: Wed, 15 Mar 2023 12:40:28 +0100
Subject: [PATCH] Correct some small logical errors in the unit tests of the
Ingredient class
---
.../java/no/ntnu/idatt1002/demo/data/recipes/Ingredient.java | 2 +-
.../no/ntnu/idatt1002/demo/data/recipes/IngredientTest.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
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 12e49cb5..50c85057 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 78a715ed..79dd0439 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
--
GitLab