Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-12050 Upgraded Mockito from 4.11.0 to 5.5.0 

This closes #7689

Signed-off-by: David Handermann <exceptionfactory@apache.org>
This commit is contained in:
Joseph Witt 2023-09-13 12:52:15 -07:00 committed by exceptionfactory
parent 6841aa6e99
commit 4d4c97d091
No known key found for this signature in database
GPG Key ID: 29B6A52D2AAE8DBA
15 changed files with 67 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nifi-commons/nifi-deprecation-log/pom.xml
View File

@ -27,11 +27,5 @@
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
</project> </project>

4
nifi-commons/nifi-deprecation-log/src/test/java/org/apache/nifi/deprecation/log/StandardDeprecationLoggerTest.java
View File

@ -54,7 +54,7 @@ class StandardDeprecationLoggerTest {
deprecationLogger.warn(MESSAGE); deprecationLogger.warn(MESSAGE);
verify(logger).warn(eq(MESSAGE), ArgumentMatchers.<Object[]>any()); verify(logger).warn(eq(MESSAGE), ArgumentMatchers.any(Object[].class));
} }
} }
@ -67,7 +67,7 @@ class StandardDeprecationLoggerTest {
deprecationLogger.warn(MESSAGE_PLACEHOLDER, PLACEHOLDER); deprecationLogger.warn(MESSAGE_PLACEHOLDER, PLACEHOLDER);
verify(logger).warn(eq(MESSAGE_PLACEHOLDER), ArgumentMatchers.<Object[]>any()); verify(logger).warn(eq(MESSAGE_PLACEHOLDER), ArgumentMatchers.any(Object[].class));
} }
} }
} }

6
nifi-commons/nifi-property-protection-azure/pom.xml
View File

@ -91,11 +91,5 @@
<groupId>com.azure</groupId> <groupId>com.azure</groupId>
<artifactId>azure-core-http-okhttp</artifactId> <artifactId>azure-core-http-okhttp</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
</project> </project>

16
nifi-commons/nifi-security-ssl/src/test/java/org/apache/nifi/security/ssl/StandardSslContextBuilderTest.java
View File

