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
The following commit(s) were added to refs/heads/main by this push: new 7303e31 (chores): fix incorrect assertion order in tests (#5463) 7303e31 is described below commit 7303e3102c5f78794f7350387c2339bde58110cd Author: Otavio Rodolfo Piske <orpi...@users.noreply.github.com> AuthorDate: Sat Apr 24 16:32:39 2021 +0200 (chores): fix incorrect assertion order in tests (#5463) This prevents confusing messages when evaluating test results --- .../integration/AthenaComponentManualIT.java | 4 +- .../aws2/s3/S3ComponentConfigurationTest.java | 2 +- .../camel/component/cmis/CMISProducerTest.java | 4 +- .../camel/component/consul/ConsulRegistryIT.java | 2 +- .../language/csimple/joor/OriginalSimpleTest.java | 2 +- .../CsvDataFormatCustomRecordConverterTest.java | 6 +- .../integration/DigitalOceanComponentIT.java | 18 ++--- .../component/git/producer/GitProducerTest.java | 88 +++++++++++----------- .../component/grpc/GrpcConsumerExceptionTest.java | 2 +- .../grpc/GrpcProducerClientInterceptorTest.java | 2 +- .../camel/component/grpc/GrpcProducerSyncTest.java | 2 +- .../component/http/HttpDisableStreamCacheTest.java | 2 +- .../JmsJMSReplyToEndpointUsingInOutTest.java | 2 +- .../jpa/MultipleJpaRouteEndpointTest.java | 2 +- .../camel/component/kafka/KafkaProducerTest.java | 8 +- .../kafka/integration/KafkaProducerFullIT.java | 8 +- .../consumer/KubernetesNamespacesConsumerTest.java | 2 +- ...bernetesReplicationControllersConsumerTest.java | 2 +- .../consumer/KubernetesServicesConsumerTest.java | 2 +- .../producer/KubernetesNamespacesProducerTest.java | 2 +- .../MinaTcpLineDelimiterUsingPlainSocketTest.java | 2 +- .../mina/MinaTcpWithInOutUsingPlainSocketTest.java | 2 +- .../camel/openapi/RestOpenApiSupportTest.java | 8 +- .../camel/opentelemetry/SpanProcessorsTest.java | 2 +- .../camel/opentracing/SpanProcessorsTest.java | 2 +- .../slot/PgReplicationSlotEndpointTest.java | 40 +++++----- .../rabbitmq/integration/RabbitMQProducerIT.java | 4 +- .../component/servlet/HttpClientRouteTest.java | 2 +- .../camel/component/sjms/SjmsEndpointTest.java | 10 +-- .../camel/component/sjms2/Sjms2EndpointTest.java | 10 +-- .../component/ConsumerAutoDownloadFileTest.java | 2 +- .../component/ConsumerCamelConcurrentTest.java | 8 +- .../component/ConsumerNativeConcurrentTest.java | 2 +- .../ProducerAutoUploadFileIsFalseTest.java | 2 +- .../component/ProducerAutoUploadFileTest.java | 2 +- .../component/ProducerUploadFileTest.java | 4 +- .../camel/component/stitch/StitchProducerTest.java | 4 +- .../vertx/kafka/VertxKafkaProducerFullTest.java | 8 +- .../VertxKafkaProducerOperationsTest.java | 2 +- .../apache/camel/WorkdayCommonAPIProducerTest.java | 25 +++--- .../camel/builder/ExpressionBuilderTest.java | 2 +- .../converter/stream/CachedOutputStreamTest.java | 2 +- .../org/apache/camel/impl/DefaultExchangeTest.java | 10 +-- .../org/apache/camel/util/StringHelperTest.java | 12 +-- .../camel/util/ObjectHelperLoadClassTest.java | 6 +- .../camel/itest/issues/JettyHttpFileCacheTest.java | 2 +- 46 files changed, 169 insertions(+), 168 deletions(-) diff --git a/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/integration/AthenaComponentManualIT.java b/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/integration/AthenaComponentManualIT.java index 99ff7cf..21ccc4b 100644 --- a/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/integration/AthenaComponentManualIT.java +++ b/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/integration/AthenaComponentManualIT.java @@ -206,7 +206,7 @@ public class AthenaComponentManualIT extends CamelTestSupport { assertTrue(exchange.getMessage().getHeader(Athena2Constants.START_QUERY_EXECUTION_ELAPSED_MILLIS, Long.class) > 0); GetQueryExecutionResponse response = exchange.getMessage().getBody(GetQueryExecutionResponse.class); - assertEquals(response.queryExecution().query(), "SELECT 1"); + assertEquals("SELECT 1", response.queryExecution().query()); } @Test @@ -248,7 +248,7 @@ public class AthenaComponentManualIT extends CamelTestSupport { GetQueryExecutionResponse response = exchange.getMessage().getBody(GetQueryExecutionResponse.class); assertEquals(QueryExecutionState.FAILED, response.queryExecution().status().state()); - assertEquals(response.queryExecution().query(), "SELECT INVALID SQL"); + assertEquals("SELECT INVALID SQL", response.queryExecution().query()); } @Test diff --git a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/S3ComponentConfigurationTest.java b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/S3ComponentConfigurationTest.java index ee296bf..dfd8853 100644 --- a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/S3ComponentConfigurationTest.java +++ b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/S3ComponentConfigurationTest.java @@ -34,7 +34,7 @@ public class S3ComponentConfigurationTest extends CamelTestSupport { .createEndpoint( "aws2-s3://TestDomain?accessKey=xxx&secretKey=yyy®ion=us-west-1&overrideEndpoint=true&uriEndpointOverride=http://localhost:4572"); assertTrue(endpoint.getConfiguration().isOverrideEndpoint()); - assertEquals(endpoint.getConfiguration().getUriEndpointOverride(), "http://localhost:4572"); + assertEquals("http://localhost:4572", endpoint.getConfiguration().getUriEndpointOverride()); } @Test diff --git a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISProducerTest.java b/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISProducerTest.java index 9af0084..5939676 100644 --- a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISProducerTest.java +++ b/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISProducerTest.java @@ -365,8 +365,8 @@ public class CMISProducerTest extends CMISTestSupport { assertNotNull(copy); assertNotEquals(document.getName(), copy.getName()); - assertEquals(document.getName(), "document.txt"); - assertEquals(copy.getName(), "renamedDocument.txt"); + assertEquals("document.txt", document.getName()); + assertEquals("renamedDocument.txt", copy.getName()); assertEquals(document.getContentStreamLength(), copy.getContentStreamLength()); assertEquals(destination.getId(), copy.getParents().get(0).getId()); } diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulRegistryIT.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulRegistryIT.java index 1242ee6..f6a7332 100644 --- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulRegistryIT.java +++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulRegistryIT.java @@ -137,7 +137,7 @@ public class ConsulRegistryIT implements Serializable { ConsulTestClass testObject = new ConsulTestClass(); registry.put("objectTestClass", testObject); ConsulTestClass clone = (ConsulTestClass) registry.lookupByName("objectTestClass"); - assertEquals(clone.hello("World"), "Hello World"); + assertEquals("Hello World", clone.hello("World")); registry.remove("objectTestClass"); } diff --git a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java index 6a18995..2002efc 100644 --- a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java +++ b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java @@ -1322,7 +1322,7 @@ public class OriginalSimpleTest extends LanguageTestSupport { fail("Should have thrown an exception"); } catch (ExpressionEvaluationException e) { IndexOutOfBoundsException cause = assertIsInstanceOf(IndexOutOfBoundsException.class, e.getCause()); - assertEquals(cause.getMessage(), "Index 3 out of bounds for length 2"); + assertEquals("Index 3 out of bounds for length 2", cause.getMessage()); } } diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvDataFormatCustomRecordConverterTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvDataFormatCustomRecordConverterTest.java index 9481682..ec75973 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvDataFormatCustomRecordConverterTest.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvDataFormatCustomRecordConverterTest.java @@ -44,10 +44,10 @@ public class CsvDataFormatCustomRecordConverterTest extends CamelSpringTestSuppo Message message = mock.getReceivedExchanges().get(0).getIn(); List<List<String>> body = CastUtils.cast((List) message.getBody()); assertNotNull(body); - assertEquals(body.size(), 1); + assertEquals(1, body.size()); List<String> row = body.get(0); - assertEquals(row.size(), 3); - assertEquals(row.toString(), "[Hello, Again, Democracy]"); + assertEquals(3, row.size()); + assertEquals("[Hello, Again, Democracy]", row.toString()); } private String getData() { diff --git a/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/integration/DigitalOceanComponentIT.java b/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/integration/DigitalOceanComponentIT.java index 299a699..374f116 100644 --- a/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/integration/DigitalOceanComponentIT.java +++ b/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/integration/DigitalOceanComponentIT.java @@ -199,7 +199,7 @@ public class DigitalOceanComponentIT extends DigitalOceanTestSupport { Exchange exchange = template.request("direct:getActions", null); assertMockEndpointsSatisfied(); - assertEquals(((List) exchange.getMessage().getBody()).size(), 30); + assertEquals(30, ((List) exchange.getMessage().getBody()).size()); } @Test @@ -237,7 +237,7 @@ public class DigitalOceanComponentIT extends DigitalOceanTestSupport { Droplet droplet = (Droplet) exchange.getMessage().getBody(); assertNotNull(droplet.getId()); - assertEquals(droplet.getRegion().getSlug(), "fra1"); + assertEquals("fra1", droplet.getRegion().getSlug()); assertCollectionSize(droplet.getTags(), 2); } @@ -261,7 +261,7 @@ public class DigitalOceanComponentIT extends DigitalOceanTestSupport { Exchange exchange = template.request("direct:getDroplets", null); assertMockEndpointsSatisfied(); - assertEquals(((List) exchange.getMessage().getBody()).size(), 1); + assertEquals(1, ((List) exchange.getMessage().getBody()).size()); } @Test @@ -281,7 +281,7 @@ public class DigitalOceanComponentIT extends DigitalOceanTestSupport { Exchange exchange = template.request("direct:createTag", null); assertMockEndpointsSatisfied(); - assertEquals(((Tag) exchange.getMessage().getBody()).getName(), "tag1"); + assertEquals("tag1", ((Tag) exchange.getMessage().getBody()).getName()); } @Test @@ -291,7 +291,7 @@ public class DigitalOceanComponentIT extends DigitalOceanTestSupport { Exchange exchange = template.request("direct:getTags", null); assertMockEndpointsSatisfied(); - assertEquals(((List<Tag>) exchange.getMessage().getBody()).get(0).getName(), "tag1"); + assertEquals("tag1", ((List<Tag>) exchange.getMessage().getBody()).get(0).getName()); } @Test @@ -302,7 +302,7 @@ public class DigitalOceanComponentIT extends DigitalOceanTestSupport { assertMockEndpointsSatisfied(); List<Image> images = (List<Image>) exchange.getMessage().getBody(); - assertNotEquals(images.size(), 1); + assertNotEquals(1, images.size()); } @Test @@ -312,7 +312,7 @@ public class DigitalOceanComponentIT extends DigitalOceanTestSupport { Exchange exchange = template.request("direct:getImage", null); assertMockEndpointsSatisfied(); - assertEquals((exchange.getMessage().getBody(Image.class)).getSlug(), "ubuntu-14-04-x64"); + assertEquals("ubuntu-14-04-x64", (exchange.getMessage().getBody(Image.class)).getSlug()); } @@ -325,7 +325,7 @@ public class DigitalOceanComponentIT extends DigitalOceanTestSupport { assertMockEndpointsSatisfied(); List<Size> sizes = (List<Size>) exchange.getMessage().getBody(); System.out.println(sizes); - assertNotEquals(sizes.size(), 1); + assertNotEquals(1, sizes.size()); } @Test @@ -337,7 +337,7 @@ public class DigitalOceanComponentIT extends DigitalOceanTestSupport { assertMockEndpointsSatisfied(); List<Region> regions = (List<Region>) exchange.getMessage().getBody(); System.out.println(regions); - assertNotEquals(regions.size(), 1); + assertNotEquals(1, regions.size()); } } diff --git a/components/camel-git/src/test/java/org/apache/camel/component/git/producer/GitProducerTest.java b/components/camel-git/src/test/java/org/apache/camel/component/git/producer/GitProducerTest.java index 273d6c6..be255a5 100644 --- a/components/camel-git/src/test/java/org/apache/camel/component/git/producer/GitProducerTest.java +++ b/components/camel-git/src/test/java/org/apache/camel/component/git/producer/GitProducerTest.java @@ -55,14 +55,14 @@ public class GitProducerTest extends GitTestSupport { public void cloneTest() throws Exception { template.sendBody("direct:clone", ""); File gitDir = new File(gitLocalRepo, ".git"); - assertEquals(gitDir.exists(), true); + assertEquals(true, gitDir.exists()); } @Test public void initTest() throws Exception { template.sendBody("direct:init", ""); File gitDir = new File(gitLocalRepo, ".git"); - assertEquals(gitDir.exists(), true); + assertEquals(true, gitDir.exists()); } @Test @@ -70,7 +70,7 @@ public class GitProducerTest extends GitTestSupport { // Init Git git = getGitTestRepository(); File gitDir = new File(gitLocalRepo, ".git"); - assertEquals(gitDir.exists(), true); + assertEquals(true, gitDir.exists()); File fileToAdd = new File(gitLocalRepo, filenameToAdd); fileToAdd.createNewFile(); git.add().addFilepattern(filenameToAdd).call(); @@ -89,7 +89,7 @@ public class GitProducerTest extends GitTestSupport { branchCreated = true; } } - assertEquals(branchCreated, true); + assertEquals(true, branchCreated); git.close(); } @@ -101,7 +101,7 @@ public class GitProducerTest extends GitTestSupport { fileToAdd.createNewFile(); git.add().addFilepattern(filenameToAdd).call(); File gitDir = new File(gitLocalRepo, ".git"); - assertEquals(gitDir.exists(), true); + assertEquals(true, gitDir.exists()); Status status = git.status().call(); assertTrue(status.getAdded().contains(filenameToAdd)); git.commit().setMessage(commitMessage).call(); @@ -117,7 +117,7 @@ public class GitProducerTest extends GitTestSupport { tagCreated = true; } } - assertEquals(tagCreated, true); + assertEquals(true, tagCreated); // Test camel-git create-branch template.sendBody("direct:checkout-specific-tag", ""); @@ -130,7 +130,7 @@ public class GitProducerTest extends GitTestSupport { branchCreated = true; } } - assertEquals(branchCreated, true); + assertEquals(true, branchCreated); git.close(); } @@ -140,7 +140,7 @@ public class GitProducerTest extends GitTestSupport { template.sendBody("direct:clone", ""); template.sendBody("direct:clone", ""); File gitDir = new File(gitLocalRepo, ".git"); - assertEquals(gitDir.exists(), true); + assertEquals(true, gitDir.exists()); }); } @@ -148,7 +148,7 @@ public class GitProducerTest extends GitTestSupport { public void pullTest() throws Exception { template.sendBody("direct:clone", ""); File gitDir = new File(gitLocalRepo, ".git"); - assertEquals(gitDir.exists(), true); + assertEquals(true, gitDir.exists()); PullResult pr = template.requestBody("direct:pull", "", PullResult.class); assertTrue(pr.isSuccessful()); } @@ -163,7 +163,7 @@ public class GitProducerTest extends GitTestSupport { template.sendBodyAndHeader("direct:add", "", GitConstants.GIT_FILE_NAME, filenameToAdd); File gitDir = new File(gitLocalRepo, ".git"); - assertEquals(gitDir.exists(), true); + assertEquals(true, gitDir.exists()); Status status = git.status().call(); assertTrue(status.getAdded().contains(filenameToAdd)); git.close(); @@ -174,7 +174,7 @@ public class GitProducerTest extends GitTestSupport { // Init Git git = getGitTestRepository(); File gitDir = new File(gitLocalRepo, ".git"); - assertEquals(gitDir.exists(), true); + assertEquals(true, gitDir.exists()); File fileToAdd = new File(gitLocalRepo, filenameToAdd); fileToAdd.createNewFile(); git.add().addFilepattern(filenameToAdd).call(); @@ -186,7 +186,7 @@ public class GitProducerTest extends GitTestSupport { // Check gitDir = new File(gitLocalRepo, ".git"); - assertEquals(gitDir.exists(), true); + assertEquals(true, gitDir.exists()); git.commit().setMessage(commitMessage).call(); validateGitLogs(git, commitMessage); status = git.status().call(); @@ -217,7 +217,7 @@ public class GitProducerTest extends GitTestSupport { // Init Git git = getGitTestRepository(); File gitDir = new File(gitLocalRepo, ".git"); - assertEquals(gitDir.exists(), true); + assertEquals(true, gitDir.exists()); File fileToAdd = new File(gitLocalRepo, filenameToAdd); fileToAdd.createNewFile(); git.add().addFilepattern(filenameToAdd).call(); @@ -238,7 +238,7 @@ public class GitProducerTest extends GitTestSupport { // Init Git git = getGitTestRepository(); File gitDir = new File(gitLocalRepo, ".git"); - assertEquals(gitDir.exists(), true); + assertEquals(true, gitDir.exists()); File fileToAdd = new File(gitLocalRepo, filenameToAdd); fileToAdd.createNewFile(); git.add().addFilepattern(filenameToAdd).call(); @@ -260,7 +260,7 @@ public class GitProducerTest extends GitTestSupport { // Initialize repository using JGit Repository repository = getTestRepository(); File gitDir = new File(gitLocalRepo, ".git"); - assertEquals(gitDir.exists(), true); + assertEquals(true, gitDir.exists()); Git git = new Git(repository); File fileToAdd = new File(gitLocalRepo, filenameToAdd); fileToAdd.createNewFile(); @@ -278,7 +278,7 @@ public class GitProducerTest extends GitTestSupport { // Init Git git = getGitTestRepository(); File gitDir = new File(gitLocalRepo, ".git"); - assertEquals(gitDir.exists(), true); + assertEquals(true, gitDir.exists()); File fileToAdd = new File(gitLocalRepo, filenameToAdd); fileToAdd.createNewFile(); git.add().addFilepattern(filenameToAdd).call(); @@ -321,7 +321,7 @@ public class GitProducerTest extends GitTestSupport { // Init Git git = getGitTestRepository(); File gitDir = new File(gitLocalRepo, ".git"); - assertEquals(gitDir.exists(), true); + assertEquals(true, gitDir.exists()); File fileToAdd = new File(gitLocalRepo, filenameToAdd); fileToAdd.createNewFile(); git.add().addFilepattern(filenameToAdd).call(); @@ -358,7 +358,7 @@ public class GitProducerTest extends GitTestSupport { // Init Git git = getGitTestRepository(); File gitDir = new File(gitLocalRepo, ".git"); - assertEquals(gitDir.exists(), true); + assertEquals(true, gitDir.exists()); File fileToAdd = new File(gitLocalRepo, filenameToAdd); fileToAdd.createNewFile(); git.add().addFilepattern(filenameToAdd).call(); @@ -393,7 +393,7 @@ public class GitProducerTest extends GitTestSupport { // Init Git git = getGitTestRepository(); File gitDir = new File(gitLocalRepo, ".git"); - assertEquals(gitDir.exists(), true); + assertEquals(true, gitDir.exists()); File fileToAdd = new File(gitLocalRepo, filenameToAdd); fileToAdd.createNewFile(); git.add().addFilepattern(filenameToAdd).call(); @@ -412,7 +412,7 @@ public class GitProducerTest extends GitTestSupport { branchCreated = true; } } - assertEquals(branchCreated, true); + assertEquals(true, branchCreated); git.close(); } @@ -424,7 +424,7 @@ public class GitProducerTest extends GitTestSupport { fileToAdd.createNewFile(); git.add().addFilepattern(filenameToAdd).call(); File gitDir = new File(gitLocalRepo, ".git"); - assertEquals(gitDir.exists(), true); + assertEquals(true, gitDir.exists()); Status status = git.status().call(); assertTrue(status.getAdded().contains(filenameToAdd)); git.commit().setMessage(commitMessage).call(); @@ -436,7 +436,7 @@ public class GitProducerTest extends GitTestSupport { branchCreated = true; } } - assertEquals(branchCreated, true); + assertEquals(true, branchCreated); // Test camel-git delete-branch template.sendBody("direct:delete-branch", ""); @@ -448,7 +448,7 @@ public class GitProducerTest extends GitTestSupport { branchCreated = true; } } - assertEquals(branchCreated, false); + assertEquals(false, branchCreated); git.close(); } @@ -460,7 +460,7 @@ public class GitProducerTest extends GitTestSupport { fileToAdd.createNewFile(); git.add().addFilepattern(filenameToAdd).call(); File gitDir = new File(gitLocalRepo, ".git"); - assertEquals(gitDir.exists(), true); + assertEquals(true, gitDir.exists()); // Test camel-git status Status status = template.requestBody("direct:status", "", Status.class); @@ -480,7 +480,7 @@ public class GitProducerTest extends GitTestSupport { fileToAdd.createNewFile(); git.add().addFilepattern(filenameToAdd).call(); File gitDir = new File(gitLocalRepo, ".git"); - assertEquals(gitDir.exists(), true); + assertEquals(true, gitDir.exists()); Status status = git.status().call(); assertTrue(status.getAdded().contains(filenameToAdd)); git.commit().setMessage(commitMessage).call(); @@ -492,7 +492,7 @@ public class GitProducerTest extends GitTestSupport { branchCreated = true; } } - assertEquals(branchCreated, true); + assertEquals(true, branchCreated); File fileToAddDifferent = new File(gitLocalRepo, filenameBranchToAdd); fileToAddDifferent.createNewFile(); git.add().addFilepattern(filenameBranchToAdd).call(); @@ -516,7 +516,7 @@ public class GitProducerTest extends GitTestSupport { fileToAdd.createNewFile(); git.add().addFilepattern(filenameToAdd).call(); File gitDir = new File(gitLocalRepo, ".git"); - assertEquals(gitDir.exists(), true); + assertEquals(true, gitDir.exists()); Status status = git.status().call(); assertTrue(status.getAdded().contains(filenameToAdd)); git.commit().setMessage(commitMessage).call(); @@ -542,7 +542,7 @@ public class GitProducerTest extends GitTestSupport { fileToAdd.createNewFile(); git.add().addFilepattern(filenameToAdd).call(); File gitDir = new File(gitLocalRepo, ".git"); - assertEquals(gitDir.exists(), true); + assertEquals(true, gitDir.exists()); Status status = git.status().call(); assertTrue(status.getAdded().contains(filenameToAdd)); git.commit().setMessage(commitMessage).call(); @@ -554,7 +554,7 @@ public class GitProducerTest extends GitTestSupport { branchCreated = true; } } - assertEquals(branchCreated, true); + assertEquals(true, branchCreated); File fileToAddDifferent = new File(gitLocalRepo, filenameBranchToAdd); fileToAddDifferent.createNewFile(); git.add().addFilepattern(filenameBranchToAdd).call(); @@ -581,7 +581,7 @@ public class GitProducerTest extends GitTestSupport { fileToAdd.createNewFile(); git.add().addFilepattern(filenameToAdd).call(); File gitDir = new File(gitLocalRepo, ".git"); - assertEquals(gitDir.exists(), true); + assertEquals(true, gitDir.exists()); Status status = git.status().call(); assertTrue(status.getAdded().contains(filenameToAdd)); git.commit().setMessage(commitMessage).call(); @@ -597,7 +597,7 @@ public class GitProducerTest extends GitTestSupport { tagCreated = true; } } - assertEquals(tagCreated, true); + assertEquals(true, tagCreated); git.close(); } @@ -609,7 +609,7 @@ public class GitProducerTest extends GitTestSupport { fileToAdd.createNewFile(); git.add().addFilepattern(filenameToAdd).call(); File gitDir = new File(gitLocalRepo, ".git"); - assertEquals(gitDir.exists(), true); + assertEquals(true, gitDir.exists()); Status status = git.status().call(); assertTrue(status.getAdded().contains(filenameToAdd)); git.commit().setMessage(commitMessage).call(); @@ -621,7 +621,7 @@ public class GitProducerTest extends GitTestSupport { tagCreated = true; } } - assertEquals(tagCreated, true); + assertEquals(true, tagCreated); // Test camel-git delete-tag template.sendBody("direct:delete-tag", ""); @@ -634,7 +634,7 @@ public class GitProducerTest extends GitTestSupport { tagExists = true; } } - assertEquals(tagExists, false); + assertEquals(false, tagExists); git.close(); } @@ -646,7 +646,7 @@ public class GitProducerTest extends GitTestSupport { fileToAdd.createNewFile(); git.add().addFilepattern(filenameToAdd).call(); File gitDir = new File(gitLocalRepo, ".git"); - assertEquals(gitDir.exists(), true); + assertEquals(true, gitDir.exists()); Status status = git.status().call(); assertTrue(status.getAdded().contains(filenameToAdd)); git.commit().setMessage(commitMessage).call(); @@ -674,7 +674,7 @@ public class GitProducerTest extends GitTestSupport { fileToAdd.createNewFile(); git.add().addFilepattern(filenameToAdd).call(); File gitDir = new File(gitLocalRepo, ".git"); - assertEquals(gitDir.exists(), true); + assertEquals(true, gitDir.exists()); Status status = git.status().call(); assertTrue(status.getAdded().contains(filenameToAdd)); git.commit().setMessage(commitMessage).call(); @@ -714,7 +714,7 @@ public class GitProducerTest extends GitTestSupport { fileToAdd.createNewFile(); git.add().addFilepattern(filenameToAdd).call(); File gitDir = new File(gitLocalRepo, ".git"); - assertEquals(gitDir.exists(), true); + assertEquals(true, gitDir.exists()); Status status = git.status().call(); assertTrue(status.getAdded().contains(filenameToAdd)); git.commit().setMessage(commitMessage).call(); @@ -751,7 +751,7 @@ public class GitProducerTest extends GitTestSupport { public void remoteAddTest() throws Exception { Repository repository = getTestRepository(); File gitDir = new File(gitLocalRepo, ".git"); - assertEquals(gitDir.exists(), true); + assertEquals(true, gitDir.exists()); Git git = new Git(repository); List<RemoteConfig> remoteConfigList = git.remoteList().call(); assertTrue(remoteConfigList.size() == 0); @@ -769,7 +769,7 @@ public class GitProducerTest extends GitTestSupport { public void remoteListTest() throws Exception { Repository repository = getTestRepository(); File gitDir = new File(gitLocalRepo, ".git"); - assertEquals(gitDir.exists(), true); + assertEquals(true, gitDir.exists()); Git git = new Git(repository); RemoteAddCommand remoteAddCommand = git.remoteAdd(); remoteAddCommand.setName("origin"); @@ -796,7 +796,7 @@ public class GitProducerTest extends GitTestSupport { = template.requestBodyAndHeader("direct:clean", "", GitConstants.GIT_FILE_NAME, filenameToAdd, Set.class); File gitDir = new File(gitLocalRepo, ".git"); - assertEquals(gitDir.exists(), true); + assertEquals(true, gitDir.exists()); assertTrue(cleaned.contains(filenameToAdd)); git.close(); } @@ -805,7 +805,7 @@ public class GitProducerTest extends GitTestSupport { public void gcTest() throws Exception { Git git = getGitTestRepository(); File gitDir = new File(gitLocalRepo, ".git"); - assertEquals(gitDir.exists(), true); + assertEquals(true, gitDir.exists()); File fileToAdd = new File(gitLocalRepo, filenameToAdd); fileToAdd.createNewFile(); git.add().addFilepattern(filenameToAdd).call(); @@ -832,7 +832,7 @@ public class GitProducerTest extends GitTestSupport { // Init Git git = getGitTestRepository(); File gitDir = new File(gitLocalRepo, ".git"); - assertEquals(gitDir.exists(), true); + assertEquals(true, gitDir.exists()); File fileToAdd = new File(gitLocalRepo, filenameToAdd); fileToAdd.createNewFile(); git.add().addFilepattern(filenameToAdd).call(); @@ -853,7 +853,7 @@ public class GitProducerTest extends GitTestSupport { // Test camel-git commit (with branch) MergeResult result = template.requestBody("direct:merge", "", MergeResult.class); - assertEquals(result.getMergeStatus().toString(), "Fast-forward"); + assertEquals("Fast-forward", result.getMergeStatus().toString()); git.close(); } @@ -865,7 +865,7 @@ public class GitProducerTest extends GitTestSupport { fileToAdd.createNewFile(); git.add().addFilepattern(filenameToAdd).call(); File gitDir = new File(gitLocalRepo, ".git"); - assertEquals(gitDir.exists(), true); + assertEquals(true, gitDir.exists()); Status status = git.status().call(); assertTrue(status.getAdded().contains(filenameToAdd)); git.commit().setMessage(commitMessage).call(); diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerExceptionTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerExceptionTest.java index d2c24dc..db8dcb7 100644 --- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerExceptionTest.java +++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerExceptionTest.java @@ -112,7 +112,7 @@ public class GrpcConsumerExceptionTest extends CamelTestSupport { @Override public void onError(Throwable t) { - assertEquals(t.getMessage(), "INTERNAL: GRPC Camel exception message"); + assertEquals("INTERNAL: GRPC Camel exception message", t.getMessage()); LOG.info("Exception", t); latch.countDown(); } diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerClientInterceptorTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerClientInterceptorTest.java index 5ba2aff..5cc038b 100644 --- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerClientInterceptorTest.java +++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerClientInterceptorTest.java @@ -87,7 +87,7 @@ public class GrpcProducerClientInterceptorTest extends CamelTestSupport { + ".PingPong?method=pingSyncSync&autoDiscoverClientInterceptors=false"); assertFalse(endpoint.getConfiguration().isAutoDiscoverClientInterceptors()); - assertEquals(endpoint.getConfiguration().getClientInterceptors().size(), 0); + assertEquals(0, endpoint.getConfiguration().getClientInterceptors().size()); } @Override diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerSyncTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerSyncTest.java index e113bc5..9c2b1af 100644 --- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerSyncTest.java +++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerSyncTest.java @@ -82,7 +82,7 @@ public class GrpcProducerSyncTest extends CamelTestSupport { pongResponse = template.requestBody("direct:grpc-sync-proto-method-name", pingRequest); assertNotNull(pongResponse); assertTrue(pongResponse instanceof PongResponse); - assertEquals(((PongResponse) pongResponse).getPongId(), GRPC_TEST_PING_ID); + assertEquals(GRPC_TEST_PING_ID, ((PongResponse) pongResponse).getPongId()); } @Test diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpDisableStreamCacheTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpDisableStreamCacheTest.java index c1f5b77..f801cde 100644 --- a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpDisableStreamCacheTest.java +++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpDisableStreamCacheTest.java @@ -76,7 +76,7 @@ public class HttpDisableStreamCacheTest extends BaseHttpTest { // should be closed by http client try { - assertEquals(context.getTypeConverter().convertTo(String.class, exchange, is), "camel rocks!"); + assertEquals("camel rocks!", context.getTypeConverter().convertTo(String.class, exchange, is)); fail("Should fail"); } catch (TypeConversionException e) { // expected diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsJMSReplyToEndpointUsingInOutTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsJMSReplyToEndpointUsingInOutTest.java index 113a295..ea8b7b7 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsJMSReplyToEndpointUsingInOutTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsJMSReplyToEndpointUsingInOutTest.java @@ -56,7 +56,7 @@ public class JmsJMSReplyToEndpointUsingInOutTest extends CamelTestSupport { JmsTemplate jms = new JmsTemplate(amq.getConfiguration().getConnectionFactory()); final TextMessage msg = (TextMessage) jms.receive("nameRequestor"); - assertEquals(msg.getText(), "What's your name"); + assertEquals("What's your name", msg.getText()); // there should be a JMSReplyTo so we know where to send the reply final Destination replyTo = msg.getJMSReplyTo(); diff --git a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/MultipleJpaRouteEndpointTest.java b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/MultipleJpaRouteEndpointTest.java index 57c08dd4..afe2213 100644 --- a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/MultipleJpaRouteEndpointTest.java +++ b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/MultipleJpaRouteEndpointTest.java @@ -103,7 +103,7 @@ public class MultipleJpaRouteEndpointTest extends CamelTestSupport { private void assertEntityManagerMap(Exchange exchange) { HashMap<String, EntityManager> entityManagerMap = exchange.getProperty(JpaConstants.ENTITY_MANAGER, HashMap.class); assertNotNull(entityManagerMap); - assertEquals(entityManagerMap.keySet().size(), 2); + assertEquals(2, entityManagerMap.keySet().size()); assertTrue(entityManagerMap.containsKey(String.valueOf(emf1.hashCode()))); EntityManager entityManager1 = entityManagerMap.get(String.valueOf(emf1.hashCode())); assertTrue(entityManagerMap.containsKey(String.valueOf(emf2.hashCode()))); diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java index cdd7284..9a25190 100644 --- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java +++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java @@ -452,14 +452,14 @@ public class KafkaProducerTest { private void assertRecordMetadataTimestampExists() { List<RecordMetadata> recordMetaData1 = (List<RecordMetadata>) in.getHeader(KafkaConstants.KAFKA_RECORDMETA); assertNotNull(recordMetaData1); - assertEquals(recordMetaData1.size(), 1, "Expected one recordMetaData"); + assertEquals(1, recordMetaData1.size(), "Expected one recordMetaData"); assertNotNull(recordMetaData1.get(0).timestamp()); } private void assertRecordMetadataExists() { List<RecordMetadata> recordMetaData1 = (List<RecordMetadata>) in.getHeader(KafkaConstants.KAFKA_RECORDMETA); assertNotNull(recordMetaData1); - assertEquals(recordMetaData1.size(), 1, "Expected one recordMetaData"); + assertEquals(1, recordMetaData1.size(), "Expected one recordMetaData"); assertNotNull(recordMetaData1.get(0)); } @@ -476,7 +476,7 @@ public class KafkaProducerTest { List<RecordMetadata> recordMetaData = (List<RecordMetadata>) ex.getMessage().getHeader(KafkaConstants.KAFKA_RECORDMETA); assertNotNull(recordMetaData); - assertEquals(recordMetaData.size(), 1, "Expected one recordMetaData"); + assertEquals(1, recordMetaData.size(), "Expected one recordMetaData"); assertNotNull(recordMetaData.get(0)); } } @@ -486,7 +486,7 @@ public class KafkaProducerTest { for (Message msg : messages) { List<RecordMetadata> recordMetaData = (List<RecordMetadata>) msg.getHeader(KafkaConstants.KAFKA_RECORDMETA); assertNotNull(recordMetaData); - assertEquals(recordMetaData.size(), 1, "Expected one recordMetaData"); + assertEquals(1, recordMetaData.size(), "Expected one recordMetaData"); assertNotNull(recordMetaData.get(0)); } } diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaProducerFullIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaProducerFullIT.java index e41e4c3..e62fe61 100644 --- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaProducerFullIT.java +++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaProducerFullIT.java @@ -180,12 +180,12 @@ public class KafkaProducerFullIT extends BaseEmbeddedKafkaTestSupport { "Not all messages were published to the kafka topics. Not received: " + messagesLatch.getCount()); List<Exchange> exchangeList = mockEndpoint.getExchanges(); - assertEquals(exchangeList.size(), 15, "Fifteen Exchanges are expected"); + assertEquals(15, exchangeList.size(), "Fifteen Exchanges are expected"); for (Exchange exchange : exchangeList) { @SuppressWarnings("unchecked") List<RecordMetadata> recordMetaData1 = (List<RecordMetadata>) (exchange.getIn().getHeader(KafkaConstants.KAFKA_RECORDMETA)); - assertEquals(recordMetaData1.size(), 1, "One RecordMetadata is expected."); + assertEquals(1, recordMetaData1.size(), "One RecordMetadata is expected."); assertTrue(recordMetaData1.get(0).offset() >= 0, "Offset is positive"); assertTrue(recordMetaData1.get(0).topic().startsWith("test"), "Topic Name start with 'test'"); } @@ -211,7 +211,7 @@ public class KafkaProducerFullIT extends BaseEmbeddedKafkaTestSupport { "Not all messages were published to the kafka topics. Not received: " + messagesLatch.getCount()); List<Exchange> exchangeList = mockEndpoint.getExchanges(); - assertEquals(exchangeList.size(), 15, "Fifteen Exchanges are expected"); + assertEquals(15, exchangeList.size(), "Fifteen Exchanges are expected"); for (Exchange exchange : exchangeList) { @SuppressWarnings("unchecked") List<RecordMetadata> recordMetaData1 @@ -313,7 +313,7 @@ public class KafkaProducerFullIT extends BaseEmbeddedKafkaTestSupport { "Not all messages were published to the kafka topics. Not received: " + messagesLatch.getCount()); List<Exchange> exchangeList = mockEndpoint.getExchanges(); - assertEquals(exchangeList.size(), 15, "Fifteen Exchanges are expected"); + assertEquals(15, exchangeList.size(), "Fifteen Exchanges are expected"); for (Exchange exchange : exchangeList) { @SuppressWarnings("unchecked") List<RecordMetadata> recordMetaData1 diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesNamespacesConsumerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesNamespacesConsumerTest.java index f93d84f..de876b6 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesNamespacesConsumerTest.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesNamespacesConsumerTest.java @@ -62,7 +62,7 @@ public class KubernetesNamespacesConsumerTest extends KubernetesTestSupport { Namespace ns = ex.getMessage().getBody(Namespace.class); - assertEquals(ns.getMetadata().getName(), "test"); + assertEquals("test", ns.getMetadata().getName()); ex = template.request("direct:listByLabels", exchange -> { Map<String, String> labels = new HashMap<>(); diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesReplicationControllersConsumerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesReplicationControllersConsumerTest.java index 4c2e82d..14a9c53 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesReplicationControllersConsumerTest.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesReplicationControllersConsumerTest.java @@ -74,7 +74,7 @@ public class KubernetesReplicationControllersConsumerTest extends KubernetesTest ReplicationController rc = ex.getMessage().getBody(ReplicationController.class); - assertEquals(rc.getMetadata().getName(), "test"); + assertEquals("test", rc.getMetadata().getName()); ex = template.request("direct:deleteReplicationController", exchange -> { exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, "default"); diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesServicesConsumerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesServicesConsumerTest.java index 66a1969..b0dbfce 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesServicesConsumerTest.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesServicesConsumerTest.java @@ -77,7 +77,7 @@ public class KubernetesServicesConsumerTest extends KubernetesTestSupport { Service serv = ex.getMessage().getBody(Service.class); - assertEquals(serv.getMetadata().getName(), "test"); + assertEquals("test", serv.getMetadata().getName()); ex = template.request("direct:deleteService", exchange -> { exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, "default"); diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNamespacesProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNamespacesProducerTest.java index 323fe1d..e1f1c5f 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNamespacesProducerTest.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNamespacesProducerTest.java @@ -65,7 +65,7 @@ public class KubernetesNamespacesProducerTest extends KubernetesTestSupport { Namespace ns = ex.getMessage().getBody(Namespace.class); - assertEquals(ns.getMetadata().getName(), "test"); + assertEquals("test", ns.getMetadata().getName()); } diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpLineDelimiterUsingPlainSocketTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpLineDelimiterUsingPlainSocketTest.java index b7a9d4c..c7dac54 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpLineDelimiterUsingPlainSocketTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpLineDelimiterUsingPlainSocketTest.java @@ -74,7 +74,7 @@ public class MinaTcpLineDelimiterUsingPlainSocketTest extends BaseMinaTest { public void testExchangeFailedOutShouldBeNull() throws Exception { String out = sendAndReceive("force-exception"); assertFalse("force-exception".equals(out), "out should not be the same as in when the exchange has failed"); - assertEquals(out, "java.lang.IllegalArgumentException: Forced exception", "should get the exception here"); + assertEquals("java.lang.IllegalArgumentException: Forced exception", out, "should get the exception here"); } private String sendAndReceive(String input) throws IOException { diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpWithInOutUsingPlainSocketTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpWithInOutUsingPlainSocketTest.java index 2c64b51..d8957b4 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpWithInOutUsingPlainSocketTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpWithInOutUsingPlainSocketTest.java @@ -76,7 +76,7 @@ public class MinaTcpWithInOutUsingPlainSocketTest extends BaseMinaTest { public void testExchangeFailedOutShouldBeNull() throws Exception { String out = sendAndReceive("force-exception"); assertFalse("force-exception".equals(out), "out should not be the same as in when the exchange has failed"); - assertEquals(out, "java.lang.IllegalArgumentException: Forced exception", "should get the exception here"); + assertEquals("java.lang.IllegalArgumentException: Forced exception", out, "should get the exception here"); } @Test diff --git a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiSupportTest.java b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiSupportTest.java index e5ef979..d8f6c8e 100644 --- a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiSupportTest.java +++ b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiSupportTest.java @@ -53,8 +53,8 @@ public class RestOpenApiSupportTest { headers.put(RestOpenApiSupport.HEADER_X_FORWARDED_PROTO, "http, HTTPS "); RestOpenApiSupport.setupXForwardedHeaders(openApi, headers); - assertEquals(openApi.basePath, "/prefix/base"); - assertEquals(openApi.host, "host"); + assertEquals("/prefix/base", openApi.basePath); + assertEquals("host", openApi.host); assertTrue(openApi.schemes.contains("http")); assertTrue(openApi.schemes.contains("https")); @@ -72,8 +72,8 @@ public class RestOpenApiSupportTest { headers.put(RestOpenApiSupport.HEADER_X_FORWARDED_PROTO, "http, HTTPS "); RestOpenApiSupport.setupXForwardedHeaders(openApi, headers); - assertEquals(openApi.getServers().get(0).url, "http://host/prefix/base"); - assertEquals(openApi.getServers().get(1).url, "https://host/prefix/base"); + assertEquals("http://host/prefix/base", openApi.getServers().get(0).url); + assertEquals("https://host/prefix/base", openApi.getServers().get(1).url); } diff --git a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/SpanProcessorsTest.java b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/SpanProcessorsTest.java index 1ae103f..ad88496 100644 --- a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/SpanProcessorsTest.java +++ b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/SpanProcessorsTest.java @@ -50,7 +50,7 @@ public class SpanProcessorsTest extends CamelOpenTelemetryTestSupport { }); verify(); - assertEquals(result.getMessage().getHeader("baggage-header", String.class), "request-header-value"); + assertEquals("request-header-value", result.getMessage().getHeader("baggage-header", String.class)); } @Override diff --git a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/SpanProcessorsTest.java b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/SpanProcessorsTest.java index 7988205..6748e69 100644 --- a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/SpanProcessorsTest.java +++ b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/SpanProcessorsTest.java @@ -51,7 +51,7 @@ public class SpanProcessorsTest extends CamelOpenTracingTestSupport { }); verify(); - assertEquals(result.getMessage().getHeader("baggage-header", String.class), "request-header-value"); + assertEquals("request-header-value", result.getMessage().getHeader("baggage-header", String.class)); } @Override diff --git a/components/camel-pg-replication-slot/src/test/java/org/apache/camel/component/pg/replication/slot/PgReplicationSlotEndpointTest.java b/components/camel-pg-replication-slot/src/test/java/org/apache/camel/component/pg/replication/slot/PgReplicationSlotEndpointTest.java index bbea152..6f4608b 100644 --- a/components/camel-pg-replication-slot/src/test/java/org/apache/camel/component/pg/replication/slot/PgReplicationSlotEndpointTest.java +++ b/components/camel-pg-replication-slot/src/test/java/org/apache/camel/component/pg/replication/slot/PgReplicationSlotEndpointTest.java @@ -34,35 +34,35 @@ public class PgReplicationSlotEndpointTest { endpoint = new PgReplicationSlotEndpoint("pg-replication-slot:/database/slot:plugin", component); - assertEquals(endpoint.getDatabase(), "database"); - assertEquals(endpoint.getPort(), Integer.valueOf(5432)); - assertEquals(endpoint.getHost(), "localhost"); - assertEquals(endpoint.getSlot(), "slot"); - assertEquals(endpoint.getOutputPlugin(), "plugin"); + assertEquals("database", endpoint.getDatabase()); + assertEquals(Integer.valueOf(5432), endpoint.getPort()); + assertEquals("localhost", endpoint.getHost()); + assertEquals("slot", endpoint.getSlot()); + assertEquals("plugin", endpoint.getOutputPlugin()); endpoint = new PgReplicationSlotEndpoint("pg-replication-slot:remote-server/database/slot:plugin", component); - assertEquals(endpoint.getDatabase(), "database"); - assertEquals(endpoint.getPort(), Integer.valueOf(5432)); - assertEquals(endpoint.getHost(), "remote-server"); - assertEquals(endpoint.getSlot(), "slot"); - assertEquals(endpoint.getOutputPlugin(), "plugin"); + assertEquals("database", endpoint.getDatabase()); + assertEquals(Integer.valueOf(5432), endpoint.getPort()); + assertEquals("remote-server", endpoint.getHost()); + assertEquals("slot", endpoint.getSlot()); + assertEquals("plugin", endpoint.getOutputPlugin()); endpoint = new PgReplicationSlotEndpoint("pg-replication-slot:remote-server:333/database/slot:plugin", component); - assertEquals(endpoint.getDatabase(), "database"); - assertEquals(endpoint.getPort(), Integer.valueOf(333)); - assertEquals(endpoint.getHost(), "remote-server"); - assertEquals(endpoint.getSlot(), "slot"); - assertEquals(endpoint.getOutputPlugin(), "plugin"); + assertEquals("database", endpoint.getDatabase()); + assertEquals(Integer.valueOf(333), endpoint.getPort()); + assertEquals("remote-server", endpoint.getHost()); + assertEquals("slot", endpoint.getSlot()); + assertEquals("plugin", endpoint.getOutputPlugin()); endpoint = new PgReplicationSlotEndpoint("pg-replication-slot://remote-server:333/database/slot:plugin", component); - assertEquals(endpoint.getDatabase(), "database"); - assertEquals(endpoint.getPort(), Integer.valueOf(333)); - assertEquals(endpoint.getHost(), "remote-server"); - assertEquals(endpoint.getSlot(), "slot"); - assertEquals(endpoint.getOutputPlugin(), "plugin"); + assertEquals("database", endpoint.getDatabase()); + assertEquals(Integer.valueOf(333), endpoint.getPort()); + assertEquals("remote-server", endpoint.getHost()); + assertEquals("slot", endpoint.getSlot()); + assertEquals("plugin", endpoint.getOutputPlugin()); } @Test diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQProducerIT.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQProducerIT.java index 700aa63..0f6a34e 100644 --- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQProducerIT.java +++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQProducerIT.java @@ -191,7 +191,7 @@ public class RabbitMQProducerIT extends AbstractRabbitMQIT { templateNotAllowCustomHeaders.sendBodyAndHeaders("new message", headers); Thread.sleep(500); - assertEquals(received.get(0), "new message"); + assertEquals("new message", received.get(0)); assertTrue(receivedHeaders.containsKey(RabbitMQConstants.EXCHANGE_NAME)); assertFalse(receivedHeaders.containsKey(CUSTOM_HEADER)); } @@ -210,7 +210,7 @@ public class RabbitMQProducerIT extends AbstractRabbitMQIT { templateAllowCustomHeaders.sendBodyAndHeaders("new message", headers); Thread.sleep(500); - assertEquals(received.get(0), "new message"); + assertEquals("new message", received.get(0)); assertTrue(receivedHeaders.containsKey(RabbitMQConstants.EXCHANGE_NAME)); assertTrue(receivedHeaders.containsKey(CUSTOM_HEADER)); } diff --git a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/HttpClientRouteTest.java b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/HttpClientRouteTest.java index 6ef8479..e159e79 100644 --- a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/HttpClientRouteTest.java +++ b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/HttpClientRouteTest.java @@ -146,7 +146,7 @@ public class HttpClientRouteTest extends ServletCamelRouterTestSupport { assertEquals(CONTENT_TYPE, contentType, "Get a wrong content type"); // assert camel http header String charsetEncoding = exchange.getIn().getHeader(Exchange.HTTP_CHARACTER_ENCODING, String.class); - assertEquals(charsetEncoding, "UTF-8", "Get a wrong charset name from the message header"); + assertEquals("UTF-8", charsetEncoding, "Get a wrong charset name from the message header"); // assert exchange charset assertEquals("UTF-8", exchange.getProperty(Exchange.CHARSET_NAME), "Get a wrong charset naem from the exchange property"); diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointTest.java index f20722c..2a8c31e 100644 --- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointTest.java +++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointTest.java @@ -44,15 +44,15 @@ public class SjmsEndpointTest extends CamelTestSupport { assertNotNull(endpoint); assertTrue(endpoint instanceof SjmsEndpoint); SjmsEndpoint sjms = (SjmsEndpoint) endpoint; - assertEquals(sjms.getEndpointUri(), "sjms://test"); - assertEquals(sjms.createExchange().getPattern(), ExchangePattern.InOnly); + assertEquals("sjms://test", sjms.getEndpointUri()); + assertEquals(ExchangePattern.InOnly, sjms.createExchange().getPattern()); } @Test public void testQueueEndpoint() throws Exception { Endpoint sjms = context.getEndpoint("sjms:queue:test"); assertNotNull(sjms); - assertEquals(sjms.getEndpointUri(), "sjms://queue:test"); + assertEquals("sjms://queue:test", sjms.getEndpointUri()); assertTrue(sjms instanceof SjmsEndpoint); } @@ -90,7 +90,7 @@ public class SjmsEndpointTest extends CamelTestSupport { assertTrue(endpoint instanceof SjmsEndpoint); SjmsEndpoint qe = (SjmsEndpoint) endpoint; assertEquals(qe.getReplyTo(), replyTo); - assertEquals(qe.createExchange().getPattern(), ExchangePattern.InOut); + assertEquals(ExchangePattern.InOut, qe.createExchange().getPattern()); } @Test @@ -142,7 +142,7 @@ public class SjmsEndpointTest extends CamelTestSupport { assertTrue(endpoint instanceof SjmsEndpoint); SjmsEndpoint qe = (SjmsEndpoint) endpoint; assertEquals(qe.getReplyTo(), replyTo); - assertEquals(qe.createExchange().getPattern(), ExchangePattern.InOut); + assertEquals(ExchangePattern.InOut, qe.createExchange().getPattern()); } @Test diff --git a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2EndpointTest.java b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2EndpointTest.java index 5e9a8c8..8e5faa7 100644 --- a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2EndpointTest.java +++ b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2EndpointTest.java @@ -38,15 +38,15 @@ public class Sjms2EndpointTest extends CamelTestSupport { assertNotNull(endpoint); assertTrue(endpoint instanceof Sjms2Endpoint); Sjms2Endpoint sjms = (Sjms2Endpoint) endpoint; - assertEquals(sjms.getEndpointUri(), "sjms2://test"); - assertEquals(sjms.createExchange().getPattern(), ExchangePattern.InOnly); + assertEquals("sjms2://test", sjms.getEndpointUri()); + assertEquals(ExchangePattern.InOnly, sjms.createExchange().getPattern()); } @Test public void testQueueEndpoint() throws Exception { Endpoint sjms = context.getEndpoint("sjms2:queue:test"); assertNotNull(sjms); - assertEquals(sjms.getEndpointUri(), "sjms2://queue:test"); + assertEquals("sjms2://queue:test", sjms.getEndpointUri()); assertTrue(sjms instanceof Sjms2Endpoint); } @@ -84,7 +84,7 @@ public class Sjms2EndpointTest extends CamelTestSupport { assertTrue(endpoint instanceof Sjms2Endpoint); Sjms2Endpoint qe = (Sjms2Endpoint) endpoint; assertEquals(qe.getReplyTo(), replyTo); - assertEquals(qe.createExchange().getPattern(), ExchangePattern.InOut); + assertEquals(ExchangePattern.InOut, qe.createExchange().getPattern()); } @Test @@ -129,7 +129,7 @@ public class Sjms2EndpointTest extends CamelTestSupport { assertTrue(endpoint instanceof Sjms2Endpoint); Sjms2Endpoint qe = (Sjms2Endpoint) endpoint; assertEquals(qe.getReplyTo(), replyTo); - assertEquals(qe.createExchange().getPattern(), ExchangePattern.InOut); + assertEquals(ExchangePattern.InOut, qe.createExchange().getPattern()); } @Test diff --git a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerAutoDownloadFileTest.java b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerAutoDownloadFileTest.java index ffc1e9f..d613401 100644 --- a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerAutoDownloadFileTest.java +++ b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerAutoDownloadFileTest.java @@ -50,7 +50,7 @@ public class ConsumerAutoDownloadFileTest extends SoroushBotTestSupport { mockEndpoint.setExpectedCount(4); mockEndpoint.assertIsSatisfied(); List<Exchange> exchanges = mockEndpoint.getExchanges(); - assertEquals(exchanges.size(), 4); + assertEquals(4, exchanges.size()); exchanges.forEach(exchange -> { SoroushMessage body = exchange.getIn().getBody(SoroushMessage.class); assertTrue(body.getFile() == null ^ body.getFileUrl() != null, diff --git a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerCamelConcurrentTest.java b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerCamelConcurrentTest.java index 5a7a703..22e1ab5 100644 --- a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerCamelConcurrentTest.java +++ b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerCamelConcurrentTest.java @@ -62,9 +62,9 @@ public class ConsumerCamelConcurrentTest extends SoroushBotTestSupport { mockEndpoint.expectedMessageCount(10); mockEndpoint.assertIsSatisfied(); LogManager.getLogger().info(fromOrder.toString()); - assertEquals(fromOrder.size(), 10); - assertEquals(fromOrder.get(7), "u0"); - assertEquals(fromOrder.get(8), "u0"); - assertEquals(fromOrder.get(9), "u0"); + assertEquals(10, fromOrder.size()); + assertEquals("u0", fromOrder.get(7)); + assertEquals("u0", fromOrder.get(8)); + assertEquals("u0", fromOrder.get(9)); } } diff --git a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerNativeConcurrentTest.java b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerNativeConcurrentTest.java index 627e801..bef9f3d 100644 --- a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerNativeConcurrentTest.java +++ b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ConsumerNativeConcurrentTest.java @@ -67,7 +67,7 @@ public class ConsumerNativeConcurrentTest extends SoroushBotTestSupport { mockEndpoint.assertIsSatisfied(); LogManager.getLogger().info(userToThread.size()); LogManager.getLogger().info(userToThread.values()); - assertEquals(badThread.get(), 0, "previous and current thread must be equal"); + assertEquals(0, badThread.get(), "previous and current thread must be equal"); assertTrue(new HashSet<>(userToThread.values()).size() > 1, "there must be more than 1 thread in $userToThread unless this test is not useful"); } diff --git a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ProducerAutoUploadFileIsFalseTest.java b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ProducerAutoUploadFileIsFalseTest.java index 6b8825f..5f04889 100644 --- a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ProducerAutoUploadFileIsFalseTest.java +++ b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ProducerAutoUploadFileIsFalseTest.java @@ -83,7 +83,7 @@ public class ProducerAutoUploadFileIsFalseTest extends SoroushBotTestSupport { assertEquals(SoroushBotWS.getReceivedMessages().get(0), body, "message sent successfully"); SoroushMessage mockedMessage = mockEndpoint.getExchanges().get(0).getIn().getBody(SoroushMessage.class); Map<String, String> fileIdToContent = SoroushBotWS.getFileIdToContent(); - assertEquals(fileIdToContent.size(), 0, "file uploaded successfully"); + assertEquals(0, fileIdToContent.size(), "file uploaded successfully"); assertNull(mockedMessage.getFileUrl()); assertNull(mockedMessage.getThumbnailUrl()); } diff --git a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ProducerAutoUploadFileTest.java b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ProducerAutoUploadFileTest.java index 979a003..486405b 100644 --- a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ProducerAutoUploadFileTest.java +++ b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ProducerAutoUploadFileTest.java @@ -84,7 +84,7 @@ public class ProducerAutoUploadFileTest extends SoroushBotTestSupport { assertEquals(SoroushBotWS.getReceivedMessages().get(0), body, "message sent successfully"); SoroushMessage mockedMessage = mockEndpoint.getExchanges().get(0).getIn().getBody(SoroushMessage.class); Map<String, String> fileIdToContent = SoroushBotWS.getFileIdToContent(); - assertEquals(fileIdToContent.size(), 2, "file uploaded successfully"); + assertEquals(2, fileIdToContent.size(), "file uploaded successfully"); assertEquals(fileIdToContent.get(mockedMessage.getFileUrl()), fileContent); assertEquals(fileIdToContent.get(mockedMessage.getThumbnailUrl()), thumbContent); } diff --git a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ProducerUploadFileTest.java b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ProducerUploadFileTest.java index e6a2d76..0114051 100644 --- a/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ProducerUploadFileTest.java +++ b/components/camel-soroush/src/test/java/org/apache/camel/component/soroushbot/component/ProducerUploadFileTest.java @@ -79,10 +79,10 @@ public class ProducerUploadFileTest extends SoroushBotTestSupport { MockEndpoint mockEndpoint = getMockEndpoint("mock:soroush"); mockEndpoint.setExpectedMessageCount(1); mockEndpoint.assertIsSatisfied(); - assertEquals(SoroushBotWS.getReceivedMessages().size(), 0, "no message sent."); + assertEquals(0, SoroushBotWS.getReceivedMessages().size(), "no message sent."); SoroushMessage mockedMessage = mockEndpoint.getExchanges().get(0).getIn().getBody(SoroushMessage.class); Map<String, String> fileIdToContent = SoroushBotWS.getFileIdToContent(); - assertEquals(fileIdToContent.size(), 2, "file uploaded successfully"); + assertEquals(2, fileIdToContent.size(), "file uploaded successfully"); assertEquals(fileIdToContent.get(mockedMessage.getFileUrl()), fileContent); assertEquals(fileIdToContent.get(mockedMessage.getThumbnailUrl()), thumbContent); } diff --git a/components/camel-stitch/src/test/java/org/apache/camel/component/stitch/StitchProducerTest.java b/components/camel-stitch/src/test/java/org/apache/camel/component/stitch/StitchProducerTest.java index 821425a..8f45f28 100644 --- a/components/camel-stitch/src/test/java/org/apache/camel/component/stitch/StitchProducerTest.java +++ b/components/camel-stitch/src/test/java/org/apache/camel/component/stitch/StitchProducerTest.java @@ -76,7 +76,7 @@ class StitchProducerTest extends CamelTestSupport { final Message message = result.getExchanges().get(0).getMessage(); - assertEquals(message.getHeader(StitchConstants.HEADERS, Map.class).get("header-1"), "test"); + assertEquals("test", message.getHeader(StitchConstants.HEADERS, Map.class).get("header-1")); } @Test @@ -140,7 +140,7 @@ class StitchProducerTest extends CamelTestSupport { final Message message = result.getExchanges().get(0).getMessage(); - assertEquals(message.getHeader(StitchConstants.HEADERS, Map.class).get("header-1"), "test"); + assertEquals("test", message.getHeader(StitchConstants.HEADERS, Map.class).get("header-1")); } @Test diff --git a/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-component/src/test/java/org/apache/camel/component/vertx/kafka/VertxKafkaProducerFullTest.java b/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-component/src/test/java/org/apache/camel/component/vertx/kafka/VertxKafkaProducerFullTest.java index 5d20ebc..765258d 100644 --- a/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-component/src/test/java/org/apache/camel/component/vertx/kafka/VertxKafkaProducerFullTest.java +++ b/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-component/src/test/java/org/apache/camel/component/vertx/kafka/VertxKafkaProducerFullTest.java @@ -159,11 +159,11 @@ public class VertxKafkaProducerFullTest extends BaseEmbeddedKafkaTest { "Not all messages were published to the kafka topics. Not received: " + messagesLatch.getCount()); List<Exchange> exchangeList = mockEndpoint.getExchanges(); - assertEquals(exchangeList.size(), 15, "Fifteen Exchanges are expected"); + assertEquals(15, exchangeList.size(), "Fifteen Exchanges are expected"); for (Exchange exchange : exchangeList) { List<RecordMetadata> recordMetaData1 = getRecordMetadata(exchange); - assertEquals(recordMetaData1.size(), 1, "One RecordMetadata is expected."); + assertEquals(1, recordMetaData1.size(), "One RecordMetadata is expected."); assertTrue(recordMetaData1.get(0).getOffset() >= 0, "Offset is positive"); assertTrue(recordMetaData1.get(0).getTopic().startsWith("test"), "Topic Name start with 'test'"); } @@ -189,7 +189,7 @@ public class VertxKafkaProducerFullTest extends BaseEmbeddedKafkaTest { "Not all messages were published to the kafka topics. Not received: " + messagesLatch.getCount()); List<Exchange> exchangeList = mockEndpoint.getExchanges(); - assertEquals(exchangeList.size(), 15, "Fifteen Exchanges are expected"); + assertEquals(15, exchangeList.size(), "Fifteen Exchanges are expected"); for (Exchange exchange : exchangeList) { List<RecordMetadata> recordMetaData1 = getRecordMetadata(exchange); @@ -267,7 +267,7 @@ public class VertxKafkaProducerFullTest extends BaseEmbeddedKafkaTest { "Not all messages were published to the kafka topics. Not received: " + messagesLatch.getCount()); List<Exchange> exchangeList = mockEndpoint.getExchanges(); - assertEquals(exchangeList.size(), 15, "Fifteen Exchanges are expected"); + assertEquals(15, exchangeList.size(), "Fifteen Exchanges are expected"); for (Exchange exchange : exchangeList) { List<RecordMetadata> recordMetaData1 = getRecordMetadata(exchange); diff --git a/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-component/src/test/java/org/apache/camel/component/vertx/kafka/operations/VertxKafkaProducerOperationsTest.java b/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-component/src/test/java/org/apache/camel/component/vertx/kafka/operations/VertxKafkaProducerOperationsTest.java index bc4f5d2..9091110 100644 --- a/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-component/src/test/java/org/apache/camel/component/vertx/kafka/operations/VertxKafkaProducerOperationsTest.java +++ b/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-component/src/test/java/org/apache/camel/component/vertx/kafka/operations/VertxKafkaProducerOperationsTest.java @@ -119,7 +119,7 @@ class VertxKafkaProducerOperationsTest extends CamelTestSupport { assertProducedMessages(records -> { // assert the size - assertEquals(records.size(), 6); + assertEquals(6, records.size()); // assert the content final ProducerRecord<Object, Object> record1 = records.get(0); diff --git a/components/camel-workday/src/test/java/org/apache/camel/WorkdayCommonAPIProducerTest.java b/components/camel-workday/src/test/java/org/apache/camel/WorkdayCommonAPIProducerTest.java index a4066f0..acadea2 100644 --- a/components/camel-workday/src/test/java/org/apache/camel/WorkdayCommonAPIProducerTest.java +++ b/components/camel-workday/src/test/java/org/apache/camel/WorkdayCommonAPIProducerTest.java @@ -43,13 +43,13 @@ public class WorkdayCommonAPIProducerTest extends CamelTestSupport { WorkdayConfiguration workdayConfiguration = workdayEndpoint.getWorkdayConfiguration(); - assertEquals(workdayConfiguration.getEntity(), WorkdayConfiguration.Entity.commonAPI); - assertEquals(workdayConfiguration.getPath(), "/workers"); - assertEquals(workdayConfiguration.getHost(), "impl.workday.com"); - assertEquals(workdayConfiguration.getTenant(), "camel"); - assertEquals(workdayConfiguration.getClientId(), "f7014d38-99d2-4969-b740-b5b62db6b46a"); - assertEquals(workdayConfiguration.getClientSecret(), "7dbaf280-3cea-11ea-b77f-2e728ce88125"); - assertEquals(workdayConfiguration.getTokenRefresh(), "88689ab63cda"); + assertEquals(WorkdayConfiguration.Entity.commonAPI, workdayConfiguration.getEntity()); + assertEquals("/workers", workdayConfiguration.getPath()); + assertEquals("impl.workday.com", workdayConfiguration.getHost()); + assertEquals("camel", workdayConfiguration.getTenant()); + assertEquals("f7014d38-99d2-4969-b740-b5b62db6b46a", workdayConfiguration.getClientId()); + assertEquals("7dbaf280-3cea-11ea-b77f-2e728ce88125", workdayConfiguration.getClientSecret()); + assertEquals("88689ab63cda", workdayConfiguration.getTokenRefresh()); } @Test @@ -66,7 +66,7 @@ public class WorkdayCommonAPIProducerTest extends CamelTestSupport { } catch (Exception exception) { assertEquals(exception.getClass(), IllegalArgumentException.class); - assertEquals(exception.getMessage(), "Host must be specified"); + assertEquals("Host must be specified", exception.getMessage()); return; } @@ -91,7 +91,7 @@ public class WorkdayCommonAPIProducerTest extends CamelTestSupport { } catch (Exception exception) { assertEquals(exception.getClass(), MalformedURLException.class); - assertEquals(exception.getMessage(), "An invalid Workday Common endpoint: '/worker' was provided."); + assertEquals("An invalid Workday Common endpoint: '/worker' was provided.", exception.getMessage()); return; } @@ -112,7 +112,7 @@ public class WorkdayCommonAPIProducerTest extends CamelTestSupport { String workdayUri = workdayProducer.prepareUri(workdayEndpoint.getWorkdayConfiguration()); - assertEquals(workdayUri, "https://impl.workday.com/ccx/api/v1/camel/workers"); + assertEquals("https://impl.workday.com/ccx/api/v1/camel/workers", workdayUri); } @Test @@ -130,8 +130,9 @@ public class WorkdayCommonAPIProducerTest extends CamelTestSupport { String workdayUri = workdayProducer.prepareUri(workdayEndpoint.getWorkdayConfiguration()); - assertEquals(workdayUri, - "https://impl.workday.com/ccx/api/v1/camel/workers/4ab56f4b34c4b4a2be3e4f5a732c2343/paySlips/4ab56f4c39c4b4a2bf3e4f5a732c2343"); + assertEquals( + "https://impl.workday.com/ccx/api/v1/camel/workers/4ab56f4b34c4b4a2be3e4f5a732c2343/paySlips/4ab56f4c39c4b4a2bf3e4f5a732c2343", + workdayUri); } @Test diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java index e9ca9ba..60cecaa 100644 --- a/core/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java @@ -105,7 +105,7 @@ public class ExpressionBuilderTest extends TestSupport { expression = camelContextPropertiesExpression(); expression.init(camelContext); Map<?, ?> properties = expression.evaluate(exchange, Map.class); - assertEquals(properties.size(), 1, "Get a wrong properties size"); + assertEquals(1, properties.size(), "Get a wrong properties size"); } @Test diff --git a/core/camel-core/src/test/java/org/apache/camel/converter/stream/CachedOutputStreamTest.java b/core/camel-core/src/test/java/org/apache/camel/converter/stream/CachedOutputStreamTest.java index 88542c8..daa8dc1 100644 --- a/core/camel-core/src/test/java/org/apache/camel/converter/stream/CachedOutputStreamTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/converter/stream/CachedOutputStreamTest.java @@ -103,7 +103,7 @@ public class CachedOutputStreamTest extends ContextTestSupport { IOHelper.close(is); files = file.list(); - assertEquals(files.length, 0, "we should have a temp file"); + assertEquals(0, files.length, "we should have a temp file"); IOHelper.close(cos); } diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultExchangeTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultExchangeTest.java index 7e91c42..f26f132 100644 --- a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultExchangeTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultExchangeTest.java @@ -99,7 +99,7 @@ public class DefaultExchangeTest extends ExchangeTestSupport { RuntimeCamelException rce = exchange.getException(RuntimeCamelException.class); assertNotNull(rce); - assertNotSame(rce.getMessage(), "Cannot connect to remote server"); + assertNotSame("Cannot connect to remote server", rce.getMessage()); assertEquals("Cannot connect to remote server", rce.getCause().getMessage()); } @@ -166,7 +166,7 @@ public class DefaultExchangeTest extends ExchangeTestSupport { exchange.removeProperties("fr*"); assertTrue(exchange.hasProperties()); - assertEquals(exchange.getProperties().size(), 1); + assertEquals(1, exchange.getProperties().size()); assertEquals(null, exchange.getProperty("fruit", String.class)); assertEquals(null, exchange.getProperty("fruit1", String.class)); assertEquals("Africa", exchange.getProperty("zone", String.class)); @@ -184,7 +184,7 @@ public class DefaultExchangeTest extends ExchangeTestSupport { exchange.removeProperties("*"); assertFalse(exchange.hasProperties()); - assertEquals(exchange.getProperties().size(), 0); + assertEquals(0, exchange.getProperties().size()); } @Test @@ -205,7 +205,7 @@ public class DefaultExchangeTest extends ExchangeTestSupport { exchange.removeProperties("fr*", "fruit1", "fruit2"); assertTrue(exchange.hasProperties()); - assertEquals(exchange.getProperties().size(), 3); + assertEquals(3, exchange.getProperties().size()); assertEquals(null, exchange.getProperty("fruit", String.class)); assertEquals("banana", exchange.getProperty("fruit1", String.class)); assertEquals("peach", exchange.getProperty("fruit2", String.class)); @@ -230,7 +230,7 @@ public class DefaultExchangeTest extends ExchangeTestSupport { exchange.removeProperties("fr*", "fruit", "fruit1", "fruit2", "zone"); assertTrue(exchange.hasProperties()); - assertEquals(exchange.getProperties().size(), 4); + assertEquals(4, exchange.getProperties().size()); assertEquals("apple", exchange.getProperty("fruit", String.class)); assertEquals("banana", exchange.getProperty("fruit1", String.class)); assertEquals("peach", exchange.getProperty("fruit2", String.class)); diff --git a/core/camel-core/src/test/java/org/apache/camel/util/StringHelperTest.java b/core/camel-core/src/test/java/org/apache/camel/util/StringHelperTest.java index 40fde98..abf2045 100644 --- a/core/camel-core/src/test/java/org/apache/camel/util/StringHelperTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/util/StringHelperTest.java @@ -194,9 +194,9 @@ public class StringHelperTest { @Test public void testRemoveInitialCharacters() throws Exception { - assertEquals(StringHelper.removeStartingCharacters("foo", '/'), "foo"); - assertEquals(StringHelper.removeStartingCharacters("/foo", '/'), "foo"); - assertEquals(StringHelper.removeStartingCharacters("//foo", '/'), "foo"); + assertEquals("foo", StringHelper.removeStartingCharacters("foo", '/')); + assertEquals("foo", StringHelper.removeStartingCharacters("/foo", '/')); + assertEquals("foo", StringHelper.removeStartingCharacters("//foo", '/')); } @Test @@ -304,9 +304,9 @@ public class StringHelperTest { @Test public void testTrimToNull() { - assertEquals(StringHelper.trimToNull("abc"), "abc"); - assertEquals(StringHelper.trimToNull(" abc"), "abc"); - assertEquals(StringHelper.trimToNull(" abc "), "abc"); + assertEquals("abc", StringHelper.trimToNull("abc")); + assertEquals("abc", StringHelper.trimToNull(" abc")); + assertEquals("abc", StringHelper.trimToNull(" abc ")); assertNull(StringHelper.trimToNull(" ")); assertNull(StringHelper.trimToNull("\t")); assertNull(StringHelper.trimToNull(" \t ")); diff --git a/core/camel-util/src/test/java/org/apache/camel/util/ObjectHelperLoadClassTest.java b/core/camel-util/src/test/java/org/apache/camel/util/ObjectHelperLoadClassTest.java index 66175d2..3c643c1 100644 --- a/core/camel-util/src/test/java/org/apache/camel/util/ObjectHelperLoadClassTest.java +++ b/core/camel-util/src/test/java/org/apache/camel/util/ObjectHelperLoadClassTest.java @@ -24,16 +24,16 @@ public class ObjectHelperLoadClassTest { @Test public void testLoadClass() throws Exception { Class<?> clazz = ObjectHelper.loadClass("int"); - Assertions.assertEquals(clazz.getName(), "int"); + Assertions.assertEquals("int", clazz.getName()); clazz = ObjectHelper.loadClass("java.lang.String"); - Assertions.assertEquals(clazz.getName(), "java.lang.String"); + Assertions.assertEquals("java.lang.String", clazz.getName()); clazz = ObjectHelper.loadClass("java.lang.String[]"); Assertions.assertTrue(clazz.isArray()); clazz = ObjectHelper.loadClass("org.apache.camel.util.MyPojo"); - Assertions.assertEquals(clazz.getName(), "org.apache.camel.util.MyPojo"); + Assertions.assertEquals("org.apache.camel.util.MyPojo", clazz.getName()); Assertions.assertFalse(clazz.isArray()); clazz = ObjectHelper.loadClass("org.apache.camel.util.MyPojo[]"); diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/JettyHttpFileCacheTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/JettyHttpFileCacheTest.java index 1684cbc..188a133 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/JettyHttpFileCacheTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/JettyHttpFileCacheTest.java @@ -52,7 +52,7 @@ public class JettyHttpFileCacheTest extends CamelTestSupport { File file = new File("target/cachedir"); String[] files = file.list(); - assertEquals(files.length, 0, "There should not have any temp file"); + assertEquals(0, files.length, "There should not have any temp file"); }