Merge remote-tracking branch 'origin/master' into dev

bpm/bonita-core/bonita-contract-data/src/test/java/org/bonitasoft/engine/core/contract/data/ContractDataServiceImplTest.java

@@ -202,7 +202,7 @@ public void archiveUserTaskData_should_not_create_archive_data_if_no_data_define
 
         contractDataService.archiveAndDeleteUserTaskData(usertTaskId, time);
 
-        verifyZeroInteractions(archiveService);
+        verifyNoInteractions(archiveService);
     }
 
     @Test(expected = SObjectModificationException.class)
@@ -360,7 +360,7 @@ public void archiveProcessData_should_not_create_archive_data_if_no_data_defined
 
         contractDataService.archiveAndDeleteProcessData(usertProcessId, time);
 
-        verifyZeroInteractions(archiveService);
+        verifyNoInteractions(archiveService);
     }
 
     @Test(expected = SObjectModificationException.class)

bpm/bonita-core/bonita-form-mapping/src/test/java/org/bonitasoft/engine/core/form/impl/FormMappingServiceImplTest.java

@@ -103,7 +103,7 @@ public void createFormMappingWithUndefinedTargetShouldNotAddPageMapping() throws
 
         formMappingService.create(PROCESS_DEFINITION_ID, "someHumanTask", 84, SFormMapping.TARGET_UNDEFINED, null);
 
-        verifyZeroInteractions(pageMappingService);
+        verifyNoInteractions(pageMappingService);
     }
 
     @Test

bpm/bonita-core/bonita-home-server/src/test/java/org/bonitasoft/engine/home/BonitaHomeServerTest.java

@@ -15,6 +15,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.entry;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.verify;
 
@@ -40,7 +41,6 @@
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import org.junit.runner.RunWith;
-import org.mockito.ArgumentMatchers;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Spy;
@@ -103,20 +103,20 @@ private BonitaConfiguration conf(String file1, byte[] bytes) {
     }
 
     @Test
-    public void should_context_have_properties_overriden_with_database_properties() throws Exception {
+    public void should_context_have_properties_overridden_with_database_properties() throws Exception {
         //given
         Properties databaseProperties = new Properties();
         databaseProperties.setProperty("overriddenProperty", "databaseValue");
         databaseProperties.setProperty("databaseProperty", "aValueInDb");
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         databaseProperties.store(out, "");
-        doReturn(Collections.singletonList(new BonitaConfiguration("myProp.properties", out.toByteArray())))
+        doReturn(List.of(new BonitaConfiguration("myProp.properties", out.toByteArray())))
                 .when(configurationService).getPlatformEngineConf();
         Properties classPathProperties = new Properties();
         classPathProperties.setProperty("overriddenProperty", "classPathValue");
         classPathProperties.setProperty("classPathProperty", "aValueInClassPath");
         doReturn(classPathProperties).when(bonitaHomeServer)
-                .getPropertiesFromClassPath(ArgumentMatchers.<String> any());
+                .getPropertiesFromClassPath(any(String[].class));
         //when
         Properties allProperties = bonitaHomeServer.getPlatformProperties();
         //then

bpm/bonita-core/bonita-process-engine/src/test/java/org/bonitasoft/engine/api/impl/resolver/ParameterBusinessArchiveArtifactManagerTest.java

@@ -16,7 +16,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -95,7 +95,7 @@ public void should_resolve_process_if_no_defined_parameters_in_process() throws
 
         // then:
         assertThat(deployed).isTrue();
-        verifyZeroInteractions(parameterService);
+        verifyNoInteractions(parameterService);
     }
 
     @Test

bpm/bonita-core/bonita-process-engine/src/test/java/org/bonitasoft/engine/api/impl/transaction/expression/bdm/internal/EntityMergerTest.java

@@ -68,7 +68,7 @@ public void merge_a_collection_of_entity_should_not_call_merge_on_bdrService_for
     public void merge_a_simple_serializable_should_not_call_merge_on_bdrService() {
         final String hello = "Hello";
         assertThat(entityMerger.merge("Hello")).isEqualTo(hello);
-        verifyZeroInteractions(bdrService);
+        verifyNoInteractions(bdrService);
     }
 
     @Test
@@ -78,7 +78,7 @@ public void merge_a_collection_of_simple_serializable_should_not_call_merge_on_b
         listOfEntities.add("Goodbye");
         listOfEntities.add("Have a nice day");
         entityMerger.merge((Serializable) listOfEntities);
-        verifyZeroInteractions(bdrService);
+        verifyNoInteractions(bdrService);
     }
 
 }

