This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 5275b05 Fix a few remanining direct usage of the target directory
5275b05 is described below
commit 5275b0562d3e0100814c8dcec6e79f3dced4672b
Author: Guillaume Nodet <[email protected]>
AuthorDate: Mon Mar 22 10:45:18 2021 +0100
Fix a few remanining direct usage of the target directory
---
.../MultiCastParallelAndStreamCachingTest.java | 2 +-
...ParallelAndStreamCachingWithEncryptionTest.java | 2 +-
.../MultiCastStreamCachingInSubRouteTest.java | 2 +-
.../MulticastParallelTimeoutStreamCachingTest.java | 26 ++--------------------
.../camel/processor/SplitterStreamCacheTest.java | 2 +-
.../SplitterStreamCachingInSubRouteTest.java | 2 +-
.../enricher/EnricherAggregateStreamingTest.java | 2 +-
7 files changed, 8 insertions(+), 30 deletions(-)
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/MultiCastParallelAndStreamCachingTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/MultiCastParallelAndStreamCachingTest.java
index 48f2961..4512e0b 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/MultiCastParallelAndStreamCachingTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/MultiCastParallelAndStreamCachingTest.java
@@ -46,7 +46,7 @@ public class MultiCastParallelAndStreamCachingTest extends
ContextTestSupport {
public void configure() throws Exception {
context.setStreamCaching(true);
context.getStreamCachingStrategy().setEnabled(true);
-
context.getStreamCachingStrategy().setSpoolDirectory("target/camel/cache");
+
context.getStreamCachingStrategy().setSpoolDirectory(testDirectory().toFile());
context.getStreamCachingStrategy().setSpoolThreshold(5L);
from("direct:start").multicast().parallelProcessing().stopOnException().to("direct:a",
"direct:b").end()
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/MultiCastParallelAndStreamCachingWithEncryptionTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/MultiCastParallelAndStreamCachingWithEncryptionTest.java
index 32295f2..5d19dd8 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/MultiCastParallelAndStreamCachingWithEncryptionTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/MultiCastParallelAndStreamCachingWithEncryptionTest.java
@@ -41,7 +41,7 @@ public class
MultiCastParallelAndStreamCachingWithEncryptionTest extends Context
public void configure() throws Exception {
context.setStreamCaching(true);
context.getStreamCachingStrategy().setEnabled(true);
-
context.getStreamCachingStrategy().setSpoolDirectory(fileUri());
+
context.getStreamCachingStrategy().setSpoolDirectory(testDirectory().toFile());
context.getStreamCachingStrategy().setSpoolThreshold(5000L);
context.getStreamCachingStrategy().setSpoolCipher("AES/CTR/NoPadding");
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/MultiCastStreamCachingInSubRouteTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/MultiCastStreamCachingInSubRouteTest.java
index 46e980e..d089926 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/MultiCastStreamCachingInSubRouteTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/MultiCastStreamCachingInSubRouteTest.java
@@ -38,7 +38,7 @@ public class MultiCastStreamCachingInSubRouteTest extends
ContextTestSupport {
public void configure() throws Exception {
context.setStreamCaching(true);
context.getStreamCachingStrategy().setEnabled(true);
-
context.getStreamCachingStrategy().setSpoolDirectory(testDirectory().toString());
+
context.getStreamCachingStrategy().setSpoolDirectory(testDirectory().toFile());
context.getStreamCachingStrategy().setSpoolThreshold(1L);
from("direct:start").multicast(new
InternalAggregationStrategy()).to("direct:a", "direct:b").end()
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelTimeoutStreamCachingTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelTimeoutStreamCachingTest.java
index c8963c7..24c547d 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelTimeoutStreamCachingTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelTimeoutStreamCachingTest.java
@@ -28,7 +28,6 @@ import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.converter.stream.CachedOutputStream;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -39,29 +38,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
*/
public class MulticastParallelTimeoutStreamCachingTest extends
ContextTestSupport {
- private static final String
TARGET_MULTICAST_PARALLEL_TIMEOUT_STREAM_CACHING_TEST_CACHE
- = "target/MulticastParallelTimeoutStreamCachingTestCache";
private static final String BODY_STRING = "message body";
private static final byte[] BODY =
BODY_STRING.getBytes(StandardCharsets.UTF_8);
- @BeforeEach
- public void setUp() throws Exception {
- super.setUp();
-
- deleteDirectory(new
File(TARGET_MULTICAST_PARALLEL_TIMEOUT_STREAM_CACHING_TEST_CACHE));
- }
-
- public static void deleteDirectory(File file) {
- if (file.isDirectory()) {
- File[] files = file.listFiles();
- for (File child : files) {
- deleteDirectory(child);
- }
- }
-
- file.delete();
- }
-
@Test
public void testCreateOutputStreamCacheAfterTimeout() throws Exception {
getMockEndpoint("mock:x").expectedBodiesReceived(BODY_STRING);
@@ -69,7 +48,7 @@ public class MulticastParallelTimeoutStreamCachingTest
extends ContextTestSuppor
template.sendBody("direct:a", "testMessage");
assertMockEndpointsSatisfied();
- File f = new
File(TARGET_MULTICAST_PARALLEL_TIMEOUT_STREAM_CACHING_TEST_CACHE);
+ File f = testDirectory().toFile();
assertTrue(f.isDirectory());
Thread.sleep(500L); // deletion happens asynchron
File[] files = f.listFiles();
@@ -123,8 +102,7 @@ public class MulticastParallelTimeoutStreamCachingTest
extends ContextTestSuppor
return new RouteBuilder() {
public void configure() {
// enable stream caching
- context.getStreamCachingStrategy()
-
.setSpoolDirectory(TARGET_MULTICAST_PARALLEL_TIMEOUT_STREAM_CACHING_TEST_CACHE);
+
context.getStreamCachingStrategy().setSpoolDirectory(testDirectory().toFile());
context.getStreamCachingStrategy().setEnabled(true);
context.getStreamCachingStrategy().setRemoveSpoolDirectoryWhenStopping(false);
context.getStreamCachingStrategy().setSpoolThreshold(1L);
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamCacheTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamCacheTest.java
index a903e49..1f4738c 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamCacheTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamCacheTest.java
@@ -49,7 +49,7 @@ public class SplitterStreamCacheTest extends
ContextTestSupport {
return new RouteBuilder() {
public void configure() {
// ensure stream is spooled to disk
-
context.getStreamCachingStrategy().setSpoolDirectory("target/tmp");
+
context.getStreamCachingStrategy().setSpoolDirectory(testDirectory().toFile());
context.getStreamCachingStrategy().setSpoolThreshold(-1);
from("seda:parallel?concurrentConsumers=5").streamCaching().split(xpath("//person/city")).to("mock:result");
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamCachingInSubRouteTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamCachingInSubRouteTest.java
index c456eda..7663f3f 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamCachingInSubRouteTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamCachingInSubRouteTest.java
@@ -38,7 +38,7 @@ public class SplitterStreamCachingInSubRouteTest extends
ContextTestSupport {
public void configure() throws Exception {
context.setStreamCaching(true);
context.getStreamCachingStrategy().setEnabled(true);
-
context.getStreamCachingStrategy().setSpoolDirectory("target/camel/cache");
+
context.getStreamCachingStrategy().setSpoolDirectory(testDirectory().toFile());
context.getStreamCachingStrategy().setSpoolThreshold(1L);
from("direct:startIterable").split(body().tokenize(",")).streaming()
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherAggregateStreamingTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherAggregateStreamingTest.java
index f500ae0..d6f0e70 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherAggregateStreamingTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherAggregateStreamingTest.java
@@ -69,7 +69,7 @@ public class EnricherAggregateStreamingTest extends
ContextTestSupport {
getContext().setStreamCaching(Boolean.TRUE);
StreamCachingStrategy scs =
getContext().getStreamCachingStrategy();
scs.setSpoolThreshold(1L);
- scs.setSpoolDirectory("target/streamcache/");
+ scs.setSpoolDirectory(testDirectory().toFile());
from("direct:start").process(new
StreamProcessor()).enrich("direct:foo", new MyAggregationStrategy(), false)
.to("mock:result");
