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/24 20:52:58 UTC
[camel] 16/27: [CAMEL-11807] Upgrade camel-tarfile 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 13aada9e6a7514f335fa1ffd8ffc750700c93ff6
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jul 24 11:58:29 2020 +0200
[CAMEL-11807] Upgrade camel-tarfile to junit5
---
components/camel-tarfile/pom.xml | 4 +--
.../tarfile/SpringTarFileDataFormatTest.java | 13 ++++++---
.../tarfile/SpringTarSplitterRouteTest.java | 4 +--
.../dataformat/tarfile/TarFileDataFormatTest.java | 32 ++++++++++++----------
.../tarfile/TarFileMultipleFilesSplitterTest.java | 2 +-
.../tarfile/TarFileSplitAndDeleteTest.java | 15 ++++++----
.../tarfile/TarSplitterRouteIssueTest.java | 10 ++++---
.../dataformat/tarfile/TarSplitterRouteTest.java | 4 +--
.../AggregationStrategyWithFilenameHeaderTest.java | 21 ++++++++------
.../AggregationStrategyWithPreservationTest.java | 20 ++++++++------
.../tarfile/TarAggregationStrategyTest.java | 17 ++++++++----
11 files changed, 85 insertions(+), 57 deletions(-)
diff --git a/components/camel-tarfile/pom.xml b/components/camel-tarfile/pom.xml
index 0956dc0a..2104806 100644
--- a/components/camel-tarfile/pom.xml
+++ b/components/camel-tarfile/pom.xml
@@ -48,7 +48,7 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -58,7 +58,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
+ <artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/SpringTarFileDataFormatTest.java b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/SpringTarFileDataFormatTest.java
index f5e68d9..ff81579 100644
--- a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/SpringTarFileDataFormatTest.java
+++ b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/SpringTarFileDataFormatTest.java
@@ -22,9 +22,9 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.Exchange;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import static java.nio.charset.StandardCharsets.UTF_8;
@@ -33,6 +33,11 @@ import static org.apache.camel.Exchange.FILE_NAME;
import static org.apache.camel.dataformat.tarfile.TarUtils.TEXT;
import static org.apache.camel.dataformat.tarfile.TarUtils.getBytes;
import static org.apache.camel.dataformat.tarfile.TarUtils.getTaredText;
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class SpringTarFileDataFormatTest extends CamelSpringTestSupport {
private static final File TEST_DIR = new File("target/springtar");
@@ -157,7 +162,7 @@ public class SpringTarFileDataFormatTest extends CamelSpringTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory(TEST_DIR);
super.setUp();
diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/SpringTarSplitterRouteTest.java b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/SpringTarSplitterRouteTest.java
index 381eac2..f4c5dbe 100644
--- a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/SpringTarSplitterRouteTest.java
+++ b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/SpringTarSplitterRouteTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.dataformat.tarfile;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class SpringTarSplitterRouteTest extends CamelSpringTestSupport {
diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileDataFormatTest.java b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileDataFormatTest.java
index 64f3c4f..8b9c3c5 100644
--- a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileDataFormatTest.java
+++ b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileDataFormatTest.java
@@ -22,6 +22,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.Iterator;
@@ -33,19 +34,24 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.util.ObjectHelper;
import org.apache.commons.compress.archivers.ArchiveStreamFactory;
import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.Exchange.FILE_NAME;
import static org.apache.camel.dataformat.tarfile.TarUtils.TEXT;
import static org.apache.camel.dataformat.tarfile.TarUtils.getBytes;
import static org.apache.camel.dataformat.tarfile.TarUtils.getTaredText;
import static org.apache.camel.dataformat.tarfile.TarUtils.getTaredTextInFolder;
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Unit tests for {@link TarFileDataFormat}.
@@ -123,9 +129,10 @@ public class TarFileDataFormatTest extends CamelTestSupport {
assertMockEndpointsSatisfied();
}
- @Test(expected = CamelExecutionException.class)
+ @Test
public void testUntarWithCorruptedTarFile() throws Exception {
- template.sendBody("direct:corruptUntar", new File("src/test/resources/data/corrupt.tar"));
+ assertThrows(CamelExecutionException.class,
+ () -> template.sendBody("direct:corruptUntar", new File("src/test/resources/data/corrupt.tar")));
}
@Test
@@ -139,7 +146,7 @@ public class TarFileDataFormatTest extends CamelTestSupport {
Exchange exchange = mock.getReceivedExchanges().get(0);
assertEquals(exchange.getIn().getMessageId(), exchange.getIn().getHeader(FILE_NAME));
- assertEquals(TEXT, new String((byte[]) exchange.getIn().getBody(), "UTF-8"));
+ assertEquals(TEXT, new String((byte[]) exchange.getIn().getBody(), StandardCharsets.UTF_8));
}
@Test
@@ -189,7 +196,7 @@ public class TarFileDataFormatTest extends CamelTestSupport {
@Test
public void testDslTar() throws Exception {
- getMockEndpoint("mock:dslTar").expectedBodiesReceived(getTaredText("poem.txt"));
+ getMockEndpoint("mock:dslTar").expectedBodiesReceived((Object) getTaredText("poem.txt"));
getMockEndpoint("mock:dslTar").expectedHeaderReceived(FILE_NAME, "poem.txt.tar");
template.sendBodyAndHeader("direct:dslTar", TEXT, FILE_NAME, "poem.txt");
@@ -223,12 +230,12 @@ public class TarFileDataFormatTest extends CamelTestSupport {
tar.setUsingIterator(true);
tar.setAllowEmptyDirectory(false);
template.sendBody("direct:untarWithEmptyDirectory", new File("src/test/resources/data/hello.tar"));
- assertTrue(!Files.exists(Paths.get("hello_out/Configurations2")));
+ assertFalse(Files.exists(Paths.get("hello_out/Configurations2")));
deleteDirectory(new File("hello_out"));
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory(TEST_DIR);
super.setUp();
@@ -283,12 +290,9 @@ public class TarFileDataFormatTest extends CamelTestSupport {
outputFile.mkdirs();
} else {
outputFile.getParentFile().mkdirs();
- TarArchiveInputStream debInputStream = (TarArchiveInputStream)
- new ArchiveStreamFactory().createArchiveInputStream("tar", is);
- try {
+ try (TarArchiveInputStream debInputStream = (TarArchiveInputStream)
+ new ArchiveStreamFactory().createArchiveInputStream("tar", is)) {
copy(debInputStream, outputFile);
- } finally {
- debInputStream.close();
}
}
}
diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileMultipleFilesSplitterTest.java b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileMultipleFilesSplitterTest.java
index bac24d7..436ea7b 100644
--- a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileMultipleFilesSplitterTest.java
+++ b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileMultipleFilesSplitterTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.AggregationStrategy;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TarFileMultipleFilesSplitterTest extends TarSplitterRouteTest {
static final String PROCESSED_FILES_HEADER_NAME = "processedFiles";
diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileSplitAndDeleteTest.java b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileSplitAndDeleteTest.java
index e451655..de45208 100644
--- a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileSplitAndDeleteTest.java
+++ b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileSplitAndDeleteTest.java
@@ -27,14 +27,17 @@ import java.util.Iterator;
import org.apache.camel.RoutesBuilder;
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 TarFileSplitAndDeleteTest extends CamelTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/testDeleteTarFileWhenUnmarshalWithDataFormat");
deleteDirectory("target/testDeleteTarFileWhenUnmarshalWithSplitter");
@@ -52,7 +55,7 @@ public class TarFileSplitAndDeleteTest extends CamelTestSupport {
notify.matchesMockWaitTime();
// the original file should have been deleted
- assertFalse("File should been deleted", new File(tarFile).exists());
+ assertFalse(new File(tarFile).exists(), "File should been deleted");
}
@Test
@@ -66,7 +69,7 @@ public class TarFileSplitAndDeleteTest extends CamelTestSupport {
notify.matchesMockWaitTime();
// the original file should have been deleted,
- assertFalse("File should been deleted", new File(tarFile).exists());
+ assertFalse(new File(tarFile).exists(), "File should been deleted");
}
diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarSplitterRouteIssueTest.java b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarSplitterRouteIssueTest.java
index 046017c..b1d0bed 100644
--- a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarSplitterRouteIssueTest.java
+++ b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarSplitterRouteIssueTest.java
@@ -19,14 +19,16 @@ package org.apache.camel.dataformat.tarfile;
import java.io.File;
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;
public class TarSplitterRouteIssueTest extends CamelTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/tar");
super.setUp();
diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarSplitterRouteTest.java b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarSplitterRouteTest.java
index c33f930..d323dd1 100644
--- a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarSplitterRouteTest.java
+++ b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarSplitterRouteTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.dataformat.tarfile;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
public class TarSplitterRouteTest extends CamelTestSupport {
diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/AggregationStrategyWithFilenameHeaderTest.java b/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/AggregationStrategyWithFilenameHeaderTest.java
index 25775a7..ea3e3d4 100644
--- a/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/AggregationStrategyWithFilenameHeaderTest.java
+++ b/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/AggregationStrategyWithFilenameHeaderTest.java
@@ -25,13 +25,18 @@ import java.util.List;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.util.IOHelper;
import org.apache.commons.compress.archivers.ArchiveStreamFactory;
import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
-import org.junit.Before;
-import org.junit.Test;
+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.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class AggregationStrategyWithFilenameHeaderTest extends CamelTestSupport {
@@ -40,7 +45,7 @@ public class AggregationStrategyWithFilenameHeaderTest extends CamelTestSupport
private TarAggregationStrategy tar = new TarAggregationStrategy(false, true);
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
tar.setParentDir("target/temp");
deleteDirectory("target/temp");
@@ -61,8 +66,8 @@ public class AggregationStrategyWithFilenameHeaderTest extends CamelTestSupport
Thread.sleep(500);
File[] files = new File("target/out").listFiles();
- assertTrue(files != null);
- assertTrue("Should be a file in target/out directory", files.length > 0);
+ assertNotNull(files);
+ assertTrue(files.length > 0, "Should be a file in target/out directory");
File resultFile = files[0];
@@ -73,9 +78,9 @@ public class AggregationStrategyWithFilenameHeaderTest extends CamelTestSupport
int fileCount = 0;
for (TarArchiveEntry entry = tis.getNextTarEntry(); entry != null; entry = tis.getNextTarEntry()) {
fileCount++;
- assertTrue("Tar entry file name should be on of: " + FILE_NAMES, FILE_NAMES.contains(entry.getName()));
+ assertTrue(FILE_NAMES.contains(entry.getName()), "Tar entry file name should be on of: " + FILE_NAMES);
}
- assertEquals("Tar file should contain " + FILE_NAMES.size() + " files", FILE_NAMES.size(), fileCount);
+ assertEquals(FILE_NAMES.size(), fileCount, "Tar file should contain " + FILE_NAMES.size() + " files");
} finally {
IOHelper.close(tis);
}
diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/AggregationStrategyWithPreservationTest.java b/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/AggregationStrategyWithPreservationTest.java
index 69f883c..d44e5d9 100644
--- a/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/AggregationStrategyWithPreservationTest.java
+++ b/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/AggregationStrategyWithPreservationTest.java
@@ -24,12 +24,17 @@ import java.util.Set;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.util.IOHelper;
import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
-import org.junit.Before;
-import org.junit.Test;
+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.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
public class AggregationStrategyWithPreservationTest extends CamelTestSupport {
@@ -38,7 +43,7 @@ public class AggregationStrategyWithPreservationTest extends CamelTestSupport {
private TarAggregationStrategy tar = new TarAggregationStrategy(true, true);
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
tar.setParentDir("target/temp");
deleteDirectory("target/temp");
@@ -56,7 +61,7 @@ public class AggregationStrategyWithPreservationTest extends CamelTestSupport {
Thread.sleep(500);
File[] files = new File("target/out").listFiles();
- assertTrue("Should be a file in target/out directory", files.length > 0);
+ assertTrue(files.length > 0, "Should be a file in target/out directory");
File resultFile = files[0];
Set<String> expectedTarFiles = new HashSet<>(Arrays.asList("another/hello.txt",
@@ -74,9 +79,8 @@ public class AggregationStrategyWithPreservationTest extends CamelTestSupport {
}
fileCount++;
}
- assertTrue("Tar file should contains " + AggregationStrategyWithPreservationTest.EXPECTED_NO_FILES + " files",
- fileCount == AggregationStrategyWithPreservationTest.EXPECTED_NO_FILES);
- assertEquals("Should have found all of the tar files in the file.", 0, expectedTarFiles.size());
+ assertEquals(fileCount, AggregationStrategyWithPreservationTest.EXPECTED_NO_FILES, "Tar file should contains " + AggregationStrategyWithPreservationTest.EXPECTED_NO_FILES + " files");
+ assertEquals(0, expectedTarFiles.size(), "Should have found all of the tar files in the file.");
} finally {
IOHelper.close(tin);
}
diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/TarAggregationStrategyTest.java b/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/TarAggregationStrategyTest.java
index fdef4cf..13f3ad1 100644
--- a/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/TarAggregationStrategyTest.java
+++ b/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/TarAggregationStrategyTest.java
@@ -21,12 +21,16 @@ import java.io.FileInputStream;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.util.IOHelper;
import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
-import org.junit.Before;
-import org.junit.Test;
+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.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class TarAggregationStrategyTest extends CamelTestSupport {
@@ -35,7 +39,7 @@ public class TarAggregationStrategyTest extends CamelTestSupport {
private TarAggregationStrategy tar = new TarAggregationStrategy();
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
tar.setParentDir("target/temp");
deleteDirectory("target/temp");
@@ -55,7 +59,7 @@ public class TarAggregationStrategyTest extends CamelTestSupport {
File[] files = new File("target/out").listFiles();
assertTrue(files != null);
- assertTrue("Should be a file in target/out directory", files.length > 0);
+ assertTrue(files.length > 0, "Should be a file in target/out directory");
File resultFile = files[0];
@@ -65,7 +69,8 @@ public class TarAggregationStrategyTest extends CamelTestSupport {
for (TarArchiveEntry te = tin.getNextTarEntry(); te != null; te = tin.getNextTarEntry()) {
fileCount = fileCount + 1;
}
- assertEquals("Tar file should contains " + TarAggregationStrategyTest.EXPECTED_NO_FILES + " files", TarAggregationStrategyTest.EXPECTED_NO_FILES, fileCount);
+ assertEquals(TarAggregationStrategyTest.EXPECTED_NO_FILES, fileCount,
+ "Tar file should contains " + TarAggregationStrategyTest.EXPECTED_NO_FILES + " files");
} finally {
IOHelper.close(tin);
}