bpm/bonita-core/bonita-process-engine/src/test/java/org/bonitasoft/engine/api/impl/transaction/process/DisableProcessTest.java

@@ -13,7 +13,7 @@
  **/
 package org.bonitasoft.engine.api.impl.transaction.process;
 
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 import java.util.ArrayList;
@@ -59,7 +59,7 @@ public void execute_should_not_clean_the_classLoader_due_to_its_use_for_running_
 
         disableProcess.execute();
 
-        verifyZeroInteractions(classLoaderService);
+        verifyNoInteractions(classLoaderService);
     }
 
 }

bpm/bonita-core/bonita-process-engine/src/test/java/org/bonitasoft/engine/bpm/contract/validation/ContractStructureValidatorTest.java

@@ -214,7 +214,7 @@ public void should_not_check_children_when_complex_input_is_null() throws Except
     public void should_not_check_type_validation_when_input_is_null() throws Exception {
         final SContractDefinition contract = aContract().withInput(aSimpleInput(TEXT).withName("someNullText")).build();
         validator.validate(contract, Collections.<String, Serializable> singletonMap("someNullText", null));
-        verifyZeroInteractions(typeValidator);
+        verifyNoInteractions(typeValidator);
     }
 
     @Test

bpm/bonita-core/bonita-process-engine/src/test/java/org/bonitasoft/engine/business/data/BusinessDataRetrieverTest.java

@@ -18,7 +18,7 @@
 import static org.bonitasoft.engine.business.data.DummyBusinessDataRefBuilder.buildSimpleRefBusinessData;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -79,8 +79,8 @@ public void getSimpleBusinessData_should_return_null_when_ref_business_data_does
 
         //then
         assertThat(retrievedEntity).isNull();
-        verifyZeroInteractions(repository);
-        verifyZeroInteractions(proxyfier);
+        verifyNoInteractions(repository);
+        verifyNoInteractions(proxyfier);
     }
 
     @Test
@@ -111,8 +111,8 @@ public void getMultiBusinessData_should_return_empty_list_when_multi_ref_data_do
 
         //then
         assertThat(retrievedEntities).isEmpty();
-        verifyZeroInteractions(repository);
-        verifyZeroInteractions(proxyfier);
+        verifyNoInteractions(repository);
+        verifyNoInteractions(proxyfier);
     }
 
     @Test
@@ -128,8 +128,8 @@ public void getMultiBusinessData_should_return_empty_Array_list_when_multi_ref_d
         retrievedEntities.add(new Employee());
         // no exceptions
 
-        verifyZeroInteractions(repository);
-        verifyZeroInteractions(proxyfier);
+        verifyNoInteractions(repository);
+        verifyNoInteractions(proxyfier);
     }
 
     @Test

bpm/bonita-core/bonita-process-engine/src/test/java/org/bonitasoft/engine/execution/WaitingEventsInterrupterTest.java

@@ -15,7 +15,7 @@
 
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 
 import java.util.Optional;
 
@@ -86,8 +86,8 @@ public void should_not_delete_timer_and_event_trigger_when_catch_is_not_a_timer(
 
         waitingEventsInterrupter.interruptWaitingEvents(processDefinition, catchEventInstance, catchEventDefinition);
 
-        verifyZeroInteractions(eventInstanceService);
-        verifyZeroInteractions(schedulerService);
+        verifyNoInteractions(eventInstanceService);
+        verifyNoInteractions(schedulerService);
     }
 
 }

bpm/bonita-core/bonita-process-engine/src/test/java/org/bonitasoft/engine/execution/transition/TransitionConditionEvaluatorTest.java

