You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2016/09/08 14:50:38 UTC
[09/50] [abbrv] logging-log4j2 git commit: LOG4J2-1528 use JUnit
Assume
LOG4J2-1528 use JUnit Assume
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/3bab4faf
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/3bab4faf
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/3bab4faf
Branch: refs/heads/LOG4J2-1349-gcfree-threadcontext
Commit: 3bab4faf41251886bf009d95a819ea21e4e0f484
Parents: f113499
Author: Mikael St�ldal <mi...@magine.com>
Authored: Tue Sep 6 17:47:32 2016 +0200
Committer: Mikael St�ldal <mi...@magine.com>
Committed: Tue Sep 6 17:47:32 2016 +0200
----------------------------------------------------------------------
.../core/config/builder/ConfigurationBuilderTest.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3bab4faf/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java
index 9bcfcd1..c465393 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java
@@ -26,6 +26,7 @@ import org.apache.logging.log4j.core.config.builder.impl.BuiltConfiguration;
import org.junit.Test;
import static org.junit.Assert.*;
+import static org.junit.Assume.assumeTrue;
public class ConfigurationBuilderTest {
@@ -84,12 +85,11 @@ public class ConfigurationBuilderTest {
// TODO make test run properly on Windows
@Test
public void testXmlConstructing() throws Exception {
- if (System.lineSeparator().length() == 1) { // Only run test on platforms with single character line endings (such as Linux), not on Windows
- final ConfigurationBuilder<BuiltConfiguration> builder = ConfigurationBuilderFactory.newConfigurationBuilder();
- addTestFixtures("config name", builder);
- final String xmlConfiguration = builder.toXmlConfiguration();
- assertEquals(expectedXml, xmlConfiguration);
- }
+ assumeTrue(System.lineSeparator().length() == 1); // Only run test on platforms with single character line endings (such as Linux), not on Windows
+ final ConfigurationBuilder<BuiltConfiguration> builder = ConfigurationBuilderFactory.newConfigurationBuilder();
+ addTestFixtures("config name", builder);
+ final String xmlConfiguration = builder.toXmlConfiguration();
+ assertEquals(expectedXml, xmlConfiguration);
}
}