fix code smells

7 files changed, 15 insertions, 15 deletions

diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/ce/measure/RangeDistributionBuilderTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/ce/measure/RangeDistributionBuilderTest.java
index 4d9c9a3f6b2..63b517ab4cd 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/ce/measure/RangeDistributionBuilderTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/ce/measure/RangeDistributionBuilderTest.java
@@ -33,7 +33,7 @@ public class RangeDistributionBuilderTest {
 
     assertThat(limits[0]).isEqualTo(4);
     assertThat(limits[1]).isEqualTo(2);
-    assertThat(limits[2]).isEqualTo(0);
+    assertThat(limits[2]).isZero();
   }
 
   @Test
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/server/ws/RequestTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/server/ws/RequestTest.java
index c183a902c67..1af1faa142c 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/server/ws/RequestTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/server/ws/RequestTest.java
@@ -366,8 +366,8 @@ public class RequestTest {
     assertThat(emptyAsNull).isNotSameAs(stringParam);
     assertThat(emptyAsNull.isPresent()).isTrue();
     expectSupplierCanNotBeNullNPE(() -> emptyAsNull.or(null));
-    assertThat(emptyAsNull.or(() -> "bar")).isEqualTo(null);
-    assertThat(emptyAsNull.getValue()).isEqualTo(null);
+    assertThat(emptyAsNull.or(() -> "bar")).isNull();
+    assertThat(emptyAsNull.getValue()).isNull();
   }
 
   @Test
@@ -427,8 +427,8 @@ public class RequestTest {
     assertThat(emptyAsNull).isNotSameAs(stringParam);
     assertThat(emptyAsNull.isPresent()).isTrue();
     expectSupplierCanNotBeNullNPE(() -> emptyAsNull.or(null));
-    assertThat(emptyAsNull.or(() -> "bar")).isEqualTo(null);
-    assertThat(emptyAsNull.getValue()).isEqualTo(null);
+    assertThat(emptyAsNull.or(() -> "bar")).isNull();
+    assertThat(emptyAsNull.getValue()).isNull();
   }
 
   @Test
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/task/TaskDefinitionTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/task/TaskDefinitionTest.java
index f1258df716f..7444240b3bd 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/task/TaskDefinitionTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/task/TaskDefinitionTest.java
@@ -61,7 +61,7 @@ public class TaskDefinitionTest {
     TaskDefinition bar = TaskDefinition.builder().key("bar").taskClass(FooTask.class).description("Bar").build();
 
     assertThat(foo.compareTo(bar)).isGreaterThan(0);
-    assertThat(foo.compareTo(foo)).isEqualTo(0);
+    assertThat(foo).isEqualByComparingTo(foo);
     assertThat(bar.compareTo(foo)).isLessThan(0);
   }
 
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/utils/DateUtilsTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/utils/DateUtilsTest.java
index 1281b641b07..f0122c75e0e 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/utils/DateUtilsTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/utils/DateUtilsTest.java
@@ -134,7 +134,7 @@ public class DateUtilsTest {
   public void date_to_long() {
     Date date = new Date();
     assertThat(DateUtils.dateToLong(date)).isEqualTo(date.getTime());
-    assertThat(DateUtils.dateToLong(null)).isEqualTo(null);
+    assertThat(DateUtils.dateToLong(null)).isNull();
   }
 
   @DataProvider
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/utils/PagingTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/utils/PagingTest.java
index c233dadde6d..d2c43d7fe6a 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/utils/PagingTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/utils/PagingTest.java
@@ -38,13 +38,13 @@ public class PagingTest {
     assertThat(paging.pageIndex()).isEqualTo(1);
     assertThat(paging.total()).isEqualTo(20);
 
-    assertThat(paging.offset()).isEqualTo(0);
+    assertThat(paging.offset()).isZero();
     assertThat(paging.pages()).isEqualTo(4);
   }
 
   @Test
   public void test_offset() {
-    assertThat(forPageIndex(1).withPageSize(5).andTotal(20).offset()).isEqualTo(0);
+    assertThat(forPageIndex(1).withPageSize(5).andTotal(20).offset()).isZero();
     assertThat(forPageIndex(2).withPageSize(5).andTotal(20).offset()).isEqualTo(5);
   }
 
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/utils/VersionTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/utils/VersionTest.java
index 8c00c020e77..e79f1ff72a5 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/utils/VersionTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/utils/VersionTest.java
@@ -77,8 +77,8 @@ public class VersionTest {
 
   @Test
   public void test_compareTo() {
-    assertThat(parse("1.2").compareTo(parse("1.2.0"))).isEqualTo(0);
-    assertThat(parse("1.2.3").compareTo(parse("1.2.3"))).isEqualTo(0);
+    assertThat(parse("1.2")).isEqualByComparingTo(parse("1.2.0"));
+    assertThat(parse("1.2.3")).isEqualByComparingTo(parse("1.2.3"));
     assertThat(parse("1.2.3").compareTo(parse("1.2.4"))).isLessThan(0);
     assertThat(parse("1.2.3").compareTo(parse("1.3"))).isLessThan(0);
     assertThat(parse("1.2.3").compareTo(parse("2.1"))).isLessThan(0);
@@ -88,7 +88,7 @@ public class VersionTest {
 
   @Test
   public void compareTo_handles_build_number() {
-    assertThat(parse("1.2").compareTo(parse("1.2.0.0"))).isEqualTo(0);
+    assertThat(parse("1.2")).isEqualByComparingTo(parse("1.2.0.0"));
     assertThat(parse("1.2.3.1234").compareTo(parse("1.2.3.4567"))).isLessThan(0);
     assertThat(parse("1.2.3.1234").compareTo(parse("1.2.3"))).isGreaterThan(0);
     assertThat(parse("1.2.3.1234").compareTo(parse("1.2.4"))).isLessThan(0);
@@ -99,7 +99,7 @@ public class VersionTest {
   public void qualifier_is_ignored_from_comparison() {
     assertThat(parse("1.2.3")).isEqualTo(parse("1.2.3-build1"));
     assertThat(parse("1.2.3")).isEqualTo(parse("1.2.3-build1"));
-    assertThat(parse("1.2.3").compareTo(parse("1.2.3-build1"))).isEqualTo(0);
+    assertThat(parse("1.2.3")).isEqualByComparingTo(parse("1.2.3-build1"));
   }
 
   @Test
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/utils/command/CommandExecutorTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/utils/command/CommandExecutorTest.java
index a158ec4972a..e758c6ff468 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/utils/command/CommandExecutorTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/utils/command/CommandExecutorTest.java
@@ -62,7 +62,7 @@ public class CommandExecutorTest {
       StreamConsumer stdErrConsumer = line -> stdErrBuilder.append(line).append(SystemUtils.LINE_SEPARATOR);
       Command command = Command.create(getScript("output")).setDirectory(workDir);
       int exitCode = CommandExecutor.create().execute(command, stdOutConsumer, stdErrConsumer, 1000L);
-      assertThat(exitCode).isEqualTo(0);
+      assertThat(exitCode).isZero();
 
       String stdOut = stdOutBuilder.toString();
       String stdErr = stdErrBuilder.toString();
@@ -103,7 +103,7 @@ public class CommandExecutorTest {
       .addArgument("1")
       .setEnvironmentVariable("ENVVAR", "2");
     int exitCode = CommandExecutor.create().execute(command, 1000L);
-    assertThat(exitCode).isEqualTo(0);
+    assertThat(exitCode).isZero();
     File logFile = new File(workDir, "echo.log");
     assertThat(logFile).exists();
     String log = FileUtils.readFileToString(logFile);