Upgrade assertJ from 3.4.1 to 3.9.0

diff --git a/pom.xml b/pom.xml
index b9b7d4fda995b5b42a46648ad009a1f264085c5d..0292d387eeeba9e4cfc98d1ec8a787d7bab17021 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -986,7 +986,7 @@
       <dependency>
         <groupId>org.assertj</groupId>
         <artifactId>assertj-core</artifactId>
-        <version>3.4.1</version>
+        <version>3.9.0</version>
       </dependency>
       <dependency>
         <groupId>org.assertj</groupId>

diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentDaoTest.java
index 8daf11c63bb91f037d2ee2871150036ef9caf72c..a47703e7b608dd00c58bd275d8a3e4b87b58ada9 100644 (file)
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentDaoTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentDaoTest.java
@@ -887,7 +887,7 @@ public class ComponentDaoTest {
 
     List<ComponentDto> components = new ArrayList<>();
     underTest.scrollForIndexing(dbSession, projectUuid, context -> components.add(context.getResultObject()));
-    return assertThat(components).extracting(ComponentDto::uuid);
+    return (ListAssert<String>)assertThat(components).extracting(ComponentDto::uuid);
   }
 
   @Test

diff --git a/server/sonar-main/src/test/java/org/sonar/application/process/ProcessLauncherImplTest.java b/server/sonar-main/src/test/java/org/sonar/application/process/ProcessLauncherImplTest.java
index 910b99d42be13faef9ed0c86e6002b4013d84682..1bf71956a32b4dca4a0684d0e0a277ed1025a1fe 100644 (file)
--- a/server/sonar-main/src/test/java/org/sonar/application/process/ProcessLauncherImplTest.java
+++ b/server/sonar-main/src/test/java/org/sonar/application/process/ProcessLauncherImplTest.java
@@ -75,7 +75,7 @@ public class ProcessLauncherImplTest {
     assertThat(monitor).isNotNull();
     assertThat(processBuilder.started).isTrue();
     assertThat(processBuilder.commands.get(0)).endsWith("java");
-    assertThat(processBuilder.commands).containsSequence(
+    assertThat(processBuilder.commands).containsSubsequence(
       "-Dfoo=bar",
       "-Dfoo2=bar2",
       "-cp",

diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexTest.java
index c0f8f8917df68cbac526974695d187e02614753d..29ce83f1b6496df54e1696238d415cd4a6053e12 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexTest.java
@@ -23,7 +23,7 @@ import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
-import org.assertj.core.api.AbstractListAssert;
+import org.assertj.core.api.ListAssert;
 import org.junit.Before;
 import org.junit.Rule;
 import org.sonar.api.config.internal.MapSettings;
@@ -97,12 +97,12 @@ public abstract class ComponentIndexTest {
     assertExactResults(query, files.toArray(new ComponentDto[0]));
   }
 
-  protected AbstractListAssert<?, ? extends List<? extends String>, String> assertSearch(String query) {
+  protected ListAssert<String> assertSearch(String query) {
     return assertSearch(SuggestionQuery.builder().setQuery(query).setQualifiers(asList(PROJECT, MODULE, FILE)).build());
   }
 
-  protected AbstractListAssert<?, ? extends List<? extends String>, String> assertSearch(SuggestionQuery query) {
-    return assertThat(index.searchSuggestions(query, features.get()).getQualifiers())
+  protected ListAssert<String> assertSearch(SuggestionQuery query) {
+    return (ListAssert<String>)assertThat(index.searchSuggestions(query, features.get()).getQualifiers())
       .flatExtracting(ComponentHitsPerQualifier::getHits)
       .extracting(ComponentHit::getUuid);
   }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/ViewsFormulaExecutorComponentVisitorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/ViewsFormulaExecutorComponentVisitorTest.java
index b12f89e4a62cb01af790564599d497cb187328c3..62cfaee396866e93baa93098fc08c555dfc947e4 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/ViewsFormulaExecutorComponentVisitorTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/ViewsFormulaExecutorComponentVisitorTest.java
@@ -21,7 +21,6 @@ package org.sonar.server.computation.task.projectanalysis.formula;
 
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
-import org.assertj.core.api.AbstractIterableAssert;
 import org.junit.Rule;
 import org.junit.Test;
 import org.sonar.api.measures.CoreMetrics;
@@ -30,7 +29,6 @@ import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolde
 import org.sonar.server.computation.task.projectanalysis.component.ViewsComponent;
 import org.sonar.server.computation.task.projectanalysis.formula.counter.IntValue;
 import org.sonar.server.computation.task.projectanalysis.measure.Measure;
-import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepoEntry;
 import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule;
 import org.sonar.server.computation.task.projectanalysis.metric.Metric;
 import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule;
@@ -150,8 +148,8 @@ public class ViewsFormulaExecutorComponentVisitorTest {
     verifySingleMetricWithVariation(ROOT_REF, 23);
   }
 
-  private AbstractIterableAssert<?, ? extends Iterable<? extends MeasureRepoEntry>, MeasureRepoEntry> verifySingleMetricWithVariation(int componentRef, int variation) {
-    return assertThat(toEntries(measureRepository.getAddedRawMeasures(componentRef)))
+  private void verifySingleMetricWithVariation(int componentRef, int variation) {
+    assertThat(toEntries(measureRepository.getAddedRawMeasures(componentRef)))
       .containsOnly(entryOf(NEW_COVERAGE_KEY, createMeasureWithVariation(variation)));
   }
 

diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/IssueWorkflowTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/IssueWorkflowTest.java
index b698daf80152d5df0b36aa7a8fc500844861a41c..f886e83679d61e5d5868b70020b8400f4dd881ea 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/IssueWorkflowTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/IssueWorkflowTest.java
@@ -67,7 +67,7 @@ public class IssueWorkflowTest {
   public void list_statuses() {
     workflow.start();
     // order is important for UI
-    assertThat(workflow.statusKeys()).containsSequence(STATUS_OPEN, STATUS_CONFIRMED, STATUS_REOPENED, STATUS_RESOLVED, STATUS_CLOSED);
+    assertThat(workflow.statusKeys()).containsSubsequence(STATUS_OPEN, STATUS_CONFIRMED, STATUS_REOPENED, STATUS_RESOLVED, STATUS_CLOSED);
   }
 
   @Test

diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/StateMachineTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/StateMachineTest.java
index abd33dffd16c4cdad7a6c08c83956e5100d774d5..92182ff606288bc1b014cbe4f972650cace4b2db 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/StateMachineTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/StateMachineTest.java
@@ -28,7 +28,7 @@ public class StateMachineTest {
   public void keep_order_of_state_keys() {
     StateMachine machine = StateMachine.builder().states("OPEN", "RESOLVED", "CLOSED").build();
 
-    assertThat(machine.stateKeys()).containsSequence("OPEN", "RESOLVED", "CLOSED");
+    assertThat(machine.stateKeys()).containsSubsequence("OPEN", "RESOLVED", "CLOSED");
   }
 
   @Test

diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/GroupsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/GroupsActionTest.java
index 7d77b094dd2800aff5030674ea92acad8d154fbf..ba8b0f0d7f642548cbafbe78e408d1ea1e02ad50 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/GroupsActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/GroupsActionTest.java
@@ -122,7 +122,7 @@ public class GroupsActionTest extends BasePermissionWsTest<GroupsAction> {
       .execute()
       .getInput();
 
-    assertThat(result).containsSequence(DefaultGroups.ANYONE, "group-1", "group-2");
+    assertThat(result).containsSubsequence(DefaultGroups.ANYONE, "group-1", "group-2");
   }
 
   @Test

diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesNotificationTemplateTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesNotificationTemplateTest.java
index d79d1f3f738aa659eaca2ea066cd9ec2f6b41f6a..50c5103883c83a334de7d5edaba9950eb103d7e5 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesNotificationTemplateTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesNotificationTemplateTest.java
@@ -186,7 +186,7 @@ public class BuiltInQualityProfilesNotificationTemplateTest {
 
     EmailMessage emailMessage = underTest.format(notification.serialize());
 
-    assertThat(emailMessage.getMessage()).containsSequence("The following built-in profiles have been updated:\n",
+    assertThat(emailMessage.getMessage()).containsSubsequence("The following built-in profiles have been updated:\n",
       profileTitleText(profileName1, languageKey1, languageName1),
       " 2 new rules\n",
       profileTitleText(profileName2, languageKey2, languageName2),
@@ -210,7 +210,7 @@ public class BuiltInQualityProfilesNotificationTemplateTest {
 
     EmailMessage emailMessage = underTest.format(notification.serialize());
 
-    assertThat(emailMessage.getMessage()).containsSequence(
+    assertThat(emailMessage.getMessage()).containsSubsequence(
       "\"" + profileName2 + "\" - " + languageName1,
       "\"" + profileName1 + "\" - " + languageName2,
       "\"" + profileName3 + "\" - " + languageName2);
@@ -254,7 +254,7 @@ public class BuiltInQualityProfilesNotificationTemplateTest {
 
   private void assertMessage(EmailMessage emailMessage, String expectedProfileDetails) {
     assertThat(emailMessage.getMessage())
-      .containsSequence(
+      .containsSubsequence(
         "The following built-in profiles have been updated:\n\n",
         expectedProfileDetails,
         "\nThis is a good time to review your quality profiles and update them to benefit from the latest evolutions: " + server.getPublicRootUrl() + "/profiles");

diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangelogActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangelogActionTest.java
index a478da55ad9db2d9b3bc4c216109d825bbba8c5d..7529e7d539f0f4436edfa39d61670ebf57b08209 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangelogActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangelogActionTest.java
@@ -279,7 +279,7 @@ public class ChangelogActionTest {
       .execute()
       .getInput();
 
-    assertThat(response).containsSequence("15:43", "15:42");
+    assertThat(response).containsSubsequence("15:43", "15:42");
   }
 
   @Test

diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/rule/SeverityTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/rule/SeverityTest.java
index e995c4a5158dedca5a8891bfc1b377e6201181c8..def28c5ede5c6a781f395c07f70456f7f99a9a31 100644 (file)
--- a/sonar-plugin-api/src/test/java/org/sonar/api/rule/SeverityTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/rule/SeverityTest.java
@@ -26,8 +26,8 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class SeverityTest {
 
   @Test
-  public void test_ALL() throws Exception {
-    assertThat(Severity.ALL).hasSize(5).containsSequence("INFO", "MINOR", "MAJOR", "CRITICAL", "BLOCKER");
+  public void test_ALL() {
+    assertThat(Severity.ALL).hasSize(5).containsSubsequence("INFO", "MINOR", "MAJOR", "CRITICAL", "BLOCKER");
   }
 
   @Test

diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/report/AnalysisContextReportPublisherTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/report/AnalysisContextReportPublisherTest.java
index 4c519f07f410373ac59546aa3c601fd9fae557cb..d420c70666c031481abd598ee132202ecfd99db2 100644 (file)
--- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/report/AnalysisContextReportPublisherTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/report/AnalysisContextReportPublisherTest.java
@@ -173,7 +173,7 @@ public class AnalysisContextReportPublisherTest {
     String content = FileUtils.readFileToString(writer.getFileStructure().analysisLog());
     assertThat(content).containsOnlyOnce(FOO);
     assertThat(content).containsOnlyOnce(BIZ);
-    assertThat(content).containsSequence(BIZ, FOO);
+    assertThat(content).containsSubsequence(BIZ, FOO);
 
     publisher.dumpModuleSettings(new DefaultInputModule(ProjectDefinition.create()
       .setBaseDir(temp.newFolder())
@@ -203,7 +203,7 @@ public class AnalysisContextReportPublisherTest {
       .setProperty("sonar.password", "azerty")
       .setProperty("sonar.cpp.license.secured", "AZERTY")));
 
-    assertThat(FileUtils.readFileToString(writer.getFileStructure().analysisLog())).containsSequence(
+    assertThat(FileUtils.readFileToString(writer.getFileStructure().analysisLog())).containsSubsequence(
       "sonar.cpp.license.secured=******",
       "sonar.login=******",
       "sonar.password=******",
@@ -218,7 +218,7 @@ public class AnalysisContextReportPublisherTest {
 
     publisher.init(writer);
 
-    assertThat(FileUtils.readFileToString(writer.getFileStructure().analysisLog())).containsSequence(
+    assertThat(FileUtils.readFileToString(writer.getFileStructure().analysisLog())).containsSubsequence(
       "sonar.cpp.license.secured=******",
       "sonar.login=******",
       "sonar.password=******");

diff --git a/tests/src/test/java/org/sonarqube/tests/issue/IssueSearchTest.java b/tests/src/test/java/org/sonarqube/tests/issue/IssueSearchTest.java
index 1063e708c746b8a884018eae4441ef8980c5828e..6e1610307b9af3c8ffb59f4ab09d50f86b3f47c2 100644 (file)
--- a/tests/src/test/java/org/sonarqube/tests/issue/IssueSearchTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/issue/IssueSearchTest.java
@@ -19,14 +19,13 @@
  */
 package org.sonarqube.tests.issue;
 
-import java.io.IOException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
-import org.assertj.core.api.AbstractListAssert;
 import org.assertj.core.api.Fail;
+import org.assertj.core.api.ListAssert;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -278,7 +277,7 @@ public class IssueSearchTest extends AbstractIssueTest {
   }
 
   @SafeVarargs
-  private final AbstractListAssert<?, ? extends List<? extends org.sonarqube.ws.Issues.Issue>, org.sonarqube.ws.Issues.Issue> assertSearch(Consumer<SearchRequest>... consumers) {
+  private final ListAssert<org.sonarqube.ws.Issues.Issue> assertSearch(Consumer<SearchRequest>... consumers) {
     return assertThat(searchResponse(consumers).getIssuesList());
   }
 

diff --git a/tests/src/test/java/org/sonarqube/tests/qualityProfile/BuiltInQualityProfilesNotificationTest.java b/tests/src/test/java/org/sonarqube/tests/qualityProfile/BuiltInQualityProfilesNotificationTest.java
index fb973a82a5cc05f2faa121332dd0209c122a3d3f..042430e63b21a9a6375abbc09552977b3401476f 100644 (file)
--- a/tests/src/test/java/org/sonarqube/tests/qualityProfile/BuiltInQualityProfilesNotificationTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/qualityProfile/BuiltInQualityProfilesNotificationTest.java
@@ -133,7 +133,7 @@ public class BuiltInQualityProfilesNotificationTest {
       .containsOnly("[SONARQUBE] Built-in quality profiles have been updated");
     String url = orchestrator.getServer().getUrl();
     assertThat(messages.get(0).getMimeMessage().getContent().toString())
-      .containsSequence(
+      .containsSubsequence(
         "The following built-in profiles have been updated:",
         "\"Basic\" - Foo: " + url + "/profiles/changelog?language=foo&name=Basic&since=", "&to=",
         " 1 new rule",

diff --git a/tests/src/test/java/org/sonarqube/tests/source/ScmTest.java b/tests/src/test/java/org/sonarqube/tests/source/ScmTest.java
index 67fd54f2b0727e454b5563664709f73dd9c79c9b..6bdd33eaa1507712322b0cc42693cdf72e30bece 100644 (file)
--- a/tests/src/test/java/org/sonarqube/tests/source/ScmTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/source/ScmTest.java
@@ -72,7 +72,7 @@ public class ScmTest {
         MapEntry.entry(4, new LineData("1", "2013-01-04T00:00:00+0000", "jhenry")),
         MapEntry.entry(8, new LineData("3", "2014-01-04T00:00:00+0000", "toto")));
 
-    assertThat(buildResult.getLogs()).containsSequence("1 files to be analyzed", "1/1 files analyzed");
+    assertThat(buildResult.getLogs()).containsSubsequence("1 files to be analyzed", "1/1 files analyzed");
 
     // Second run with same file should not trigger blame but SCM data are copied from previous analysis
     buildResult = orchestrator.executeBuild(build);