Browse Source

Use INFO level by default in unit tests

tags/5.4-M12
Simon Brandhof 8 years ago
parent
commit
00b76c8a74

+ 1
- 1
server/sonar-process/src/test/resources/logback-test.xml View File

@@ -7,7 +7,7 @@
</encoder>
</appender>

<root level="debug">
<root level="INFO">
<appender-ref ref="STDOUT"/>
</root>
</configuration>

+ 1
- 1
server/sonar-search/src/test/resources/logback-test.xml View File

@@ -31,7 +31,7 @@
</appender>

<root>
<level value="DEBUG"/>
<level value="INFO"/>
<appender-ref ref="CONSOLE"/>
</root>


+ 1
- 1
sonar-application/src/test/resources/logback-test.xml View File

@@ -11,7 +11,7 @@
</appender>

<root>
<level value="DEBUG"/>
<level value="INFO"/>
<appender-ref ref="CONSOLE"/>
</root>


+ 1
- 1
sonar-batch/src/test/resources/logback-test.xml View File

@@ -35,7 +35,7 @@
</logger>

<root>
<level value="DEBUG"/>
<level value="INFO"/>
<appender-ref ref="STDOUT"/>
</root>


+ 3
- 8
sonar-plugin-api/src/main/java/org/sonar/api/utils/log/LogTester.java View File

@@ -19,9 +19,8 @@
*/
package org.sonar.api.utils.log;

import org.junit.rules.ExternalResource;

import java.util.List;
import org.junit.rules.ExternalResource;

/**
* <b>For tests only</b>
@@ -58,12 +57,8 @@ import java.util.List;
*/
public class LogTester extends ExternalResource {

private LoggerLevel initialLevel;

@Override
protected void before() throws Throwable {
initialLevel = Loggers.getFactory().getLevel();

// this shared instance breaks compatibility with parallel execution of tests
LogInterceptors.set(new ListInterceptor());
setLevel(LoggerLevel.INFO);
@@ -72,7 +67,7 @@ public class LogTester extends ExternalResource {
@Override
protected void after() {
LogInterceptors.set(NullInterceptor.NULL_INSTANCE);
setLevel(initialLevel);
setLevel(LoggerLevel.INFO);
}

LoggerLevel getLevel() {
@@ -81,7 +76,7 @@ public class LogTester extends ExternalResource {

/**
* Enable/disable debug logs. Info, warn and error logs are always enabled.
* By default debug logs are enabled when LogTester is started.
* By default INFO logs are enabled when LogTester is started.
*/
public LogTester setLevel(LoggerLevel level) {
Loggers.getFactory().setLevel(level);

+ 2
- 0
sonar-plugin-api/src/test/java/org/sonar/api/utils/log/ConsoleLoggersTest.java View File

@@ -40,5 +40,7 @@ public class ConsoleLoggersTest {

underTest.setLevel(LoggerLevel.DEBUG);
assertThat(underTest.getLevel()).isEqualTo(LoggerLevel.DEBUG);

underTest.setLevel(LoggerLevel.INFO);
}
}

+ 2
- 4
sonar-plugin-api/src/test/java/org/sonar/api/utils/log/LogTesterTest.java View File

@@ -29,8 +29,6 @@ public class LogTesterTest {

@Test
public void info_level_by_default() throws Throwable {
LoggerLevel initial = underTest.getLevel();

// when LogTester is used, then info logs are enabled by default
underTest.before();
assertThat(underTest.getLevel()).isEqualTo(LoggerLevel.INFO);
@@ -43,8 +41,8 @@ public class LogTesterTest {

// reset to initial level after execution of test
underTest.after();
assertThat(underTest.getLevel()).isEqualTo(initial);
assertThat(Loggers.getFactory().getLevel()).isEqualTo(initial);
assertThat(underTest.getLevel()).isEqualTo(LoggerLevel.INFO);
assertThat(Loggers.getFactory().getLevel()).isEqualTo(LoggerLevel.INFO);
}

@Test

Loading…
Cancel
Save