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 37c7e5cb99fe77120a28f4d906d5a3a1cf7f1ae8 Author: Guillaume Nodet <[email protected]> AuthorDate: Mon Jul 27 16:11:21 2020 +0200 [CAMEL-11807] Upgrade camel-zipfile to junit5 --- .../camel/dataformat/zipfile/SpringZipSplitterRouteTest.java | 2 +- .../camel/dataformat/zipfile/ZipFileDataFormatTest.java | 11 +++++++---- .../dataformat/zipfile/ZipFileIteratorDataFormatTest.java | 2 +- .../dataformat/zipfile/ZipFileMultipleFilesSplitterTest.java | 2 +- .../camel/dataformat/zipfile/ZipFileSplitAndDeleteTest.java | 2 +- .../camel/dataformat/zipfile/ZipFileSplitOneFileTest.java | 2 +- .../camel/dataformat/zipfile/ZipSplitterRouteIssueTest.java | 2 +- .../apache/camel/dataformat/zipfile/ZipSplitterRouteTest.java | 2 +- .../zipfile/AggregationStrategyWithFilenameHeaderTest.java | 6 ++++-- .../zipfile/AggregationStrategyWithPreservationTest.java | 6 ++++-- .../zipfile/ZipAggregationStrategyEmptyFileTest.java | 6 ++++-- .../aggregate/zipfile/ZipAggregationStrategyTest.java | 6 ++++-- 12 files changed, 30 insertions(+), 19 deletions(-) diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/SpringZipSplitterRouteTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/SpringZipSplitterRouteTest.java index f5d3974..2c90f5c 100644 --- a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/SpringZipSplitterRouteTest.java +++ b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/SpringZipSplitterRouteTest.java @@ -18,7 +18,7 @@ package org.apache.camel.dataformat.zipfile; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; -import org.junit.jupiter.api.*; import static org.junit.jupiter.api.Assertions.*; +import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; public class SpringZipSplitterRouteTest extends CamelSpringTestSupport { diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormatTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormatTest.java index f2817fa..5885e8c 100644 --- a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormatTest.java +++ b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormatTest.java @@ -42,13 +42,16 @@ import org.apache.camel.converter.stream.InputStreamCache; import org.apache.camel.test.junit5.CamelTestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.*; +import org.junit.jupiter.api.Test; +import static org.apache.camel.Exchange.FILE_NAME; import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; -import static org.junit.jupiter.api.Assertions.*; - -import static org.apache.camel.Exchange.FILE_NAME; +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.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit tests for {@link ZipFileDataFormat}. diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileIteratorDataFormatTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileIteratorDataFormatTest.java index 8f75453..cb8c852 100644 --- a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileIteratorDataFormatTest.java +++ b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileIteratorDataFormatTest.java @@ -23,7 +23,7 @@ import org.apache.camel.Exchange; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.junit5.CamelTestSupport; -import org.junit.jupiter.api.*; import static org.junit.jupiter.api.Assertions.*; +import org.junit.jupiter.api.Test; public class ZipFileIteratorDataFormatTest extends CamelTestSupport { diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileMultipleFilesSplitterTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileMultipleFilesSplitterTest.java index 2120667..2b42026 100644 --- a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileMultipleFilesSplitterTest.java +++ b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileMultipleFilesSplitterTest.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.jupiter.api.*; import static org.junit.jupiter.api.Assertions.*; +import org.junit.jupiter.api.Test; public class ZipFileMultipleFilesSplitterTest extends ZipSplitterRouteTest { static final String PROCESSED_FILES_HEADER_NAME = "processedFiles"; diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitAndDeleteTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitAndDeleteTest.java index 62e601e..0912714 100644 --- a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitAndDeleteTest.java +++ b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitAndDeleteTest.java @@ -29,7 +29,7 @@ import org.apache.camel.builder.NotifyBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.*; +import org.junit.jupiter.api.Test; import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitOneFileTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitOneFileTest.java index 6aabea2..35136bc 100644 --- a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitOneFileTest.java +++ b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitOneFileTest.java @@ -30,7 +30,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.*; +import org.junit.jupiter.api.Test; import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipSplitterRouteIssueTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipSplitterRouteIssueTest.java index 5de29ae..9fac583 100644 --- a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipSplitterRouteIssueTest.java +++ b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipSplitterRouteIssueTest.java @@ -21,7 +21,7 @@ import java.io.File; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.*; +import org.junit.jupiter.api.Test; import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipSplitterRouteTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipSplitterRouteTest.java index 2f30f4b2..834196a 100644 --- a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipSplitterRouteTest.java +++ b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipSplitterRouteTest.java @@ -19,7 +19,7 @@ package org.apache.camel.dataformat.zipfile; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.junit5.CamelTestSupport; -import org.junit.jupiter.api.*; import static org.junit.jupiter.api.Assertions.*; +import org.junit.jupiter.api.Test; public class ZipSplitterRouteTest extends CamelTestSupport { diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/AggregationStrategyWithFilenameHeaderTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/AggregationStrategyWithFilenameHeaderTest.java index f52dacc..4178c30 100644 --- a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/AggregationStrategyWithFilenameHeaderTest.java +++ b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/AggregationStrategyWithFilenameHeaderTest.java @@ -29,10 +29,12 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.junit5.CamelTestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.*; +import org.junit.jupiter.api.Test; import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; -import static org.junit.jupiter.api.Assertions.*; +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 { diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/AggregationStrategyWithPreservationTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/AggregationStrategyWithPreservationTest.java index b8e1b54..1ecab94 100644 --- a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/AggregationStrategyWithPreservationTest.java +++ b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/AggregationStrategyWithPreservationTest.java @@ -29,10 +29,12 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.junit5.CamelTestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.*; +import org.junit.jupiter.api.Test; import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; -import static org.junit.jupiter.api.Assertions.*; +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 AggregationStrategyWithPreservationTest extends CamelTestSupport { diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategyEmptyFileTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategyEmptyFileTest.java index 47b5e18..6808d5a 100644 --- a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategyEmptyFileTest.java +++ b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategyEmptyFileTest.java @@ -26,10 +26,12 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.junit5.CamelTestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.*; +import org.junit.jupiter.api.Test; import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; -import static org.junit.jupiter.api.Assertions.*; +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 ZipAggregationStrategyEmptyFileTest extends CamelTestSupport { diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategyTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategyTest.java index 60fdbcc..289f253 100644 --- a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategyTest.java +++ b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategyTest.java @@ -26,10 +26,12 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.junit5.CamelTestSupport; import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.*; +import org.junit.jupiter.api.Test; import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; -import static org.junit.jupiter.api.Assertions.*; +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 ZipAggregationStrategyTest extends CamelTestSupport {
