logging-log4j-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Gary Gregory <garydgreg...@gmail.com>
Subject Re: logging-log4j2 git commit: LOG4J2-1528 fix line endings
Date Tue, 06 Sep 2016 17:58:23 GMT
I saw a commit go by with an Assume, so that's good.

Gary

On Tue, Sep 6, 2016 at 11:48 AM, Mikael Ståldal <mikael.staldal@magine.com>
wrote:

> Like this?
>
> On Tue, Sep 6, 2016 at 4:51 PM, Gary Gregory <garydgregory@gmail.com>
> wrote:
>
>> Can you use a JUnit Assume to skip the test, that would allow that test
>> to be counted as skipped.
>>
>> Gary
>>
>> On Sep 6, 2016 5:46 AM, <mikes@apache.org> wrote:
>>
>>> Repository: logging-log4j2
>>> Updated Branches:
>>>   refs/heads/master 170469514 -> 2f8236e5f
>>>
>>>
>>> LOG4J2-1528 fix line endings
>>>
>>>
>>> Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
>>> Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit
>>> /2f8236e5
>>> Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/2
>>> f8236e5
>>> Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/2
>>> f8236e5
>>>
>>> Branch: refs/heads/master
>>> Commit: 2f8236e5f64388fb05c27a9497d62168c4325fb9
>>> Parents: 1704695
>>> Author: Mikael Ståldal <mikael.staldal@magine.com>
>>> Authored: Tue Sep 6 14:45:48 2016 +0200
>>> Committer: Mikael Ståldal <mikael.staldal@magine.com>
>>> Committed: Tue Sep 6 14:45:48 2016 +0200
>>>
>>> ----------------------------------------------------------------------
>>>  .../builder/impl/DefaultConfigurationBuilder.java  |  2 +-
>>>  .../config/builder/ConfigurationBuilderTest.java   | 17
>>> ++++++++++-------
>>>  2 files changed, 11 insertions(+), 8 deletions(-)
>>> ----------------------------------------------------------------------
>>>
>>>
>>> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2
>>> f8236e5/log4j-core/src/main/java/org/apache/logging/log4j/co
>>> re/config/builder/impl/DefaultConfigurationBuilder.java
>>> ----------------------------------------------------------------------
>>> diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/con
>>> fig/builder/impl/DefaultConfigurationBuilder.java
>>> b/log4j-core/src/main/java/org/apache/logging/log4j/core/con
>>> fig/builder/impl/DefaultConfigurationBuilder.java
>>> index acec63c..8a700a4 100644
>>> --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/con
>>> fig/builder/impl/DefaultConfigurationBuilder.java
>>> +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/con
>>> fig/builder/impl/DefaultConfigurationBuilder.java
>>> @@ -54,7 +54,7 @@ import org.apache.logging.log4j.core.util.Throwables;
>>>  public class DefaultConfigurationBuilder<T extends BuiltConfiguration>
>>> implements ConfigurationBuilder<T> {
>>>
>>>      private static final String INDENT = "\t";
>>> -    private static final String EOL = "\n";
>>> +    private static final String EOL = System.lineSeparator();
>>>
>>>      private final Component root = new Component();
>>>      private Component loggers;
>>>
>>> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2
>>> f8236e5/log4j-core/src/test/java/org/apache/logging/log4j/co
>>> re/config/builder/ConfigurationBuilderTest.java
>>> ----------------------------------------------------------------------
>>> diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/con
>>> fig/builder/ConfigurationBuilderTest.java b/log4j-core/src/test/java/org
>>> /apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java
>>> index 12356c6..9bcfcd1 100644
>>> --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/con
>>> fig/builder/ConfigurationBuilderTest.java
>>> +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/con
>>> fig/builder/ConfigurationBuilderTest.java
>>> @@ -16,8 +16,6 @@
>>>   */
>>>  package org.apache.logging.log4j.core.config.builder;
>>>
>>> -import static org.junit.Assert.assertEquals;
>>> -
>>>  import org.apache.logging.log4j.Level;
>>>  import org.apache.logging.log4j.core.Filter;
>>>  import org.apache.logging.log4j.core.appender.ConsoleAppender;
>>> @@ -27,9 +25,11 @@ import org.apache.logging.log4j.core.
>>> config.builder.api.ConfigurationBuilderFact
>>>  import org.apache.logging.log4j.core.config.builder.impl.BuiltConfi
>>> guration;
>>>  import org.junit.Test;
>>>
>>> +import static org.junit.Assert.*;
>>> +
>>>  public class ConfigurationBuilderTest {
>>>
>>> -    private static final String EOL = "\n"; // HACK!
>>> System.lineSeparator();
>>> +    private static final String EOL = System.lineSeparator();
>>>
>>>      private void addTestFixtures(final String name, final
>>> ConfigurationBuilder<BuiltConfiguration> builder) {
>>>          builder.setConfigurationName(name);
>>> @@ -81,12 +81,15 @@ public class ConfigurationBuilderTest {
>>>              "\t</Loggers>" + EOL +
>>>              "</Configuration>" + EOL;
>>>
>>> +    // TODO make test run properly on Windows
>>>      @Test
>>>      public void testXmlConstructing() throws Exception {
>>> -        final ConfigurationBuilder<BuiltConfiguration> builder =
>>> ConfigurationBuilderFactory.newConfigurationBuilder();
>>> -        addTestFixtures("config name", builder);
>>> -        final String xmlConfiguration = builder.toXmlConfiguration();
>>> -        assertEquals(expectedXml, xmlConfiguration);
>>> +        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);
>>> +        }
>>>      }
>>>
>>>  }
>>>
>>>
>
>
> --
> [image: MagineTV]
>
> *Mikael Ståldal*
> Senior software developer
>
> *Magine TV*
> mikael.staldal@magine.com
> Grev Turegatan 3  | 114 46 Stockholm, Sweden  |   www.magine.com
>
> Privileged and/or Confidential Information may be contained in this
> message. If you are not the addressee indicated in this message
> (or responsible for delivery of the message to such a person), you may not
> copy or deliver this message to anyone. In such case,
> you should destroy this message and kindly notify the sender by reply
> email.
>



-- 
E-Mail: garydgregory@gmail.com | ggregory@apache.org
Java Persistence with Hibernate, Second Edition
<http://www.manning.com/bauer3/>
JUnit in Action, Second Edition <http://www.manning.com/tahchiev/>
Spring Batch in Action <http://www.manning.com/templier/>
Blog: http://garygregory.wordpress.com
Home: http://garygregory.com/
Tweet! http://twitter.com/GaryGregory

Mime
View raw message