diff --git a/src/test/java/ntnu/idatt2016/v233/SmartMat/service/product/ProductServiceTest.java b/src/test/java/ntnu/idatt2016/v233/SmartMat/service/product/ProductServiceTest.java index 3e63f644f1131ff2d1d222386beaa6398b00a65c..42595c72ca2cd9065873429645914e5d5c1b9810 100644 --- a/src/test/java/ntnu/idatt2016/v233/SmartMat/service/product/ProductServiceTest.java +++ b/src/test/java/ntnu/idatt2016/v233/SmartMat/service/product/ProductServiceTest.java @@ -134,7 +134,7 @@ public class ProductServiceTest { // Verify that the service returns the correct volume Optional<List<String>> returnedVolume = productService.getProductVolume(productId); assertTrue(returnedVolume.isPresent()); - assertEquals(List.of("500", "ml"), returnedVolume.get()); + assertEquals(List.of("500.0", "ml"), returnedVolume.get()); } @Test diff --git a/src/test/java/ntnu/idatt2016/v233/SmartMat/util/ProductUtilTest.java b/src/test/java/ntnu/idatt2016/v233/SmartMat/util/ProductUtilTest.java index 0164ae29d869b4a85b47dab4cdd82d95c78d8b1e..2ee4467a78d2727454b1cd6a497527973dca9bac 100644 --- a/src/test/java/ntnu/idatt2016/v233/SmartMat/util/ProductUtilTest.java +++ b/src/test/java/ntnu/idatt2016/v233/SmartMat/util/ProductUtilTest.java @@ -22,7 +22,7 @@ class ProductUtilTest { @Test void getVolumeFromProduct() { - assertEquals(List.of("24x500", "ml"), ProductUtil.getVolumeFromProduct(product).get()); + assertEquals(List.of("500.0", "ml"), ProductUtil.getVolumeFromProduct(product).get()); this.product = Product.builder() .ean(123456789) @@ -30,7 +30,7 @@ class ProductUtilTest { .description("Pepsi Original 24x500 ml") .build(); - assertEquals(List.of("24x500", "ml"), ProductUtil.getVolumeFromProduct(product).get()); + assertEquals(List.of("500.0", "ml"), ProductUtil.getVolumeFromProduct(product).get()); this.product = Product.builder() .ean(123456789) @@ -39,7 +39,7 @@ class ProductUtilTest { .build(); - assertEquals(List.of("24x500", "ml"), ProductUtil.getVolumeFromProduct(product).get()); + assertEquals(List.of("500.0", "ml"), ProductUtil.getVolumeFromProduct(product).get()); this.product = Product.builder() .ean(123456789) @@ -48,6 +48,6 @@ class ProductUtilTest { .build(); - assertEquals(List.of("24x500", "ml"), ProductUtil.getVolumeFromProduct(product).get()); + assertEquals(List.of("500.0", "ml"), ProductUtil.getVolumeFromProduct(product).get()); } } \ No newline at end of file