Merge remote-tracking branch 'origin/release-10.2.0' into dev

bonitasoft · Oct 2, 2024 · 86c1c19 · 86c1c19
2 parents 146bcda + 2320bdc
commit 86c1c19
Show file tree

Hide file tree

Showing 104 changed files with 384 additions and 5,394 deletions.
diff --git a/bonita-engine-spring-boot-starter/build.gradle b/bonita-engine-spring-boot-starter/build.gradle
@@ -19,7 +19,6 @@ dependencies {
     annotationProcessor(libs.springBootConfigurationProcessor)
 
     testImplementation(libs.springBootTest)
-    testImplementation("junit:junit:${Deps.junit4Version}")
     testImplementation("org.assertj:assertj-core:${Deps.assertjVersion}")
 }
 

diff --git a/bonita-engine-standalone/build.gradle b/bonita-engine-standalone/build.gradle
@@ -22,7 +22,6 @@ dependencies {
     compileOnly libs.lombok
 
     testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}"
-    testImplementation "junit:junit:${Deps.junit4Version}"
     testImplementation "com.github.stefanbirkner:system-rules:${Deps.systemRulesVersion}"
 
     // These 3 drivers are used for some specific tests:

diff --git a/bonita-integration-tests/benchmarks/build.gradle b/bonita-integration-tests/benchmarks/build.gradle
@@ -3,7 +3,6 @@ plugins {
 }
 
 dependencies {
-    api "junit:junit:${Deps.junit4Version}"
     api "org.assertj:assertj-core:${Deps.assertjVersion}"
     api "org.mockito:mockito-core:${Deps.mockitoVersion}"
     api project(':bonita-integration-tests:bonita-integration-tests-client')

diff --git a/bonita-integration-tests/bonita-integration-tests-client/build.gradle b/bonita-integration-tests/bonita-integration-tests-client/build.gradle
@@ -5,7 +5,6 @@ plugins {
 }
 dependencies {
     api project(':bonita-test-api')
-    api "junit:junit:${Deps.junit4Version}"
     api libs.commonsIO
     api project(':bpm:bonita-common')
     api project(':bpm:bonita-client')

diff --git a/.../bonita-integration-tests-client/src/test/java/org/bonitasoft/engine/identity/UserIT.java b/.../bonita-integration-tests-client/src/test/java/org/bonitasoft/engine/identity/UserIT.java
@@ -27,16 +27,20 @@
 import org.bonitasoft.engine.api.PlatformAPI;
 import org.bonitasoft.engine.api.PlatformAPIAccessor;
 import org.bonitasoft.engine.api.TenantAPIAccessor;
-import org.bonitasoft.engine.exception.*;
+import org.bonitasoft.engine.exception.AlreadyExistsException;
+import org.bonitasoft.engine.exception.BonitaException;
+import org.bonitasoft.engine.exception.CreationException;
+import org.bonitasoft.engine.exception.DeletionException;
+import org.bonitasoft.engine.exception.NotFoundException;
+import org.bonitasoft.engine.exception.SearchException;
+import org.bonitasoft.engine.exception.UpdateException;
 import org.bonitasoft.engine.identity.impl.IconImpl;
 import org.bonitasoft.engine.platform.LoginException;
 import org.bonitasoft.engine.platform.NodeNotStartedException;
 import org.bonitasoft.engine.search.Order;
 import org.bonitasoft.engine.search.SearchOptionsBuilder;
 import org.bonitasoft.engine.search.SearchResult;
 import org.bonitasoft.engine.session.PlatformSession;
-import org.bonitasoft.platform.setup.PlatformSetup;
-import org.junit.Assume;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -734,8 +738,6 @@ public void searchUserSortedById() throws BonitaException {
      */
     @Test
     public void should_search_user_case_insensitively() throws BonitaException {
-        Assume.assumeTrue("Search is case sensitive on our docker oracle",
-                !PlatformSetup.getPropertyBonitaBdmDbVendor().equals("oracle"));
         List<User> users = asList(
                 getIdentityAPI().createUser("Jean_Michel", "bpm", "Jean Michel", "Jarre"),
                 getIdentityAPI().createUser("michel.mimi", "bpm", "Michel", "Mimi"));

diff --git a/...egration-tests-client/src/test/java/org/bonitasoft/engine/profile/ProfileCommunityIT.java b/...egration-tests-client/src/test/java/org/bonitasoft/engine/profile/ProfileCommunityIT.java
@@ -0,0 +1,40 @@
+/**
+ * Copyright (C) 2024 Bonitasoft S.A.
+ * Bonitasoft, 32 rue Gustave Eiffel - 38000 Grenoble
+ * This library is free software; you can redistribute it and/or modify it under the terms
+ * of the GNU Lesser General Public License as published by the Free Software Foundation
+ * version 2.1 of the License.
+ * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License along with this
+ * program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+ * Floor, Boston, MA 02110-1301, USA.
+ **/
+package org.bonitasoft.engine.profile;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.bonitasoft.engine.exception.BonitaException;
+import org.bonitasoft.engine.search.Order;
+import org.bonitasoft.engine.search.SearchOptionsBuilder;
+import org.bonitasoft.engine.search.SearchResult;
+import org.junit.Test;
+
+/**
+ * Specific tests for the community edition on the profile API
+ */
+public class ProfileCommunityIT extends AbstractProfileIT {
+
+    @Test
+    public void searchProfile() throws BonitaException {
+        final SearchOptionsBuilder builder = new SearchOptionsBuilder(0, 10);
+        builder.sort(ProfileSearchDescriptor.NAME, Order.DESC);
+
+        final SearchResult<Profile> searchedProfiles = getProfileAPI().searchProfiles(builder.done());
+        assertThat(searchedProfiles.getCount()).isEqualTo(2);
+        assertThat(searchedProfiles.getResult().get(0).getName()).isEqualTo("User");
+        assertThat(searchedProfiles.getResult().get(1).getName()).isEqualTo("Administrator");
+    }
+
+}
diff --git a/...onita-integration-tests-client/src/test/java/org/bonitasoft/engine/profile/ProfileIT.java b/...onita-integration-tests-client/src/test/java/org/bonitasoft/engine/profile/ProfileIT.java
@@ -26,7 +26,6 @@
 import org.bonitasoft.engine.search.Order;
 import org.bonitasoft.engine.search.SearchOptionsBuilder;
 import org.bonitasoft.engine.search.SearchResult;
-import org.junit.Assume;
 import org.junit.Test;
 
 /**
@@ -60,17 +59,6 @@ private List<String> getProfilesFromSession(User user, String password) throws L
         return profiles;
     }
 
-    @Test
-    public void searchProfile() throws BonitaException {
-        Assume.assumeTrue("Community only", isCommunityEdition());
-        final SearchOptionsBuilder builder = new SearchOptionsBuilder(0, 10);
-        builder.sort(ProfileSearchDescriptor.NAME, Order.DESC);
-
-        final SearchResult<Profile> searchedProfiles = getProfileAPI().searchProfiles(builder.done());
-        assertThat(searchedProfiles.getCount()).isEqualTo(2);
-        assertEquals("User", searchedProfiles.getResult().get(0).getName());
-    }
-
     @Test
     public void searchProfileWithSearchTerm() throws BonitaException {
         final SearchOptionsBuilder builder = new SearchOptionsBuilder(0, 10);

diff --git a/bonita-integration-tests/bonita-integration-tests-local/build.gradle b/bonita-integration-tests/bonita-integration-tests-local/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id("bonita-tests")
 }
 dependencies {
-    api "junit:junit:${Deps.junit4Version}"
     api "org.assertj:assertj-core:${Deps.assertjVersion}"
     api "org.mockito:mockito-core:${Deps.mockitoVersion}"
     api project(':bonita-integration-tests:bonita-integration-tests-client')

diff --git a/bonita-integration-tests/bonita-integration-tests-web/build.gradle b/bonita-integration-tests/bonita-integration-tests-web/build.gradle
@@ -12,6 +12,7 @@ dependencies {
     implementation libs.slf4jApi
     implementation libs.commonsIO
     implementation libs.jakartaServletApi
+    implementation libs.junit4
     implementation libs.springTest
     testImplementation "org.hamcrest:hamcrest:${Deps.hamcrestVersion}"
     testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}"

diff --git a/bonita-integration-tests/bonita-query-tests/build.gradle b/bonita-integration-tests/bonita-query-tests/build.gradle
@@ -1,9 +1,8 @@
 plugins { id 'bonita-docker-database' }
 
 dependencies {
-    testAnnotationProcessor(libs.lombok)
-    testImplementation(libs.lombok)
-    testImplementation "junit:junit:${Deps.junit4Version}"
+    testAnnotationProcessor libs.lombok
+    testImplementation libs.lombok
     testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}"
     testImplementation libs.h2
     testImplementation libs.springBeans
@@ -18,4 +17,4 @@ dependencies {
     testRuntimeOnly libs.tomcatDbcp
 }
 
-databaseIntegrationTest { include "**/*Test.class" }
+databaseIntegrationTest { include "**/*Test.class" }
diff --git a/bonita-integration-tests/bonita-test-utils/build.gradle b/bonita-integration-tests/bonita-test-utils/build.gradle
@@ -2,12 +2,12 @@ dependencies {
     api project(':bpm:bonita-client')
     api project(':bpm:bonita-common')
     api project(':bonita-test-api')
-    api "junit:junit:${Deps.junit4Version}"
     api libs.commonsIO
     api "xmlunit:xmlunit:${Deps.xmlunitVersion}"
     api "org.assertj:assertj-core:${Deps.assertjVersion}"
 
     implementation project(':bpm:bonita-core:bonita-process-engine')
+    implementation libs.junit4
     implementation libs.springTest
 }
 

diff --git a/...gration-tests/bonita-test-utils/src/main/java/org/bonitasoft/engine/test/APITestUtil.java b/...gration-tests/bonita-test-utils/src/main/java/org/bonitasoft/engine/test/APITestUtil.java
@@ -122,7 +122,6 @@
 import org.bonitasoft.engine.operation.Operation;
 import org.bonitasoft.engine.page.Page;
 import org.bonitasoft.engine.page.PageSearchDescriptor;
-import org.bonitasoft.engine.platform.PlatformNotFoundException;
 import org.bonitasoft.engine.search.Order;
 import org.bonitasoft.engine.search.SearchOptionsBuilder;
 import org.bonitasoft.engine.search.SearchResult;
@@ -1862,11 +1861,4 @@ private boolean isADefaultMethod(final Method method) {
         return DEFAULT_METHODS.contains(method.getName());
     }
 
-    protected boolean isCommunityEdition() {
-        try {
-            return "community".equalsIgnoreCase(getPlatformInformationAPI().getPlatformInformation().get("edition"));
-        } catch (PlatformNotFoundException e) {
-            throw new RuntimeException(e);
-        }
-    }
 }
diff --git a/bonita-test-api/build.gradle b/bonita-test-api/build.gradle
@@ -1,7 +1,7 @@
 dependencies {
     api libs.commonsIO
     api project(':bonita-engine-standalone')
-    api "junit:junit:${Deps.junit4Version}"
+    api libs.junit4
     api(project(':platform:platform-resources'))
 
     implementation libs.springTest

diff --git a/bpm/bonita-api/bonita-server-api-http/build.gradle b/bpm/bonita-api/bonita-server-api-http/build.gradle
@@ -8,10 +8,6 @@ dependencies {
     api libs.commonsFileUpload
     api libs.commonsIO
     testImplementation libs.springTest
-    testImplementation libs.junit5api
-    testRuntimeOnly libs.junitJupiterEngine
-    testImplementation libs.junit4
-    testRuntimeOnly libs.junitVintageEngine
     testImplementation "org.mockito:mockito-junit-jupiter:${Deps.mockitoVersion}"
     testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}"
     testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}"
@@ -20,7 +16,3 @@ dependencies {
     compileOnly libs.jakartaServletApi
     testImplementation libs.jakartaServletApi
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/bpm/bonita-client/build.gradle b/bpm/bonita-client/build.gradle
@@ -10,7 +10,6 @@ dependencies {
     api libs.httpComponentsClient
     api libs.xstream
     api libs.httpComponentsMime
-    testImplementation "junit:junit:${Deps.junit4Version}"
     testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}"
     testImplementation libs.logback
     testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}"

diff --git a/bpm/bonita-common/build.gradle b/bpm/bonita-common/build.gradle
@@ -22,7 +22,6 @@ dependencies {
     annotationProcessor libs.lombok
 
     testImplementation project(':bpm:bonita-sap-jco-connector-api')
-    testImplementation "junit:junit:${Deps.junit4Version}"
     testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}"
     testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}"
     testImplementation libs.logback

diff --git a/bpm/bonita-core/bonita-actor-mapping/build.gradle b/bpm/bonita-core/bonita-actor-mapping/build.gradle
@@ -7,7 +7,6 @@ dependencies {
     api project(':services:bonita-events')
     api project(':services:bonita-log')
     api project(':services:bonita-persistence')
-    testImplementation "junit:junit:${Deps.junit4Version}"
     testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}"
     testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}"
 

diff --git a/bpm/bonita-core/bonita-category/build.gradle b/bpm/bonita-core/bonita-category/build.gradle
@@ -7,7 +7,6 @@ dependencies {
     api project(':services:bonita-events')
     api project(':services:bonita-log')
     api project(':services:bonita-persistence')
-    testImplementation "junit:junit:${Deps.junit4Version}"
     testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}"
 
     annotationProcessor libs.lombok

diff --git a/bpm/bonita-core/bonita-contract-data/build.gradle b/bpm/bonita-core/bonita-contract-data/build.gradle
@@ -10,10 +10,6 @@ dependencies {
     implementation 'org.bonitasoft.engine:bonita-process-definition-model'
     testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}"
     testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}"