@@ -17,7 +17,7 @@
 import static org.assertj.core.api.Assertions.fail;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 
 import java.util.Collections;
 
@@ -71,7 +71,7 @@ public void evaluateCondition_should_return_null_when_there_is_no_condition() th
         //then
         assertThat(value).isNull();
 
-        verifyZeroInteractions(expressionResolverService);
+        verifyNoInteractions(expressionResolverService);
     }
 
     @Test
@@ -94,7 +94,7 @@ public void evaluateCondition_should_throw_SExpressionEvaluationException_when_e
                     .isEqualTo("Condition expression must return a boolean, on transition: " + transition.getName());
             assertThat(e.getExpressionName()).isEqualTo("isTrue");
 
-            verifyZeroInteractions(expressionResolverService);
+            verifyNoInteractions(expressionResolverService);
         }
 
     }

bpm/bonita-core/bonita-process-engine/src/test/java/org/bonitasoft/engine/expression/BusinessDataExpressionExecutorStrategyTest.java

@@ -27,7 +27,7 @@
 import static org.mockito.Mockito.nullable;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 import java.util.Arrays;
@@ -233,8 +233,8 @@ public void evaluate_should_first_check_if_expression_already_evaluated_and_avai
                 context, null, ContainerState.ACTIVE);
 
         assertThat(fetchedBizData).isEqualTo(expectedBizData);
-        verifyZeroInteractions(businessDataRetriever);
-        verifyZeroInteractions(refBusinessDataRetriever);
+        verifyNoInteractions(businessDataRetriever);
+        verifyNoInteractions(refBusinessDataRetriever);
     }
 
     @Test

bpm/bonita-core/bonita-process-engine/src/test/java/org/bonitasoft/engine/expression/DocumentListReferenceExpressionExecutorStrategyTest.java

@@ -80,7 +80,7 @@ public void evaluate_result_should_retrieve_documents_list_when_it_is_not_alread
 
         //then:
         assertThat(result).hasSize(1).containsOnly(expectedDocumentList);
-        verifyZeroInteractions(activityInstanceService);
+        verifyNoInteractions(activityInstanceService);
     }
 
     @Test
@@ -100,7 +100,7 @@ public void evaluate_should_directly_return_the_documents_list_when_it_is_alread
 
         //then:
         assertThat(result).isSameAs(documentListInContext);
-        verifyZeroInteractions(documentService);
+        verifyNoInteractions(documentService);
     }
 
     // =================================================================================================================

bpm/bonita-core/bonita-process-engine/src/test/java/org/bonitasoft/engine/expression/DocumentReferenceExpressionExecutorStrategyTest.java

@@ -174,7 +174,7 @@ public void evaluate_should_directly_return_the_document_when_it_is_already_in_t
 
         //then:
         assertThat(result).isSameAs(docInContext);
-        verifyZeroInteractions(documentService);
+        verifyNoInteractions(documentService);
     }
 
     @Test

bpm/bonita-core/bonita-process-engine/src/test/java/org/bonitasoft/engine/platform/PlatformManagerTest.java

@@ -123,8 +123,8 @@ public void should_start_platform_only_once() throws Exception {
 
         boolean started = platformManager.start();
 
-        verifyZeroInteractions(platformLifecycleService1);
-        verifyZeroInteractions(platformLifecycleService2);
+        verifyNoInteractions(platformLifecycleService1);
+        verifyNoInteractions(platformLifecycleService2);
         verify(platformStateProvider, never()).setStarted();
         assertThat(started).isFalse();
     }
@@ -147,8 +147,8 @@ public void should_stop_platform_only_once() throws Exception {
 
         boolean stopped = platformManager.stop();
 
-        verifyZeroInteractions(platformLifecycleService1);
-        verifyZeroInteractions(platformLifecycleService2);
+        verifyNoInteractions(platformLifecycleService1);
+        verifyNoInteractions(platformLifecycleService2);
         verify(platformStateProvider, never()).setStopped();
         assertThat(stopped).isFalse();
     }