This is an automated email from the ASF dual-hosted git repository.
pvillard31 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new d3d24018b42 NIFI-16032 Corrected misordered assertEqual arguments.
(#11361)
d3d24018b42 is described below
commit d3d24018b429c1e6403d681cb3e53e5898bf2f69
Author: dan-s1 <[email protected]>
AuthorDate: Mon Jun 22 11:39:58 2026 -0400
NIFI-16032 Corrected misordered assertEqual arguments. (#11361)
---
...wPropertyAssetReferenceResolverServiceTest.java | 8 ++++----
.../schema/RemoteProcessGroupSchemaTest.java | 6 +++---
.../schema/v2/RemoteProcessGroupSchemaV2Test.java | 4 ++--
.../org/apache/nifi/util/NiFiPropertiesTest.java | 2 +-
.../stream/io/ByteCountingInputStreamTest.java | 12 +++++------
.../nifi/stream/io/LimitingInputStreamTest.java | 2 +-
.../nifi/stream/io/util/StreamDemarcatorTest.java | 18 ++++++++--------
.../mock/connectors/tests/CreateConnectorIT.java | 2 +-
.../kinesis/stream/TestConsumeKinesisStream.java | 12 +++++------
.../nifi/processors/aws/s3/TestPutS3Object.java | 2 +-
.../aws/s3/service/S3FileResourceServiceTest.java | 2 +-
.../AzureBlobStorageFileResourceServiceTest.java | 2 +-
...zureDataLakeStorageFileResourceServiceTest.java | 2 +-
.../ConfluentEncodedSchemaReferenceReaderTest.java | 2 +-
.../org/apache/nifi/avro/TestAvroTypeUtil.java | 2 +-
.../processors/gcp/bigquery/PutBigQueryIT.java | 10 ++++-----
.../nifi/github/GitHubFlowRegistryClientTest.java | 2 +-
.../apache/nifi/processors/hadoop/PutHDFSTest.java | 4 ++--
.../processors/hadoop/TestGetHDFSFileInfo.java | 14 ++++++-------
.../apache/nifi/jms/processors/ConsumeJMSIT.java | 2 +-
.../apache/nifi/processors/mongodb/GetMongoIT.java | 6 +++---
.../apache/nifi/processors/mongodb/PutMongoIT.java | 10 ++++-----
.../processors/mongodb/RunMongoAggregationIT.java | 2 +-
.../processors/mongodb/gridfs/FetchGridFSIT.java | 4 ++--
.../nifi/processors/mqtt/TestConsumeMQTT.java | 2 +-
.../nifi/processors/network/pcap/TestPCAP.java | 2 +-
.../parquet/TestConvertAvroToParquet.java | 24 +++++++++++-----------
.../TestSiteToSiteStatusReportingTask.java | 8 ++++----
.../apache/nifi/processors/smb/PutSmbFileTest.java | 4 ++--
.../processors/standard/TestAttributesToCSV.java | 8 ++++----
.../processors/standard/TestAttributesToJSON.java | 2 +-
.../processors/standard/TestExecuteProcess.java | 4 ++--
.../nifi/processors/standard/TestFlattenJson.java | 5 ++---
.../processors/standard/TestUnpackContent.java | 4 ++--
.../standard/db/impl/TestMSSQLDatabaseAdapter.java | 20 +++++++++---------
.../db/impl/TestOracle12DatabaseAdapter.java | 16 +++++++--------
...tpRequestCertificateAttributesProviderTest.java | 8 ++++----
.../nifi/syslog/TestSyslog5424RecordReader.java | 6 +++---
.../apache/nifi/syslog/TestSyslogRecordReader.java | 2 +-
.../nifi/authorization/user/NiFiUserUtilsTest.java | 2 +-
.../nifi/cluster/manager/BulletinMergerTest.java | 2 +-
.../repository/StandardProcessSessionIT.java | 2 +-
.../TestStatusAnalyticsModelMapFactory.java | 4 ++--
.../web/api/metrics/jmx/JmxMetricsFilterTest.java | 12 +++++------
.../org/apache/nifi/registry/web/api/FlowsIT.java | 2 +-
.../oidc/StandardOidcIdentityProviderTest.java | 4 ++--
46 files changed, 137 insertions(+), 138 deletions(-)
diff --git
a/minifi/minifi-commons/minifi-commons-framework/src/test/java/org/apache/nifi/minifi/commons/service/StandardFlowPropertyAssetReferenceResolverServiceTest.java
b/minifi/minifi-commons/minifi-commons-framework/src/test/java/org/apache/nifi/minifi/commons/service/StandardFlowPropertyAssetReferenceResolverServiceTest.java
index bc86b6e1ccb..8124a6aea87 100644
---
a/minifi/minifi-commons/minifi-commons-framework/src/test/java/org/apache/nifi/minifi/commons/service/StandardFlowPropertyAssetReferenceResolverServiceTest.java
+++
b/minifi/minifi-commons/minifi-commons-framework/src/test/java/org/apache/nifi/minifi/commons/service/StandardFlowPropertyAssetReferenceResolverServiceTest.java
@@ -99,10 +99,10 @@ public class
StandardFlowPropertyAssetReferenceResolverServiceTest {
}
private void verifyProperties() {
- assertEquals(processorProperties.get("assetReferenceProperty"),
"asset1Path");
- assertEquals(processorProperties.get("notAssetReferenceProperty"),
"some value1");
-
assertEquals(controllerServiceProperties.get("assetReferenceProperty"),
"asset2Path");
-
assertEquals(controllerServiceProperties.get("notAssetReferenceProperty"),
"some value2");
+ assertEquals("asset1Path",
processorProperties.get("assetReferenceProperty"));
+ assertEquals("some value1",
processorProperties.get("notAssetReferenceProperty"));
+ assertEquals("asset2Path",
controllerServiceProperties.get("assetReferenceProperty"));
+ assertEquals("some value2",
controllerServiceProperties.get("notAssetReferenceProperty"));
}
private VersionedDataflow aVersionedDataflow() {
diff --git
a/minifi/minifi-toolkit/minifi-toolkit-schema/src/test/java/org/apache/nifi/minifi/toolkit/schema/RemoteProcessGroupSchemaTest.java
b/minifi/minifi-toolkit/minifi-toolkit-schema/src/test/java/org/apache/nifi/minifi/toolkit/schema/RemoteProcessGroupSchemaTest.java
index c633c1a6029..8d6beb1ebfb 100644
---
a/minifi/minifi-toolkit/minifi-toolkit-schema/src/test/java/org/apache/nifi/minifi/toolkit/schema/RemoteProcessGroupSchemaTest.java
+++
b/minifi/minifi-toolkit/minifi-toolkit-schema/src/test/java/org/apache/nifi/minifi/toolkit/schema/RemoteProcessGroupSchemaTest.java
@@ -64,12 +64,12 @@ public class RemoteProcessGroupSchemaTest {
map.put(RemoteProcessGroupSchema.TRANSPORT_PROTOCOL_KEY, "RAW");
RemoteProcessGroupSchema first = new RemoteProcessGroupSchema(map);
validateIssuesNumMatches(0, first);
- assertEquals(first.getTransportProtocol(), "RAW");
+ assertEquals("RAW", first.getTransportProtocol());
map.put(RemoteProcessGroupSchema.TRANSPORT_PROTOCOL_KEY, "HTTP");
RemoteProcessGroupSchema second = new RemoteProcessGroupSchema(map);
validateIssuesNumMatches(0, second);
- assertEquals(second.getTransportProtocol(), "HTTP");
+ assertEquals("HTTP", second.getTransportProtocol());
}
@Test
@@ -82,7 +82,7 @@ public class RemoteProcessGroupSchemaTest {
map.put(RemoteProcessGroupSchema.LOCAL_NETWORK_INTERFACE_KEY, "eth1");
RemoteProcessGroupSchema first = new RemoteProcessGroupSchema(map);
validateIssuesNumMatches(0, first);
- assertEquals(first.getLocalNetworkInterface(), "eth1");
+ assertEquals("eth1", first.getLocalNetworkInterface());
}
@Test
public void testProxySettings() {
diff --git
a/minifi/minifi-toolkit/minifi-toolkit-schema/src/test/java/org/apache/nifi/minifi/toolkit/schema/v2/RemoteProcessGroupSchemaV2Test.java
b/minifi/minifi-toolkit/minifi-toolkit-schema/src/test/java/org/apache/nifi/minifi/toolkit/schema/v2/RemoteProcessGroupSchemaV2Test.java
index a79789efceb..60dc9cf1212 100644
---
a/minifi/minifi-toolkit/minifi-toolkit-schema/src/test/java/org/apache/nifi/minifi/toolkit/schema/v2/RemoteProcessGroupSchemaV2Test.java
+++
b/minifi/minifi-toolkit/minifi-toolkit-schema/src/test/java/org/apache/nifi/minifi/toolkit/schema/v2/RemoteProcessGroupSchemaV2Test.java
@@ -59,12 +59,12 @@ public class RemoteProcessGroupSchemaV2Test {
map.put(RemoteProcessGroupSchema.TRANSPORT_PROTOCOL_KEY, "RAW");
RemoteProcessGroupSchemaV2 first = new
RemoteProcessGroupSchemaV2(map);
validateIssuesNumMatches(0, first);
- assertEquals(first.getTransportProtocol(), "RAW");
+ assertEquals("RAW", first.getTransportProtocol());
map.put(RemoteProcessGroupSchema.TRANSPORT_PROTOCOL_KEY, "HTTP");
RemoteProcessGroupSchemaV2 second = new
RemoteProcessGroupSchemaV2(map);
validateIssuesNumMatches(0, second);
- assertEquals(second.getTransportProtocol(), "HTTP");
+ assertEquals("HTTP", second.getTransportProtocol());
}
private PortSchema createPortSchema(String id, String name, String
wrapperName) {
diff --git
a/nifi-commons/nifi-properties/src/test/java/org/apache/nifi/util/NiFiPropertiesTest.java
b/nifi-commons/nifi-properties/src/test/java/org/apache/nifi/util/NiFiPropertiesTest.java
index 36524ed0f25..1bee2e085ac 100644
---
a/nifi-commons/nifi-properties/src/test/java/org/apache/nifi/util/NiFiPropertiesTest.java
+++
b/nifi-commons/nifi-properties/src/test/java/org/apache/nifi/util/NiFiPropertiesTest.java
@@ -253,7 +253,7 @@ public class NiFiPropertiesTest {
properties = NiFiProperties.createBasicNiFiProperties(null,
Map.of(NiFiProperties.WEB_MAX_CONTENT_SIZE, size));
// Assert specific values are used:
- assertEquals(properties.getWebMaxContentSize(), size);
+ assertEquals(size, properties.getWebMaxContentSize());
}
@Test
diff --git
a/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/stream/io/ByteCountingInputStreamTest.java
b/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/stream/io/ByteCountingInputStreamTest.java
index 66f7976e2b3..f37710828ca 100644
---
a/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/stream/io/ByteCountingInputStreamTest.java
+++
b/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/stream/io/ByteCountingInputStreamTest.java
@@ -33,9 +33,9 @@ public class ByteCountingInputStreamTest {
/* verify first 2 bytes */
tmp = bcis.read();
- assertEquals(tmp, 97);
+ assertEquals(97, tmp);
tmp = bcis.read();
- assertEquals(tmp, 98);
+ assertEquals(98, tmp);
/* save bytes read and place mark */
final long bytesAtMark = bcis.getBytesRead();
@@ -43,9 +43,9 @@ public class ByteCountingInputStreamTest {
/* verify next 2 bytes */
tmp = bcis.read();
- assertEquals(tmp, 99);
+ assertEquals(99, tmp);
tmp = bcis.read();
- assertEquals(tmp, 100);
+ assertEquals(100, tmp);
/* verify reset returns to position when mark was placed */
bcis.reset();
@@ -69,9 +69,9 @@ public class ByteCountingInputStreamTest {
// Act
/* verify first 2 bytes */
tmp = bcis.read();
- assertEquals(tmp, 97);
+ assertEquals(97, tmp);
tmp = bcis.read();
- assertEquals(tmp, 98);
+ assertEquals(98, tmp);
int availableBytes = bcis.available();
assertEquals(alphabet.length() - 2, availableBytes);
diff --git
a/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/stream/io/LimitingInputStreamTest.java
b/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/stream/io/LimitingInputStreamTest.java
index 52f55b980e0..5dcefe4a28e 100644
---
a/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/stream/io/LimitingInputStreamTest.java
+++
b/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/stream/io/LimitingInputStreamTest.java
@@ -50,7 +50,7 @@ public class LimitingInputStreamTest {
public void testReadLimitExceeded() throws IOException {
final LimitingInputStream is = new LimitingInputStream(new
ByteArrayInputStream(TEST_BUFFER), 9);
final long bytesRead = StreamUtils.copy(is, new
ByteArrayOutputStream());
- assertEquals(bytesRead, 9);
+ assertEquals(9, bytesRead);
assertTrue(is.hasReachedLimit());
}
}
diff --git
a/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/stream/io/util/StreamDemarcatorTest.java
b/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/stream/io/util/StreamDemarcatorTest.java
index 542780c88d8..d9e1f71135a 100644
---
a/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/stream/io/util/StreamDemarcatorTest.java
+++
b/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/stream/io/util/StreamDemarcatorTest.java
@@ -221,7 +221,7 @@ public class StreamDemarcatorTest {
ByteArrayInputStream is = new ByteArrayInputStream(new byte[] {0, 0,
0, 0, -1, 0, 0, 0});
StreamDemarcator scanner = new StreamDemarcator(is, null, 20);
byte[] b = scanner.nextToken();
- assertArrayEquals(b, new byte[] {0, 0, 0, 0, -1, 0, 0, 0});
+ assertArrayEquals(new byte[] {0, 0, 0, 0, -1, 0, 0, 0}, b);
}
@Test
@@ -229,15 +229,15 @@ public class StreamDemarcatorTest {
ByteArrayInputStream is = new ByteArrayInputStream(new byte[] {0, 0,
0, 0, -1, 0, 0, 0});
StreamDemarcator scanner = new StreamDemarcator(is,
"water".getBytes(StandardCharsets.UTF_8), 20, 1024);
byte[] b = scanner.nextToken();
- assertArrayEquals(b, new byte[] {0, 0, 0, 0, -1, 0, 0, 0});
+ assertArrayEquals(new byte[] {0, 0, 0, 0, -1, 0, 0, 0}, b);
}
@Test
public void verifyScannerHandlesNegativeOneByteDelimiter() throws
IOException {
ByteArrayInputStream is = new ByteArrayInputStream(new byte[] {0, 0,
0, 0, -1, 0, 0, 0});
StreamDemarcator scanner = new StreamDemarcator(is, new byte[] {-1},
20, 1024);
- assertArrayEquals(scanner.nextToken(), new byte[] {0, 0, 0, 0});
- assertArrayEquals(scanner.nextToken(), new byte[] {0, 0, 0});
+ assertArrayEquals(new byte[] {0, 0, 0, 0}, scanner.nextToken());
+ assertArrayEquals(new byte[] {0, 0, 0}, scanner.nextToken());
}
@Test
@@ -266,8 +266,8 @@ public class StreamDemarcatorTest {
assertNotNull(first);
assertNotNull(second);
- assertArrayEquals(first, new byte[] {'Y', 'e', 's'});
- assertArrayEquals(second, new byte[] {'N', 'o'});
+ assertArrayEquals(new byte[] {'Y', 'e', 's'}, first);
+ assertArrayEquals(new byte[] {'N', 'o'}, second);
}
@Test
@@ -316,9 +316,9 @@ public class StreamDemarcatorTest {
assertNotNull(second);
assertNotNull(third);
- assertArrayEquals(first, new byte[] {'1', '2', '3'});
- assertArrayEquals(second, new byte[] {'4', '5', '6'});
- assertArrayEquals(third, new byte[] {'7', '8', '9'});
+ assertArrayEquals(new byte[] {'1', '2', '3'}, first);
+ assertArrayEquals(new byte[] {'4', '5', '6'}, second);
+ assertArrayEquals(new byte[] {'7', '8', '9'}, third);
}
}
diff --git
a/nifi-connector-mock-bundle/nifi-connector-mock-test-bundle/nifi-connector-mock-integration-tests/src/test/java/org/apache/nifi/mock/connectors/tests/CreateConnectorIT.java
b/nifi-connector-mock-bundle/nifi-connector-mock-test-bundle/nifi-connector-mock-integration-tests/src/test/java/org/apache/nifi/mock/connectors/tests/CreateConnectorIT.java
index 18884a8d830..8d15b2c6c71 100644
---
a/nifi-connector-mock-bundle/nifi-connector-mock-test-bundle/nifi-connector-mock-integration-tests/src/test/java/org/apache/nifi/mock/connectors/tests/CreateConnectorIT.java
+++
b/nifi-connector-mock-bundle/nifi-connector-mock-test-bundle/nifi-connector-mock-integration-tests/src/test/java/org/apache/nifi/mock/connectors/tests/CreateConnectorIT.java
@@ -74,7 +74,7 @@ public class CreateConnectorIT {
.build()) {
final List<ValidationResult> results = testRunner.validate();
- assertEquals(results.size(), 1);
+ assertEquals(1, results.size());
final String message = results.getFirst().getExplanation();
assertTrue(message.contains("com.example.nonexistent:missing-nar:1.0.0"),
"Expected exception message to contain missing bundle coordinates but was: " +
message);
assertTrue(message.contains("com.example.nonexistent.MissingProcessor"),
"Expected exception message to contain missing processor type but was: " +
message);
diff --git
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/kinesis/stream/TestConsumeKinesisStream.java
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/kinesis/stream/TestConsumeKinesisStream.java
index 4e711115663..2bd550d08d5 100644
---
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/kinesis/stream/TestConsumeKinesisStream.java
+++
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/kinesis/stream/TestConsumeKinesisStream.java
@@ -356,7 +356,7 @@ public class TestConsumeKinesisStream {
assertSchedulerConfigs(processor.scheduler, hostname);
assertConfigsBuilder(processor.configsBuilder);
- assertEquals(processor.scheduler.applicationName(),
"test-application");
+ assertEquals("test-application",
processor.scheduler.applicationName());
if (!waitForFailure) {
// re-trigger the processor to ensure the Worker isn't
re-initialised when already running
@@ -386,11 +386,11 @@ public class TestConsumeKinesisStream {
private void assertSchedulerConfigs(final Scheduler scheduler, final
String hostname) {
assertTrue(scheduler.leaseManagementConfig().workerIdentifier().startsWith(hostname));
- assertEquals(scheduler.coordinatorConfig().applicationName(),
"test-application");
- assertEquals(scheduler.leaseManagementConfig().streamName(),
"test-stream");
-
assertEquals(scheduler.retrievalConfig().streamTracker().streamConfigList().getFirst().initialPositionInStreamExtended().getInitialPositionInStream(),
- InitialPositionInStream.TRIM_HORIZON);
-
assertEquals(scheduler.coordinatorConfig().parentShardPollIntervalMillis(), 1);
+ assertEquals("test-application",
scheduler.coordinatorConfig().applicationName());
+ assertEquals("test-stream",
scheduler.leaseManagementConfig().streamName());
+ assertEquals(InitialPositionInStream.TRIM_HORIZON,
+
scheduler.retrievalConfig().streamTracker().streamConfigList().getFirst().initialPositionInStreamExtended().getInitialPositionInStream());
+ assertEquals(1,
scheduler.coordinatorConfig().parentShardPollIntervalMillis());
}
// public so TestRunners is able to see and instantiate the class for the
tests
diff --git
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/TestPutS3Object.java
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/TestPutS3Object.java
index a031a3afa3e..db3a35b518f 100644
---
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/TestPutS3Object.java
+++
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/TestPutS3Object.java
@@ -108,7 +108,7 @@ public class TestPutS3Object {
ArgumentCaptor<RequestBody> captureRequestBody =
ArgumentCaptor.forClass(RequestBody.class);
verify(mockS3Client).putObject(captureRequest.capture(),
captureRequestBody.capture());
PutObjectRequest putObjectRequest = captureRequest.getValue();
- assertEquals(putObjectRequest.contentLength(), contentLength);
+ assertEquals(contentLength, putObjectRequest.contentLength());
runner.assertAllFlowFilesTransferred(PutS3Object.REL_SUCCESS, 1);
}
diff --git
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/service/S3FileResourceServiceTest.java
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/service/S3FileResourceServiceTest.java
index efafbc262cc..2e71dd97c28 100644
---
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/service/S3FileResourceServiceTest.java
+++
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/service/S3FileResourceServiceTest.java
@@ -123,7 +123,7 @@ class S3FileResourceServiceTest {
private void assertFileResource(FileResource fileResource) {
assertNotNull(fileResource);
assertEquals(fileResource.getInputStream(), responseStream);
- assertEquals(fileResource.getSize(), CONTENT_LENGTH);
+ assertEquals(CONTENT_LENGTH, fileResource.getSize());
verify(client).getObject(request);
verify(responseStream).response();
verify(response).contentLength();
diff --git
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/services/azure/storage/AzureBlobStorageFileResourceServiceTest.java
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/services/azure/storage/AzureBlobStorageFileResourceServiceTest.java
index 30193c3aa02..7362cdacf79 100644
---
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/services/azure/storage/AzureBlobStorageFileResourceServiceTest.java
+++
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/services/azure/storage/AzureBlobStorageFileResourceServiceTest.java
@@ -161,7 +161,7 @@ class AzureBlobStorageFileResourceServiceTest {
private void assertFileResource(FileResource fileResource) {
assertNotNull(fileResource);
assertEquals(fileResource.getInputStream(), blobInputStream);
- assertEquals(fileResource.getSize(), CONTENT_LENGTH);
+ assertEquals(CONTENT_LENGTH, fileResource.getSize());
}
private void verifyMockInvocations(String customContainer, String
customBlobName) {
diff --git
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/services/azure/storage/AzureDataLakeStorageFileResourceServiceTest.java
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/services/azure/storage/AzureDataLakeStorageFileResourceServiceTest.java
index b8798938754..cc30520f339 100644
---
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/services/azure/storage/AzureDataLakeStorageFileResourceServiceTest.java
+++
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/services/azure/storage/AzureDataLakeStorageFileResourceServiceTest.java
@@ -223,7 +223,7 @@ class AzureDataLakeStorageFileResourceServiceTest {
private void assertFileResource(FileResource fileResource) {
assertNotNull(fileResource);
assertEquals(fileResource.getInputStream(), inputStream);
- assertEquals(fileResource.getSize(), CONTENT_LENGTH);
+ assertEquals(CONTENT_LENGTH, fileResource.getSize());
}
private void verifyMockInvocations() {
diff --git
a/nifi-extension-bundles/nifi-confluent-platform-bundle/nifi-confluent-schema-registry-service/src/test/java/org/apache/nifi/confluent/schemaregistry/ConfluentEncodedSchemaReferenceReaderTest.java
b/nifi-extension-bundles/nifi-confluent-platform-bundle/nifi-confluent-schema-registry-service/src/test/java/org/apache/nifi/confluent/schemaregistry/ConfluentEncodedSchemaReferenceReaderTest.java
index c91f84727cd..b46f6d22a42 100644
---
a/nifi-extension-bundles/nifi-confluent-platform-bundle/nifi-confluent-schema-registry-service/src/test/java/org/apache/nifi/confluent/schemaregistry/ConfluentEncodedSchemaReferenceReaderTest.java
+++
b/nifi-extension-bundles/nifi-confluent-platform-bundle/nifi-confluent-schema-registry-service/src/test/java/org/apache/nifi/confluent/schemaregistry/ConfluentEncodedSchemaReferenceReaderTest.java
@@ -69,7 +69,7 @@ class ConfluentEncodedSchemaReferenceReaderTest {
final OptionalLong schemaVersionId =
schemaIdentifier.getSchemaVersionId();
assertTrue(schemaVersionId.isPresent());
- assertEquals(schemaVersionId.getAsLong(), ID);
+ assertEquals(ID, schemaVersionId.getAsLong());
}
}
}
diff --git
a/nifi-extension-bundles/nifi-extension-utils/nifi-record-utils/nifi-avro-record-utils/src/test/java/org/apache/nifi/avro/TestAvroTypeUtil.java
b/nifi-extension-bundles/nifi-extension-utils/nifi-record-utils/nifi-avro-record-utils/src/test/java/org/apache/nifi/avro/TestAvroTypeUtil.java
index e293f0ab6cf..70658d59ee5 100644
---
a/nifi-extension-bundles/nifi-extension-utils/nifi-record-utils/nifi-avro-record-utils/src/test/java/org/apache/nifi/avro/TestAvroTypeUtil.java
+++
b/nifi-extension-bundles/nifi-extension-utils/nifi-record-utils/nifi-avro-record-utils/src/test/java/org/apache/nifi/avro/TestAvroTypeUtil.java
@@ -313,7 +313,7 @@ public class TestAvroTypeUtil {
Record r = builder.build();
@SuppressWarnings("unchecked")
GenericArray<Integer> values = (GenericArray<Integer>)
r.get("listOfInt");
- assertEquals(values.size(), 1);
+ assertEquals(1, values.size());
RecordSchema record = AvroTypeUtil.createSchema(avroSchema);
RecordField field = record.getField("listOfInt").get();
assertEquals(RecordFieldType.ARRAY,
field.getDataType().getFieldType());
diff --git
a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/bigquery/PutBigQueryIT.java
b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/bigquery/PutBigQueryIT.java
index 09175249a92..abe993f053e 100644
---
a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/bigquery/PutBigQueryIT.java
+++
b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/bigquery/PutBigQueryIT.java
@@ -193,7 +193,7 @@ public class PutBigQueryIT {
FieldValueList firstElt = iterator.next();
assertFalse(iterator.hasNext());
- assertEquals(firstElt.get("name").getStringValue(), "Jane Doe");
+ assertEquals("Jane Doe", firstElt.get("name").getStringValue());
deleteTable(tableName);
}
@@ -334,7 +334,7 @@ public class PutBigQueryIT {
TableResult result =
bigquery.listTableData(dataset.getDatasetId().getDataset(), tableName, schema);
Iterator<FieldValueList> iterator = result.getValues().iterator();
FieldValueList firstElt = iterator.next();
- assertEquals(firstElt.get(0).getNumericValue().intValue(), 0);
+ assertEquals(0, firstElt.get(0).getNumericValue().intValue());
deleteTable(tableName);
}
@@ -375,7 +375,7 @@ public class PutBigQueryIT {
TableResult result =
bigquery.listTableData(dataset.getDatasetId().getDataset(), tableName, schema);
Iterator<FieldValueList> iterator = result.getValues().iterator();
FieldValueList firstElt = iterator.next();
- assertEquals(firstElt.get(0).getDoubleValue(), 1.0);
+ assertEquals(1.0, firstElt.get(0).getDoubleValue());
deleteTable(tableName);
}
@@ -416,7 +416,7 @@ public class PutBigQueryIT {
TableResult result =
bigquery.listTableData(dataset.getDatasetId().getDataset(), tableName, schema);
Iterator<FieldValueList> iterator = result.getValues().iterator();
FieldValueList firstElt = iterator.next();
- assertEquals(firstElt.get(0).getDoubleValue(), 1.0);
+ assertEquals(1.0, firstElt.get(0).getDoubleValue());
deleteTable(tableName);
}
@@ -532,7 +532,7 @@ public class PutBigQueryIT {
john = firstElt.get("name").getStringValue().equals("John Doe") ?
firstElt : sndElt;
jane = firstElt.get("name").getStringValue().equals("Jane Doe") ?
firstElt : sndElt;
- assertEquals(jane.get("job").getRecordValue().get(0).getStringValue(),
"Director");
+ assertEquals("Director",
jane.get("job").getRecordValue().get(0).getStringValue());
assertEquals(2, john.get("alias").getRepeatedValue().size());
assertTrue(john.get("addresses").getRepeatedValue().get(0).getRecordValue().get(0).getStringValue().endsWith("000"));
diff --git
a/nifi-extension-bundles/nifi-github-bundle/nifi-github-extensions/src/test/java/org/apache/nifi/github/GitHubFlowRegistryClientTest.java
b/nifi-extension-bundles/nifi-github-bundle/nifi-github-extensions/src/test/java/org/apache/nifi/github/GitHubFlowRegistryClientTest.java
index 6683dfbe0f5..f3900576c00 100644
---
a/nifi-extension-bundles/nifi-github-bundle/nifi-github-extensions/src/test/java/org/apache/nifi/github/GitHubFlowRegistryClientTest.java
+++
b/nifi-extension-bundles/nifi-github-bundle/nifi-github-extensions/src/test/java/org/apache/nifi/github/GitHubFlowRegistryClientTest.java
@@ -104,7 +104,7 @@ public class GitHubFlowRegistryClientTest {
public void testDirExclusion() throws IOException, FlowRegistryException {
setupClientConfigurationContextWithDefaults();
final Set<FlowRegistryBucket> buckets =
flowRegistryClient.getBuckets(clientConfigurationContext, DEFAULT_REPO_BRANCH);
- assertEquals(buckets.stream().filter(b ->
b.getName().equals(".github")).count(), 0);
+ assertEquals(0, buckets.stream().filter(b ->
b.getName().equals(".github")).count());
}
@Test
diff --git
a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/PutHDFSTest.java
b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/PutHDFSTest.java
index 464093430e6..980b7287831 100644
---
a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/PutHDFSTest.java
+++
b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/PutHDFSTest.java
@@ -218,8 +218,8 @@ public class PutHDFSTest {
}
assertEquals(1, results.size());
for (ValidationResult vr : results) {
- assertEquals(vr.getSubject(), "Codec");
- assertEquals(vr.getExplanation(), "Compression codec cannot be set
when used in 'append avro' mode");
+ assertEquals("Codec", vr.getSubject());
+ assertEquals("Compression codec cannot be set when used in 'append
avro' mode", vr.getExplanation());
}
results = new HashSet<>();
diff --git
a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/TestGetHDFSFileInfo.java
b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/TestGetHDFSFileInfo.java
index 6f848ed1b4f..3f5e774287f 100644
---
a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/TestGetHDFSFileInfo.java
+++
b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/TestGetHDFSFileInfo.java
@@ -182,10 +182,10 @@ public class TestGetHDFSFileInfo {
final MockFlowFile mff =
runner.getFlowFilesForRelationship(GetHDFSFileInfo.REL_ORIGINAL).getFirst();
ProcessContext context = runner.getProcessContext();
-
assertEquals(context.getProperty(GetHDFSFileInfo.FULL_PATH).evaluateAttributeExpressions(mff).getValue(),
"/some/home/mydir");
-
assertEquals(context.getProperty(GetHDFSFileInfo.DIR_FILTER).evaluateAttributeExpressions(mff).getValue(),
"^(dir.*)$");
-
assertEquals(context.getProperty(GetHDFSFileInfo.FILE_FILTER).evaluateAttributeExpressions(mff).getValue(),
"^(.*)$");
-
assertEquals(context.getProperty(GetHDFSFileInfo.FILE_EXCLUDE_FILTER).evaluateAttributeExpressions(mff).getValue(),
"^(none.*)$");
+ assertEquals("/some/home/mydir",
context.getProperty(GetHDFSFileInfo.FULL_PATH).evaluateAttributeExpressions(mff).getValue());
+ assertEquals("^(dir.*)$",
context.getProperty(GetHDFSFileInfo.DIR_FILTER).evaluateAttributeExpressions(mff).getValue());
+ assertEquals("^(.*)$",
context.getProperty(GetHDFSFileInfo.FILE_FILTER).evaluateAttributeExpressions(mff).getValue());
+ assertEquals("^(none.*)$",
context.getProperty(GetHDFSFileInfo.FILE_EXCLUDE_FILTER).evaluateAttributeExpressions(mff).getValue());
}
@Test
@@ -211,7 +211,7 @@ public class TestGetHDFSFileInfo {
final MockFlowFile mff =
runner.getFlowFilesForRelationship(GetHDFSFileInfo.REL_ORIGINAL).getFirst();
ProcessContext context = runner.getProcessContext();
-
assertEquals(context.getProperty(GetHDFSFileInfo.FULL_PATH).evaluateAttributeExpressions(mff).getValue(),
"/some/home/mydir");
+ assertEquals("/some/home/mydir",
context.getProperty(GetHDFSFileInfo.FULL_PATH).evaluateAttributeExpressions(mff).getValue());
}
@Test
@@ -528,7 +528,7 @@ public class TestGetHDFSFileInfo {
runner.assertNotValid();
}
}
- assertEquals(matchCount, 9);
+ assertEquals(9, matchCount);
}
@Test
@@ -632,7 +632,7 @@ public class TestGetHDFSFileInfo {
runner.assertNotValid();
}
}
- assertEquals(matchCount, 5);
+ assertEquals(5, matchCount);
}
@Test
diff --git
a/nifi-extension-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/ConsumeJMSIT.java
b/nifi-extension-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/ConsumeJMSIT.java
index da89d3eac62..fe31c2f36d5 100644
---
a/nifi-extension-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/ConsumeJMSIT.java
+++
b/nifi-extension-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/ConsumeJMSIT.java
@@ -233,7 +233,7 @@ public class ConsumeJMSIT {
Message message = jmst.receive("errorQueue");
assertNotNull(message);
-
assertEquals(message.getStringProperty("unsupportedMessagePropertyKey"),
"unsupportedMessagePropertyValue");
+ assertEquals("unsupportedMessagePropertyValue",
message.getStringProperty("unsupportedMessagePropertyKey"));
} finally {
((CachingConnectionFactory)
jmsTemplate.getConnectionFactory()).destroy();
}
diff --git
a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/GetMongoIT.java
b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/GetMongoIT.java
index cec3b812081..4d9a789d952 100644
---
a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/GetMongoIT.java
+++
b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/GetMongoIT.java
@@ -182,7 +182,7 @@ public class GetMongoIT extends AbstractMongoIT {
ObjectMapper mapper = new ObjectMapper();
Map<String, Object> parsed = mapper.readValue(raw, Map.class);
- assertSame(parsed.get("date_field").getClass(), String.class);
+ assertSame(String.class, parsed.get("date_field").getClass());
}
@Test
@@ -257,7 +257,7 @@ public class GetMongoIT extends AbstractMongoIT {
runner.assertTransferCount(GetMongo.REL_ORIGINAL, 1);
List<MockFlowFile> results =
runner.getFlowFilesForRelationship(GetMongo.REL_SUCCESS);
assertTrue(results.get(0).getSize() > 0, "Flowfile was empty");
-
assertEquals(results.get(0).getAttribute(CoreAttributes.MIME_TYPE.key()),
"application/json", "Wrong mime type");
+ assertEquals("application/json",
results.getFirst().getAttribute(CoreAttributes.MIME_TYPE.key()), "Wrong mime
type");
}
@Test
@@ -272,7 +272,7 @@ public class GetMongoIT extends AbstractMongoIT {
runner.assertTransferCount(GetMongo.REL_ORIGINAL, 1);
List<MockFlowFile> results =
runner.getFlowFilesForRelationship(GetMongo.REL_SUCCESS);
assertTrue(results.get(0).getSize() > 0, "Flowfile was empty");
-
assertEquals(results.get(0).getAttribute(CoreAttributes.MIME_TYPE.key()),
"application/json", "Wrong mime type");
+ assertEquals("application/json",
results.getFirst().getAttribute(CoreAttributes.MIME_TYPE.key()), "Wrong mime
type");
}
@Test
diff --git
a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/PutMongoIT.java
b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/PutMongoIT.java
index ec013d17703..0988c5b38ba 100644
---
a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/PutMongoIT.java
+++
b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/PutMongoIT.java
@@ -278,10 +278,10 @@ public class PutMongoIT extends MongoWriteTestBase {
assertEquals(found.get("department"), document.get("department"));
Document contacts = (Document) found.get("contacts");
assertNotNull(contacts);
- assertEquals(contacts.get("twitter"), "@JohnSmith");
- assertEquals(contacts.get("email"), "[email protected]");
- assertEquals(contacts.get("phone"), "555-555-5555");
- assertEquals(collection.countDocuments(document), 1);
+ assertEquals("@JohnSmith", contacts.get("twitter"));
+ assertEquals("[email protected]", contacts.get("email"));
+ assertEquals("555-555-5555", contacts.get("phone"));
+ assertEquals(1, collection.countDocuments(document));
}
@Test
@@ -614,7 +614,7 @@ public class PutMongoIT extends MongoWriteTestBase {
for (Document doc : array) {
String msg = doc.getString("msg");
assertNotNull(msg, "Msg was null");
- assertEquals(msg, "Hi", "Msg had wrong value");
+ assertEquals("Hi", msg, "Msg had wrong value");
}
}
diff --git
a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/RunMongoAggregationIT.java
b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/RunMongoAggregationIT.java
index eab684dcf46..7145f3b3dec 100644
---
a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/RunMongoAggregationIT.java
+++
b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/RunMongoAggregationIT.java
@@ -129,7 +129,7 @@ public class RunMongoAggregationIT extends AbstractMongoIT {
for (MockFlowFile mff : flowFiles) {
String val = mff.getAttribute(AGG_ATTR);
assertNotNull("Missing query attribute", val);
- assertEquals(val, queryInput, "Value was wrong");
+ assertEquals(queryInput, val, "Value was wrong");
}
}
diff --git
a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/gridfs/FetchGridFSIT.java
b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/gridfs/FetchGridFSIT.java
index 840b6e7821b..8a6a0218d8e 100644
---
a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/gridfs/FetchGridFSIT.java
+++
b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/gridfs/FetchGridFSIT.java
@@ -70,7 +70,7 @@ public class FetchGridFSIT extends GridFSITTestBase {
runner.assertTransferCount(FetchGridFS.REL_SUCCESS, 1);
List<MockFlowFile> flowFiles =
runner.getFlowFilesForRelationship(FetchGridFS.REL_SUCCESS);
byte[] rawData = runner.getContentAsByteArray(flowFiles.get(0));
- assertEquals(new String(rawData), content, "Data did not match for the
file");
+ assertEquals(content, new String(rawData), "Data did not match for the
file");
runner.clearTransferState();
runner.setProperty(FetchGridFS.QUERY, query);
@@ -82,7 +82,7 @@ public class FetchGridFSIT extends GridFSITTestBase {
runner.assertTransferCount(FetchGridFS.REL_SUCCESS, 1);
flowFiles =
runner.getFlowFilesForRelationship(FetchGridFS.REL_SUCCESS);
rawData = runner.getContentAsByteArray(flowFiles.get(0));
- assertEquals(new String(rawData), content, "Data did not match for the
file");
+ assertEquals(content, new String(rawData), "Data did not match for the
file");
}
@Test
diff --git
a/nifi-extension-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/test/java/org/apache/nifi/processors/mqtt/TestConsumeMQTT.java
b/nifi-extension-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/test/java/org/apache/nifi/processors/mqtt/TestConsumeMQTT.java
index 88b4ab59f20..0654cc69c02 100644
---
a/nifi-extension-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/test/java/org/apache/nifi/processors/mqtt/TestConsumeMQTT.java
+++
b/nifi-extension-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/test/java/org/apache/nifi/processors/mqtt/TestConsumeMQTT.java
@@ -532,7 +532,7 @@ public class TestConsumeMQTT {
testRunner.run(1, false, false);
final List<MockFlowFile> flowFiles =
testRunner.getFlowFilesForRelationship(ConsumeMQTT.REL_MESSAGE);
- assertEquals(flowFiles.size(), 1);
+ assertEquals(1, flowFiles.size());
assertEquals("{\"name\":\"Apache NiFi\"}\\n"
+ THIS_IS_NOT_JSON + "\\n"
+ "{\"name\":\"Apache NiFi\"}",
diff --git
a/nifi-extension-bundles/nifi-network-bundle/nifi-network-processors/src/test/java/org/apache/nifi/processors/network/pcap/TestPCAP.java
b/nifi-extension-bundles/nifi-network-bundle/nifi-network-processors/src/test/java/org/apache/nifi/processors/network/pcap/TestPCAP.java
index 5c5fc2c795a..6080264abd2 100644
---
a/nifi-extension-bundles/nifi-network-bundle/nifi-network-processors/src/test/java/org/apache/nifi/processors/network/pcap/TestPCAP.java
+++
b/nifi-extension-bundles/nifi-network-bundle/nifi-network-processors/src/test/java/org/apache/nifi/processors/network/pcap/TestPCAP.java
@@ -99,6 +99,6 @@ public class TestPCAP {
assertEquals(packetHeaderValues.get("origLen"),
litteEndianBuffer.getInt());
byte[] body = new byte[30];
litteEndianBuffer.get(40, body, 0, 30);
- assertArrayEquals(body, PACKET_DATA);
+ assertArrayEquals(PACKET_DATA, body);
}
}
diff --git
a/nifi-extension-bundles/nifi-parquet-bundle/nifi-parquet-processors/src/test/java/org/apache/nifi/processors/parquet/TestConvertAvroToParquet.java
b/nifi-extension-bundles/nifi-parquet-bundle/nifi-parquet-processors/src/test/java/org/apache/nifi/processors/parquet/TestConvertAvroToParquet.java
index b709e105ded..36f3d5927f6 100644
---
a/nifi-extension-bundles/nifi-parquet-bundle/nifi-parquet-processors/src/test/java/org/apache/nifi/processors/parquet/TestConvertAvroToParquet.java
+++
b/nifi-extension-bundles/nifi-parquet-bundle/nifi-parquet-processors/src/test/java/org/apache/nifi/processors/parquet/TestConvertAvroToParquet.java
@@ -213,26 +213,26 @@ public class TestConvertAvroToParquet {
Group firstRecord = parquetRecords.get(0);
// Primitive
- assertEquals(firstRecord.getInteger("myint", 0), 1);
- assertEquals(firstRecord.getLong("mylong", 0), 2);
+ assertEquals(1, firstRecord.getInteger("myint", 0));
+ assertEquals(2, firstRecord.getLong("mylong", 0));
assertTrue(firstRecord.getBoolean("myboolean", 0));
- assertEquals(firstRecord.getFloat("myfloat", 0), 3.1, 0.0001);
- assertEquals(firstRecord.getDouble("mydouble", 0), 4.1, 0.001);
- assertEquals(firstRecord.getString("mybytes", 0), "hello");
- assertEquals(firstRecord.getString("mystring", 0), "hello");
+ assertEquals(3.1, firstRecord.getFloat("myfloat", 0), 0.0001);
+ assertEquals(4.1, firstRecord.getDouble("mydouble", 0), 0.001);
+ assertEquals("hello", firstRecord.getString("mybytes", 0));
+ assertEquals("hello", firstRecord.getString("mystring", 0));
// Nested
- assertEquals(firstRecord.getGroup("mynestedrecord",
0).getInteger("mynestedint", 0), 1);
+ assertEquals(1, firstRecord.getGroup("mynestedrecord",
0).getInteger("mynestedint", 0));
// Array
- assertEquals(firstRecord.getGroup("myarray", 0).getGroup("list",
0).getInteger("element", 0), 1);
- assertEquals(firstRecord.getGroup("myarray", 0).getGroup("list",
1).getInteger("element", 0), 2);
+ assertEquals(1, firstRecord.getGroup("myarray", 0).getGroup("list",
0).getInteger("element", 0));
+ assertEquals(2, firstRecord.getGroup("myarray", 0).getGroup("list",
1).getInteger("element", 0));
// Map
- assertEquals(firstRecord.getGroup("mymap", 0).getGroup("key_value",
0).getInteger("value", 0), 1);
- assertEquals(firstRecord.getGroup("mymap", 0).getGroup("key_value",
1).getInteger("value", 0), 2);
+ assertEquals(1, firstRecord.getGroup("mymap", 0).getGroup("key_value",
0).getInteger("value", 0));
+ assertEquals(2, firstRecord.getGroup("mymap", 0).getGroup("key_value",
1).getInteger("value", 0));
// Fixed
- assertEquals(firstRecord.getString("myfixed", 0), "A");
+ assertEquals("A", firstRecord.getString("myfixed", 0));
}
}
diff --git
a/nifi-extension-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/test/java/org/apache/nifi/reporting/TestSiteToSiteStatusReportingTask.java
b/nifi-extension-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/test/java/org/apache/nifi/reporting/TestSiteToSiteStatusReportingTask.java
index fdabe2aee7d..0a185b1d165 100644
---
a/nifi-extension-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/test/java/org/apache/nifi/reporting/TestSiteToSiteStatusReportingTask.java
+++
b/nifi-extension-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/test/java/org/apache/nifi/reporting/TestSiteToSiteStatusReportingTask.java
@@ -185,7 +185,7 @@ public class TestSiteToSiteStatusReportingTask {
JsonReader jsonReader = Json.createReader(new
ByteArrayInputStream(msg.getBytes()));
JsonObject object = jsonReader.readArray().getJsonObject(0);
JsonValue destination = object.get("destinationName");
- assertEquals(destination, JsonValue.NULL);
+ assertEquals(JsonValue.NULL, destination);
}
@@ -268,7 +268,7 @@ public class TestSiteToSiteStatusReportingTask {
JsonReader jsonReader = Json.createReader(new
ByteArrayInputStream(msg.getBytes()));
JsonObject object = jsonReader.readArray().getJsonObject(0);
JsonValue activeThreadCount = object.get("activeThreadCount");
- assertEquals(activeThreadCount, JsonValue.NULL);
+ assertEquals(JsonValue.NULL, activeThreadCount);
}
@Test
@@ -311,7 +311,7 @@ public class TestSiteToSiteStatusReportingTask {
JsonReader jsonReader = Json.createReader(new
ByteArrayInputStream(msg.getBytes()));
JsonObject firstElement = jsonReader.readArray().getJsonObject(0);
JsonValue targetURI = firstElement.get("targetURI");
- assertEquals(targetURI, JsonValue.NULL);
+ assertEquals(JsonValue.NULL, targetURI);
}
@Test
@@ -361,7 +361,7 @@ public class TestSiteToSiteStatusReportingTask {
JsonReader jsonReader = Json.createReader(new
ByteArrayInputStream(msg.getBytes()));
JsonObject object = jsonReader.readArray().getJsonObject(0);
JsonValue type = object.get("processorType");
- assertEquals(type, JsonValue.NULL);
+ assertEquals(JsonValue.NULL, type);
}
/***********************************
diff --git
a/nifi-extension-bundles/nifi-smb-bundle/nifi-smb-processors/src/test/java/org/apache/nifi/processors/smb/PutSmbFileTest.java
b/nifi-extension-bundles/nifi-smb-bundle/nifi-smb-processors/src/test/java/org/apache/nifi/processors/smb/PutSmbFileTest.java
index 92e45a3a2ee..2efdfd5e0a3 100644
---
a/nifi-extension-bundles/nifi-smb-bundle/nifi-smb-processors/src/test/java/org/apache/nifi/processors/smb/PutSmbFileTest.java
+++
b/nifi-extension-bundles/nifi-smb-bundle/nifi-smb-processors/src/test/java/org/apache/nifi/processors/smb/PutSmbFileTest.java
@@ -270,8 +270,8 @@ public class PutSmbFileTest {
verify(connection).authenticate(authenticationContext.capture());
AuthenticationContext acObj = authenticationContext.getValue();
- assertEquals(acObj.getUsername(), USERNAME);
- assertEquals(acObj.getDomain(), DOMAIN);
+ assertEquals(USERNAME, acObj.getUsername());
+ assertEquals(DOMAIN, acObj.getDomain());
assertArrayEquals(acObj.getPassword(), PASSWORD.toCharArray());
}
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestAttributesToCSV.java
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestAttributesToCSV.java
index 4bf235d46f5..c513e9d74eb 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestAttributesToCSV.java
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestAttributesToCSV.java
@@ -691,8 +691,8 @@ public class TestAttributesToCSV {
final byte[] contentData = testRunner.getContentAsByteArray(flowFile);
final String contentDataString = new String(contentData,
StandardCharsets.UTF_8);
- assertEquals(contentDataString.split(newline)[0],
"beach-name,beach-location");
- assertEquals(contentDataString.split(newline)[1], "Malibu
Beach,\"California, US\"");
+ assertEquals("beach-name,beach-location",
contentDataString.split(newline)[0]);
+ assertEquals("Malibu Beach,\"California, US\"",
contentDataString.split(newline)[1]);
}
@Test
@@ -757,8 +757,8 @@ public class TestAttributesToCSV {
final byte[] contentData = testRunner.getContentAsByteArray(flowFile);
final String contentDataString = new String(contentData,
StandardCharsets.UTF_8);
- assertEquals(contentDataString.split(newline)[0],
"beach-name,beach-location,path,filename,uuid");
- assertEquals(contentDataString.split(newline)[1], "Malibu
Beach,\"California, US\"," + path + "," + filename + "," + uuid);
+ assertEquals("beach-name,beach-location,path,filename,uuid",
contentDataString.split(newline)[0]);
+ assertEquals("Malibu Beach,\"California, US\"," + path + "," +
filename + "," + uuid, contentDataString.split(newline)[1]);
}
@Test
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestAttributesToJSON.java
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestAttributesToJSON.java
index 6f36db680ff..a9e4b9c2c0b 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestAttributesToJSON.java
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestAttributesToJSON.java
@@ -143,7 +143,7 @@ public class TestAttributesToJSON {
Map<String, String> val = MAPPER.readValue(json, new TypeReference<>()
{ });
- assertEquals(val.get(nonPresentAttributeKey), "");
+ assertEquals("", val.get(nonPresentAttributeKey));
}
@Test
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestExecuteProcess.java
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestExecuteProcess.java
index 6688537cd56..65bc1ae8b35 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestExecuteProcess.java
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestExecuteProcess.java
@@ -259,8 +259,8 @@ public class TestExecuteProcess {
final List<MockFlowFile> succeeded =
runner.getFlowFilesForRelationship(ExecuteProcess.REL_SUCCESS);
assertEquals(1, succeeded.size());
assertTrue(new
String(succeeded.getFirst().toByteArray()).contains("DOES-NOT-EXIST"));
-
assertEquals(succeeded.getFirst().getAttribute(ExecuteProcess.ATTRIBUTE_COMMAND),
"ls");
-
assertEquals(succeeded.getFirst().getAttribute(ExecuteProcess.ATTRIBUTE_COMMAND_ARGS),
"DOES-NOT-EXIST");
+ assertEquals("ls",
succeeded.getFirst().getAttribute(ExecuteProcess.ATTRIBUTE_COMMAND));
+ assertEquals("DOES-NOT-EXIST",
succeeded.getFirst().getAttribute(ExecuteProcess.ATTRIBUTE_COMMAND_ARGS));
}
/**
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestFlattenJson.java
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestFlattenJson.java
index e4659ea4b78..3e966355020 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestFlattenJson.java
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestFlattenJson.java
@@ -65,9 +65,8 @@ public class TestFlattenJson {
}
}""";
final Map parsed = (Map) baseTest(testRunner, json, 2);
- assertEquals(parsed.get("test.msg"), "Hello, world", "test.msg should
exist, but doesn't");
- assertEquals(parsed.get("first.second.third"),
- Arrays.asList("one", "two", "three", "four", "five"),
+ assertEquals("Hello, world", parsed.get("test.msg"), "test.msg should
exist, but doesn't");
+ assertEquals(Arrays.asList("one", "two", "three", "four", "five"),
parsed.get("first.second.third"),
"Three level block doesn't exist.");
}
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestUnpackContent.java
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestUnpackContent.java
index 9edfe081f66..630f19d157c 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestUnpackContent.java
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestUnpackContent.java
@@ -465,7 +465,7 @@ public class TestUnpackContent {
final List<MockFlowFile> unpacked =
runner.getFlowFilesForRelationship(UnpackContent.REL_SUCCESS);
for (final MockFlowFile flowFile : unpacked) {
-
assertEquals(flowFile.getAttribute(UnpackContent.SEGMENT_ORIGINAL_FILENAME),
"data");
+ assertEquals("data",
flowFile.getAttribute(UnpackContent.SEGMENT_ORIGINAL_FILENAME));
}
final TestRunner mergeRunner = TestRunners.newTestRunner(new
MergeContent());
@@ -502,7 +502,7 @@ public class TestUnpackContent {
final List<MockFlowFile> unpacked =
runner.getFlowFilesForRelationship(UnpackContent.REL_SUCCESS);
for (final MockFlowFile flowFile : unpacked) {
-
assertEquals(flowFile.getAttribute(UnpackContent.SEGMENT_ORIGINAL_FILENAME),
"data");
+ assertEquals("data",
flowFile.getAttribute(UnpackContent.SEGMENT_ORIGINAL_FILENAME));
}
final TestRunner mergeRunner = TestRunners.newTestRunner(new
MergeContent());
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/db/impl/TestMSSQLDatabaseAdapter.java
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/db/impl/TestMSSQLDatabaseAdapter.java
index dca741cbbe0..7628e0bc072 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/db/impl/TestMSSQLDatabaseAdapter.java
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/db/impl/TestMSSQLDatabaseAdapter.java
@@ -28,19 +28,19 @@ public class TestMSSQLDatabaseAdapter {
public void testGeneration() {
String sql1 = db.getSelectStatement("database.tablename",
"some(set),of(columns),that,might,contain,methods,a.*", "", "", null, null);
String expected1 = "SELECT
some(set),of(columns),that,might,contain,methods,a.* FROM database.tablename";
- assertEquals(sql1, expected1);
+ assertEquals(expected1, sql1);
String sql2 = db.getSelectStatement("database.tablename",
"some(set),of(columns),that,might,contain,methods,a.*", "that='some\"' value'",
"", null, null);
String expected2 = "SELECT
some(set),of(columns),that,might,contain,methods,a.* FROM database.tablename
WHERE that='some\"' value'";
- assertEquals(sql2, expected2);
+ assertEquals(expected2, sql2);
String sql3 = db.getSelectStatement("database.tablename",
"some(set),of(columns),that,might,contain,methods,a.*", "that='some\"' value'",
"might DESC", null, null);
String expected3 = "SELECT
some(set),of(columns),that,might,contain,methods,a.* FROM database.tablename
WHERE that='some\"' value' ORDER BY might DESC";
- assertEquals(sql3, expected3);
+ assertEquals(expected3, sql3);
String sql4 = db.getSelectStatement("database.tablename", "",
"that='some\"' value'", "might DESC", null, null);
String expected4 = "SELECT * FROM database.tablename WHERE
that='some\"' value' ORDER BY might DESC";
- assertEquals(sql4, expected4);
+ assertEquals(expected4, sql4);
}
@Test
@@ -61,30 +61,30 @@ public class TestMSSQLDatabaseAdapter {
public void testTOPQuery() {
String sql1 = db.getSelectStatement("database.tablename",
"some(set),of(columns),that,might,contain,methods,a.*", "", "", 100L, null);
String expected1 = "SELECT TOP 100
some(set),of(columns),that,might,contain,methods,a.* FROM database.tablename";
- assertEquals(sql1, expected1);
+ assertEquals(expected1, sql1);
String sql2 = db.getSelectStatement("database.tablename",
"some(set),of(columns),that,might,contain,methods,a.*", "", "contain", 100L,
null);
String expected2 = "SELECT TOP 100
some(set),of(columns),that,might,contain,methods,a.* FROM database.tablename
ORDER BY contain";
- assertEquals(sql2, expected2);
+ assertEquals(expected2, sql2);
String sql4 = db.getSelectStatement("database.tablename", "",
"that='some\"' value'", "might DESC", 123456L, null);
String expected4 = "SELECT TOP 123456 * FROM database.tablename WHERE
that='some\"' value' ORDER BY might DESC";
- assertEquals(sql4, expected4);
+ assertEquals(expected4, sql4);
}
@Test
public void testPagingQuery() {
String sql1 = db.getSelectStatement("database.tablename",
"some(set),of(columns),that,might,contain,methods,a.*", "", "contain", 100L,
0L);
String expected1 = "SELECT
some(set),of(columns),that,might,contain,methods,a.* FROM database.tablename
ORDER BY contain OFFSET 0 ROWS FETCH NEXT 100 ROWS ONLY";
- assertEquals(sql1, expected1);
+ assertEquals(expected1, sql1);
String sql2 = db.getSelectStatement("database.tablename",
"some(set),of(columns),that,might,contain,methods,a.*", "", "contain", 10000L,
123456L);
String expected2 = "SELECT
some(set),of(columns),that,might,contain,methods,a.* FROM database.tablename
ORDER BY contain OFFSET 123456 ROWS FETCH NEXT 10000 ROWS ONLY";
- assertEquals(sql2, expected2);
+ assertEquals(expected2, sql2);
String sql3 = db.getSelectStatement("database.tablename",
"some(set),of(columns),that,might,contain,methods,a.*", "methods='strange'",
"contain", 10000L, 123456L);
String expected3 = "SELECT
some(set),of(columns),that,might,contain,methods,a.* FROM database.tablename
WHERE methods='strange' ORDER BY contain OFFSET 123456 ROWS FETCH NEXT 10000
ROWS ONLY";
- assertEquals(sql3, expected3);
+ assertEquals(expected3, sql3);
}
@Test
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/db/impl/TestOracle12DatabaseAdapter.java
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/db/impl/TestOracle12DatabaseAdapter.java
index c80440cd838..d8de5c11a77 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/db/impl/TestOracle12DatabaseAdapter.java
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/db/impl/TestOracle12DatabaseAdapter.java
@@ -41,19 +41,19 @@ public class TestOracle12DatabaseAdapter {
public void testGeneration() {
String sql1 = db.getSelectStatement("database.tablename",
"some(set),of(columns),that,might,contain,methods,a.*", "", "", null, null);
String expected1 = "SELECT
some(set),of(columns),that,might,contain,methods,a.* FROM database.tablename";
- assertEquals(sql1, expected1);
+ assertEquals(expected1, sql1);
String sql2 = db.getSelectStatement("database.tablename",
"some(set),of(columns),that,might,contain,methods,a.*", "that='some\"' value'",
"", null, null);
String expected2 = "SELECT
some(set),of(columns),that,might,contain,methods,a.* FROM database.tablename
WHERE that='some\"' value'";
- assertEquals(sql2, expected2);
+ assertEquals(expected2, sql2);
String sql3 = db.getSelectStatement("database.tablename",
"some(set),of(columns),that,might,contain,methods,a.*", "that='some\"' value'",
"might DESC", null, null);
String expected3 = "SELECT
some(set),of(columns),that,might,contain,methods,a.* FROM database.tablename
WHERE that='some\"' value' ORDER BY might DESC";
- assertEquals(sql3, expected3);
+ assertEquals(expected3, sql3);
String sql4 = db.getSelectStatement("database.tablename", "",
"that='some\"' value'", "might DESC", null, null);
String expected4 = "SELECT * FROM database.tablename WHERE
that='some\"' value' ORDER BY might DESC";
- assertEquals(sql4, expected4);
+ assertEquals(expected4, sql4);
}
@Test
@@ -67,19 +67,19 @@ public class TestOracle12DatabaseAdapter {
public void testPagingQuery() {
String sql1 = db.getSelectStatement("database.tablename",
"some(set),of(columns),that,might,contain,methods,a.*", "", "contain", 100L,
0L);
String expected1 = "SELECT
some(set),of(columns),that,might,contain,methods,a.* FROM database.tablename
ORDER BY contain FETCH NEXT 100 ROWS ONLY";
- assertEquals(sql1, expected1);
+ assertEquals(expected1, sql1);
String sql2 = db.getSelectStatement("database.tablename",
"some(set),of(columns),that,might,contain,methods,a.*", "", "contain", 10000L,
123456L);
String expected2 = "SELECT
some(set),of(columns),that,might,contain,methods,a.* FROM database.tablename
ORDER BY contain OFFSET 123456 ROWS FETCH NEXT 10000 ROWS ONLY";
- assertEquals(sql2, expected2);
+ assertEquals(expected2, sql2);
String sql3 = db.getSelectStatement("database.tablename",
"some(set),of(columns),that,might,contain,methods,a.*", "methods='strange'",
"contain", 10000L, 123456L);
String expected3 = "SELECT
some(set),of(columns),that,might,contain,methods,a.* FROM database.tablename
WHERE methods='strange' ORDER BY contain OFFSET 123456 ROWS FETCH NEXT 10000
ROWS ONLY";
- assertEquals(sql3, expected3);
+ assertEquals(expected3, sql3);
String sql4 = db.getSelectStatement("database.tablename",
"some(set),of(columns),that,might,contain,methods,a.*", "", "", 100L, null);
String expected4 = "SELECT
some(set),of(columns),that,might,contain,methods,a.* FROM database.tablename
FETCH NEXT 100 ROWS ONLY";
- assertEquals(sql4, expected4);
+ assertEquals(expected4, sql4);
}
@Test
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/http/HandleHttpRequestCertificateAttributesProviderTest.java
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/http/HandleHttpRequestCertificateAttributesProviderTest.java
index 85151810654..eb3cbb1aa67 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/http/HandleHttpRequestCertificateAttributesProviderTest.java
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/http/HandleHttpRequestCertificateAttributesProviderTest.java
@@ -139,11 +139,11 @@ class HandleHttpRequestCertificateAttributesProviderTest {
assertSubjectIssuerFound(attributes);
- assertEquals(attributes.get(FIRST_SAN_NAME_ATTRIBUTE_KEY),
EMAIL_ADDRESS);
- assertEquals(attributes.get(FIRST_SAN_NAME_TYPE_ATTRIBUTE_KEY),
RFC_822_NAME_GENERAL_NAME);
+ assertEquals(EMAIL_ADDRESS,
attributes.get(FIRST_SAN_NAME_ATTRIBUTE_KEY));
+ assertEquals(RFC_822_NAME_GENERAL_NAME,
attributes.get(FIRST_SAN_NAME_TYPE_ATTRIBUTE_KEY));
- assertEquals(attributes.get(SECOND_SAN_NAME_ATTRIBUTE_KEY), DNS_NAME);
- assertEquals(attributes.get(SECOND_SAN_NAME_TYPE_ATTRIBUTE_KEY),
DNS_NAME_GENERAL_NAME);
+ assertEquals(DNS_NAME, attributes.get(SECOND_SAN_NAME_ATTRIBUTE_KEY));
+ assertEquals(DNS_NAME_GENERAL_NAME,
attributes.get(SECOND_SAN_NAME_TYPE_ATTRIBUTE_KEY));
}
private void assertSubjectIssuerFound(final Map<String, String>
attributes) {
diff --git
a/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/syslog/TestSyslog5424RecordReader.java
b/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/syslog/TestSyslog5424RecordReader.java
index 78e8e19a484..bde398a255f 100644
---
a/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/syslog/TestSyslog5424RecordReader.java
+++
b/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/syslog/TestSyslog5424RecordReader.java
@@ -192,7 +192,7 @@ public class TestSyslog5424RecordReader {
count++;
record = deserializer.nextRecord();
}
- assertEquals(count, 3);
+ assertEquals(3, count);
deserializer.close();
}
}
@@ -220,8 +220,8 @@ public class TestSyslog5424RecordReader {
exceptionCount++;
}
}
- assertEquals(count, 3);
- assertEquals(exceptionCount, 1);
+ assertEquals(3, count);
+ assertEquals(1, exceptionCount);
deserializer.close();
}
}
diff --git
a/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/syslog/TestSyslogRecordReader.java
b/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/syslog/TestSyslogRecordReader.java
index 9bc54e66e5c..e49e31f26d7 100644
---
a/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/syslog/TestSyslogRecordReader.java
+++
b/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/syslog/TestSyslogRecordReader.java
@@ -143,7 +143,7 @@ public class TestSyslogRecordReader {
count++;
record = deserializer.nextRecord();
}
- assertEquals(count, 3);
+ assertEquals(3, count);
deserializer.close();
}
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-authorization-providers/src/test/java/org/apache/nifi/authorization/user/NiFiUserUtilsTest.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-authorization-providers/src/test/java/org/apache/nifi/authorization/user/NiFiUserUtilsTest.java
index fb0187ff3a6..b6b88f45365 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-authorization-providers/src/test/java/org/apache/nifi/authorization/user/NiFiUserUtilsTest.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-authorization-providers/src/test/java/org/apache/nifi/authorization/user/NiFiUserUtilsTest.java
@@ -70,7 +70,7 @@ public class NiFiUserUtilsTest {
final List<String> proxiedEntitiesChain =
NiFiUserUtils.buildProxiedEntitiesChain(null);
logger.info("Proxied entities chain: {}", proxiedEntitiesChain);
- assertEquals(proxiedEntitiesChain, Collections.EMPTY_LIST);
+ assertEquals(Collections.EMPTY_LIST, proxiedEntitiesChain);
}
private NiFiUser createMockNiFiUser(final String identity, final NiFiUser
chain, final boolean isAnonymous) {
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/BulletinMergerTest.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/BulletinMergerTest.java
index 21fc1bee79f..7b38540d77f 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/BulletinMergerTest.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/BulletinMergerTest.java
@@ -77,7 +77,7 @@ public class BulletinMergerTest {
assertTrue(merged.contains(bulletinEntity2), "Second Bulletin not
found");
assertTrue(merged.contains(unauthorizedBulletin), "Protected Bulletin
not found");
- assertEquals(bulletinEntity1.getNodeAddress(), ALL_NODES_MESSAGE);
+ assertEquals(ALL_NODES_MESSAGE, bulletinEntity1.getNodeAddress());
}
@Test
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/repository/StandardProcessSessionIT.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/repository/StandardProcessSessionIT.java
index db119a1db7c..8b617dcfd60 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/repository/StandardProcessSessionIT.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/repository/StandardProcessSessionIT.java
@@ -2102,7 +2102,7 @@ public class StandardProcessSessionIT {
StreamUtils.fillBuffer(in, buffer);
}
- assertEquals(new String(buffer), "hello, world");
+ assertEquals("hello, world", new String(buffer));
}
@Test
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/status/analytics/TestStatusAnalyticsModelMapFactory.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/status/analytics/TestStatusAnalyticsModelMapFactory.java
index e7c5313b2ad..f2678385f9b 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/status/analytics/TestStatusAnalyticsModelMapFactory.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/status/analytics/TestStatusAnalyticsModelMapFactory.java
@@ -59,7 +59,7 @@ public class TestStatusAnalyticsModelMapFactory {
StatusAnalyticsModel bytesModel = modelMap.get("queuedBytes").getKey();
assertNotNull(countModel);
assertNotNull(bytesModel);
- assertEquals(countModel.getClass().getName(),
"org.apache.nifi.controller.status.analytics.models.OrdinaryLeastSquares");
- assertEquals(bytesModel.getClass().getName(),
"org.apache.nifi.controller.status.analytics.models.OrdinaryLeastSquares");
+
assertEquals("org.apache.nifi.controller.status.analytics.models.OrdinaryLeastSquares",
countModel.getClass().getName());
+
assertEquals("org.apache.nifi.controller.status.analytics.models.OrdinaryLeastSquares",
bytesModel.getClass().getName());
}
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/web/api/metrics/jmx/JmxMetricsFilterTest.java
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/web/api/metrics/jmx/JmxMetricsFilterTest.java
index 2ae58379c65..ebc7696f17c 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/web/api/metrics/jmx/JmxMetricsFilterTest.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/web/api/metrics/jmx/JmxMetricsFilterTest.java
@@ -53,7 +53,7 @@ class JmxMetricsFilterTest {
final Collection<JmxMetricsResultDTO> actual =
metricsFilter.filter(results);
- assertEquals(actual.size(), 2);
+ assertEquals(2, actual.size());
assertTrue(actual.containsAll(results));
}
@@ -63,7 +63,7 @@ class JmxMetricsFilterTest {
final Collection<JmxMetricsResultDTO> actual =
metricsFilter.filter(results);
- assertEquals(actual.size(), 2);
+ assertEquals(2, actual.size());
assertTrue(actual.containsAll(results));
}
@@ -73,7 +73,7 @@ class JmxMetricsFilterTest {
final Collection<JmxMetricsResultDTO> actual =
metricsFilter.filter(results);
- assertEquals(actual.size(), 1);
+ assertEquals(1, actual.size());
assertTrue(actual.contains(RESULT_ONE));
assertFalse(actual.contains(RESULT_TWO));
}
@@ -84,7 +84,7 @@ class JmxMetricsFilterTest {
final Collection<JmxMetricsResultDTO> actual =
metricsFilter.filter(results);
- assertEquals(actual.size(), 2);
+ assertEquals(2, actual.size());
assertTrue(actual.containsAll(results));
}
@@ -103,7 +103,7 @@ class JmxMetricsFilterTest {
final Collection<JmxMetricsResultDTO> actual =
metricsFilter.filter(results);
- assertEquals(actual.size(), 2);
+ assertEquals(2, actual.size());
assertTrue(actual.containsAll(results));
}
@@ -131,7 +131,7 @@ class JmxMetricsFilterTest {
final Collection<JmxMetricsResultDTO> actual =
metricsFilter.filter(results);
- assertEquals(actual.size(), 1);
+ assertEquals(1, actual.size());
assertFalse(actual.contains(RESULT_ONE));
assertTrue(actual.contains(RESULT_TWO));
}
diff --git
a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/test/java/org/apache/nifi/registry/web/api/FlowsIT.java
b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/test/java/org/apache/nifi/registry/web/api/FlowsIT.java
index 4aab674aa45..4cec9f4c513 100644
---
a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/test/java/org/apache/nifi/registry/web/api/FlowsIT.java
+++
b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/test/java/org/apache/nifi/registry/web/api/FlowsIT.java
@@ -141,7 +141,7 @@ public class FlowsIT extends UnsecuredITBase {
assertNotNull(createdFlow.getIdentifier());
assertNotNull(createdFlow.getBucketName());
assertEquals(0, createdFlow.getVersionCount());
- assertEquals(createdFlow.getType(), BucketItemType.Flow);
+ assertEquals(BucketItemType.Flow, createdFlow.getType());
assertTrue(createdFlow.getCreatedTimestamp() - testStartTime > 0L); //
both server and client in same JVM, so there shouldn't be skew
assertEquals(createdFlow.getCreatedTimestamp(),
createdFlow.getModifiedTimestamp());
assertNotNull(createdFlow.getLink());
diff --git
a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/test/java/org/apache/nifi/registry/web/security/authentication/oidc/StandardOidcIdentityProviderTest.java
b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/test/java/org/apache/nifi/registry/web/security/authentication/oidc/StandardOidcIdentityProviderTest.java
index afb2b41f39a..7dec6b6eede 100644
---
a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/test/java/org/apache/nifi/registry/web/security/authentication/oidc/StandardOidcIdentityProviderTest.java
+++
b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/test/java/org/apache/nifi/registry/web/security/authentication/oidc/StandardOidcIdentityProviderTest.java
@@ -42,7 +42,7 @@ public class StandardOidcIdentityProviderTest {
Scope scope = provider.getScope();
// two additional scopes are set, two (openid, email) are hard-coded
- assertEquals(scope.toArray().length, 4);
+ assertEquals(4, scope.toArray().length);
assertTrue(scope.contains("openid"));
assertTrue(scope.contains("email"));
assertTrue(scope.contains(additionalScopeProfile));
@@ -59,7 +59,7 @@ public class StandardOidcIdentityProviderTest {
// three additional scopes are set but one is duplicated and mustn't
be returned; note that there is
// another one inserted in between the duplicated; two (openid, email)
are hard-coded
- assertEquals(scope.toArray().length, 4);
+ assertEquals(4, scope.toArray().length);
}
private StandardOidcIdentityProvider
createOidcProviderWithAdditionalScopes(String... additionalScopes) throws
IllegalAccessException {