-    testImplementation libs.junit5api
-    testImplementation libs.junit4
-    testRuntimeOnly(libs.junitJupiterEngine)
-    testRuntimeOnly(libs.junitVintageEngine)
     annotationProcessor libs.lombok
     compileOnly libs.lombok
 }
diff --git a/bpm/bonita-core/bonita-core-data/build.gradle b/bpm/bonita-core/bonita-core-data/build.gradle
@@ -6,7 +6,6 @@ dependencies {
     api libs.commonsLang
     api project(':services:bonita-cache')
     api project(':services:bonita-persistence')
-    testImplementation "junit:junit:${Deps.junit4Version}"
     testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}"
     testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}"
 }
diff --git a/bpm/bonita-core/bonita-form-mapping/build.gradle b/bpm/bonita-core/bonita-form-mapping/build.gradle
@@ -10,7 +10,6 @@ dependencies {
     api project(':services:bonita-commons')
     api project(':services:bonita-events')
     api libs.hibernateCore
-    testImplementation "junit:junit:${Deps.junit4Version}"
     testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}"
     testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}"
 

diff --git a/bpm/bonita-core/bonita-home-server/build.gradle b/bpm/bonita-core/bonita-home-server/build.gradle
@@ -4,7 +4,6 @@ dependencies {
     api project(':bpm:bonita-common')
     api libs.commonsIO
     api project(':platform:platform-resources')
-    testImplementation "junit:junit:${Deps.junit4Version}"
     testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}"
     testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}"
     testImplementation "com.github.stefanbirkner:system-rules:${Deps.systemRulesVersion}"

