NIFI-16119 Simplified assertions

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() {

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());
     }

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 {

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

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");
     }
 

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");
         }
     }
 

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();

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

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));
     }
 

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());

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)"),