You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2020/07/27 15:38:54 UTC
[camel] 07/43: [CAMEL-11807] Upgrade camel-zip-deflater to junit5
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
commit d594e262f11ff1989dd693efa3bc40c9b52035dd
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 11:27:48 2020 +0200
[CAMEL-11807] Upgrade camel-zip-deflater to junit5
---
components/camel-zip-deflater/pom.xml | 6 +++---
.../deflater/GzipDataFormatFileDeleteTest.java | 17 ++++++++++-------
.../deflater/GzipDataFormatFileUnmarshalDeleteTest.java | 16 +++++++++-------
.../camel/dataformat/deflater/GzipDataFormatTest.java | 8 +++++---
.../deflater/ZipDeflaterDataFormatFileDeleteTest.java | 17 ++++++++++-------
.../ZipDeflaterDataFormatFileUnmarshalDeleteTest.java | 15 +++++++++------
.../dataformat/deflater/ZipDeflaterDataFormatTest.java | 8 ++++++--
7 files changed, 52 insertions(+), 35 deletions(-)
diff --git a/components/camel-zip-deflater/pom.xml b/components/camel-zip-deflater/pom.xml
index 5ed54e3..fd85c6f 100644
--- a/components/camel-zip-deflater/pom.xml
+++ b/components/camel-zip-deflater/pom.xml
@@ -43,13 +43,13 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/GzipDataFormatFileDeleteTest.java b/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/GzipDataFormatFileDeleteTest.java
index 1097b4a..0a9b24e 100644
--- a/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/GzipDataFormatFileDeleteTest.java
+++ b/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/GzipDataFormatFileDeleteTest.java
@@ -21,15 +21,18 @@ import java.io.File;
import org.apache.camel.Exchange;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class GzipDataFormatFileDeleteTest extends CamelTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/data/gzip");
super.setUp();
@@ -49,10 +52,10 @@ public class GzipDataFormatFileDeleteTest extends CamelTestSupport {
oneExchangeDone.matchesWaitTime();
File in = new File("target/data/gzip/hello.txt");
- Assert.assertFalse("Should have been deleted " + in, in.exists());
+ assertFalse(in.exists(), "Should have been deleted " + in);
File out = new File("target/data/gzip/out/hello.txt.gz");
- Assert.assertTrue("Should have been created " + out, out.exists());
+ assertTrue(out.exists(), "Should have been created " + out);
}
@Override
diff --git a/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/GzipDataFormatFileUnmarshalDeleteTest.java b/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/GzipDataFormatFileUnmarshalDeleteTest.java
index 8327abd..27f8e3e 100644
--- a/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/GzipDataFormatFileUnmarshalDeleteTest.java
+++ b/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/GzipDataFormatFileUnmarshalDeleteTest.java
@@ -21,15 +21,17 @@ import java.io.File;
import org.apache.camel.Exchange;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertFalse;
public class GzipDataFormatFileUnmarshalDeleteTest extends CamelTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/data/gzip");
super.setUp();
@@ -47,10 +49,10 @@ public class GzipDataFormatFileUnmarshalDeleteTest extends CamelTestSupport {
notify.matchesMockWaitTime();
File in = new File("target/gzip/hello.txt");
- Assert.assertFalse("Should have been deleted " + in, in.exists());
+ assertFalse(in.exists(), "Should have been deleted " + in);
File out = new File("target/gzip/out/hello.txt.gz");
- Assert.assertFalse("Should have been deleted " + out, out.exists());
+ assertFalse(out.exists(), "Should have been deleted " + out);
}
@Override
diff --git a/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/GzipDataFormatTest.java b/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/GzipDataFormatTest.java
index f06dbdb..0564677 100644
--- a/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/GzipDataFormatTest.java
+++ b/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/GzipDataFormatTest.java
@@ -23,8 +23,10 @@ import java.util.zip.GZIPInputStream;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.IOConverter;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Unit test of the gzip data format.
@@ -59,7 +61,7 @@ public class GzipDataFormatTest extends CamelTestSupport {
GZIPInputStream stream = new GZIPInputStream(new ByteArrayInputStream(output));
String result = IOConverter.toString(stream, null);
- assertEquals("Uncompressed something different than compressed", TEXT, result);
+ assertEquals(TEXT, result, "Uncompressed something different than compressed");
}
@Test
diff --git a/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/ZipDeflaterDataFormatFileDeleteTest.java b/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/ZipDeflaterDataFormatFileDeleteTest.java
index 8a86851..3807e1c 100644
--- a/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/ZipDeflaterDataFormatFileDeleteTest.java
+++ b/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/ZipDeflaterDataFormatFileDeleteTest.java
@@ -21,15 +21,18 @@ import java.io.File;
import org.apache.camel.Exchange;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ZipDeflaterDataFormatFileDeleteTest extends CamelTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/data/zip");
super.setUp();
@@ -47,10 +50,10 @@ public class ZipDeflaterDataFormatFileDeleteTest extends CamelTestSupport {
oneExchangeDone.matchesWaitTime();
File in = new File("target/data/zip/hello.txt");
- Assert.assertFalse("Should have been deleted " + in, in.exists());
+ assertFalse(in.exists(), "Should have been deleted " + in);
File out = new File("target/data/zip/out/hello.txt.zip");
- Assert.assertTrue("Should have been created " + out, out.exists());
+ assertTrue(out.exists(), "Should have been created " + out);
}
@Override
diff --git a/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/ZipDeflaterDataFormatFileUnmarshalDeleteTest.java b/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/ZipDeflaterDataFormatFileUnmarshalDeleteTest.java
index 5c6daef..b445ddd 100644
--- a/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/ZipDeflaterDataFormatFileUnmarshalDeleteTest.java
+++ b/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/ZipDeflaterDataFormatFileUnmarshalDeleteTest.java
@@ -21,14 +21,17 @@ import java.io.File;
import org.apache.camel.Exchange;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertFalse;
public class ZipDeflaterDataFormatFileUnmarshalDeleteTest extends CamelTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/data/zip");
super.setUp();
@@ -46,10 +49,10 @@ public class ZipDeflaterDataFormatFileUnmarshalDeleteTest extends CamelTestSuppo
event.matchesMockWaitTime();
File in = new File("target/zip/hello.txt");
- assertFalse("Should have been deleted " + in, in.exists());
+ assertFalse(in.exists(), "Should have been deleted " + in);
File out = new File("target/zip/out/hello.txt.zip");
- assertFalse("Should have been deleted " + out, out.exists());
+ assertFalse(out.exists(), "Should have been deleted " + out);
}
@Override
diff --git a/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/ZipDeflaterDataFormatTest.java b/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/ZipDeflaterDataFormatTest.java
index 67096b3..5246186 100644
--- a/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/ZipDeflaterDataFormatTest.java
+++ b/components/camel-zip-deflater/src/test/java/org/apache/camel/dataformat/deflater/ZipDeflaterDataFormatTest.java
@@ -29,8 +29,12 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.stream.InputStreamCache;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.support.DefaultExchange;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Unit test of the zip data format.