diff options
| author | Duarte Meneses <duarte.meneses@sonarsource.com> | 2021-08-10 07:57:05 -0500 |
|---|---|---|
| committer | sonartech <sonartech@sonarsource.com> | 2021-08-11 20:08:07 +0000 |
| commit | 8be4f5b086485b2a9f83f88dfb6e66eece33d949 (patch) | |
| tree | a0105548c716fd0fd65fe5f257afb74010a5280e /server/sonar-main/src/test | |
| parent | d9ca950d8e7a035e25843dd97c2e38ef4eac7054 (diff) | |
| download | sonarqube-8be4f5b086485b2a9f83f88dfb6e66eece33d949.tar.gz sonarqube-8be4f5b086485b2a9f83f88dfb6e66eece33d949.zip | |
SONAR-15244 Despite sonar.log.useJsonOutput is enabled some logs are still not in a JSON format
Diffstat (limited to 'server/sonar-main/src/test')
| -rw-r--r-- | server/sonar-main/src/test/java/org/sonar/application/command/CommandFactoryImplTest.java | 6 | ||||
| -rw-r--r-- | server/sonar-main/src/test/java/org/sonar/application/command/EsJvmOptionsTest.java | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/server/sonar-main/src/test/java/org/sonar/application/command/CommandFactoryImplTest.java b/server/sonar-main/src/test/java/org/sonar/application/command/CommandFactoryImplTest.java index ff12bbb68c6..b3bf9a7c1ce 100644 --- a/server/sonar-main/src/test/java/org/sonar/application/command/CommandFactoryImplTest.java +++ b/server/sonar-main/src/test/java/org/sonar/application/command/CommandFactoryImplTest.java @@ -134,7 +134,7 @@ public class CommandFactoryImplTest { assertThat(esConfig.getHttpPort()).isEqualTo(9001); assertThat(esConfig.getEsJvmOptions().getAll()) // enforced values - .contains("-XX:+UseConcMarkSweepGC", "-Dfile.encoding=UTF-8") + .contains("-Dfile.encoding=UTF-8") // default settings .contains("-Xms512m", "-Xmx512m", "-XX:+HeapDumpOnOutOfMemoryError"); assertThat(esConfig.getEsYmlSettings()).isNotNull(); @@ -169,7 +169,7 @@ public class CommandFactoryImplTest { assertThat(esConfig.getHttpPort()).isEqualTo(9001); assertThat(esConfig.getEsJvmOptions().getAll()) // enforced values - .contains("-XX:+UseConcMarkSweepGC", "-Dfile.encoding=UTF-8") + .contains("-Dfile.encoding=UTF-8") // default settings .contains("-Xms512m", "-Xmx512m", "-XX:+HeapDumpOnOutOfMemoryError"); assertThat(esConfig.getEsYmlSettings()).isNotNull(); @@ -209,7 +209,7 @@ public class CommandFactoryImplTest { assertThat(esConfig.getHttpPort()).isEqualTo(1234); assertThat(esConfig.getEsJvmOptions().getAll()) // enforced values - .contains("-XX:+UseConcMarkSweepGC", "-Dfile.encoding=UTF-8") + .contains("-Dfile.encoding=UTF-8") .contains("-Djava.io.tmpdir=" + tempDir.getAbsolutePath()) // user settings .contains("-Xms10G", "-Xmx10G") 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 62086882fd4..f3d78b6adfe 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 @@ -50,7 +50,6 @@ public class EsJvmOptionsTest { assertThat(underTest.getAll()) .containsExactly( - "-XX:+UseConcMarkSweepGC", "-XX:CMSInitiatingOccupancyFraction=75", "-XX:+UseCMSInitiatingOccupancyOnly", "-Djava.io.tmpdir=" + tmpDir.getAbsolutePath(), @@ -133,7 +132,6 @@ public class EsJvmOptionsTest { "\n" + "# DO NOT EDIT THIS FILE\n" + "\n" + - "-XX:+UseConcMarkSweepGC\n" + "-XX:CMSInitiatingOccupancyFraction=75\n" + "-XX:+UseCMSInitiatingOccupancyOnly\n" + "-Djava.io.tmpdir=" + tmpDir.getAbsolutePath() + "\n" + |