Repository: logging-log4j2
Updated Branches:
  refs/heads/master 571ac1dbf -> a88c7162d


Merge StringsTest tests.


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/fc6b63c5
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/fc6b63c5
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/fc6b63c5

Branch: refs/heads/master
Commit: fc6b63c565f199f3986bb5e444d706301b335746
Parents: 571ac1d
Author: Matt Sicker <[email protected]>
Authored: Sat Feb 27 20:09:41 2016 -0600
Committer: Matt Sicker <[email protected]>
Committed: Sat Feb 27 20:09:41 2016 -0600

----------------------------------------------------------------------
 .../java/org/apache/log4j/util/StringsTest.java | 36 --------------------
 .../apache/logging/log4j/util/StringsTest.java  |  9 +++++
 2 files changed, 9 insertions(+), 36 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/fc6b63c5/log4j-api/src/test/java/org/apache/log4j/util/StringsTest.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/test/java/org/apache/log4j/util/StringsTest.java 
b/log4j-api/src/test/java/org/apache/log4j/util/StringsTest.java
deleted file mode 100644
index 39c5f2f..0000000
--- a/log4j-api/src/test/java/org/apache/log4j/util/StringsTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.log4j.util;
-
-import org.apache.logging.log4j.util.Strings;
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- * Tests {@link Strings}.
- */
-public class StringsTest {
-
-    /**
-     * A sanity test to make sure a typo does not mess up {@link 
Strings#EMPTY}.
-     */
-    @Test
-    public void testEMPTY() {
-        Assert.assertEquals("", Strings.EMPTY);
-        Assert.assertEquals(0, Strings.EMPTY.length());
-    }
-}

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/fc6b63c5/log4j-api/src/test/java/org/apache/logging/log4j/util/StringsTest.java
----------------------------------------------------------------------
diff --git 
a/log4j-api/src/test/java/org/apache/logging/log4j/util/StringsTest.java 
b/log4j-api/src/test/java/org/apache/logging/log4j/util/StringsTest.java
index fc120e7..d516739 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/util/StringsTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/util/StringsTest.java
@@ -22,6 +22,15 @@ import org.junit.Test;
 
 public class StringsTest {
 
+    /**
+     * A sanity test to make sure a typo does not mess up {@link 
Strings#EMPTY}.
+     */
+    @Test
+    public void testEMPTY() {
+        Assert.assertEquals("", Strings.EMPTY);
+        Assert.assertEquals(0, Strings.EMPTY.length());
+    }
+
     @Test
     public void testQuote() {
         Assert.assertEquals("'Q'", Strings.quote("Q"));

Reply via email to