Code smells test fixes

6 files changed, 55 insertions, 51 deletions

diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/es/response/NodeStatsResponseTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/es/response/NodeStatsResponseTest.java
index 6c7c6e7eef3..007432a9ba4 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/es/response/NodeStatsResponseTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/es/response/NodeStatsResponseTest.java
@@ -123,9 +123,9 @@ public class NodeStatsResponseTest {
     assertThat(indicesStats).isNotNull();
     assertThat(indicesStats.getStoreSizeInBytes()).isEqualTo(8670970);
     assertThat(indicesStats.getTranslogSizeInBytes()).isEqualTo(8274137);
-    assertThat(indicesStats.getRequestCacheMemorySizeInBytes()).isEqualTo(0);
+    assertThat(indicesStats.getRequestCacheMemorySizeInBytes()).isZero();
     assertThat(indicesStats.getFieldDataMemorySizeInBytes()).isEqualTo(4880);
-    assertThat(indicesStats.getQueryCacheMemorySizeInBytes()).isEqualTo(0);
+    assertThat(indicesStats.getQueryCacheMemorySizeInBytes()).isZero();
 
   }
 
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/es/searchrequest/AllFiltersTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/es/searchrequest/AllFiltersTest.java
index 9e7a299112c..68696e4e5fb 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/es/searchrequest/AllFiltersTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/es/searchrequest/AllFiltersTest.java
@@ -52,7 +52,8 @@ public class AllFiltersTest {
     FilterScope filterScope = mock(FilterScope.class);
     RequestFiltersComputer.AllFilters allFilters = RequestFiltersComputer.newAllFilters();
 
-    assertThatThrownBy(() -> allFilters.addFilter(null, filterScope, boolQuery()))
+    BoolQueryBuilder boolQuery = boolQuery();
+    assertThatThrownBy(() -> allFilters.addFilter(null, filterScope, boolQuery))
       .isInstanceOf(NullPointerException.class)
       .hasMessage("name can't be null");
   }
