#5 - Fix tests for barcode generator services

src/test/java/at/kocmana/barcodeservice/ean/EanControllerTest.java

@@ -33,7 +33,7 @@ void generateEan13_ShouldReturnOkWithImage() throws Exception {
     //given
     var barcode = "123456789012";
     var requestedBarcode = new Ean13(barcode);
-    var image = readBufferedImageFromFile("test-ean13.jpg");
+    var image = readBufferedImageFromFile("ean/test-ean13.jpg");
     when(service.generateEan13(requestedBarcode)).thenReturn(image);
 
     //when
@@ -60,7 +60,7 @@ void generateEan8_ShouldReturnOkWithImage() throws Exception {
     //given
     var barcode = "1234567";
     var requestedBarcode = new Ean8(barcode);
-    var image = readBufferedImageFromFile("test-ean8.jpg");
+    var image = readBufferedImageFromFile("ean/test-ean8.jpg");
     when(service.generateEan8(requestedBarcode)).thenReturn(image);
 
     //when

src/test/java/at/kocmana/barcodeservice/ean/EanServiceTest.java

@@ -5,7 +5,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import at.kocmana.barcodeservice.ean.model.Ean13;
-import org.junit.jupiter.api.Disabled;
+import at.kocmana.barcodeservice.ean.model.Ean8;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -17,11 +17,10 @@ class EanServiceTest {
   EanService underTest;
 
   @Test
-  @Disabled("This test is incorrectly failing and should be revisited as issue #")
   void whenGenerateEan13_CorrectImageIsReturned() {
     //given
     var ean13 = new Ean13("123456789012");
-    var filename = "test-ean13.jpg";
+    var filename = "ean/test-ean13.bmp";
     var expectedImage = readBufferedImageFromFile(filename);
 
     //when
@@ -31,4 +30,18 @@ void whenGenerateEan13_CorrectImageIsReturned() {
     assertThat(compareImages(actualResult, expectedImage)).isTrue();
   }
 
+  @Test
+  void whenGenerateEan8_CorrectImageIsReturned() {
+    //given
+    var ean8 = new Ean8("1234567");
+    var filename = "ean/test-ean8.bmp";
+    var expectedImage = readBufferedImageFromFile(filename);
+
+    //when
+    var actualResult = underTest.generateEan8(ean8);
+
+    //then
+    assertThat(compareImages(actualResult, expectedImage)).isTrue();
+  }
+
 }

src/test/java/at/kocmana/barcodeservice/qr/QrControllerTest.java

@@ -33,7 +33,7 @@ void generateQrCode_ShouldReturnOkWithImage() throws Exception {
     //given
     var payload = "some payload";
     var request = new Qr(payload);
-    var requestedQrCode = readBufferedImageFromFile("test-qr.jpg");
+    var requestedQrCode = readBufferedImageFromFile("qr/test-qr.jpg");
     when(service.generateQrCode(request)).thenReturn(requestedQrCode);
 
     //when

src/test/java/at/kocmana/barcodeservice/qr/QrServiceTest.java

@@ -0,0 +1,32 @@
+package at.kocmana.barcodeservice.qr;
+
+import static at.kocmana.barcodeservice.testutil.FileUtil.readBufferedImageFromFile;
+import static at.kocmana.barcodeservice.testutil.ImageUtil.compareImages;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import at.kocmana.barcodeservice.qr.model.Qr;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest(classes = QrServiceImpl.class)
+class QrServiceTest {
+
+  @Autowired
+  QrService underTest;
+
+  @Test
+  void whenGenerateQrCode_CorrectImageIsReturned() {
+    //given
+    var qr = new Qr("some payload");
+    var filename = "qr/test-qr.bmp";
+    var expectedImage = readBufferedImageFromFile(filename);
+
+    //when
+    var actualResult = underTest.generateQrCode(qr);
+
+    //then
+    assertThat(compareImages(actualResult, expectedImage)).isTrue();
+  }
+
+}

src/test/java/at/kocmana/barcodeservice/testutil/ImageUtil.java

@@ -22,17 +22,17 @@ public static byte[] toByteArray(BufferedImage image) {
     return byteArrayOutputStream.toByteArray();
   }
 
-  public static boolean compareImages(BufferedImage imgA, BufferedImage imgB) {
-   if (imgA.getWidth() != imgB.getWidth() || imgA.getHeight() != imgB.getHeight()) {
+  public static boolean compareImages(BufferedImage imageA, BufferedImage imageB) {
+   if (imageA.getWidth() != imageB.getWidth() || imageA.getHeight() != imageB.getHeight()) {
       return false;
     }
 
-    int width  = imgA.getWidth();
-    int height = imgA.getHeight();
+    int width  = imageA.getWidth();
+    int height = imageA.getHeight();
 
     for (int y = 0; y < height; y++) {
       for (int x = 0; x < width; x++) {
-        if (imgA.getRGB(x, y) != imgB.getRGB(x, y)) {
+        if (imageA.getRGB(x, y) != imageB.getRGB(x, y)) {
           return false;
         }
       }