[camel] 03/11: CAMEL-18575: use JUnit's 5 TempDir annotation camel-barcode

[or...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 9acb1e0bacb5dfabaf53504c432950c2065f011b
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Oct 3 12:13:41 2022 +0200

    CAMEL-18575: use JUnit's 5 TempDir annotation camel-barcode
---
 .../dataformat/barcode/BarcodeDataFormatCamelTest.java  | 17 +++++++++++------
 .../camel/dataformat/barcode/BarcodeUnmarshalTest.java  |  7 ++++++-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatCamelTest.java b/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatCamelTest.java
index ac89bdbd6e1..20dddceabae 100644
--- a/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatCamelTest.java
+++ b/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatCamelTest.java
@@ -16,18 +16,23 @@
  */
 package org.apache.camel.dataformat.barcode;
 
+import java.nio.file.Path;
 import java.util.concurrent.TimeUnit;
 
 import com.google.zxing.BarcodeFormat;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.DataFormat;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
 /**
  * This class tests all Camel dependend cases for {@link BarcodeDataFormat}.
  */
 public class BarcodeDataFormatCamelTest extends BarcodeTestBase {
 
+    @TempDir
+    Path testDirectory;
+
     /**
      * tests barcode (QR-Code) generation and reading.
      * 
@@ -125,40 +130,40 @@ public class BarcodeDataFormatCamelTest extends BarcodeTestBase {
 
                 from("direct:code1")
                         .marshal(code1)
-                        .to(fileUri());
+                        .to(fileUri(testDirectory));
 
                 // QR-Code with modified size
                 DataFormat code2 = new BarcodeDataFormat(200, 200);
 
                 from("direct:code2")
                         .marshal(code2)
-                        .to(fileUri());
+                        .to(fileUri(testDirectory));
 
                 // QR-Code with JPEG type
                 DataFormat code3 = new BarcodeDataFormat(BarcodeImageType.JPG);
 
                 from("direct:code3")
                         .marshal(code3)
-                        .to(fileUri());
+                        .to(fileUri(testDirectory));
 
                 // PDF-417 code with modified size and image type
                 DataFormat code4 = new BarcodeDataFormat(200, 200, BarcodeImageType.JPG, BarcodeFormat.PDF_417);
 
                 from("direct:code4")
                         .marshal(code4)
-                        .to(fileUri());
+                        .to(fileUri(testDirectory));
 
                 // AZTEC with modified size and PNG type
                 DataFormat code5 = new BarcodeDataFormat(200, 200, BarcodeImageType.PNG, BarcodeFormat.AZTEC);
 
                 from("direct:code5")
                         .marshal(code5)
-                        .to(fileUri());
+                        .to(fileUri(testDirectory));
 
                 // generic file read --->
                 // 
                 // read file and route it
-                from(fileUri("?noop=true&initialDelay=0&delay=10"))
+                from(fileUri(testDirectory, "?noop=true&initialDelay=0&delay=10"))
                         .multicast().to("direct:unmarshall", "mock:image");
 
                 // get the message from code
diff --git a/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeUnmarshalTest.java b/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeUnmarshalTest.java
index fec6d63c5c1..7f347072848 100644
--- a/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeUnmarshalTest.java
+++ b/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeUnmarshalTest.java
@@ -17,6 +17,7 @@
 package org.apache.camel.dataformat.barcode;
 
 import java.io.*;
+import java.nio.file.Path;
 
 import javax.imageio.ImageIO;
 
@@ -31,11 +32,15 @@ import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.DataFormat;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class BarcodeUnmarshalTest extends BarcodeTestBase {
 
+    @TempDir
+    Path testDirectory;
+
     @Test
     void testOrientation() {
 
@@ -68,7 +73,7 @@ public class BarcodeUnmarshalTest extends BarcodeTestBase {
                                         new HybridBinarizer(new BufferedImageLuminanceSource(ImageIO.read(bis))));
                                 BitMatrix blackMatrix = bitmap.getBlackMatrix();
                                 blackMatrix.rotate180();
-                                File file = testDirectory(true).resolve("TestImage.png").toFile();
+                                File file = testDirectory.resolve("TestImage.png").toFile();
                                 FileOutputStream outputStream = new FileOutputStream(file);
                                 MatrixToImageWriter.writeToStream(blackMatrix, "png", outputStream);
                                 exchange.getIn().setBody(file);