From dea5599c8677d363281208ff75f7f26034408e4c Mon Sep 17 00:00:00 2001 From: dan-s1 Date: Wed, 15 Jul 2026 18:45:40 +0000 Subject: [PATCH] NIFI-16119 Simplified assertions --- .../org/apache/nifi/record/path/TestRecordPath.java | 2 +- .../hadoop/inotify/TestEventTypeValidator.java | 3 ++- .../service/aws/AmazonMSKConnectionServiceTest.java | 4 ++-- .../nifi/processors/mongodb/gridfs/PutGridFSIT.java | 3 ++- .../apache/nifi/processors/smb/PutSmbFileTest.java | 3 ++- .../processors/snowflake/SnowflakeIngestIT.java | 3 ++- .../KubernetesConfigMapStateProviderTest.java | 3 ++- .../api/dto/DtoFactoryBulletinStackTraceTest.java | 3 ++- .../authorization/AuthorizingFlowContextTest.java | 6 +++--- .../flow/TestVersionedRemoteProcessGroup.java | 13 +++++++------ .../pg/ImportFlowWithIncompatibleBundleIT.java | 4 ++-- 11 files changed, 27 insertions(+), 20 deletions(-) diff --git a/nifi-commons/nifi-record-path/src/test/java/org/apache/nifi/record/path/TestRecordPath.java b/nifi-commons/nifi-record-path/src/test/java/org/apache/nifi/record/path/TestRecordPath.java index 072d29b83a7e..18a1d576ec86 100644 --- a/nifi-commons/nifi-record-path/src/test/java/org/apache/nifi/record/path/TestRecordPath.java +++ b/nifi-commons/nifi-record-path/src/test/java/org/apache/nifi/record/path/TestRecordPath.java @@ -2831,7 +2831,7 @@ public void supportsNumber() { @Test public void supportsNull() { final FieldValue fieldValue = evaluateSingleFieldValue("toNumber(/notAField)", record); - assertEquals(null, fieldValue.getValue()); + assertNull(fieldValue.getValue()); } @Test public void throwsExceptionOnUnsupportedType() { diff --git a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/inotify/TestEventTypeValidator.java b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/inotify/TestEventTypeValidator.java index 5730cdd31aa6..49f50e56195f 100644 --- a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/inotify/TestEventTypeValidator.java +++ b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/inotify/TestEventTypeValidator.java @@ -24,6 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; public class TestEventTypeValidator { @@ -43,7 +44,7 @@ public void nullInputShouldProperlyFail() { ValidationResult result = eventTypeValidator.validate(subject, input, context); assertEquals("subject", result.getSubject()); - assertEquals(null, result.getInput()); + assertNull(result.getInput()); assertEquals("Empty event types are not allowed.", result.getExplanation()); assertFalse(result.isValid()); } diff --git a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-aws/src/test/java/org/apache/nifi/kafka/service/aws/AmazonMSKConnectionServiceTest.java b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-aws/src/test/java/org/apache/nifi/kafka/service/aws/AmazonMSKConnectionServiceTest.java index e174c95719b4..bce7cdccc1fc 100644 --- a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-aws/src/test/java/org/apache/nifi/kafka/service/aws/AmazonMSKConnectionServiceTest.java +++ b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-aws/src/test/java/org/apache/nifi/kafka/service/aws/AmazonMSKConnectionServiceTest.java @@ -37,8 +37,8 @@ import java.util.Map; import java.util.Properties; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; class AmazonMSKConnectionServiceTest { @@ -114,7 +114,7 @@ void testWebIdentityWithTokenProviderAddsProperty() throws InitializationExcepti final Object provider = properties.get(AmazonMSKProperty.NIFI_AWS_MSK_CREDENTIALS_PROVIDER.getProperty()); assertNotNull(provider); - assertTrue(provider instanceof AwsCredentialsProvider); + assertInstanceOf(AwsCredentialsProvider.class, provider); } private static class MockOAuth2AccessTokenProvider extends AbstractControllerService implements OAuth2AccessTokenProvider { diff --git a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/gridfs/PutGridFSIT.java b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/gridfs/PutGridFSIT.java index 83c764206c09..ee65e9d64700 100644 --- a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/gridfs/PutGridFSIT.java +++ b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/gridfs/PutGridFSIT.java @@ -33,6 +33,7 @@ import java.util.HashMap; import java.util.Map; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; public class PutGridFSIT extends GridFSITTestBase { @@ -108,7 +109,7 @@ public void testNoUniqueness() { Document query = Document.parse(String.format("{\"filename\": \"%s\"}", fileName)); long count = files.countDocuments(query); - assertTrue(count == 10, "Wrong count"); + assertEquals(10, count, "Wrong count"); } @Test 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 2efdfd5e0a30..5c04b61add98 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 @@ -49,6 +49,7 @@ import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.anyInt; @@ -448,7 +449,7 @@ public void testTemporarySuffixIsSetRenameIsCalled() throws IOException { ); assertTrue(initialFilename.getValue().endsWith(suffix), "Suffix is not present and it should be"); - assertTrue(!finalFilename.getValue().endsWith(suffix), "Suffix is present and it shouldn't be"); + assertFalse(finalFilename.getValue().endsWith(suffix), "Suffix is present and it shouldn't be"); assertTrue(replace.getValue(), "Replace flag should be true"); } diff --git a/nifi-extension-bundles/nifi-snowflake-bundle/nifi-snowflake-processors/src/test/java/org/apache/nifi/processors/snowflake/SnowflakeIngestIT.java b/nifi-extension-bundles/nifi-snowflake-bundle/nifi-snowflake-processors/src/test/java/org/apache/nifi/processors/snowflake/SnowflakeIngestIT.java index c0408d7f6d58..bf64dc5959ac 100644 --- a/nifi-extension-bundles/nifi-snowflake-bundle/nifi-snowflake-processors/src/test/java/org/apache/nifi/processors/snowflake/SnowflakeIngestIT.java +++ b/nifi-extension-bundles/nifi-snowflake-bundle/nifi-snowflake-processors/src/test/java/org/apache/nifi/processors/snowflake/SnowflakeIngestIT.java @@ -56,6 +56,7 @@ import static org.apache.nifi.processors.snowflake.GetSnowflakeIngestStatus.REL_RETRY; import static org.apache.nifi.processors.snowflake.GetSnowflakeIngestStatus.REL_SUCCESS; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; import static org.junit.jupiter.api.Assumptions.assumeTrue; @@ -206,7 +207,7 @@ private void verifyTableContents() throws Exception { assertTrue(resultSet.next(), "Expected row in test table"); assertEquals(1, resultSet.getInt("ID")); assertEquals("foo", resultSet.getString("VALUE")); - assertTrue(!resultSet.next(), "Unexpected additional rows in test table"); + assertFalse(resultSet.next(), "Unexpected additional rows in test table"); } } diff --git a/nifi-framework-bundle/nifi-framework-extensions/nifi-framework-kubernetes-bundle/nifi-framework-kubernetes-state-provider/src/test/java/org/apache/nifi/kubernetes/state/provider/KubernetesConfigMapStateProviderTest.java b/nifi-framework-bundle/nifi-framework-extensions/nifi-framework-kubernetes-bundle/nifi-framework-kubernetes-state-provider/src/test/java/org/apache/nifi/kubernetes/state/provider/KubernetesConfigMapStateProviderTest.java index 3574a7898f6d..16a13cd87aea 100644 --- a/nifi-framework-bundle/nifi-framework-extensions/nifi-framework-kubernetes-bundle/nifi-framework-kubernetes-state-provider/src/test/java/org/apache/nifi/kubernetes/state/provider/KubernetesConfigMapStateProviderTest.java +++ b/nifi-framework-bundle/nifi-framework-extensions/nifi-framework-kubernetes-bundle/nifi-framework-kubernetes-state-provider/src/test/java/org/apache/nifi/kubernetes/state/provider/KubernetesConfigMapStateProviderTest.java @@ -56,6 +56,7 @@ import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -229,7 +230,7 @@ protected KubernetesClient getKubernetesClient() { final IOException exception = assertThrows(IOException.class, () -> provider.setState(state, COMPONENT_ID)); assertEquals(String.format("Failed to update state for Component with ID [%s]", COMPONENT_ID), exception.getMessage()); - assertTrue(exception.getCause() instanceof KubernetesClientException); + assertInstanceOf(KubernetesClientException.class, exception.getCause()); assertEquals(conflictException, exception.getCause()); verify(mockResource, atLeastOnce()).update(); diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/web/api/dto/DtoFactoryBulletinStackTraceTest.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/web/api/dto/DtoFactoryBulletinStackTraceTest.java index dc06fcd62c94..504b3971a22a 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/web/api/dto/DtoFactoryBulletinStackTraceTest.java +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/web/api/dto/DtoFactoryBulletinStackTraceTest.java @@ -26,6 +26,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; class DtoFactoryBulletinStackTraceTest { @@ -48,7 +49,7 @@ void testBulletinDtoDoesNotIncludeStackTraceByDefault() { final BulletinDTO dto = dtoFactory.createBulletinDto(bulletin, false); assertNotNull(dto); - assertEquals(null, dto.getStackTrace(), "DTO must not include stackTrace by default"); + assertNull(dto.getStackTrace(), "DTO must not include stackTrace by default"); } @Test diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/web/connector/authorization/AuthorizingFlowContextTest.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/web/connector/authorization/AuthorizingFlowContextTest.java index ddc4f277ba56..2a27bf9a5a4d 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/web/connector/authorization/AuthorizingFlowContextTest.java +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/web/connector/authorization/AuthorizingFlowContextTest.java @@ -42,9 +42,9 @@ import org.springframework.security.core.context.SecurityContext; import org.springframework.security.core.context.SecurityContextHolder; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.lenient; @@ -113,7 +113,7 @@ void testGetRootGroupAuthorizesReadAndReturnsWrappedFacade() { final ProcessGroupFacade result = authorizingFlowContext.getRootGroup(); assertNotNull(result); - assertTrue(result instanceof AuthorizingProcessGroupFacade); + assertInstanceOf(AuthorizingProcessGroupFacade.class, result); verify(connectorAuthorizable).authorize(any(Authorizer.class), any(RequestAction.class), any(NiFiUser.class)); } @@ -124,7 +124,7 @@ void testGetParameterContextAuthorizesReadAndReturnsWrappedFacade() { final ParameterContextFacade result = authorizingFlowContext.getParameterContext(); assertNotNull(result); - assertTrue(result instanceof AuthorizingParameterContextFacade); + assertInstanceOf(AuthorizingParameterContextFacade.class, result); verify(connectorAuthorizable).authorize(any(Authorizer.class), any(RequestAction.class), any(NiFiUser.class)); } diff --git a/nifi-registry/nifi-registry-core/nifi-registry-data-model/src/test/java/org/apache/nifi/registry/flow/TestVersionedRemoteProcessGroup.java b/nifi-registry/nifi-registry-core/nifi-registry-data-model/src/test/java/org/apache/nifi/registry/flow/TestVersionedRemoteProcessGroup.java index 5f7c00780d46..c2534410cc90 100644 --- a/nifi-registry/nifi-registry-core/nifi-registry-data-model/src/test/java/org/apache/nifi/registry/flow/TestVersionedRemoteProcessGroup.java +++ b/nifi-registry/nifi-registry-core/nifi-registry-data-model/src/test/java/org/apache/nifi/registry/flow/TestVersionedRemoteProcessGroup.java @@ -20,6 +20,7 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class TestVersionedRemoteProcessGroup { @@ -31,10 +32,10 @@ public void testGetTargetUriAndGetTargetUris() { /* targetUri is null, targetUris varies */ vRPG.setTargetUris(null); - assertEquals(null, vRPG.getTargetUris()); + assertNull(vRPG.getTargetUris()); vRPG.setTargetUris(""); - assertEquals(null, vRPG.getTargetUris()); + assertNull(vRPG.getTargetUris()); vRPG.setTargetUris("uri-2"); assertEquals("uri-2", vRPG.getTargetUris()); @@ -45,10 +46,10 @@ public void testGetTargetUriAndGetTargetUris() { /* targetUri is empty, targetUris varies */ vRPG.setTargetUris(null); - assertEquals(null, vRPG.getTargetUris()); + assertNull(vRPG.getTargetUris()); vRPG.setTargetUris(""); - assertEquals(null, vRPG.getTargetUris()); + assertNull(vRPG.getTargetUris()); vRPG.setTargetUris("uri-2"); assertEquals("uri-2", vRPG.getTargetUris()); @@ -59,10 +60,10 @@ public void testGetTargetUriAndGetTargetUris() { /* targetUri is set, targetUris varies */ vRPG.setTargetUris(null); - assertEquals(null, vRPG.getTargetUris()); + assertNull(vRPG.getTargetUris()); vRPG.setTargetUris(""); - assertEquals(null, vRPG.getTargetUris()); + assertNull(vRPG.getTargetUris()); vRPG.setTargetUris("uri-2"); assertEquals("uri-2", vRPG.getTargetUris()); diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/pg/ImportFlowWithIncompatibleBundleIT.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/pg/ImportFlowWithIncompatibleBundleIT.java index 0fdc0673aaf7..d925fc2a77c7 100644 --- a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/pg/ImportFlowWithIncompatibleBundleIT.java +++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/pg/ImportFlowWithIncompatibleBundleIT.java @@ -43,6 +43,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; /** @@ -104,8 +105,7 @@ public void testUploadFlowWithParameterProviderIncompatibleBundleVersion() throw final ParameterProviderDTO providerDto = createdProvider.getComponent(); assertNotNull(providerDto); assertNotNull(providerDto.getBundle(), "Bundle should not be null"); - assertFalse(INCOMPATIBLE_VERSION.equals(providerDto.getBundle().getVersion()), - "Bundle version should NOT be the incompatible version - should have fallen back to available version"); + assertNotEquals(INCOMPATIBLE_VERSION, providerDto.getBundle().getVersion(), "Bundle version should NOT be the incompatible version - should have fallen back to available version"); assertEquals(getNiFiVersion(), providerDto.getBundle().getVersion(), "Bundle version should be the NiFi framework version (fallback)"); assertFalse(providerDto.getType().startsWith("(Missing)"),