From 55beb4250989be32c957a61b80321f6d2c4528a6 Mon Sep 17 00:00:00 2001 From: Philippe Perrin Date: Thu, 10 Dec 2020 11:30:28 +0100 Subject: [PATCH] Fix AssertJ assertions --- .../source/SourceLinesHashRepositoryImplTest.java | 4 ++-- .../java/org/sonar/application/command/EsJvmOptionsTest.java | 2 ++ .../org/sonar/process/systeminfo/JvmStateSectionTest.java | 5 ++++- .../server/issue/index/IssueIndexSecurityReportsTest.java | 4 +++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/SourceLinesHashRepositoryImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/SourceLinesHashRepositoryImplTest.java index 1ca98731ca1..05fef6d04c3 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/SourceLinesHashRepositoryImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/SourceLinesHashRepositoryImplTest.java @@ -233,8 +233,8 @@ public class SourceLinesHashRepositoryImplTest { for (int i = 0; i < expectedLines.size(); i++) { assertThat(actualLines.get(i)) - .isEqualTo(expectedLines.get(i)) - .withFailMessage("Line hash is different for line %d", i); + .withFailMessage("Line hash is different for line %d", i) + .isEqualTo(expectedLines.get(i)); } } } diff --git a/server/sonar-main/src/test/java/org/sonar/application/command/EsJvmOptionsTest.java b/server/sonar-main/src/test/java/org/sonar/application/command/EsJvmOptionsTest.java index 2d51a0f5403..d7b21dce9e8 100644 --- a/server/sonar-main/src/test/java/org/sonar/application/command/EsJvmOptionsTest.java +++ b/server/sonar-main/src/test/java/org/sonar/application/command/EsJvmOptionsTest.java @@ -80,6 +80,7 @@ public class EsJvmOptionsTest { EsJvmOptions underTest = new EsJvmOptions(new Props(properties), tmpDir); assertThat(underTest.getAll()) + .isNotEmpty() .doesNotContain("-Des.enforce.bootstrap.checks=true"); } @@ -109,6 +110,7 @@ public class EsJvmOptionsTest { EsJvmOptions underTest = new EsJvmOptions(new Props(properties), tmpDir); assertThat(underTest.getAll()) + .isNotEmpty() .doesNotContain("-Des.enforce.bootstrap.checks=true"); } diff --git a/server/sonar-process/src/test/java/org/sonar/process/systeminfo/JvmStateSectionTest.java b/server/sonar-process/src/test/java/org/sonar/process/systeminfo/JvmStateSectionTest.java index db8ab605e18..3e81b2a7a39 100644 --- a/server/sonar-process/src/test/java/org/sonar/process/systeminfo/JvmStateSectionTest.java +++ b/server/sonar-process/src/test/java/org/sonar/process/systeminfo/JvmStateSectionTest.java @@ -54,6 +54,9 @@ public class JvmStateSectionTest { JvmStateSection underTest = new JvmStateSection(PROCESS_NAME); ProtobufSystemInfo.Section section = underTest.toProtobuf(memoryBean); - assertThat(section.getAttributesList()).extracting("key").doesNotContain("Heap Committed (MB)"); + assertThat(section.getAttributesList()) + .extracting("key") + .isNotEmpty() + .doesNotContain("Heap Committed (MB)"); } } diff --git a/server/sonar-webserver-es/src/test/java/org/sonar/server/issue/index/IssueIndexSecurityReportsTest.java b/server/sonar-webserver-es/src/test/java/org/sonar/server/issue/index/IssueIndexSecurityReportsTest.java index c398be4e9c7..8ebde33671c 100644 --- a/server/sonar-webserver-es/src/test/java/org/sonar/server/issue/index/IssueIndexSecurityReportsTest.java +++ b/server/sonar-webserver-es/src/test/java/org/sonar/server/issue/index/IssueIndexSecurityReportsTest.java @@ -164,7 +164,9 @@ public class IssueIndexSecurityReportsTest { public void getOwaspTop10Report_aggregation_no_cwe() { List owaspTop10Report = indexIssuesAndAssertOwaspReport(false); - assertThat(owaspTop10Report).allMatch(category -> category.getChildren().isEmpty()); + assertThat(owaspTop10Report) + .isNotEmpty() + .allMatch(category -> category.getChildren().isEmpty()); } @Test -- 2.39.5