diff --git a/bpm/bonita-core/bonita-login/build.gradle b/bpm/bonita-core/bonita-login/build.gradle
@@ -6,7 +6,6 @@ dependencies {
     api project(':services:bonita-authentication')
     api project(':services:bonita-profile')
     api project(':services:bonita-authorization')
-    testImplementation "junit:junit:${Deps.junit4Version}"
     testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}"
     testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}"
     testImplementation libs.logback

diff --git a/bpm/bonita-core/bonita-parameter/build.gradle b/bpm/bonita-core/bonita-parameter/build.gradle
@@ -7,7 +7,6 @@ dependencies {
     api project(':services:bonita-cache')
     api project(':services:bonita-builder')
     api project(':services:bonita-persistence')
-    testImplementation "junit:junit:${Deps.junit4Version}"
     testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}"
     testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}"
     testImplementation "com.github.stefanbirkner:system-rules:${Deps.systemRulesVersion}"

diff --git a/bpm/bonita-core/bonita-platform-login/build.gradle b/bpm/bonita-core/bonita-platform-login/build.gradle
@@ -4,6 +4,5 @@ dependencies {
     api project(':services:bonita-commons')
     api project(':services:bonita-platform-session')
     api project(':services:bonita-platform-authentication')
-    testImplementation "junit:junit:${Deps.junit4Version}"
     testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}"
 }
