This is an automated email from the ASF dual-hosted git repository. mthomsen 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 0fa4490 NIFI-9842 Refactored nifi-commons using JUnit 5 0fa4490 is described below commit 0fa4490a9857f67427d21397f7292fdfeaeac77d Author: exceptionfactory <exceptionfact...@apache.org> AuthorDate: Mon Mar 28 11:44:13 2022 -0500 NIFI-9842 Refactored nifi-commons using JUnit 5 - Refactored nifi-bootstrap using JUnit 5 - Refactored nifi-maven-archetypes using JUnit 5 - Refactored nifi-stateless using JUnit 5 This closes #5912 Signed-off-by: Mike Thomsen <mthom...@apache.org> --- .../http/HttpNotificationServiceTest.java | 16 ++++---- .../bootstrap/util/TestSecureNiFiConfigUtil.java | 46 ++++++++++++---------- ...sSecretsManagerSensitivePropertyProviderIT.java | 25 ++++++------ ...zureKeyVaultKeySensitivePropertyProviderIT.java | 25 ++++++------ .../GcpKmsSensitivePropertyProviderIT.java | 25 ++++++------ .../nifi/security/krb/TestKerberosKeytabUser.java | 6 +-- .../security/krb/TestKerberosPasswordUser.java | 6 +-- .../security/krb/TestKerberosTicketCacheUser.java | 8 ++-- .../nifi/security/krb/TestKeytabConfiguration.java | 6 +-- .../stream/io/TestNonFlushableOutputStream.java | 2 +- .../filter/SanitizeContextPathFilterTest.groovy | 34 +--------------- .../apache/nifi/web/util/WebUtilsGroovyTest.groovy | 34 +++++++--------- .../org/apache/nifi/web/util/WebUtilsTest.java | 16 +++----- .../jaxb/TestJAXBExtensionManifestParser.java | 16 ++++---- .../nifi/runtime/manifest/TestRuntimeManifest.java | 10 ++--- .../nifi-__artifactBaseName__-processors/pom.xml | 9 ++++- .../src/test/java/MyProcessorTest.java | 6 +-- .../nifi-__artifactBaseName__/pom.xml | 9 ++++- .../src/test/java/TestStandardMyService.java | 6 +-- ...ropertiesFileEngineConfigurationParserTest.java | 2 +- .../engine/TestStandardStatelessEngine.java | 6 +-- .../TestStatelessFileSystemContentRepository.java | 2 +- 22 files changed, 148 insertions(+), 167 deletions(-) diff --git a/nifi-bootstrap/src/test/java/org/apache/nifi/bootstrap/http/HttpNotificationServiceTest.java b/nifi-bootstrap/src/test/java/org/apache/nifi/bootstrap/http/HttpNotificationServiceTest.java index 27cbd73..96575a9 100644 --- a/nifi-bootstrap/src/test/java/org/apache/nifi/bootstrap/http/HttpNotificationServiceTest.java +++ b/nifi-bootstrap/src/test/java/org/apache/nifi/bootstrap/http/HttpNotificationServiceTest.java @@ -31,9 +31,9 @@ import org.apache.nifi.components.PropertyValue; import org.apache.nifi.security.util.SslContextFactory; import org.apache.nifi.security.util.TemporaryKeyStoreBuilder; import org.apache.nifi.security.util.TlsConfiguration; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSocketFactory; @@ -56,9 +56,9 @@ import static org.apache.nifi.bootstrap.notification.http.HttpNotificationServic import static org.apache.nifi.bootstrap.notification.http.HttpNotificationService.PROP_TRUSTSTORE_TYPE; import static org.apache.nifi.bootstrap.notification.http.HttpNotificationService.NOTIFICATION_SUBJECT_KEY; import static org.apache.nifi.bootstrap.notification.http.HttpNotificationService.NOTIFICATION_TYPE_KEY; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThrows; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; public class HttpNotificationServiceTest { @@ -76,12 +76,12 @@ public class HttpNotificationServiceTest { private MockWebServer mockWebServer; - @Before + @BeforeEach public void startServer() { mockWebServer = new MockWebServer(); } - @After + @AfterEach public void shutdownServer() throws IOException { mockWebServer.shutdown(); } diff --git a/nifi-bootstrap/src/test/java/org/apache/nifi/bootstrap/util/TestSecureNiFiConfigUtil.java b/nifi-bootstrap/src/test/java/org/apache/nifi/bootstrap/util/TestSecureNiFiConfigUtil.java index 82cfdd3..65d62f4 100644 --- a/nifi-bootstrap/src/test/java/org/apache/nifi/bootstrap/util/TestSecureNiFiConfigUtil.java +++ b/nifi-bootstrap/src/test/java/org/apache/nifi/bootstrap/util/TestSecureNiFiConfigUtil.java @@ -25,10 +25,9 @@ import org.apache.nifi.util.NiFiProperties; import org.apache.nifi.util.StringUtils; import org.bouncycastle.asn1.x509.GeneralName; import org.bouncycastle.util.IPAddress; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -50,6 +49,11 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestSecureNiFiConfigUtil { public static final String TEST_RESOURCE_DIR = "src/test/resources/"; private final Logger logger = LoggerFactory.getLogger("org.apache.nifi.bootstrap.util.TestSecureNiFiConfigUtil"); @@ -86,7 +90,7 @@ public class TestSecureNiFiConfigUtil { return DigestUtils.sha256Hex(Files.readAllBytes(filepath)); } - @Before + @BeforeEach public void init() throws IOException { nifiPropertiesFile = Files.createTempFile(PROPERTIES_PREFIX, ".properties"); TlsConfiguration tlsConfig = new TemporaryKeyStoreBuilder().build(); @@ -94,7 +98,7 @@ public class TestSecureNiFiConfigUtil { Files.move(Paths.get(tlsConfig.getTruststorePath()), existingTruststorePath, StandardCopyOption.REPLACE_EXISTING); } - @After + @AfterEach public void cleanUp() throws IOException { deleteIfExists(nifiPropertiesFile); @@ -115,29 +119,29 @@ public class TestSecureNiFiConfigUtil { NiFiProperties niFiProperties = this.configureSecureNiFiProperties(testPropertiesFilePath); keystorePath = Paths.get(niFiProperties.getProperty(NiFiProperties.SECURITY_KEYSTORE)); - Assert.assertTrue(keystorePath.toFile().exists()); - Assert.assertFalse(niFiProperties.getProperty(NiFiProperties.SECURITY_KEYSTORE_PASSWD).isEmpty()); - Assert.assertEquals("PKCS12", niFiProperties.getProperty(NiFiProperties.SECURITY_KEYSTORE_TYPE)); + assertTrue(keystorePath.toFile().exists()); + assertFalse(niFiProperties.getProperty(NiFiProperties.SECURITY_KEYSTORE_PASSWD).isEmpty()); + assertEquals("PKCS12", niFiProperties.getProperty(NiFiProperties.SECURITY_KEYSTORE_TYPE)); char[] keyPassword = niFiProperties.getProperty(NiFiProperties.SECURITY_KEYSTORE_PASSWD).toCharArray(); KeyStore keyStore = KeyStoreUtils.loadKeyStore(keystorePath.toString(), niFiProperties.getProperty(NiFiProperties.SECURITY_KEYSTORE_PASSWD).toCharArray(), niFiProperties.getProperty(NiFiProperties.SECURITY_KEYSTORE_TYPE)); String alias = keyStore.aliases().nextElement(); - Assert.assertTrue(keyStore.isKeyEntry(alias)); + assertTrue(keyStore.isKeyEntry(alias)); Key key = keyStore.getKey(alias, keyPassword); - Assert.assertNotNull(key); + assertNotNull(key); truststorePath = Paths.get(niFiProperties.getProperty(NiFiProperties.SECURITY_TRUSTSTORE)); - Assert.assertTrue(truststorePath.toFile().exists()); - Assert.assertFalse(niFiProperties.getProperty(NiFiProperties.SECURITY_TRUSTSTORE_PASSWD).isEmpty()); - Assert.assertEquals("PKCS12", niFiProperties.getProperty(NiFiProperties.SECURITY_TRUSTSTORE_TYPE)); + assertTrue(truststorePath.toFile().exists()); + assertFalse(niFiProperties.getProperty(NiFiProperties.SECURITY_TRUSTSTORE_PASSWD).isEmpty()); + assertEquals("PKCS12", niFiProperties.getProperty(NiFiProperties.SECURITY_TRUSTSTORE_TYPE)); KeyStore trustStore = KeyStoreUtils.loadKeyStore(truststorePath.toString(), niFiProperties.getProperty(NiFiProperties.SECURITY_TRUSTSTORE_PASSWD).toCharArray(), niFiProperties.getProperty(NiFiProperties.SECURITY_TRUSTSTORE_TYPE)); String trustAlias = trustStore.aliases().nextElement(); - Assert.assertTrue(trustStore.isCertificateEntry(trustAlias)); + assertTrue(trustStore.isCertificateEntry(trustAlias)); Certificate certificate = trustStore.getCertificate(trustAlias); certificate.verify(certificate.getPublicKey()); @@ -147,14 +151,14 @@ public class TestSecureNiFiConfigUtil { for(List<?> list : sans) { String san = (String) list.get(1); if (IPAddress.isValid(san)) { - Assert.assertEquals(GeneralName.iPAddress, list.get(0)); + assertEquals(GeneralName.iPAddress, list.get(0)); } else { - Assert.assertEquals(GeneralName.dNSName, list.get(0)); + assertEquals(GeneralName.dNSName, list.get(0)); } foundSands.add((String) list.get(1)); } for(String expectedSAN : expectedSANs) { - Assert.assertTrue(foundSands.contains(expectedSAN)); + assertTrue(foundSands.contains(expectedSAN)); } } } @@ -170,11 +174,11 @@ public class TestSecureNiFiConfigUtil { keystorePath = Paths.get(niFiProperties.getProperty(NiFiProperties.SECURITY_KEYSTORE)); truststorePath = Paths.get(niFiProperties.getProperty(NiFiProperties.SECURITY_TRUSTSTORE)); - Assert.assertEquals(expectKeystoreToExist, Paths.get(niFiProperties.getProperty(NiFiProperties.SECURITY_KEYSTORE)).toFile().exists()); - Assert.assertEquals(expectTruststoreToExist, Paths.get(niFiProperties.getProperty(NiFiProperties.SECURITY_TRUSTSTORE)).toFile().exists()); + assertEquals(expectKeystoreToExist, Paths.get(niFiProperties.getProperty(NiFiProperties.SECURITY_KEYSTORE)).toFile().exists()); + assertEquals(expectTruststoreToExist, Paths.get(niFiProperties.getProperty(NiFiProperties.SECURITY_TRUSTSTORE)).toFile().exists()); // Show that nifi.properties was not updated - Assert.assertEquals(getFileHash(nifiPropertiesFile), getFileHash(testPropertiesFilePath)); + assertEquals(getFileHash(nifiPropertiesFile), getFileHash(testPropertiesFilePath)); } @Test diff --git a/nifi-commons/nifi-property-protection-aws/src/test/java/org/apache/nifi/properties/AwsSecretsManagerSensitivePropertyProviderIT.java b/nifi-commons/nifi-property-protection-aws/src/test/java/org/apache/nifi/properties/AwsSecretsManagerSensitivePropertyProviderIT.java index f60a80a..3a21561 100644 --- a/nifi-commons/nifi-property-protection-aws/src/test/java/org/apache/nifi/properties/AwsSecretsManagerSensitivePropertyProviderIT.java +++ b/nifi-commons/nifi-property-protection-aws/src/test/java/org/apache/nifi/properties/AwsSecretsManagerSensitivePropertyProviderIT.java @@ -17,10 +17,9 @@ package org.apache.nifi.properties; import org.apache.nifi.properties.configuration.AwsSecretsManagerClientProvider; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.mockito.internal.util.io.IOUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,6 +31,10 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.Properties; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + /** * To run this test, make sure to first configure sensitive credential information as in the following link * https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-files.html @@ -89,18 +92,18 @@ public class AwsSecretsManagerSensitivePropertyProviderIT { IOUtil.writeText(bootstrapConfText.toString(), mockAWSBootstrapConf.toFile()); } - @BeforeClass + @BeforeAll public static void initOnce() throws IOException { initializeBootstrapProperties(); - Assert.assertNotNull(props); + assertNotNull(props); final AwsSecretsManagerClientProvider provider = new AwsSecretsManagerClientProvider(); final Properties properties = provider.getClientProperties(props).orElse(null); final SecretsManagerClient secretsManagerClient = provider.getClient(properties).orElse(null); spp = new AwsSecretsManagerSensitivePropertyProvider(secretsManagerClient); - Assert.assertNotNull(spp); + assertNotNull(spp); } - @AfterClass + @AfterAll public static void tearDownOnce() throws IOException { Files.deleteIfExists(mockBootstrapConf); Files.deleteIfExists(mockAWSBootstrapConf); @@ -123,8 +126,8 @@ public class AwsSecretsManagerSensitivePropertyProviderIT { String unprotectedValue = spp.unprotect(protectedValue, ProtectedPropertyContext.defaultContext(propertyName)); logger.info("Unprotected Value: " + unprotectedValue); - Assert.assertEquals(SAMPLE_PLAINTEXT, unprotectedValue); - Assert.assertNotEquals(SAMPLE_PLAINTEXT, protectedValue); - Assert.assertNotEquals(protectedValue, unprotectedValue); + assertEquals(SAMPLE_PLAINTEXT, unprotectedValue); + assertNotEquals(SAMPLE_PLAINTEXT, protectedValue); + assertNotEquals(protectedValue, unprotectedValue); } } diff --git a/nifi-commons/nifi-property-protection-azure/src/test/java/org/apache/nifi/properties/AzureKeyVaultKeySensitivePropertyProviderIT.java b/nifi-commons/nifi-property-protection-azure/src/test/java/org/apache/nifi/properties/AzureKeyVaultKeySensitivePropertyProviderIT.java index 4d7bb56..bd2e7e7 100644 --- a/nifi-commons/nifi-property-protection-azure/src/test/java/org/apache/nifi/properties/AzureKeyVaultKeySensitivePropertyProviderIT.java +++ b/nifi-commons/nifi-property-protection-azure/src/test/java/org/apache/nifi/properties/AzureKeyVaultKeySensitivePropertyProviderIT.java @@ -18,10 +18,9 @@ package org.apache.nifi.properties; import com.azure.security.keyvault.keys.cryptography.CryptographyClient; import org.apache.nifi.properties.configuration.AzureCryptographyClientProvider; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.mockito.internal.util.io.IOUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,6 +31,10 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.Properties; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + /** * For the purposes of running this test, if you have a key, first make sure you have configured * credential information as in the following link @@ -92,18 +95,18 @@ public class AzureKeyVaultKeySensitivePropertyProviderIT { IOUtil.writeText(bootstrapConfText.toString(), mockAzureBootstrapConf.toFile()); } - @BeforeClass + @BeforeAll public static void initOnce() throws IOException { initializeBootstrapProperties(); - Assert.assertNotNull(props); + assertNotNull(props); final AzureCryptographyClientProvider provider = new AzureCryptographyClientProvider(); final Properties properties = provider.getClientProperties(props).orElse(null); final CryptographyClient cryptographyClient = provider.getClient(properties).orElse(null); spp = new AzureKeyVaultKeySensitivePropertyProvider(cryptographyClient, properties); - Assert.assertNotNull(spp); + assertNotNull(spp); } - @AfterClass + @AfterAll public static void tearDownOnce() throws IOException { Files.deleteIfExists(mockBootstrapConf); Files.deleteIfExists(mockAzureBootstrapConf); @@ -125,8 +128,8 @@ public class AzureKeyVaultKeySensitivePropertyProviderIT { String unprotectedValue = spp.unprotect(protectedValue, ProtectedPropertyContext.defaultContext("property")); logger.info("Unprotected Value: " + unprotectedValue); - Assert.assertEquals(SAMPLE_PLAINTEXT, unprotectedValue); - Assert.assertNotEquals(SAMPLE_PLAINTEXT, protectedValue); - Assert.assertNotEquals(protectedValue, unprotectedValue); + assertEquals(SAMPLE_PLAINTEXT, unprotectedValue); + assertNotEquals(SAMPLE_PLAINTEXT, protectedValue); + assertNotEquals(protectedValue, unprotectedValue); } } diff --git a/nifi-commons/nifi-property-protection-gcp/src/test/java/org/apache/nifi/properties/GcpKmsSensitivePropertyProviderIT.java b/nifi-commons/nifi-property-protection-gcp/src/test/java/org/apache/nifi/properties/GcpKmsSensitivePropertyProviderIT.java index 60c4d04..a448381 100644 --- a/nifi-commons/nifi-property-protection-gcp/src/test/java/org/apache/nifi/properties/GcpKmsSensitivePropertyProviderIT.java +++ b/nifi-commons/nifi-property-protection-gcp/src/test/java/org/apache/nifi/properties/GcpKmsSensitivePropertyProviderIT.java @@ -18,10 +18,9 @@ package org.apache.nifi.properties; import com.google.cloud.kms.v1.KeyManagementServiceClient; import org.apache.nifi.properties.configuration.GoogleKeyManagementServiceClientProvider; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.mockito.internal.util.io.IOUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,6 +31,10 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.Properties; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + /** * To run this test, make sure to first configure sensitive credential information as in the following link * https://cloud.google.com/kms/docs/reference/libraries#cloud-console @@ -91,18 +94,18 @@ public class GcpKmsSensitivePropertyProviderIT { IOUtil.writeText(bootstrapConfText.toString(), mockGCPBootstrapConf.toFile()); } - @BeforeClass + @BeforeAll public static void initOnce() throws IOException { initializeBootstrapProperties(); - Assert.assertNotNull(props); + assertNotNull(props); final GoogleKeyManagementServiceClientProvider provider = new GoogleKeyManagementServiceClientProvider(); final Properties clientProperties = provider.getClientProperties(props).orElse(null); final KeyManagementServiceClient client = provider.getClient(clientProperties).orElse(null); spp = new GcpKmsSensitivePropertyProvider(client, clientProperties); - Assert.assertNotNull(spp); + assertNotNull(spp); } - @AfterClass + @AfterAll public static void tearDownOnce() throws IOException { Files.deleteIfExists(mockBootstrapConf); Files.deleteIfExists(mockGCPBootstrapConf); @@ -124,8 +127,8 @@ public class GcpKmsSensitivePropertyProviderIT { String unprotectedValue = spp.unprotect(protectedValue, ProtectedPropertyContext.defaultContext("property")); logger.info("Unprotected Value: " + unprotectedValue); - Assert.assertEquals(SAMPLE_PLAINTEXT, unprotectedValue); - Assert.assertNotEquals(SAMPLE_PLAINTEXT, protectedValue); - Assert.assertNotEquals(protectedValue, unprotectedValue); + assertEquals(SAMPLE_PLAINTEXT, unprotectedValue); + assertNotEquals(SAMPLE_PLAINTEXT, protectedValue); + assertNotEquals(protectedValue, unprotectedValue); } } diff --git a/nifi-commons/nifi-security-kerberos/src/test/java/org/apache/nifi/security/krb/TestKerberosKeytabUser.java b/nifi-commons/nifi-security-kerberos/src/test/java/org/apache/nifi/security/krb/TestKerberosKeytabUser.java index 5d7c7ff..5e925ff 100644 --- a/nifi-commons/nifi-security-kerberos/src/test/java/org/apache/nifi/security/krb/TestKerberosKeytabUser.java +++ b/nifi-commons/nifi-security-kerberos/src/test/java/org/apache/nifi/security/krb/TestKerberosKeytabUser.java @@ -16,12 +16,12 @@ */ package org.apache.nifi.security.krb; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.security.auth.login.AppConfigurationEntry; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestKerberosKeytabUser { diff --git a/nifi-commons/nifi-security-kerberos/src/test/java/org/apache/nifi/security/krb/TestKerberosPasswordUser.java b/nifi-commons/nifi-security-kerberos/src/test/java/org/apache/nifi/security/krb/TestKerberosPasswordUser.java index 422adc2..da383e6 100644 --- a/nifi-commons/nifi-security-kerberos/src/test/java/org/apache/nifi/security/krb/TestKerberosPasswordUser.java +++ b/nifi-commons/nifi-security-kerberos/src/test/java/org/apache/nifi/security/krb/TestKerberosPasswordUser.java @@ -16,12 +16,12 @@ */ package org.apache.nifi.security.krb; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.security.auth.login.AppConfigurationEntry; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestKerberosPasswordUser { diff --git a/nifi-commons/nifi-security-kerberos/src/test/java/org/apache/nifi/security/krb/TestKerberosTicketCacheUser.java b/nifi-commons/nifi-security-kerberos/src/test/java/org/apache/nifi/security/krb/TestKerberosTicketCacheUser.java index 381a60b..fa81a57 100644 --- a/nifi-commons/nifi-security-kerberos/src/test/java/org/apache/nifi/security/krb/TestKerberosTicketCacheUser.java +++ b/nifi-commons/nifi-security-kerberos/src/test/java/org/apache/nifi/security/krb/TestKerberosTicketCacheUser.java @@ -16,13 +16,13 @@ */ package org.apache.nifi.security.krb; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.security.auth.login.AppConfigurationEntry; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class TestKerberosTicketCacheUser { diff --git a/nifi-commons/nifi-security-kerberos/src/test/java/org/apache/nifi/security/krb/TestKeytabConfiguration.java b/nifi-commons/nifi-security-kerberos/src/test/java/org/apache/nifi/security/krb/TestKeytabConfiguration.java index 663fa06..9d095bd 100644 --- a/nifi-commons/nifi-security-kerberos/src/test/java/org/apache/nifi/security/krb/TestKeytabConfiguration.java +++ b/nifi-commons/nifi-security-kerberos/src/test/java/org/apache/nifi/security/krb/TestKeytabConfiguration.java @@ -16,12 +16,12 @@ */ package org.apache.nifi.security.krb; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.security.auth.login.AppConfigurationEntry; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestKeytabConfiguration { diff --git a/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/stream/io/TestNonFlushableOutputStream.java b/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/stream/io/TestNonFlushableOutputStream.java index 563eb1b..7a266bc 100644 --- a/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/stream/io/TestNonFlushableOutputStream.java +++ b/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/stream/io/TestNonFlushableOutputStream.java @@ -17,7 +17,7 @@ package org.apache.nifi.stream.io; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import java.io.IOException; diff --git a/nifi-commons/nifi-web-utils/src/test/groovy/org/apache/nifi/web/filter/SanitizeContextPathFilterTest.groovy b/nifi-commons/nifi-web-utils/src/test/groovy/org/apache/nifi/web/filter/SanitizeContextPathFilterTest.groovy index 8727ade..b12e6d6 100644 --- a/nifi-commons/nifi-web-utils/src/test/groovy/org/apache/nifi/web/filter/SanitizeContextPathFilterTest.groovy +++ b/nifi-commons/nifi-web-utils/src/test/groovy/org/apache/nifi/web/filter/SanitizeContextPathFilterTest.groovy @@ -16,39 +16,13 @@ */ package org.apache.nifi.web.filter -import org.junit.After -import org.junit.Before -import org.junit.BeforeClass -import org.junit.Test -import org.junit.runner.RunWith -import org.junit.runners.JUnit4 -import org.slf4j.Logger -import org.slf4j.LoggerFactory +import org.junit.jupiter.api.Test import javax.servlet.FilterConfig import javax.servlet.ServletContext import javax.servlet.http.HttpServletRequest -@RunWith(JUnit4.class) -class SanitizeContextPathFilterTest extends GroovyTestCase { - private static final Logger logger = LoggerFactory.getLogger(SanitizeContextPathFilterTest.class) - - @BeforeClass - static void setUpOnce() throws Exception { - logger.metaClass.methodMissing = { String name, args -> - logger.info("[${name?.toUpperCase()}] ${(args as List).join(" ")}") - } - } - - @Before - void setUp() throws Exception { - - } - - @After - void tearDown() throws Exception { - - } +class SanitizeContextPathFilterTest { private static String getValue(String parameterName, Map<String, String> params = [:]) { params.containsKey(parameterName) ? params[parameterName] : "" @@ -69,7 +43,6 @@ class SanitizeContextPathFilterTest extends GroovyTestCase { // Act scpf.init(mockFilterConfig) - logger.info("Allowed context paths: ${scpf.getAllowedContextPaths()}") // Assert assert scpf.getAllowedContextPaths() == EXPECTED_ALLOWED_CONTEXT_PATHS @@ -89,7 +62,6 @@ class SanitizeContextPathFilterTest extends GroovyTestCase { // Act scpf.init(mockFilterConfig) - logger.info("Allowed context paths: ${scpf.getAllowedContextPaths()}") // Assert assert scpf.getAllowedContextPaths() == EXPECTED_ALLOWED_CONTEXT_PATHS @@ -131,13 +103,11 @@ class SanitizeContextPathFilterTest extends GroovyTestCase { getHeader : { String headerName -> getValue(headerName, HEADERS) }, setAttribute : { String attr, String value -> requestAttributes[attr] = value - logger.mock("Set request attribute ${attr} to ${value}") }, ] as HttpServletRequest SanitizeContextPathFilter scpf = new SanitizeContextPathFilter() scpf.init(mockFilterConfig) - logger.info("Allowed context paths: ${scpf.getAllowedContextPaths()}") // Act scpf.injectContextPathAttribute(mockRequest) diff --git a/nifi-commons/nifi-web-utils/src/test/groovy/org/apache/nifi/web/util/WebUtilsGroovyTest.groovy b/nifi-commons/nifi-web-utils/src/test/groovy/org/apache/nifi/web/util/WebUtilsGroovyTest.groovy index 7d7781e..4bc55a2 100644 --- a/nifi-commons/nifi-web-utils/src/test/groovy/org/apache/nifi/web/util/WebUtilsGroovyTest.groovy +++ b/nifi-commons/nifi-web-utils/src/test/groovy/org/apache/nifi/web/util/WebUtilsGroovyTest.groovy @@ -18,9 +18,7 @@ package org.apache.nifi.web.util import org.apache.http.conn.ssl.DefaultHostnameVerifier import org.glassfish.jersey.client.ClientConfig -import org.junit.Test -import org.junit.runner.RunWith -import org.junit.runners.JUnit4 +import org.junit.jupiter.api.Test import org.mockito.Mockito import sun.security.tools.keytool.CertAndKeyGen import sun.security.x509.X500Name @@ -33,8 +31,10 @@ import javax.ws.rs.client.Client import javax.ws.rs.core.UriBuilderException import java.security.cert.X509Certificate -@RunWith(JUnit4.class) -class WebUtilsGroovyTest extends GroovyTestCase { +import static org.junit.jupiter.api.Assertions.assertThrows +import static org.junit.jupiter.api.Assertions.assertTrue + +class WebUtilsGroovyTest { static final String PCP_HEADER = "X-ProxyContextPath" static final String FC_HEADER = "X-Forwarded-Context" static final String FP_HEADER = "X-Forwarded-Prefix" @@ -156,9 +156,7 @@ class WebUtilsGroovyTest extends GroovyTestCase { def invalidContextPaths = ["/other/path", "localhost", "/../trying/to/escape"] invalidContextPaths.each { String contextPath -> - shouldFail(UriBuilderException) { - WebUtils.verifyContextPath(Arrays.asList(ALLOWED_PATH), contextPath) - } + assertThrows(UriBuilderException.class, () -> WebUtils.verifyContextPath(Arrays.asList(ALLOWED_PATH), contextPath)) } } @@ -213,7 +211,7 @@ class WebUtilsGroovyTest extends GroovyTestCase { hostnameVerifier.verify(serverHostname, cert) } - @Test(expected = SSLPeerUnverifiedException) + @Test void testHostnameVerifierDomainLevelMismatch() { // Arrange final String EXPECTED_DN = "CN=*.nifi.apache.org,OU=Security,O=Apache,ST=CA,C=US" @@ -226,11 +224,10 @@ class WebUtilsGroovyTest extends GroovyTestCase { Client client = WebUtils.createClient(clientConfig, sslContext) DefaultHostnameVerifier hostnameVerifier = client.getHostnameVerifier() - // Verify - hostnameVerifier.verify(hostname, cert) + assertThrows(SSLPeerUnverifiedException.class, () -> hostnameVerifier.verify(hostname, cert)) } - @Test(expected = SSLPeerUnverifiedException) + @Test void testHostnameVerifierEmptyHostname() { // Arrange final String EXPECTED_DN = "CN=nifi.apache.org,OU=Security,O=Apache,ST=CA,C=US" @@ -243,11 +240,10 @@ class WebUtilsGroovyTest extends GroovyTestCase { Client client = WebUtils.createClient(clientConfig, sslContext) DefaultHostnameVerifier hostnameVerifier = client.getHostnameVerifier() - // Verify - hostnameVerifier.verify(hostname, cert) + assertThrows(SSLPeerUnverifiedException.class, () -> hostnameVerifier.verify(hostname, cert)) } - @Test(expected = SSLPeerUnverifiedException) + @Test void testHostnameVerifierDifferentSubdomain() { // Arrange final String EXPECTED_DN = "CN=nifi.apache.org,OU=Security,O=Apache,ST=CA,C=US" @@ -260,11 +256,10 @@ class WebUtilsGroovyTest extends GroovyTestCase { Client client = WebUtils.createClient(clientConfig, sslContext) DefaultHostnameVerifier hostnameVerifier = client.getHostnameVerifier() - // Verify - hostnameVerifier.verify(hostname, cert) + assertThrows(SSLPeerUnverifiedException.class, () -> hostnameVerifier.verify(hostname, cert)) } - @Test(expected = SSLPeerUnverifiedException) + @Test void testHostnameVerifierDifferentTLD() { // Arrange final String EXPECTED_DN = "CN=nifi.apache.org,OU=Security,O=Apache,ST=CA,C=US" @@ -277,8 +272,7 @@ class WebUtilsGroovyTest extends GroovyTestCase { Client client = WebUtils.createClient(clientConfig, sslContext) DefaultHostnameVerifier hostnameVerifier = client.getHostnameVerifier() - // Verify - hostnameVerifier.verify(hostname, cert) + assertThrows(SSLPeerUnverifiedException.class, () -> hostnameVerifier.verify(hostname, cert)) } @Test diff --git a/nifi-commons/nifi-web-utils/src/test/groovy/org/apache/nifi/web/util/WebUtilsTest.java b/nifi-commons/nifi-web-utils/src/test/groovy/org/apache/nifi/web/util/WebUtilsTest.java index 2df2632..5b35b20 100644 --- a/nifi-commons/nifi-web-utils/src/test/groovy/org/apache/nifi/web/util/WebUtilsTest.java +++ b/nifi-commons/nifi-web-utils/src/test/groovy/org/apache/nifi/web/util/WebUtilsTest.java @@ -16,26 +16,24 @@ */ package org.apache.nifi.web.util; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import javax.servlet.http.HttpServletRequest; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class WebUtilsTest { @Mock private HttpServletRequest request; - // -- scheme tests - @Test public void testDeterminedProxiedSchemeWhenNoHeaders() { when(request.getHeader(any())).thenReturn(null); @@ -55,8 +53,6 @@ public class WebUtilsTest { assertEquals("http", WebUtils.determineProxiedScheme(request)); } - // -- host tests - @Test public void testDetermineProxiedHostWhenNoHeaders() { when(request.getHeader(any())).thenReturn(null); @@ -88,8 +84,6 @@ public class WebUtilsTest { assertEquals("x-forwarded-host", WebUtils.determineProxiedHost(request)); } - // -- port tests - @Test public void testDetermineProxiedPortWhenNoHeaders() { when(request.getServerPort()).thenReturn(443); diff --git a/nifi-manifest/nifi-extension-manifest-parser/src/test/java/org/apache/nifi/extension/manifest/parser/jaxb/TestJAXBExtensionManifestParser.java b/nifi-manifest/nifi-extension-manifest-parser/src/test/java/org/apache/nifi/extension/manifest/parser/jaxb/TestJAXBExtensionManifestParser.java index c949ecc..f3796c1 100644 --- a/nifi-manifest/nifi-extension-manifest-parser/src/test/java/org/apache/nifi/extension/manifest/parser/jaxb/TestJAXBExtensionManifestParser.java +++ b/nifi-manifest/nifi-extension-manifest-parser/src/test/java/org/apache/nifi/extension/manifest/parser/jaxb/TestJAXBExtensionManifestParser.java @@ -30,25 +30,25 @@ import org.apache.nifi.extension.manifest.ResourceDefinition; import org.apache.nifi.extension.manifest.ResourceType; import org.apache.nifi.extension.manifest.Restriction; import org.apache.nifi.extension.manifest.parser.ExtensionManifestParser; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestJAXBExtensionManifestParser { private ExtensionManifestParser parser; - @Before + @BeforeEach public void setup() { parser = new JAXBExtensionManifestParser(); } diff --git a/nifi-manifest/nifi-runtime-manifest-test/src/test/java/org/apache/nifi/runtime/manifest/TestRuntimeManifest.java b/nifi-manifest/nifi-runtime-manifest-test/src/test/java/org/apache/nifi/runtime/manifest/TestRuntimeManifest.java index 657d0de..f3eb71d 100644 --- a/nifi-manifest/nifi-runtime-manifest-test/src/test/java/org/apache/nifi/runtime/manifest/TestRuntimeManifest.java +++ b/nifi-manifest/nifi-runtime-manifest-test/src/test/java/org/apache/nifi/runtime/manifest/TestRuntimeManifest.java @@ -32,7 +32,7 @@ import org.apache.nifi.c2.protocol.component.api.SchedulingDefaults; import org.apache.nifi.components.resource.ResourceCardinality; import org.apache.nifi.components.resource.ResourceType; import org.apache.nifi.scheduling.SchedulingStrategy; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.FileInputStream; import java.io.IOException; @@ -40,10 +40,10 @@ import java.io.InputStream; import java.util.List; import java.util.Map; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestRuntimeManifest { diff --git a/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-processors/pom.xml b/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-processors/pom.xml index 200b48d..7b90372 100644 --- a/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-processors/pom.xml +++ b/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-processors/pom.xml @@ -47,8 +47,13 @@ <scope>test</scope> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> <scope>test</scope> </dependency> </dependencies> diff --git a/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-processors/src/test/java/MyProcessorTest.java b/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-processors/src/test/java/MyProcessorTest.java index 2b709f8..68d92e3 100644 --- a/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-processors/src/test/java/MyProcessorTest.java +++ b/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-processors/src/test/java/MyProcessorTest.java @@ -18,15 +18,15 @@ package ${package}; import org.apache.nifi.util.TestRunner; import org.apache.nifi.util.TestRunners; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class MyProcessorTest { private TestRunner testRunner; - @Before + @BeforeEach public void init() { testRunner = TestRunners.newTestRunner(MyProcessor.class); } diff --git a/nifi-maven-archetypes/nifi-service-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__/pom.xml b/nifi-maven-archetypes/nifi-service-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__/pom.xml index 6ff837a..2d85b27 100644 --- a/nifi-maven-archetypes/nifi-service-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__/pom.xml +++ b/nifi-maven-archetypes/nifi-service-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__/pom.xml @@ -48,8 +48,13 @@ <scope>test</scope> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> <scope>test</scope> </dependency> </dependencies> diff --git a/nifi-maven-archetypes/nifi-service-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__/src/test/java/TestStandardMyService.java b/nifi-maven-archetypes/nifi-service-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__/src/test/java/TestStandardMyService.java index e7035f0..e8c0162 100644 --- a/nifi-maven-archetypes/nifi-service-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__/src/test/java/TestStandardMyService.java +++ b/nifi-maven-archetypes/nifi-service-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__/src/test/java/TestStandardMyService.java @@ -19,12 +19,12 @@ package ${package}; import org.apache.nifi.reporting.InitializationException; import org.apache.nifi.util.TestRunner; import org.apache.nifi.util.TestRunners; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class TestStandardMyService { - @Before + @BeforeEach public void init() { } diff --git a/nifi-stateless/nifi-stateless-api/src/test/java/org/apache/nifi/stateless/config/PropertiesFileEngineConfigurationParserTest.java b/nifi-stateless/nifi-stateless-api/src/test/java/org/apache/nifi/stateless/config/PropertiesFileEngineConfigurationParserTest.java index ffcce51..32be8dc 100644 --- a/nifi-stateless/nifi-stateless-api/src/test/java/org/apache/nifi/stateless/config/PropertiesFileEngineConfigurationParserTest.java +++ b/nifi-stateless/nifi-stateless-api/src/test/java/org/apache/nifi/stateless/config/PropertiesFileEngineConfigurationParserTest.java @@ -31,7 +31,7 @@ import java.nio.file.Path; import java.util.Collection; import java.util.Properties; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/test/java/org/apache/nifi/stateless/engine/TestStandardStatelessEngine.java b/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/test/java/org/apache/nifi/stateless/engine/TestStandardStatelessEngine.java index 1036574..c4ddb0e 100644 --- a/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/test/java/org/apache/nifi/stateless/engine/TestStandardStatelessEngine.java +++ b/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/test/java/org/apache/nifi/stateless/engine/TestStandardStatelessEngine.java @@ -16,12 +16,12 @@ */ package org.apache.nifi.stateless.engine; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.time.Duration; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class TestStandardStatelessEngine { diff --git a/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/test/java/org/apache/nifi/stateless/repository/TestStatelessFileSystemContentRepository.java b/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/test/java/org/apache/nifi/stateless/repository/TestStatelessFileSystemContentRepository.java index 3924809..3e7dfeb 100644 --- a/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/test/java/org/apache/nifi/stateless/repository/TestStatelessFileSystemContentRepository.java +++ b/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/test/java/org/apache/nifi/stateless/repository/TestStatelessFileSystemContentRepository.java @@ -35,7 +35,7 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.Arrays; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows;