Author: rpopma
Date: Fri May 16 13:38:10 2014
New Revision: 1595195
URL: http://svn.apache.org/r1595195
Log:
moved tests from core.helpers to core.util, removed core.helpers package,
replaced individual static imports with .* imports
Added:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/util/CachedClockTest.java
- copied, changed from r1595182,
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/helpers/CachedClockTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/util/CharsetsTest.java
- copied, changed from r1595182,
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/helpers/CharsetsTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/util/ClockFactoryTest.java
- copied, changed from r1595182,
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/helpers/ClockFactoryTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/util/FileUtilsTest.java
- copied, changed from r1595182,
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/helpers/FileUtilsTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/util/SystemClockTest.java
- copied, changed from r1595182,
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/helpers/SystemClockTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/util/UUIDTest.java
- copied, changed from r1595182,
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/helpers/UUIDTest.java
Removed:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/helpers/
Copied:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/util/CachedClockTest.java
(from r1595182,
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/helpers/CachedClockTest.java)
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/util/CachedClockTest.java?p2=logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/util/CachedClockTest.java&p1=logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/helpers/CachedClockTest.java&r1=1595182&r2=1595195&rev=1595195&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/helpers/CachedClockTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/util/CachedClockTest.java
Fri May 16 13:38:10 2014
@@ -14,9 +14,9 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.core.helpers;
+package org.apache.logging.log4j.core.util;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
import org.apache.logging.log4j.core.util.CachedClock;
import org.junit.Test;
Copied:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/util/CharsetsTest.java
(from r1595182,
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/helpers/CharsetsTest.java)
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/util/CharsetsTest.java?p2=logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/util/CharsetsTest.java&p1=logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/helpers/CharsetsTest.java&r1=1595182&r2=1595195&rev=1595195&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/helpers/CharsetsTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/util/CharsetsTest.java
Fri May 16 13:38:10 2014
@@ -15,9 +15,9 @@
* limitations under the license.
*/
-package org.apache.logging.log4j.core.helpers;
+package org.apache.logging.log4j.core.util;
-import static org.junit.Assert.assertSame;
+import static org.junit.Assert.*;
import java.nio.charset.Charset;
import java.nio.charset.IllegalCharsetNameException;
Copied:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/util/ClockFactoryTest.java
(from r1595182,
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/helpers/ClockFactoryTest.java)
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/util/ClockFactoryTest.java?p2=logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/util/ClockFactoryTest.java&p1=logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/helpers/ClockFactoryTest.java&r1=1595182&r2=1595195&rev=1595195&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/helpers/ClockFactoryTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/util/ClockFactoryTest.java
Fri May 16 13:38:10 2014
@@ -14,9 +14,9 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.core.helpers;
+package org.apache.logging.log4j.core.util;
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
import org.apache.logging.log4j.core.util.CachedClock;
import org.apache.logging.log4j.core.util.Clock;
Copied:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/util/FileUtilsTest.java
(from r1595182,
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/helpers/FileUtilsTest.java)
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/util/FileUtilsTest.java?p2=logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/util/FileUtilsTest.java&p1=logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/helpers/FileUtilsTest.java&r1=1595182&r2=1595195&rev=1595195&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/helpers/FileUtilsTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/util/FileUtilsTest.java
Fri May 16 13:38:10 2014
@@ -15,12 +15,9 @@
* limitations under the license.
*/
-package org.apache.logging.log4j.core.helpers;
+package org.apache.logging.log4j.core.util;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
import java.io.File;
import java.net.URI;
Copied:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/util/SystemClockTest.java
(from r1595182,
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/helpers/SystemClockTest.java)
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/util/SystemClockTest.java?p2=logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/util/SystemClockTest.java&p1=logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/helpers/SystemClockTest.java&r1=1595182&r2=1595195&rev=1595195&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/helpers/SystemClockTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/util/SystemClockTest.java
Fri May 16 13:38:10 2014
@@ -14,9 +14,9 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.core.helpers;
+package org.apache.logging.log4j.core.util;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
import org.apache.logging.log4j.core.util.SystemClock;
import org.junit.Test;
Copied:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/util/UUIDTest.java
(from r1595182,
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/helpers/UUIDTest.java)
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/util/UUIDTest.java?p2=logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/util/UUIDTest.java&p1=logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/helpers/UUIDTest.java&r1=1595182&r2=1595195&rev=1595195&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/helpers/UUIDTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/util/UUIDTest.java
Fri May 16 13:38:10 2014
@@ -14,9 +14,9 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.core.helpers;
+package org.apache.logging.log4j.core.util;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
import java.util.UUID;
@@ -35,7 +35,7 @@ public class UUIDTest {
@Test
public void testTimeBaseUUID() {
final UUID uuid = UUIDUtil.getTimeBasedUUID();
- final UUID uuid2 = UUIDUtil.getTimeBasedUUID();
+ //final UUID uuid2 = UUIDUtil.getTimeBasedUUID(); // unused
final long current = (System.currentTimeMillis() * 10000) +
NUM_100NS_INTERVALS_SINCE_UUID_EPOCH;
final long time = uuid.timestamp();
assertTrue("Incorrect time", current + 10000 - time > 0);
