From c1b811da429ce068a15b21d87aa969dd6d956a72 Mon Sep 17 00:00:00 2001 From: Bruno Andrade Date: Mon, 19 Jun 2023 12:20:35 +0100 Subject: [PATCH] NO-JIRA (code smell fix): using isEmpty, isTrue, isNegative for better readability --- .../step/ReportPersistComponentsStepIT.java | 2 +- .../QProfileStatusRepositoryImplTest.java | 4 ++-- .../java/org/sonar/application/es/EsLoggingTest.java | 2 +- .../org/sonar/server/setting/ChildSettingsTest.java | 2 +- .../java/org/sonar/server/app/TomcatContextsTest.java | 5 +++-- .../duplications/utils/FastStringComparatorTest.java | 2 +- .../pattern/IssueExclusionPatternInitializerTest.java | 10 +++++----- 7 files changed, 14 insertions(+), 13 deletions(-) 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 e7d791ea682..7dd7d3449c9 100644 --- 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 8e1255d712c..f6b42acc807 100644 --- 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 6336e311249..68c5b090665 100644 --- 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 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 2ac280badf7..4f3eb325035 100644 --- 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 0a91baa820e..81350b5c7b8 100644 --- 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 70bbc1974e4..308cfe5f028 100644 --- 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 415df5aa832..35f9178c9f3 100644 --- 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); } -- 2.39.5