diff --git a/bpm/bonita-core/bonita-process-definition/build.gradle b/bpm/bonita-core/bonita-process-definition/build.gradle
@@ -12,7 +12,6 @@ dependencies {
     api project(':services:bonita-data-instance')
     api project(':services:bonita-classloader')
     api project(':services:bonita-builder')
-    testImplementation "junit:junit:${Deps.junit4Version}"
     testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}"
     testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}"
     testImplementation libs.logback

diff --git a/bpm/bonita-core/bonita-process-engine/build.gradle b/bpm/bonita-core/bonita-process-engine/build.gradle
@@ -72,13 +72,9 @@ dependencies {
     annotationProcessor libs.lombok
     compileOnly libs.lombok
 
-    testImplementation "org.junit.jupiter:junit-jupiter-api:${Deps.junit5Version}"
-    testImplementation "org.junit.jupiter:junit-jupiter-params:${Deps.junit5Version}"
-    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${Deps.junit5Version}"
-    testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${Deps.junit5Version}"
+    testImplementation libs.junit5params
     testAnnotationProcessor libs.lombok
 
-    testImplementation "junit:junit:${Deps.junit4Version}"
     testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}"
     testImplementation "org.mockito:mockito-junit-jupiter:${Deps.mockitoVersion}"
     testImplementation "com.github.stefanbirkner:system-rules:${Deps.systemRulesVersion}"      // works with Junit4