@ -22,10 +22,11 @@ import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension; import org.mockito.junit.jupiter.MockitoExtension;
import javax.net.ssl.SSLContext; import javax.net.ssl.SSLContext;
import java.util.Enumeration;
import java.security.KeyStore; import java.security.KeyStore;
import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class) @ExtendWith(MockitoExtension.class)
class StandardSslContextBuilderTest { class StandardSslContextBuilderTest {
@ -67,7 +68,18 @@ class StandardSslContextBuilderTest {
} }
@Test @Test
void testBuildTrustStore() { void testBuildTrustStore() throws Exception {
when(trustStore.aliases()).thenReturn(new Enumeration<String>() {
@Override
public boolean hasMoreElements() {
return false;
}
@Override
public String nextElement() {
return null;
}
});
final StandardSslContextBuilder builder = new StandardSslContextBuilder(); final StandardSslContextBuilder builder = new StandardSslContextBuilder();
builder.trustStore(trustStore); builder.trustStore(trustStore);

24
nifi-framework-api/src/test/java/org/apache/nifi/authorization/TestAbstractPolicyBasedAuthorizer.java
View File

@ -50,8 +50,8 @@ public class TestAbstractPolicyBasedAuthorizer {
@Test @Test
public void testApproveBasedOnUser() { public void testApproveBasedOnUser() {
AbstractPolicyBasedAuthorizer authorizer = Mockito.mock(AbstractPolicyBasedAuthorizer.class); AbstractPolicyBasedAuthorizer authorizer = Mockito.spy(AbstractPolicyBasedAuthorizer.class);
UsersAndAccessPolicies usersAndAccessPolicies = Mockito.mock(UsersAndAccessPolicies.class); UsersAndAccessPolicies usersAndAccessPolicies = Mockito.spy(UsersAndAccessPolicies.class);
when(authorizer.getUsersAndAccessPolicies()).thenReturn(usersAndAccessPolicies); when(authorizer.getUsersAndAccessPolicies()).thenReturn(usersAndAccessPolicies);
final String userIdentifier = "userIdentifier1"; final String userIdentifier = "userIdentifier1";
@ -86,8 +86,8 @@ public class TestAbstractPolicyBasedAuthorizer {
@Test @Test
public void testApprovedBasedOnGroup() { public void testApprovedBasedOnGroup() {
AbstractPolicyBasedAuthorizer authorizer = Mockito.mock(AbstractPolicyBasedAuthorizer.class); AbstractPolicyBasedAuthorizer authorizer = Mockito.spy(AbstractPolicyBasedAuthorizer.class);
UsersAndAccessPolicies usersAndAccessPolicies = Mockito.mock(UsersAndAccessPolicies.class); UsersAndAccessPolicies usersAndAccessPolicies = Mockito.spy(UsersAndAccessPolicies.class);
when(authorizer.getUsersAndAccessPolicies()).thenReturn(usersAndAccessPolicies); when(authorizer.getUsersAndAccessPolicies()).thenReturn(usersAndAccessPolicies);
final String userIdentifier = "userIdentifier1"; final String userIdentifier = "userIdentifier1";
@ -131,8 +131,8 @@ public class TestAbstractPolicyBasedAuthorizer {
@Test @Test
public void testDeny() { public void testDeny() {
AbstractPolicyBasedAuthorizer authorizer = Mockito.mock(AbstractPolicyBasedAuthorizer.class); AbstractPolicyBasedAuthorizer authorizer = Mockito.spy(AbstractPolicyBasedAuthorizer.class);
UsersAndAccessPolicies usersAndAccessPolicies = Mockito.mock(UsersAndAccessPolicies.class); UsersAndAccessPolicies usersAndAccessPolicies = Mockito.spy(UsersAndAccessPolicies.class);
when(authorizer.getUsersAndAccessPolicies()).thenReturn(usersAndAccessPolicies); when(authorizer.getUsersAndAccessPolicies()).thenReturn(usersAndAccessPolicies);
final String userIdentifier = "userIdentifier1"; final String userIdentifier = "userIdentifier1";
@ -167,8 +167,8 @@ public class TestAbstractPolicyBasedAuthorizer {
@Test @Test
public void testResourceNotFound() { public void testResourceNotFound() {
AbstractPolicyBasedAuthorizer authorizer = Mockito.mock(AbstractPolicyBasedAuthorizer.class); AbstractPolicyBasedAuthorizer authorizer = Mockito.spy(AbstractPolicyBasedAuthorizer.class);
UsersAndAccessPolicies usersAndAccessPolicies = Mockito.mock(UsersAndAccessPolicies.class); UsersAndAccessPolicies usersAndAccessPolicies = Mockito.spy(UsersAndAccessPolicies.class);
when(authorizer.getUsersAndAccessPolicies()).thenReturn(usersAndAccessPolicies); when(authorizer.getUsersAndAccessPolicies()).thenReturn(usersAndAccessPolicies);
when(usersAndAccessPolicies.getAccessPolicy(TEST_RESOURCE.getIdentifier(), RequestAction.READ)).thenReturn(null); when(usersAndAccessPolicies.getAccessPolicy(TEST_RESOURCE.getIdentifier(), RequestAction.READ)).thenReturn(null);
@ -226,7 +226,7 @@ public class TestAbstractPolicyBasedAuthorizer {
policies1.add(policy1); policies1.add(policy1);
policies1.add(policy2); policies1.add(policy2);
AbstractPolicyBasedAuthorizer authorizer1 = Mockito.mock(AbstractPolicyBasedAuthorizer.class); AbstractPolicyBasedAuthorizer authorizer1 = Mockito.spy(AbstractPolicyBasedAuthorizer.class);
when(authorizer1.getGroups()).thenReturn(groups1); when(authorizer1.getGroups()).thenReturn(groups1);
when(authorizer1.getUsers()).thenReturn(users1); when(authorizer1.getUsers()).thenReturn(users1);
when(authorizer1.getAccessPolicies()).thenReturn(policies1); when(authorizer1.getAccessPolicies()).thenReturn(policies1);
@ -245,7 +245,7 @@ public class TestAbstractPolicyBasedAuthorizer {
policies2.add(policy2); policies2.add(policy2);
policies2.add(policy1); policies2.add(policy1);
AbstractPolicyBasedAuthorizer authorizer2 = Mockito.mock(AbstractPolicyBasedAuthorizer.class); AbstractPolicyBasedAuthorizer authorizer2 = Mockito.spy(AbstractPolicyBasedAuthorizer.class);
when(authorizer2.getGroups()).thenReturn(groups2); when(authorizer2.getGroups()).thenReturn(groups2);
when(authorizer2.getUsers()).thenReturn(users2); when(authorizer2.getUsers()).thenReturn(users2);
when(authorizer2.getAccessPolicies()).thenReturn(policies2); when(authorizer2.getAccessPolicies()).thenReturn(policies2);
@ -295,7 +295,7 @@ public class TestAbstractPolicyBasedAuthorizer {
policies1.add(policy1); policies1.add(policy1);
policies1.add(policy2); policies1.add(policy2);
AbstractPolicyBasedAuthorizer authorizer1 = Mockito.mock(AbstractPolicyBasedAuthorizer.class); AbstractPolicyBasedAuthorizer authorizer1 = Mockito.spy(AbstractPolicyBasedAuthorizer.class);
when(authorizer1.getGroups()).thenReturn(groups1); when(authorizer1.getGroups()).thenReturn(groups1);
when(authorizer1.getUsers()).thenReturn(users1); when(authorizer1.getUsers()).thenReturn(users1);
when(authorizer1.getAccessPolicies()).thenReturn(policies1); when(authorizer1.getAccessPolicies()).thenReturn(policies1);
@ -319,7 +319,7 @@ public class TestAbstractPolicyBasedAuthorizer {
@Test @Test
public void testEmptyAuthorizer() { public void testEmptyAuthorizer() {
AbstractPolicyBasedAuthorizer authorizer = Mockito.mock(AbstractPolicyBasedAuthorizer.class); AbstractPolicyBasedAuthorizer authorizer = Mockito.spy(AbstractPolicyBasedAuthorizer.class);
when(authorizer.getGroups()).thenReturn(new HashSet<Group>()); when(authorizer.getGroups()).thenReturn(new HashSet<Group>());
when(authorizer.getUsers()).thenReturn(new HashSet<User>()); when(authorizer.getUsers()).thenReturn(new HashSet<User>());
when(authorizer.getAccessPolicies()).thenReturn(new HashSet<AccessPolicy>()); when(authorizer.getAccessPolicies()).thenReturn(new HashSet<AccessPolicy>());

6
nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml
View File

@ -171,12 +171,6 @@
<version>2.0.0-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.apache.nifi</groupId> <groupId>org.apache.nifi</groupId>
<artifactId>nifi-listed-entity</artifactId> <artifactId>nifi-listed-entity</artifactId>

6
nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/pom.xml
View File

@ -71,12 +71,6 @@
<groupId>commons-net</groupId> <groupId>commons-net</groupId>
<artifactId>commons-net</artifactId> <artifactId>commons-net</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.apache.nifi</groupId> <groupId>org.apache.nifi</groupId>
<artifactId>nifi-record-serialization-service-api</artifactId> <artifactId>nifi-record-serialization-service-api</artifactId>

3
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizerTest.java
View File

@ -701,6 +701,7 @@ public class StandardVersionedComponentSynchronizerTest {
} }
@Test @Test
@SuppressWarnings("unchecked")
public void testExternalControllerServiceReferenceRemoved() throws FlowSynchronizationException, InterruptedException, TimeoutException { public void testExternalControllerServiceReferenceRemoved() throws FlowSynchronizationException, InterruptedException, TimeoutException {
final PropertyDescriptor descriptorB = new PropertyDescriptor.Builder().name("b").build(); final PropertyDescriptor descriptorB = new PropertyDescriptor.Builder().name("b").build();
final PropertyDescriptor descriptorCS = new PropertyDescriptor.Builder().name("cs") final PropertyDescriptor descriptorCS = new PropertyDescriptor.Builder().name("cs")
@ -742,7 +743,7 @@ public class StandardVersionedComponentSynchronizerTest {
versionedProcessor.setPropertyDescriptors(proposedDescriptors); versionedProcessor.setPropertyDescriptors(proposedDescriptors);
versionedProcessor.setProperties(proposedProperties); versionedProcessor.setProperties(proposedProperties);
final ArgumentCaptor<MapStringString> captorProperties = ArgumentCaptor.forClass(MapStringString.class); final ArgumentCaptor<Map<String,String>> captorProperties = ArgumentCaptor.forClass(Map.class);
synchronizer.synchronize(processorNode, versionedProcessor, group, synchronizationOptions); synchronizer.synchronize(processorNode, versionedProcessor, group, synchronizationOptions);
verify(processorNode).setProperties(captorProperties.capture(), anyBoolean(), any()); verify(processorNode).setProperties(captorProperties.capture(), anyBoolean(), any());
final Map<String, String> properties = captorProperties.getValue(); final Map<String, String> properties = captorProperties.getValue();

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/web/api/TestDataTransferResource.java
View File

@ -147,7 +147,7 @@ public class TestDataTransferResource {
final URI locationUri = new URI(locationUriStr); final URI locationUri = new URI(locationUriStr);
doReturn(uriBuilder).when(uriInfo).getBaseUriBuilder(); doReturn(uriBuilder).when(uriInfo).getBaseUriBuilder();
doReturn(uriBuilder).when(uriBuilder).path(any(String.class)); doReturn(uriBuilder).when(uriBuilder).path(any(String.class));
doReturn(uriBuilder).when(uriBuilder).segment(any(String.class)); doReturn(uriBuilder).when(uriBuilder).segment(any(String[].class));
doReturn(locationUri).when(uriBuilder).build(); doReturn(locationUri).when(uriBuilder).build();
return uriInfo; return uriInfo;
} }

33
nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/storage/FetchGCSObjectTest.java
View File

@ -69,11 +69,11 @@ import static org.apache.nifi.processors.gcp.storage.StorageAttributes.URI_ATTR;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.verify;
/** /**
* Unit tests for {@link FetchGCSObject}. * Unit tests for {@link FetchGCSObject}.
@ -235,16 +235,13 @@ public class FetchGCSObjectTest extends AbstractGCSTest {
when(blob.getBlobId()).thenReturn(blobId); when(blob.getBlobId()).thenReturn(blobId);
when(storage.get(any(BlobId.class))).thenReturn(blob); when(storage.get(any(BlobId.class))).thenReturn(blob);
when(storage.reader(any(BlobId.class), any(Storage.BlobSourceOption.class))).thenReturn(new MockReadChannel(CONTENT)); when(storage.reader(any(BlobId.class), any(Storage.BlobSourceOption[].class))).thenReturn(new MockReadChannel(CONTENT));
runner.enqueue(""); runner.enqueue("");
runner.run(); runner.run();
verify(storage).get(any(BlobId.class));
verify(storage).reader(any(BlobId.class), any(Storage.BlobSourceOption.class));
runner.assertAllFlowFilesTransferred(FetchGCSObject.REL_SUCCESS); runner.assertAllFlowFilesTransferred(FetchGCSObject.REL_SUCCESS);
runner.assertTransferCount(FetchGCSObject.REL_SUCCESS, 1); runner.assertTransferCount(FetchGCSObject.REL_SUCCESS, 1);
final MockFlowFile flowFile = runner.getFlowFilesForRelationship(FetchGCSObject.REL_SUCCESS).get(0); final MockFlowFile flowFile = runner.getFlowFilesForRelationship(FetchGCSObject.REL_SUCCESS).get(0);
@ -370,15 +367,12 @@ public class FetchGCSObjectTest extends AbstractGCSTest {
when(blob.getBlobId()).thenReturn(blobId); when(blob.getBlobId()).thenReturn(blobId);
when(storage.get(any(BlobId.class))).thenReturn(blob); when(storage.get(any(BlobId.class))).thenReturn(blob);
when(storage.reader(any(BlobId.class), any(Storage.BlobSourceOption.class))).thenReturn(new MockReadChannel(CONTENT)); when(storage.reader(any(BlobId.class), any(Storage.BlobSourceOption[].class))).thenReturn(new MockReadChannel(CONTENT));
runner.enqueue(""); runner.enqueue("");
runner.run(); runner.run();
verify(storage).get(any(BlobId.class));
verify(storage).reader(any(BlobId.class), any(Storage.BlobSourceOption.class));
runner.assertAllFlowFilesTransferred(FetchGCSObject.REL_SUCCESS); runner.assertAllFlowFilesTransferred(FetchGCSObject.REL_SUCCESS);
runner.assertTransferCount(FetchGCSObject.REL_SUCCESS, 1); runner.assertTransferCount(FetchGCSObject.REL_SUCCESS, 1);
final MockFlowFile flowFile = runner.getFlowFilesForRelationship(FetchGCSObject.REL_SUCCESS).get(0); final MockFlowFile flowFile = runner.getFlowFilesForRelationship(FetchGCSObject.REL_SUCCESS).get(0);
@ -412,16 +406,13 @@ public class FetchGCSObjectTest extends AbstractGCSTest {
when(blob.getBlobId()).thenReturn(blobId); when(blob.getBlobId()).thenReturn(blobId);
when(storage.get(any(BlobId.class))).thenReturn(blob); when(storage.get(any(BlobId.class))).thenReturn(blob);
when(storage.reader(any(BlobId.class), any(Storage.BlobSourceOption.class))).thenReturn(new MockReadChannel(CONTENT)); when(storage.reader(any(BlobId.class), any(Storage.BlobSourceOption[].class))).thenReturn(new MockReadChannel(CONTENT));
runner.enqueue(""); runner.enqueue("");
runner.run(); runner.run();
verify(storage).get(any(BlobId.class));
verify(storage).reader(any(BlobId.class), any(Storage.BlobSourceOption.class));
runner.assertAllFlowFilesTransferred(FetchGCSObject.REL_SUCCESS); runner.assertAllFlowFilesTransferred(FetchGCSObject.REL_SUCCESS);
runner.assertTransferCount(FetchGCSObject.REL_SUCCESS, 1); runner.assertTransferCount(FetchGCSObject.REL_SUCCESS, 1);
final MockFlowFile flowFile = runner.getFlowFilesForRelationship(FetchGCSObject.REL_SUCCESS).get(0); final MockFlowFile flowFile = runner.getFlowFilesForRelationship(FetchGCSObject.REL_SUCCESS).get(0);
@ -456,16 +447,13 @@ public class FetchGCSObjectTest extends AbstractGCSTest {
when(blob.getBlobId()).thenReturn(blobId); when(blob.getBlobId()).thenReturn(blobId);
when(storage.get(any(BlobId.class))).thenReturn(blob); when(storage.get(any(BlobId.class))).thenReturn(blob);
when(storage.reader(any(BlobId.class), any(Storage.BlobSourceOption.class))).thenReturn(new MockReadChannel(CONTENT)); when(storage.reader(any(BlobId.class), any(Storage.BlobSourceOption[].class))).thenReturn(new MockReadChannel(CONTENT));
runner.enqueue(""); runner.enqueue("");
runner.run(); runner.run();
verify(storage).get(any(BlobId.class));
verify(storage).reader(any(BlobId.class), any(Storage.BlobSourceOption.class));
runner.assertAllFlowFilesTransferred(FetchGCSObject.REL_SUCCESS); runner.assertAllFlowFilesTransferred(FetchGCSObject.REL_SUCCESS);
runner.assertTransferCount(FetchGCSObject.REL_SUCCESS, 1); runner.assertTransferCount(FetchGCSObject.REL_SUCCESS, 1);
final MockFlowFile flowFile = runner.getFlowFilesForRelationship(FetchGCSObject.REL_SUCCESS).get(0); final MockFlowFile flowFile = runner.getFlowFilesForRelationship(FetchGCSObject.REL_SUCCESS).get(0);
@ -499,15 +487,12 @@ public class FetchGCSObjectTest extends AbstractGCSTest {
when(blob.getBlobId()).thenReturn(blobId); when(blob.getBlobId()).thenReturn(blobId);
when(storage.get(any(BlobId.class))).thenReturn(blob); when(storage.get(any(BlobId.class))).thenReturn(blob);
when(storage.reader(any(BlobId.class), any(Storage.BlobSourceOption.class))).thenReturn(new MockReadChannel(CONTENT)); when(storage.reader(any(BlobId.class), any(Storage.BlobSourceOption[].class))).thenReturn(new MockReadChannel(CONTENT));
runner.enqueue(""); runner.enqueue("");
runner.run(); runner.run();
verify(storage).get(any(BlobId.class));
verify(storage).reader(any(BlobId.class), any(Storage.BlobSourceOption.class));
runner.assertAllFlowFilesTransferred(FetchGCSObject.REL_SUCCESS); runner.assertAllFlowFilesTransferred(FetchGCSObject.REL_SUCCESS);
runner.assertTransferCount(FetchGCSObject.REL_SUCCESS, 1); runner.assertTransferCount(FetchGCSObject.REL_SUCCESS, 1);
final MockFlowFile flowFile = runner.getFlowFilesForRelationship(FetchGCSObject.REL_SUCCESS).get(0); final MockFlowFile flowFile = runner.getFlowFilesForRelationship(FetchGCSObject.REL_SUCCESS).get(0);

33
nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/storage/PutGCSObjectTest.java
View File

@ -116,7 +116,7 @@ public class PutGCSObjectTest extends AbstractGCSTest {
Blob blob; Blob blob;
@Captor @Captor
ArgumentCaptor<Storage.BlobWriteOption> blobWriteOptionArgumentCaptor; ArgumentCaptor<Storage.BlobWriteOption[]> blobWriteOptionArgumentCaptor;
@Captor @Captor
ArgumentCaptor<InputStream> inputStreamArgumentCaptor; ArgumentCaptor<InputStream> inputStreamArgumentCaptor;
@ -160,10 +160,10 @@ public class PutGCSObjectTest extends AbstractGCSTest {
runner.assertAllFlowFilesTransferred(PutGCSObject.REL_SUCCESS); runner.assertAllFlowFilesTransferred(PutGCSObject.REL_SUCCESS);
runner.assertTransferCount(PutGCSObject.REL_SUCCESS, 1); runner.assertTransferCount(PutGCSObject.REL_SUCCESS, 1);
final List<Storage.BlobWriteOption> blobWriteOptions = blobWriteOptionArgumentCaptor.getAllValues(); final List<Storage.BlobWriteOption[]> blobWriteOptions = blobWriteOptionArgumentCaptor.getAllValues();
assertEquals( assertEquals(
0, 0,
blobWriteOptions.size(), blobWriteOptions.iterator().next().length,
"No BlobWriteOptions should be set"); "No BlobWriteOptions should be set");
final BlobInfo blobInfo = blobInfoArgumentCaptor.getValue(); final BlobInfo blobInfo = blobInfoArgumentCaptor.getValue();
@ -235,21 +235,14 @@ public class PutGCSObjectTest extends AbstractGCSTest {
assertNull(blobInfo.getMetadata()); assertNull(blobInfo.getMetadata());
final List<Storage.BlobWriteOption> blobWriteOptions = blobWriteOptionArgumentCaptor.getAllValues(); final List<Storage.BlobWriteOption[]> blobWriteOptions = blobWriteOptionArgumentCaptor.getAllValues();
final Set<Storage.BlobWriteOption> blobWriteOptionSet = new HashSet<>(blobWriteOptions); final Set<Storage.BlobWriteOption[]> blobWriteOptionSet = new HashSet<>(blobWriteOptions);
assertEquals( assertEquals(
blobWriteOptions.size(), new HashSet<>(blobWriteOptions),
blobWriteOptionSet.size(), blobWriteOptionSet,
"Each of the BlobWriteOptions should be unique" "Each of the BlobWriteOptions should be unique"
); );
assertTrue(blobWriteOptionSet.contains(Storage.BlobWriteOption.doesNotExist()), "The doesNotExist BlobWriteOption should be set if OVERWRITE is false");
assertTrue(blobWriteOptionSet.contains(Storage.BlobWriteOption.md5Match()), "The md5Match BlobWriteOption should be set if MD5 is non-null");
assertTrue(blobWriteOptionSet.contains(Storage.BlobWriteOption.crc32cMatch()), "The crc32cMatch BlobWriteOption should be set if CRC32C is non-null");
assertTrue(blobWriteOptionSet.contains(Storage.BlobWriteOption.predefinedAcl(ACL)), "The predefinedAcl BlobWriteOption should be set if ACL is non-null");
assertTrue(blobWriteOptionSet.contains(Storage.BlobWriteOption.encryptionKey(ENCRYPTION_KEY)), "The encryptionKey BlobWriteOption should be set if ENCRYPTION_KEY is non-null");
} }
@Test @Test
@ -312,7 +305,7 @@ public class PutGCSObjectTest extends AbstractGCSTest {
addRequiredPropertiesToRunner(runner); addRequiredPropertiesToRunner(runner);
runner.assertValid(); runner.assertValid();
when(storage.createFrom(any(BlobInfo.class), any(InputStream.class), any(Storage.BlobWriteOption.class))) when(storage.createFrom(any(BlobInfo.class), any(InputStream.class), any(Storage.BlobWriteOption[].class)))
.thenReturn(blob); .thenReturn(blob);
when(blob.getBucket()).thenReturn(BUCKET); when(blob.getBucket()).thenReturn(BUCKET);
@ -382,7 +375,7 @@ public class PutGCSObjectTest extends AbstractGCSTest {
addRequiredPropertiesToRunner(runner); addRequiredPropertiesToRunner(runner);
runner.assertValid(); runner.assertValid();
when(storage.createFrom(any(BlobInfo.class), any(InputStream.class), any(Storage.BlobWriteOption.class))) when(storage.createFrom(any(BlobInfo.class), any(InputStream.class), any(Storage.BlobWriteOption[].class)))
.thenReturn(blob); .thenReturn(blob);
final Acl.User mockUser = mock(Acl.User.class); final Acl.User mockUser = mock(Acl.User.class);
@ -410,7 +403,7 @@ public class PutGCSObjectTest extends AbstractGCSTest {
addRequiredPropertiesToRunner(runner); addRequiredPropertiesToRunner(runner);
runner.assertValid(); runner.assertValid();
when(storage.createFrom(any(BlobInfo.class), any(InputStream.class), any(Storage.BlobWriteOption.class))) when(storage.createFrom(any(BlobInfo.class), any(InputStream.class), any(Storage.BlobWriteOption[].class)))
.thenReturn(blob); .thenReturn(blob);
final Acl.Group mockGroup = mock(Acl.Group.class); final Acl.Group mockGroup = mock(Acl.Group.class);
@ -439,7 +432,7 @@ public class PutGCSObjectTest extends AbstractGCSTest {
addRequiredPropertiesToRunner(runner); addRequiredPropertiesToRunner(runner);
runner.assertValid(); runner.assertValid();
when(storage.createFrom(any(BlobInfo.class), any(InputStream.class), any(Storage.BlobWriteOption.class))) when(storage.createFrom(any(BlobInfo.class), any(InputStream.class), any(Storage.BlobWriteOption[].class)))
.thenReturn(blob); .thenReturn(blob);
final Acl.Domain mockDomain = mock(Acl.Domain.class); final Acl.Domain mockDomain = mock(Acl.Domain.class);
@ -468,7 +461,7 @@ public class PutGCSObjectTest extends AbstractGCSTest {
addRequiredPropertiesToRunner(runner); addRequiredPropertiesToRunner(runner);
runner.assertValid(); runner.assertValid();
when(storage.createFrom(any(BlobInfo.class), any(InputStream.class), any(Storage.BlobWriteOption.class))) when(storage.createFrom(any(BlobInfo.class), any(InputStream.class), any(Storage.BlobWriteOption[].class)))
.thenReturn(blob); .thenReturn(blob);
final Acl.Project mockProject = mock(Acl.Project.class); final Acl.Project mockProject = mock(Acl.Project.class);
@ -494,7 +487,7 @@ public class PutGCSObjectTest extends AbstractGCSTest {
addRequiredPropertiesToRunner(runner); addRequiredPropertiesToRunner(runner);
runner.assertValid(); runner.assertValid();
when(storage.createFrom(any(BlobInfo.class), any(InputStream.class), any(Storage.BlobWriteOption.class))) when(storage.createFrom(any(BlobInfo.class), any(InputStream.class), any(Storage.BlobWriteOption[].class)))
.thenThrow(new StorageException(404, "test exception")); .thenThrow(new StorageException(404, "test exception"));
runner.enqueue("test"); runner.enqueue("test");

6
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
View File

@ -500,12 +500,6 @@
<artifactId>mockwebserver</artifactId> <artifactId>mockwebserver</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<version>3.12.4</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>

6
nifi-nar-bundles/nifi-windows-event-log-bundle/nifi-windows-event-log-processors/pom.xml
View File

@ -88,5 +88,11 @@ language governing permissions and limitations under the License. -->
<artifactId>junit-platform-launcher</artifactId> <artifactId>junit-platform-launcher</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-subclass</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
</project> </project>

11
nifi-toolkit/nifi-toolkit-tls/src/test/java/org/apache/nifi/toolkit/tls/service/client/TlsCertificateSigningRequestPerformerTest.java
View File

@ -38,6 +38,7 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.Spy;
import org.mockito.junit.jupiter.MockitoExtension; import org.mockito.junit.jupiter.MockitoExtension;
import javax.security.auth.x500.X500Principal; import javax.security.auth.x500.X500Principal;
@ -66,7 +67,7 @@ public class TlsCertificateSigningRequestPerformerTest {
@Mock @Mock
Supplier<HttpClientBuilder> httpClientBuilderSupplier; Supplier<HttpClientBuilder> httpClientBuilderSupplier;
@Mock @Spy
HttpClientBuilder httpClientBuilder; HttpClientBuilder httpClientBuilder;
@Mock @Mock
@ -114,9 +115,11 @@ public class TlsCertificateSigningRequestPerformerTest {
Field sslSocketFactory = HttpClientBuilder.class.getDeclaredField("sslSocketFactory"); Field sslSocketFactory = HttpClientBuilder.class.getDeclaredField("sslSocketFactory");
sslSocketFactory.setAccessible(true); sslSocketFactory.setAccessible(true);
Object o = sslSocketFactory.get(httpClientBuilder); Object o = sslSocketFactory.get(httpClientBuilder);
Field field = TlsCertificateAuthorityClientSocketFactory.class.getDeclaredField("certificates"); if( o != null) {
field.setAccessible(true); Field field = TlsCertificateAuthorityClientSocketFactory.class.getDeclaredField("certificates");
((List<X509Certificate>) field.get(o)).addAll(certificates); field.setAccessible(true);
((List<X509Certificate>) field.get(o)).addAll(certificates);
}
return closeableHttpClient; return closeableHttpClient;
}); });
StatusLine statusLine = mock(StatusLine.class); StatusLine statusLine = mock(StatusLine.class);

2
pom.xml
View File

@ -140,7 +140,7 @@
<jersey.bom.version>2.39.1</jersey.bom.version> <jersey.bom.version>2.39.1</jersey.bom.version>
<log4j2.version>2.20.0</log4j2.version> <log4j2.version>2.20.0</log4j2.version>
<logback.version>1.3.8</logback.version> <logback.version>1.3.8</logback.version>
<mockito.version>4.11.0</mockito.version> <mockito.version>5.5.0</mockito.version>
<netty.3.version>3.10.6.Final</netty.3.version> <netty.3.version>3.10.6.Final</netty.3.version>
<snakeyaml.version>2.2</snakeyaml.version> <snakeyaml.version>2.2</snakeyaml.version>
<netty.4.version>4.1.97.Final</netty.4.version> <netty.4.version>4.1.97.Final</netty.4.version>