aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-scanner-engine
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@sonarsource.com>2018-01-10 21:41:23 +0100
committerSimon Brandhof <simon.brandhof@sonarsource.com>2018-01-14 20:37:37 +0100
commit12d555eff64f68a39456c1a416b72fc930c8153b (patch)
tree96c60d71c99b39e26260fd093c89557dad5476c7 /sonar-scanner-engine
parentd55f047c445daf698ccde5f0af9d0669804c818b (diff)
downloadsonarqube-12d555eff64f68a39456c1a416b72fc930c8153b.tar.gz
sonarqube-12d555eff64f68a39456c1a416b72fc930c8153b.zip
Upgrade assertJ from 3.4.1 to 3.9.0
Diffstat (limited to 'sonar-scanner-engine')
-rw-r--r--sonar-scanner-engine/src/test/java/org/sonar/scanner/report/AnalysisContextReportPublisherTest.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/report/AnalysisContextReportPublisherTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/report/AnalysisContextReportPublisherTest.java
index 4c519f07f41..d420c70666c 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/report/AnalysisContextReportPublisherTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/report/AnalysisContextReportPublisherTest.java
@@ -173,7 +173,7 @@ public class AnalysisContextReportPublisherTest {
String content = FileUtils.readFileToString(writer.getFileStructure().analysisLog());
assertThat(content).containsOnlyOnce(FOO);
assertThat(content).containsOnlyOnce(BIZ);
- assertThat(content).containsSequence(BIZ, FOO);
+ assertThat(content).containsSubsequence(BIZ, FOO);
publisher.dumpModuleSettings(new DefaultInputModule(ProjectDefinition.create()
.setBaseDir(temp.newFolder())
@@ -203,7 +203,7 @@ public class AnalysisContextReportPublisherTest {
.setProperty("sonar.password", "azerty")
.setProperty("sonar.cpp.license.secured", "AZERTY")));
- assertThat(FileUtils.readFileToString(writer.getFileStructure().analysisLog())).containsSequence(
+ assertThat(FileUtils.readFileToString(writer.getFileStructure().analysisLog())).containsSubsequence(
"sonar.cpp.license.secured=******",
"sonar.login=******",
"sonar.password=******",
@@ -218,7 +218,7 @@ public class AnalysisContextReportPublisherTest {
publisher.init(writer);
- assertThat(FileUtils.readFileToString(writer.getFileStructure().analysisLog())).containsSequence(
+ assertThat(FileUtils.readFileToString(writer.getFileStructure().analysisLog())).containsSubsequence(
"sonar.cpp.license.secured=******",
"sonar.login=******",
"sonar.password=******");