@@ -89,7 +85,3 @@ dependencies {
     testImplementation "org.awaitility:awaitility:${Deps.awaitilityVersion}"
     testRuntimeOnly libs.logback
 }
-
-test {
-    useJUnitPlatform()
-}
diff --git a/bpm/bonita-core/bonita-process-instance/build.gradle b/bpm/bonita-core/bonita-process-instance/build.gradle
@@ -23,7 +23,6 @@ dependencies {
     api project(':bpm:bonita-core:bonita-contract-data')
     api 'org.bonitasoft.engine:bonita-connector-model'
 
-    testImplementation "junit:junit:${Deps.junit4Version}"
     testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}"
     testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}"
     testImplementation "com.github.stefanbirkner:system-rules:${Deps.systemRulesVersion}"

diff --git a/bpm/bonita-core/bonita-user-filter/build.gradle b/bpm/bonita-core/bonita-user-filter/build.gradle
@@ -11,7 +11,6 @@ dependencies {
     api project(':bpm:bonita-core:bonita-process-instance')
     api project(':bpm:bonita-core:bonita-home-server')
     api project(':services:bonita-commons')
-    testImplementation "junit:junit:${Deps.junit4Version}"
     testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}"
     testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}"
 }
diff --git a/bpm/bonita-external/build.gradle b/bpm/bonita-external/build.gradle
@@ -4,6 +4,5 @@ dependencies {
     api project(':bpm:bonita-core:bonita-process-engine')
     api project(':services:bonita-command')
     api project(':bpm:bonita-core:bonita-process-definition')
-    testImplementation "junit:junit:${Deps.junit4Version}"
     testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}"
 }
diff --git a/bpm/bonita-web-extensions/build.gradle b/bpm/bonita-web-extensions/build.gradle
@@ -4,7 +4,6 @@ dependencies {
     api(libs.javaxServletApi)
     api(project(":bpm:bonita-client"))
     api(project(":bpm:bonita-common"))
-    testImplementation "junit:junit:${Deps.junit4Version}"
     testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}"
 }