You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2022/10/03 15:58:34 UTC
[camel] 05/11: CAMEL-18575: use JUnit's 5 TempDir annotation in camel-jetty
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 79d5c376639a2558fa79640e534e51d1f4bb2d52
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Oct 3 13:32:55 2022 +0200
CAMEL-18575: use JUnit's 5 TempDir annotation in camel-jetty
---
.../component/jetty/HttpStreamCacheFileIssueTest.java | 12 +++++++++---
.../jetty/HttpStreamCacheFileResponseTest.java | 8 +++++---
.../component/jetty/HttpStreamCacheFileTest.java | 12 +++++++++---
.../apache/camel/component/jetty/HttpToFileTest.java | 8 ++++++--
.../component/jetty/file/JettyFileConsumerTest.java | 19 ++++++++++++-------
5 files changed, 41 insertions(+), 18 deletions(-)
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpStreamCacheFileIssueTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpStreamCacheFileIssueTest.java
index 9aec0bd70d2..f1eb3eb0a05 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpStreamCacheFileIssueTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpStreamCacheFileIssueTest.java
@@ -16,16 +16,22 @@
*/
package org.apache.camel.component.jetty;
+import java.io.File;
+
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class HttpStreamCacheFileIssueTest extends BaseJettyTest {
+ @TempDir
+ File testDirectory;
+
private String body = "12345678901234567890123456789012345678901234567890";
@Test
@@ -36,7 +42,7 @@ public class HttpStreamCacheFileIssueTest extends BaseJettyTest {
assertEquals(body, out);
// the temporary files should have been deleted
- String[] files = testDirectory().toFile().list();
+ String[] files = testDirectory.list();
assertEquals(0, files.length, "There should be no files");
assertMockEndpointsSatisfied();
@@ -51,14 +57,14 @@ public class HttpStreamCacheFileIssueTest extends BaseJettyTest {
// to write to file
context.getStreamCachingStrategy().setSpoolEnabled(true);
context.getStreamCachingStrategy().setSpoolThreshold(16);
- context.getStreamCachingStrategy().setSpoolDirectory(testDirectory().toFile());
+ context.getStreamCachingStrategy().setSpoolDirectory(testDirectory);
context.setStreamCaching(true);
// use a route so we got an unit of work
from("direct:start").to("http://localhost:{{port}}/myserver").process(new Processor() {
public void process(Exchange exchange) {
// there should be a temp cache file
- String[] files = testDirectory().toFile().list();
+ String[] files = testDirectory.list();
assertTrue(files.length > 0, "There should be a temp cache file");
}
})
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpStreamCacheFileResponseTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpStreamCacheFileResponseTest.java
index 192438abb59..2a880d2d8d0 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpStreamCacheFileResponseTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpStreamCacheFileResponseTest.java
@@ -23,11 +23,14 @@ import java.time.Duration;
import org.apache.camel.builder.RouteBuilder;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import static org.awaitility.Awaitility.await;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class HttpStreamCacheFileResponseTest extends BaseJettyTest {
+ @TempDir
+ File testDirectory;
private String body = "12345678901234567890123456789012345678901234567890";
private String body2 = "Bye " + body;
@@ -37,10 +40,9 @@ public class HttpStreamCacheFileResponseTest extends BaseJettyTest {
String out = template.requestBody("http://localhost:{{port}}/myserver", body, String.class);
assertEquals(body2, out);
- File dir = testDirectory().toFile();
await()
.atMost(Duration.ofSeconds(1))
- .untilAsserted(() -> assertEquals(0, dir.list().length, "There should be no files"));
+ .untilAsserted(() -> assertEquals(0, testDirectory.list().length, "There should be no files"));
}
@Override
@@ -51,7 +53,7 @@ public class HttpStreamCacheFileResponseTest extends BaseJettyTest {
// enable stream caching and use a low threshold so its forced
// to write to file
context.getStreamCachingStrategy().setSpoolEnabled(true);
- context.getStreamCachingStrategy().setSpoolDirectory(testDirectory().toFile());
+ context.getStreamCachingStrategy().setSpoolDirectory(testDirectory);
context.getStreamCachingStrategy().setSpoolThreshold(16);
context.setStreamCaching(true);
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpStreamCacheFileTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpStreamCacheFileTest.java
index 9f28fe8c32d..fd372373fdf 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpStreamCacheFileTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpStreamCacheFileTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.jetty;
+import java.io.File;
+
import org.apache.camel.CamelExecutionException;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
@@ -23,6 +25,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.http.base.HttpOperationFailedException;
import org.apache.camel.util.ObjectHelper;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -30,6 +33,9 @@ import static org.junit.jupiter.api.Assertions.fail;
public class HttpStreamCacheFileTest extends BaseJettyTest {
+ @TempDir
+ File testDirectory;
+
private final String responseBody = "12345678901234567890123456789012345678901234567890";
@Test
@@ -38,7 +44,7 @@ public class HttpStreamCacheFileTest extends BaseJettyTest {
assertEquals("Bye World", out);
// the temporary files should have been deleted
- String[] files = testDirectory().toFile().list();
+ String[] files = testDirectory.list();
assertEquals(0, files.length, "There should be no files");
}
@@ -54,7 +60,7 @@ public class HttpStreamCacheFileTest extends BaseJettyTest {
}
// the temporary files should have been deleted
- String[] files = testDirectory().toFile().list();
+ String[] files = testDirectory.list();
assertEquals(0, files.length, "There should be no files");
}
@@ -67,7 +73,7 @@ public class HttpStreamCacheFileTest extends BaseJettyTest {
// to write to file
context.getStreamCachingStrategy().setSpoolEnabled(true);
context.getStreamCachingStrategy().setSpoolThreshold(16);
- context.getStreamCachingStrategy().setSpoolDirectory(testDirectory().toFile());
+ context.getStreamCachingStrategy().setSpoolDirectory(testDirectory);
context.setStreamCaching(true);
// use a route so we got an unit of work
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpToFileTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpToFileTest.java
index 9359b3bd8da..8780452cf81 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpToFileTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpToFileTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.jetty;
+import java.nio.file.Path;
import java.time.Duration;
import org.apache.camel.Exchange;
@@ -23,6 +24,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import static org.apache.camel.test.junit5.TestSupport.assertFileExists;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -31,6 +33,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
* Unit testing demonstrating how to store incoming requests as files and serving a response back.
*/
public class HttpToFileTest extends BaseJettyTest {
+ @TempDir
+ Path testDirectory;
@Test
public void testToJettyAndSaveToFile() throws Exception {
@@ -47,7 +51,7 @@ public class HttpToFileTest extends BaseJettyTest {
// give file some time to save
Awaitility.await()
.atMost(Duration.ofSeconds(1))
- .untilAsserted(() -> assertFileExists(testFile("hello.txt"), "Hello World"));
+ .untilAsserted(() -> assertFileExists(testDirectory.resolve("hello.txt"), "Hello World"));
}
@Override
@@ -61,7 +65,7 @@ public class HttpToFileTest extends BaseJettyTest {
// store the content from the queue as a file
from("seda:in").setHeader(Exchange.FILE_NAME, constant("hello.txt")).convertBodyTo(String.class)
- .to(fileUri()).to("mock:result");
+ .to(fileUri(testDirectory)).to("mock:result");
}
};
}
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/file/JettyFileConsumerTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/file/JettyFileConsumerTest.java
index d8a9346acde..6d170046766 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/file/JettyFileConsumerTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/file/JettyFileConsumerTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.jetty.file;
import java.io.File;
import java.io.FileInputStream;
+import java.nio.file.Path;
import java.time.Duration;
import org.apache.camel.Exchange;
@@ -26,17 +27,20 @@ import org.apache.camel.component.jetty.BaseJettyTest;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class JettyFileConsumerTest extends BaseJettyTest {
+ @TempDir
+ Path testDirectory;
private void testingSendingFile(File src) throws Exception {
FileInputStream fis = new FileInputStream(src);
String response = template.requestBody("http://localhost:{{port}}/myapp/myservice", fis, String.class);
assertEquals("OK", response, "Response should be OK ");
- File des = testFile("test/temp.xml").toFile();
+ File des = testDirectory.resolve("test/temp.xml").toFile();
assertTrue(des.exists(), "The uploaded file should exists");
assertEquals(src.length(), des.length(), "This two file should have same size");
}
@@ -59,7 +63,7 @@ public class JettyFileConsumerTest extends BaseJettyTest {
File jpg = new File("src/test/resources/java.jpg");
String response = template.requestBody("http://localhost:{{port}}/myapp/myservice2", jpg, String.class);
assertEquals("OK", response, "Response should be OK ");
- File des = testFile("test/java.jpg").toFile();
+ File des = testDirectory.resolve("test/java.jpg").toFile();
assertTrue(des.exists(), "The uploaded file should exists");
assertEquals(jpg.length(), des.length(), "This two file should have same size");
}
@@ -69,11 +73,11 @@ public class JettyFileConsumerTest extends BaseJettyTest {
getMockEndpoint("mock:result").expectedMessageCount(1);
File jpg = new File("src/test/resources/java.jpg");
- template.sendBodyAndHeader(fileUri("binary"), jpg, Exchange.FILE_NAME, "java.jpg");
+ template.sendBodyAndHeader(fileUri(testDirectory, "binary"), jpg, Exchange.FILE_NAME, "java.jpg");
assertMockEndpointsSatisfied();
- File des = testFile("test/java.jpg").toFile();
+ File des = testDirectory.resolve("test/java.jpg").toFile();
Awaitility.await().atMost(Duration.ofSeconds(2))
.untilAsserted(() -> assertTrue(des.exists(), "The uploaded file should exists"));
assertEquals(jpg.length(), des.length(), "This two file should have same size");
@@ -83,13 +87,14 @@ public class JettyFileConsumerTest extends BaseJettyTest {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("jetty:http://localhost:{{port}}/myapp/myservice").to(fileUri("test?fileName=temp.xml"))
+ from("jetty:http://localhost:{{port}}/myapp/myservice").to(fileUri(testDirectory, "test?fileName=temp.xml"))
.setBody(constant("OK"));
from("jetty:http://localhost:{{port}}/myapp/myservice2").to("log:foo?showAll=true")
- .to(fileUri("test?fileName=java.jpg")).setBody(constant("OK"));
+ .to(fileUri(testDirectory, "test?fileName=java.jpg")).setBody(constant("OK"));
- from(fileUri("binary?noop=true")).to("http://localhost:{{port}}/myapp/myservice2").to("mock:result");
+ from(fileUri(testDirectory, "binary?noop=true")).to("http://localhost:{{port}}/myapp/myservice2")
+ .to("mock:result");
}
};
}