NO-JIRA (code smell fix): using isEmpty, isTrue, isNegative for better readability

diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/ReportPersistComponentsStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/ReportPersistComponentsStepIT.java
index e7d791ea682022eb69a444e0ab5dfcf9cdc1b24e..7dd7d3449c901f1dbddf4eb754ed95b2aab004f2 100644 (file)
--- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/ReportPersistComponentsStepIT.java
+++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/ReportPersistComponentsStepIT.java
@@ -464,7 +464,7 @@ public class ReportPersistComponentsStepIT extends BaseStepTest {
     Stream.of(project.uuid(), dir.uuid())
       .forEach(uuid -> assertThat(dbClient.componentDao().selectByUuid(db.getSession(), uuid).get().isPrivate())
         .describedAs("for uuid " + uuid)
-        .isEqualTo(true));
+        .isTrue());
   }
 
   private ReportComponent createSampleProjectComponentTree(ComponentDto project) {

diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualityprofile/QProfileStatusRepositoryImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualityprofile/QProfileStatusRepositoryImplTest.java
index 8e1255d712c00eac394bf13b5a3099cf337fcd12..f6b42acc8079e3d665d400726c605b9cb39c4568 100644 (file)
--- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualityprofile/QProfileStatusRepositoryImplTest.java
+++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/qualityprofile/QProfileStatusRepositoryImplTest.java
@@ -54,12 +54,12 @@ public class QProfileStatusRepositoryImplTest {
   public void get_return_empty_for_qp_not_registered(QProfileStatusRepository.Status status) {
     underTest.register("key", status);
 
-    assertThat(underTest.get("other_key")).isEqualTo(Optional.empty());
+    assertThat(underTest.get("other_key")).isEmpty();
   }
 
   @Test
   public void get_return_empty_for_null_qp_key() {
-    assertThat(underTest.get(null)).isEqualTo(Optional.empty());
+    assertThat(underTest.get(null)).isEmpty();
   }
 
   @Test

diff --git a/server/sonar-main/src/test/java/org/sonar/application/es/EsLoggingTest.java b/server/sonar-main/src/test/java/org/sonar/application/es/EsLoggingTest.java
index 6336e3112498da5fc530a8b60cfb0e15482619d8..68c5b0906655613189f2b951b302ac3527fa6108 100644 (file)
--- a/server/sonar-main/src/test/java/org/sonar/application/es/EsLoggingTest.java
+++ b/server/sonar-main/src/test/java/org/sonar/application/es/EsLoggingTest.java
@@ -127,7 +127,7 @@ public class EsLoggingTest {
 
   private void verifyProperties(Properties properties, String... expectedPropertyKeysAndValuesOrdered) {
     if (expectedPropertyKeysAndValuesOrdered.length == 0) {
-      assertThat(properties.size()).isZero();
+      assertThat(properties).isEmpty();
     } else {
       assertThat(expectedPropertyKeysAndValuesOrdered.length % 2).describedAs("Number of parameters must be even").isZero();
       Set<String> keys = new HashSet<>(expectedPropertyKeysAndValuesOrdered.length / 2 + 1);

diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/setting/ChildSettingsTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/setting/ChildSettingsTest.java
index 2ac280badf7664275a1401a8d47dcfdf4ce888da..4f3eb3250359228c02a0247150383cb9ccefb7b5 100644 (file)
--- a/server/sonar-server-common/src/test/java/org/sonar/server/setting/ChildSettingsTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/setting/ChildSettingsTest.java
@@ -100,7 +100,7 @@ public class ChildSettingsTest {
     assertThat(underTest.get(key)).isEqualTo(Optional.of(childValue));
 
     underTest.remove(key);
-    assertThat(underTest.get(key)).isEqualTo(Optional.empty());
+    assertThat(underTest.get(key)).isEmpty();
   }
 
   @Test

diff --git a/server/sonar-webserver/src/test/java/org/sonar/server/app/TomcatContextsTest.java b/server/sonar-webserver/src/test/java/org/sonar/server/app/TomcatContextsTest.java
index 0a91baa820e0e81dc3723d9c7cd03c9e85dc1db7..81350b5c7b8c84606be63e408ae033910a88f2d1 100644 (file)
--- a/server/sonar-webserver/src/test/java/org/sonar/server/app/TomcatContextsTest.java
+++ b/server/sonar-webserver/src/test/java/org/sonar/server/app/TomcatContextsTest.java
@@ -88,8 +88,9 @@ public class TomcatContextsTest {
 
     underTest.addStaticDir(tomcat, "/deploy", dir);
 
-    assertThat(dir).isDirectory().exists();
-    assertThat(dir.listFiles()).isEmpty();
+    assertThat(dir).isDirectory()
+      .exists()
+      .isEmptyDirectory();
   }
 
   @Test

diff --git a/sonar-duplications/src/test/java/org/sonar/duplications/utils/FastStringComparatorTest.java b/sonar-duplications/src/test/java/org/sonar/duplications/utils/FastStringComparatorTest.java
index 70bbc1974e4b0bd141d58904a70c8963b8edfa08..308cfe5f028b6606cd00ef81b73c178f7c0c78ae 100644 (file)
--- a/sonar-duplications/src/test/java/org/sonar/duplications/utils/FastStringComparatorTest.java
+++ b/sonar-duplications/src/test/java/org/sonar/duplications/utils/FastStringComparatorTest.java
@@ -35,7 +35,7 @@ public class FastStringComparatorTest {
     String s2 = "PE";
 
     assertThat(s1).hasSameHashCodeAs(s2);
-    assertThat(compare(s1, s2)).isLessThan(0);
+    assertThat(compare(s1, s2)).isNegative();
     assertThat(compare(s2, s1)).isPositive();
   }
 

diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/ignore/pattern/IssueExclusionPatternInitializerTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/ignore/pattern/IssueExclusionPatternInitializerTest.java
index 415df5aa8322f4ab8312e3889b62b8259a25fbd9..35f9178c9f3a3f1f61233bad57c5cacab0a201cb 100644 (file)
--- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/ignore/pattern/IssueExclusionPatternInitializerTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/issue/ignore/pattern/IssueExclusionPatternInitializerTest.java
@@ -42,7 +42,7 @@ public class IssueExclusionPatternInitializerTest {
   public void testNoConfiguration() {
     patternsInitializer = new IssueExclusionPatternInitializer(settings.asConfig());
     assertThat(patternsInitializer.hasConfiguredPatterns()).isFalse();
-    assertThat(patternsInitializer.getMulticriteriaPatterns().size()).isZero();
+    assertThat(patternsInitializer.getMulticriteriaPatterns()).isEmpty();
   }
 
   @Test(expected = MessageException.class)
@@ -75,9 +75,9 @@ public class IssueExclusionPatternInitializerTest {
     assertThat(patternsInitializer.hasConfiguredPatterns()).isTrue();
     assertThat(patternsInitializer.hasFileContentPattern()).isTrue();
     assertThat(patternsInitializer.hasMulticriteriaPatterns()).isFalse();
-    assertThat(patternsInitializer.getMulticriteriaPatterns().size()).isZero();
+    assertThat(patternsInitializer.getMulticriteriaPatterns()).isEmpty();
     assertThat(patternsInitializer.getBlockPatterns()).hasSize(3);
-    assertThat(patternsInitializer.getAllFilePatterns().size()).isZero();
+    assertThat(patternsInitializer.getAllFilePatterns()).isEmpty();
   }
 
   @Test(expected = MessageException.class)
@@ -98,8 +98,8 @@ public class IssueExclusionPatternInitializerTest {
     assertThat(patternsInitializer.hasConfiguredPatterns()).isTrue();
     assertThat(patternsInitializer.hasFileContentPattern()).isTrue();
     assertThat(patternsInitializer.hasMulticriteriaPatterns()).isFalse();
-    assertThat(patternsInitializer.getMulticriteriaPatterns().size()).isZero();
-    assertThat(patternsInitializer.getBlockPatterns().size()).isZero();
+    assertThat(patternsInitializer.getMulticriteriaPatterns()).isEmpty();
+    assertThat(patternsInitializer.getBlockPatterns()).isEmpty();
     assertThat(patternsInitializer.getAllFilePatterns()).hasSize(2);
   }