@@ -62,7 +63,8 @@ public class AllFiltersTest {
     String name = randomAlphabetic(12);
     RequestFiltersComputer.AllFilters allFilters = RequestFiltersComputer.newAllFilters();
 
-    assertThatThrownBy(() -> allFilters.addFilter(name, null, boolQuery()))
+    BoolQueryBuilder boolQuery = boolQuery();
+    assertThatThrownBy(() -> allFilters.addFilter(name, null, boolQuery))
       .isInstanceOf(NullPointerException.class)
       .hasMessage("filterScope can't be null");
   }
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/es/searchrequest/NestedFieldFilterScopeTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/es/searchrequest/NestedFieldFilterScopeTest.java
index 9d97622c5b5..e5b47d68071 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/es/searchrequest/NestedFieldFilterScopeTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/es/searchrequest/NestedFieldFilterScopeTest.java
@@ -83,8 +83,7 @@ public class NestedFieldFilterScopeTest {
 
     assertThat(underTest)
       .isEqualTo(underTest)
-      .isEqualTo(new NestedFieldFilterScope<>(fieldName, nestedFieldName, value));
-    assertThat(underTest)
+      .isEqualTo(new NestedFieldFilterScope<>(fieldName, nestedFieldName, value))
       .isNotEqualTo(null)
       .isNotEqualTo(new Object())
       .isNotEqualTo(new NestedFieldFilterScope<>(fieldName2, nestedFieldName, value))
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/es/searchrequest/RequestFiltersComputerTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/es/searchrequest/RequestFiltersComputerTest.java
index 98480f6533b..8880d4c8a9b 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/es/searchrequest/RequestFiltersComputerTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/es/searchrequest/RequestFiltersComputerTest.java
@@ -99,7 +99,7 @@ public class RequestFiltersComputerTest {
     AllFilters allFilters = randomNonEmptyAllFilters();
     RequestFiltersComputer underTest = new RequestFiltersComputer(allFilters, Collections.emptySet());
 
-    assertThat(underTest.getQueryFilters().get()).isEqualTo(toBoolQuery(allFilters.stream()));
+    assertThat(underTest.getQueryFilters()).contains(toBoolQuery(allFilters.stream()));
   }
 
   @Test
@@ -116,7 +116,7 @@ public class RequestFiltersComputerTest {
     Set<TopAggregationDefinition<?>> atLeastOneNonStickyTopAggs = randomNonEmptyTopAggregations(() -> false);
     RequestFiltersComputer underTest = new RequestFiltersComputer(allFilters, atLeastOneNonStickyTopAggs);
 
-    assertThat(underTest.getQueryFilters().get()).isEqualTo(toBoolQuery(allFilters.stream()));
+    assertThat(underTest.getQueryFilters()).contains(toBoolQuery(allFilters.stream()));
   }
 
   @Test
@@ -179,9 +179,9 @@ public class RequestFiltersComputerTest {
 
     RequestFiltersComputer underTest = new RequestFiltersComputer(allFilters, declaredTopAggregations);
 
-    assertThat(underTest.getQueryFilters().get()).isEqualTo(toBoolQuery(filterField3, filterField4));
+    assertThat(underTest.getQueryFilters()).contains(toBoolQuery(filterField3, filterField4));
     QueryBuilder[] postFilters = {filterField1_1, filterField1_2, filterField2};
-    assertThat(underTest.getPostFilters().get()).isEqualTo(toBoolQuery(postFilters));
+    assertThat(underTest.getPostFilters()).contains(toBoolQuery(postFilters));
     assertTopAggregationFilter(underTest, stickyTopAggField1, filterField2);
     assertTopAggregationFilter(underTest, nonStickyTopAggField1, postFilters);
     assertTopAggregationFilter(underTest, stickyTopAggField2, filterField1_1, filterField1_2);
@@ -215,9 +215,9 @@ public class RequestFiltersComputerTest {
 
     RequestFiltersComputer underTest = new RequestFiltersComputer(allFilters, declaredTopAggregations);
 
-    assertThat(underTest.getQueryFilters().get()).isEqualTo(toBoolQuery(filterField2));
+    assertThat(underTest.getQueryFilters()).contains(toBoolQuery(filterField2));
     QueryBuilder[] postFilters = {filterField1_1, filterField1_2};
-    assertThat(underTest.getPostFilters().get()).isEqualTo(toBoolQuery(postFilters));
+    assertThat(underTest.getPostFilters()).contains(toBoolQuery(postFilters));
     assertThat(underTest.getTopAggregationFilter(stickyTopAggField1)).isEmpty();
     assertTopAggregationFilter(underTest, nonStickyTopAggField1, postFilters);
     assertTopAggregationFilter(underTest, nonStickyTopAggField2, postFilters);
@@ -269,9 +269,9 @@ public class RequestFiltersComputerTest {
 
     RequestFiltersComputer underTest = new RequestFiltersComputer(allFilters, declaredTopAggregations);
 
-    assertThat(underTest.getQueryFilters().get()).isEqualTo(toBoolQuery(filterField3, filterField4));
+    assertThat(underTest.getQueryFilters()).contains(toBoolQuery(filterField3, filterField4));
     QueryBuilder[] postFilters = {filterField1_1, filterField1_2, filterField2};
-    assertThat(underTest.getPostFilters().get()).isEqualTo(toBoolQuery(postFilters));
+    assertThat(underTest.getPostFilters()).contains(toBoolQuery(postFilters));
     assertTopAggregationFilter(underTest, stickyTopAggField1, filterField2);
     assertTopAggregationFilter(underTest, nonStickyTopAggField1, postFilters);
     assertTopAggregationFilter(underTest, stickyTopAggField2, filterField1_1, filterField1_2);
@@ -343,14 +343,14 @@ public class RequestFiltersComputerTest {
 
     RequestFiltersComputer underTest = new RequestFiltersComputer(allFilters, declaredTopAggregations);
 
-    assertThat(underTest.getQueryFilters().get()).isEqualTo(toBoolQuery(queryFilter));
+    assertThat(underTest.getQueryFilters()).contains(toBoolQuery(queryFilter));
     QueryBuilder[] postFilters = {
       filterNestedField1_value1_1, filterNestedField1_value1_2,
       filterNestedField1_value2_1, filterNestedField1_value2_2,
       filterField1_1, filterField1_2,
       filterField2_1, filterField2_2,
       filterNestedField3_1, filterNestedField3_2};
-    assertThat(underTest.getPostFilters().get()).isEqualTo(toBoolQuery(postFilters));
+    assertThat(underTest.getPostFilters()).contains(toBoolQuery(postFilters));
     assertTopAggregationFilter(underTest, stickyTopAggNestedField1_value1,
       filterNestedField1_value2_1, filterNestedField1_value2_2,
       filterField1_1, filterField1_2,
@@ -408,9 +408,9 @@ public class RequestFiltersComputerTest {
 
     RequestFiltersComputer underTest = new RequestFiltersComputer(allFilters, declaredTopAggregations);
 
-    assertThat(underTest.getQueryFilters().get()).isEqualTo(toBoolQuery(filterField2));
+    assertThat(underTest.getQueryFilters()).contains(toBoolQuery(filterField2));
     QueryBuilder[] postFilters = {filterField1_1, filterField1_2};
-    assertThat(underTest.getPostFilters().get()).isEqualTo(toBoolQuery(postFilters));
+    assertThat(underTest.getPostFilters()).contains(toBoolQuery(postFilters));
     assertThat(underTest.getTopAggregationFilter(stickyTopAggField1)).isEmpty();
     assertTopAggregationFilter(underTest, nonStickyTopAggField1, postFilters);
     assertTopAggregationFilter(underTest, nonStickyTopAggField2, postFilters);
@@ -442,7 +442,7 @@ public class RequestFiltersComputerTest {
 
     assertThat(underTest.getQueryFilters()).isEmpty();
     QueryBuilder[] postFilters = {filterField1_1, filterField1_2, filterField2};
-    assertThat(underTest.getPostFilters().get()).isEqualTo(toBoolQuery(postFilters));
+    assertThat(underTest.getPostFilters()).contains(toBoolQuery(postFilters));
     assertTopAggregationFilter(underTest, stickyTopAggField1, filterField2);
     assertTopAggregationFilter(underTest, nonStickyTopAggField1, postFilters);
     assertTopAggregationFilter(underTest, stickyTopAggField2, filterField1_1, filterField1_2);
@@ -496,11 +496,11 @@ public class RequestFiltersComputerTest {
 
   private static void assertTopAggregationFilter(RequestFiltersComputer underTest,
     TopAggregationDefinition<?> topAggregation, QueryBuilder firstFilter, QueryBuilder... otherFilters) {
-    assertThat(underTest.getTopAggregationFilter(topAggregation).get()).isEqualTo(toBoolQuery(firstFilter, otherFilters));
+    assertThat(underTest.getTopAggregationFilter(topAggregation)).contains(toBoolQuery(firstFilter, otherFilters));
   }
 
   private static void assertTopAggregationFilter(RequestFiltersComputer underTest,
     TopAggregationDefinition<?> topAggregation, QueryBuilder[] filters) {
-    assertThat(underTest.getTopAggregationFilter(topAggregation).get()).isEqualTo(toBoolQuery(filters));
+    assertThat(underTest.getTopAggregationFilter(topAggregation)).contains(toBoolQuery(filters));
   }
 }
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/es/searchrequest/SimpleFieldFilterScopeTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/es/searchrequest/SimpleFieldFilterScopeTest.java
index 00847c6e878..63c1cea117f 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/es/searchrequest/SimpleFieldFilterScopeTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/es/searchrequest/SimpleFieldFilterScopeTest.java
@@ -51,8 +51,7 @@ public class SimpleFieldFilterScopeTest {
 
     assertThat(underTest)
       .isEqualTo(underTest)
-      .isEqualTo(new SimpleFieldFilterScope(fieldName1));
-    assertThat(underTest)
+      .isEqualTo(new SimpleFieldFilterScope(fieldName1))
       .isNotEqualTo(null)
       .isNotEqualTo(new Object())
       .isNotEqualTo(new SimpleFieldFilterScope(fieldName2))
@@ -70,7 +69,6 @@ public class SimpleFieldFilterScopeTest {
       .isEqualTo(underTest.hashCode())
       .isEqualTo(new SimpleFieldFilterScope(fieldName1).hashCode());
     assertThat(underTest.hashCode())
-      .isNotEqualTo(null)
       .isNotEqualTo(new Object().hashCode())
       .isNotEqualTo(new SimpleFieldFilterScope(fieldName2).hashCode())
       .isNotEqualTo(new NestedFieldFilterScope<>(fieldName1, "foo", "bar").hashCode())
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/issue/notification/IssuesChangesNotificationBuilderTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/issue/notification/IssuesChangesNotificationBuilderTest.java
index 4db76a1818a..1b7316c2722 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/issue/notification/IssuesChangesNotificationBuilderTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/issue/notification/IssuesChangesNotificationBuilderTest.java
@@ -64,7 +64,8 @@ public class IssuesChangesNotificationBuilderTest {
   @Test
   public void fail_if_changed_issues_empty() {
     AnalysisChange analysisChange = new AnalysisChange(1_000_000_000L);
-    assertThatThrownBy(() -> new IssuesChangesNotificationBuilder(Collections.emptySet(), analysisChange))
+    Set<ChangedIssue> issues = Collections.emptySet();
+    assertThatThrownBy(() -> new IssuesChangesNotificationBuilder(issues, analysisChange))
       .isInstanceOf(IllegalArgumentException.class)
       .hasMessage("issues can't be empty");
   }
@@ -89,8 +90,8 @@ public class IssuesChangesNotificationBuilderTest {
     long date = 1_000_000_000L;
     UserChange userChange = new UserChange(date, new User("user_uuid", "user_login", null));
 
-    assertThat(userChange.toString())
-      .isEqualTo("UserChange{date=1000000000, user=User{uuid='user_uuid', login='user_login', name='null'}}");
+    assertThat(userChange)
+      .hasToString("UserChange{date=1000000000, user=User{uuid='user_uuid', login='user_login', name='null'}}");
   }
 
   @Test
@@ -102,8 +103,9 @@ public class IssuesChangesNotificationBuilderTest {
     UserChange userChange1 = new UserChange(now, new User(uuid_1, login_1, name_1));
     UserChange userChange2 = new UserChange(now, new User(uuid_1, login_1, name_1));
 
-    assertThat(userChange1.equals(userChange2)).isTrue();
-    assertThat(userChange1.equals(userChange1)).isTrue();
+    assertThat(userChange1)
+      .isEqualTo(userChange2)
+      .isEqualTo(userChange1);
   }
 
   @DataProvider
@@ -132,7 +134,7 @@ public class IssuesChangesNotificationBuilderTest {
     String name_1 = "name-1";
     UserChange userChange1 = new UserChange(now, new User(uuid_1, login_1, name_1));
 
-    assertThat(userChange1.equals(object)).isFalse();
+    assertThat(userChange1).isNotEqualTo(object);
   }
 
   @Test
@@ -166,8 +168,7 @@ public class IssuesChangesNotificationBuilderTest {
     long date = 1_000_000_000L;
     AnalysisChange userChange = new AnalysisChange(date);
 
-    assertThat(userChange.toString())
-      .isEqualTo("AnalysisChange{1000000000}");
+    assertThat(userChange).hasToString("AnalysisChange{1000000000}");
   }
 
   @Test
@@ -175,8 +176,9 @@ public class IssuesChangesNotificationBuilderTest {
     AnalysisChange analysisChange1 = new AnalysisChange(1_000_000_000L);
     AnalysisChange analysisChange2 = new AnalysisChange(1_000_000_000L);
 
-    assertThat(analysisChange1.equals(analysisChange2)).isTrue();
-    assertThat(analysisChange1.equals(analysisChange1)).isTrue();
+    assertThat(analysisChange1)
+      .isEqualTo(analysisChange2)
+      .isEqualTo(analysisChange1);
   }
 
   @Test
@@ -184,21 +186,21 @@ public class IssuesChangesNotificationBuilderTest {
     AnalysisChange analysisChange1 = new AnalysisChange(1_000_000_000L);
     AnalysisChange analysisChange2 = new AnalysisChange(2_000_000_000L);
 
-    assertThat(analysisChange1.equals(analysisChange2)).isFalse();
+    assertThat(analysisChange1).isNotEqualTo(analysisChange2);
   }
 
   @Test
   public void AnalysisChange_not_equal_with_null() {
     AnalysisChange analysisChange1 = new AnalysisChange(1_000_000_000L);
 
-    assertThat(analysisChange1.equals(null)).isFalse();
+    assertThat(analysisChange1).isNotEqualTo(null);
   }
 
   @Test
   public void AnalysisChange_not_equal_with_Object() {
     AnalysisChange analysisChange1 = new AnalysisChange(1_000_000_000L);
 
-    assertThat(analysisChange1.equals(new Object())).isFalse();
+    assertThat(analysisChange1).isNotEqualTo(new Object());
   }
 
   @Test
@@ -215,8 +217,8 @@ public class IssuesChangesNotificationBuilderTest {
       .setBranchName("branch-name")
       .build();
 
-    assertThat(project.toString())
-      .isEqualTo("Project{uuid='uuid', key='key', projectName='name', branchName='branch-name'}");
+    assertThat(project)
+      .hasToString("Project{uuid='uuid', key='key', projectName='name', branchName='branch-name'}");
   }
 
   @Test
@@ -233,8 +235,9 @@ public class IssuesChangesNotificationBuilderTest {
       .setBranchName("branch-name")
       .build();
 
-    assertThat(project1.equals(project2)).isTrue();
-    assertThat(project1.equals(project1)).isTrue();
+    assertThat(project1)
+      .isEqualTo(project2)
+      .isEqualTo(project1);
   }
 
   @DataProvider
@@ -263,7 +266,7 @@ public class IssuesChangesNotificationBuilderTest {
       .setBranchName("branch-name1")
       .build();
 
-    assertThat(project1.equals(object)).isFalse();
+    assertThat(project1).isNotEqualTo(object);
   }
 
   @Test
@@ -284,8 +287,8 @@ public class IssuesChangesNotificationBuilderTest {
   public void Rule_toString() {
     Rule rule = newRule("repository", "key", RuleType.CODE_SMELL, "name");
 
-    assertThat(rule.toString())
-      .isEqualTo("Rule{key=repository:key, type=CODE_SMELL, name='name'}");
+    assertThat(rule)
+      .hasToString("Rule{key=repository:key, type=CODE_SMELL, name='name'}");
   }
 
   @Test
@@ -293,8 +296,9 @@ public class IssuesChangesNotificationBuilderTest {
     Rule rule1 = newRule("repository", "key", RuleType.CODE_SMELL, "name");
     Rule rule2 = newRule("repository", "key", RuleType.CODE_SMELL, "name");
 
-    assertThat(rule1.equals(rule2)).isTrue();
-    assertThat(rule1.equals(rule1)).isTrue();
+    assertThat(rule1)
+      .isEqualTo(rule2)
+      .isEqualTo(rule1);
   }
 
   @DataProvider
@@ -341,8 +345,8 @@ public class IssuesChangesNotificationBuilderTest {
       .setAssignee(new User("uuid", "login", "name"))
       .build();
 
-    assertThat(changedIssue.toString())
-      .isEqualTo("ChangedIssue{key='key', newStatus='status', newResolution='resolution', " +
+    assertThat(changedIssue)
+      .hasToString("ChangedIssue{key='key', newStatus='status', newResolution='resolution', " +
         "assignee=User{uuid='uuid', login='login', name='name'}, " +
         "rule=Rule{key=repository:key, type=CODE_SMELL, name='name'}, " +
         "project=Project{uuid='uuid', key='key', projectName='name', branchName='branch-name'}}");
@@ -365,8 +369,9 @@ public class IssuesChangesNotificationBuilderTest {
       .setAssignee(new User("uuid", "login", "name"))
       .build();
 
-    assertThat(changedIssue1.equals(changedIssue2)).isTrue();
-    assertThat(changedIssue1.equals(changedIssue1)).isTrue();
+    assertThat(changedIssue1)
+      .isEqualTo(changedIssue2)
+      .isEqualTo(changedIssue1);
   }
 
   @DataProvider
@@ -430,7 +435,7 @@ public class IssuesChangesNotificationBuilderTest {
       .setAssignee(new User("uuid", "login", "name"))
       .build();
 
-    assertThat(changedIssue.equals(object)).isFalse();
+    assertThat(changedIssue).isNotEqualTo(object);
   }
 
   @Test