[NO JIRA] Fix quality issues related to assertions

14 files changed, 25 insertions, 23 deletions

diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/issue/IssueFieldsSetterTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/issue/IssueFieldsSetterTest.java
index f8a08862d6d..375ec976e73 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/issue/IssueFieldsSetterTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/issue/IssueFieldsSetterTest.java
@@ -23,6 +23,7 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 import java.util.Random;
+import java.util.function.Predicate;
 import org.apache.commons.lang.time.DateUtils;
 import org.junit.Test;
 import org.sonar.api.utils.Duration;
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/issue/notification/ChangesOnMyIssueNotificationHandlerTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/issue/notification/ChangesOnMyIssueNotificationHandlerTest.java
index d1fbb495c9e..0a583409014 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/issue/notification/ChangesOnMyIssueNotificationHandlerTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/issue/notification/ChangesOnMyIssueNotificationHandlerTest.java
@@ -81,7 +81,7 @@ public class ChangesOnMyIssueNotificationHandlerTest {
 
   @Test
   public void getMetadata_returns_same_instance_as_static_method() {
-    assertThat(underTest.getMetadata().get()).isSameAs(ChangesOnMyIssueNotificationHandler.newMetadata());
+    assertThat(underTest.getMetadata()).containsSame(ChangesOnMyIssueNotificationHandler.newMetadata());
   }
 
   @Test
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/issue/notification/FPOrWontFixNotificationHandlerTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/issue/notification/FPOrWontFixNotificationHandlerTest.java
index 9e4e19d3e22..7f8184450d8 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/issue/notification/FPOrWontFixNotificationHandlerTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/issue/notification/FPOrWontFixNotificationHandlerTest.java
@@ -81,7 +81,7 @@ public class FPOrWontFixNotificationHandlerTest {
 
   @Test
   public void getMetadata_returns_same_instance_as_static_method() {
-    assertThat(underTest.getMetadata().get()).isSameAs(FPOrWontFixNotificationHandler.newMetadata());
+    assertThat(underTest.getMetadata()).containsSame(FPOrWontFixNotificationHandler.newMetadata());
   }
 
   @Test
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/issue/notification/MyNewIssuesNotificationHandlerTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/issue/notification/MyNewIssuesNotificationHandlerTest.java
index 124f818685f..78bda2543a6 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/issue/notification/MyNewIssuesNotificationHandlerTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/issue/notification/MyNewIssuesNotificationHandlerTest.java
@@ -57,7 +57,7 @@ public class MyNewIssuesNotificationHandlerTest {
 
   @Test
   public void getMetadata_returns_same_instance_as_static_method() {
-    assertThat(underTest.getMetadata().get()).isSameAs(MyNewIssuesNotificationHandler.newMetadata());
+    assertThat(underTest.getMetadata()).containsSame(MyNewIssuesNotificationHandler.newMetadata());
   }
 
   @Test
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/issue/notification/NewIssuesNotificationHandlerTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/issue/notification/NewIssuesNotificationHandlerTest.java
index 1650a77004a..f7cea888707 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/issue/notification/NewIssuesNotificationHandlerTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/issue/notification/NewIssuesNotificationHandlerTest.java
@@ -55,7 +55,7 @@ public class NewIssuesNotificationHandlerTest {
 
   @Test
   public void getMetadata_returns_same_instance_as_static_method() {
-    assertThat(underTest.getMetadata().get()).isSameAs(NewIssuesNotificationHandler.newMetadata());
+    assertThat(underTest.getMetadata()).containsSame(NewIssuesNotificationHandler.newMetadata());
   }
 
   @Test
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/issue/workflow/TransitionTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/issue/workflow/TransitionTest.java
index 8f25b759baa..33dacd3aeb5 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/issue/workflow/TransitionTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/issue/workflow/TransitionTest.java
@@ -138,7 +138,7 @@ public class TransitionTest {
   @Test
   public void test_toString() {
     Transition t1 = Transition.create("resolve", "OPEN", "RESOLVED");
-    assertThat(t1.toString()).isEqualTo("OPEN->resolve->RESOLVED");
+    assertThat(t1).hasToString("OPEN->resolve->RESOLVED");
   }
 
   @Test
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/metric/UnanalyzedLanguageMetricsTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/metric/UnanalyzedLanguageMetricsTest.java
index 77a8a428188..9045f106c1d 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/metric/UnanalyzedLanguageMetricsTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/metric/UnanalyzedLanguageMetricsTest.java
@@ -31,7 +31,7 @@ public class UnanalyzedLanguageMetricsTest {
   public void count_metrics() {
     UnanalyzedLanguageMetrics coreCustomMetrics = new UnanalyzedLanguageMetrics();
     List<Metric> metrics = coreCustomMetrics.getMetrics();
-    assertThat(metrics.size()).isEqualTo(2);
+    assertThat(metrics).hasSize(2);
   }
 
 }
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/notification/EmailRecipientTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/notification/EmailRecipientTest.java
index 3966753a7cc..da19938a9b9 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/notification/EmailRecipientTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/notification/EmailRecipientTest.java
@@ -82,6 +82,6 @@ public class EmailRecipientTest {
     String login = randomAlphabetic(11);
     String email = randomAlphabetic(12);
 
-    assertThat(new EmailRecipient(login, email).toString()).isEqualTo("EmailRecipient{'" + login + "':'" + email + "'}");
+    assertThat(new EmailRecipient(login, email)).hasToString("EmailRecipient{'" + login + "':'" + email + "'}");
   }
 }
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/qualitygate/EvaluatedConditionTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/qualitygate/EvaluatedConditionTest.java
index 4c0d1ada8c3..3b71bba1c98 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/qualitygate/EvaluatedConditionTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/qualitygate/EvaluatedConditionTest.java
@@ -64,7 +64,7 @@ public class EvaluatedConditionTest {
 
   @Test
   public void override_toString() {
-    assertThat(underTest.toString()).isEqualTo("EvaluatedCondition{condition=" +
+    assertThat(underTest).hasToString("EvaluatedCondition{condition=" +
       "Condition{metricKey='metricKey', operator=GREATER_THAN, errorThreshold='2'}, " +
       "status=ERROR, value='value'}");
   }
@@ -73,7 +73,7 @@ public class EvaluatedConditionTest {
   public void toString_does_not_quote_null_value() {
     EvaluatedCondition underTest = new EvaluatedCondition(CONDITION_1, ERROR, null);
 
-    assertThat(underTest.toString()).isEqualTo("EvaluatedCondition{condition=" +
+    assertThat(underTest).hasToString("EvaluatedCondition{condition=" +
       "Condition{metricKey='metricKey', operator=GREATER_THAN, errorThreshold='2'}, " +
       "status=ERROR, value=null}");
   }
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/qualitygate/QualityGateTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/qualitygate/QualityGateTest.java
index d462d2f0a8e..181d4bb5f10 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/qualitygate/QualityGateTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/qualitygate/QualityGateTest.java
@@ -89,7 +89,7 @@ public class QualityGateTest {
   public void toString_is_override() {
     QualityGate underTest = new QualityGate(QUALIGATE_ID, QUALIGATE_NAME, ImmutableSet.of(CONDITION_2));
 
-    assertThat(underTest.toString()).isEqualTo("QualityGate{id=qg_id, name='qg_name', conditions=[" +
+    assertThat(underTest).hasToString("QualityGate{id=qg_id, name='qg_name', conditions=[" +
       "Condition{metricKey='m2', operator=LESS_THAN, errorThreshold='2'}" +
       "]}");
   }
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/qualitygate/notification/QGChangeNotificationHandlerTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/qualitygate/notification/QGChangeNotificationHandlerTest.java
index 941dd76ba43..32a6c873912 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/qualitygate/notification/QGChangeNotificationHandlerTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/qualitygate/notification/QGChangeNotificationHandlerTest.java
@@ -53,7 +53,7 @@ public class QGChangeNotificationHandlerTest {
 
   @Test
   public void getMetadata_returns_same_instance_as_static_method() {
-    assertThat(underTest.getMetadata().get()).isSameAs(QGChangeNotificationHandler.newMetadata());
+    assertThat(underTest.getMetadata()).containsSame(QGChangeNotificationHandler.newMetadata());
   }
 
   @Test
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/qualityprofile/QualityProfileTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/qualityprofile/QualityProfileTest.java
index dabd5618065..ac35a913ac8 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/qualityprofile/QualityProfileTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/qualityprofile/QualityProfileTest.java
@@ -88,6 +88,6 @@ public class QualityProfileTest {
 
   @Test
   public void verify_toString() {
-    assertThat(QUALITY_PROFILE.toString()).isEqualTo("QualityProfile{key=qpKey, name=qpName, language=languageKey, rulesUpdatedAt=1274194245000}");
+    assertThat(QUALITY_PROFILE).hasToString("QualityProfile{key=qpKey, name=qpName, language=languageKey, rulesUpdatedAt=1274194245000}");
   }
 }
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/webhook/ProjectAnalysisTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/ProjectAnalysisTest.java
index 9f70619f5da..1bf827e6c53 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/webhook/ProjectAnalysisTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/ProjectAnalysisTest.java
@@ -76,12 +76,12 @@ public class ProjectAnalysisTest {
 
   @Test
   public void verify_getters() {
-    assertThat(underTest.getCeTask().get()).isSameAs(ceTask);
+    assertThat(underTest.getCeTask()).containsSame(ceTask);
     assertThat(underTest.getProject()).isSameAs(project);
-    assertThat(underTest.getBranch().get()).isSameAs(branch);
-    assertThat(underTest.getQualityGate().get()).isSameAs(qualityGate);
+    assertThat(underTest.getBranch()).containsSame(branch);
+    assertThat(underTest.getQualityGate()).containsSame(qualityGate);
     assertThat(underTest.getProperties()).isEqualTo(properties);
-    assertThat(underTest.getAnalysis().get()).isEqualTo(analysis);
+    assertThat(underTest.getAnalysis()).contains(analysis);
 
     ProjectAnalysis underTestWithNulls = new ProjectAnalysis(project, null, null, null, null, null, emptyMap());
     assertThat(underTestWithNulls.getCeTask()).isEmpty();
@@ -111,11 +111,12 @@ public class ProjectAnalysisTest {
       .setQualityGate(new QualityGate("A", "B", emptySet()))
       .setStatus(Metric.Level.ERROR)
       .build();
-    assertThat(underTest).isNotEqualTo(new ProjectAnalysis(project, ceTask, analysis, branch, otherQualityGate, 1L, properties));
-    assertThat(underTest).isNotEqualTo(new ProjectAnalysis(project, ceTask, analysis, branch, qualityGate, null, properties));
-    assertThat(underTest).isNotEqualTo(new ProjectAnalysis(project, ceTask, analysis, branch, qualityGate, 2L, properties));
-    assertThat(underTest).isNotEqualTo(new ProjectAnalysis(project, ceTask, analysis, branch, qualityGate, 1L, emptyMap()));
-    assertThat(underTest).isNotEqualTo(new ProjectAnalysis(project, ceTask, analysis, branch, qualityGate, 1L, ImmutableMap.of("A", "B")));
+    assertThat(underTest)
+      .isNotEqualTo(new ProjectAnalysis(project, ceTask, analysis, branch, otherQualityGate, 1L, properties))
+      .isNotEqualTo(new ProjectAnalysis(project, ceTask, analysis, branch, qualityGate, null, properties))
+      .isNotEqualTo(new ProjectAnalysis(project, ceTask, analysis, branch, qualityGate, 2L, properties))
+      .isNotEqualTo(new ProjectAnalysis(project, ceTask, analysis, branch, qualityGate, 1L, emptyMap()))
+      .isNotEqualTo(new ProjectAnalysis(project, ceTask, analysis, branch, qualityGate, 1L, ImmutableMap.of("A", "B")));
   }
 
   @Test
@@ -151,7 +152,7 @@ public class ProjectAnalysisTest {
 
   @Test
   public void verify_toString() {
-    assertThat(underTest.toString()).isEqualTo(
+    assertThat(underTest).hasToString(
       "ProjectAnalysis{project=Project{uuid='uuid', key='key', name='name'}, ceTask=CeTask{id='id', status=SUCCESS}, branch=Branch{main=true, name='name', type=BRANCH}, qualityGate=EvaluatedQualityGate{qualityGate=QualityGate{id=id, name='name', conditions=[]}, status=ERROR, evaluatedConditions=[]}, updatedAt=1, properties={a=b}, analysis=Analysis{uuid='analysis_uuid', date=1500, revision=sha1}}");
   }
 }
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/webhook/WebhookDeliveryTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/WebhookDeliveryTest.java
index 0e213399bb7..bc67f84ca88 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/webhook/WebhookDeliveryTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/WebhookDeliveryTest.java
@@ -70,7 +70,7 @@ public class WebhookDeliveryTest {
       .setError(cause)
       .build();
 
-    assertThat(delivery.getErrorMessage().get()).isEqualTo("fail to connect");
+    assertThat(delivery.getErrorMessage()).contains("fail to connect");
   }
 
   private static WebhookDelivery.Builder newBuilderTemplate() {