You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by mr...@apache.org on 2015/09/01 15:44:43 UTC
svn commit: r1700548 - in
/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document:
DocumentNodeStoreTest.java HierarchyConflictTest.java
NodeStoreDiffTest.java cache/SerializerTest.java
Author: mreutegg
Date: Tue Sep 1 13:44:43 2015
New Revision: 1700548
URL: http://svn.apache.org/r1700548
Log:
OAK-3326: Remove System.out.println() in tests
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/HierarchyConflictTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/SerializerTest.java
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java?rev=1700548&r1=1700547&r2=1700548&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java Tue Sep 1 13:44:43 2015
@@ -90,9 +90,13 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.stats.Clock;
import org.junit.After;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class DocumentNodeStoreTest {
+ private static final Logger LOG = LoggerFactory.getLogger(DocumentNodeStoreTest.class);
+
@After
public void tearDown() {
Revision.resetClockToDefault();
@@ -1597,7 +1601,7 @@ public class DocumentNodeStoreTest {
}
}
- System.out.println("Starting the final merge "+ new Date());
+ LOG.info("Starting the final merge {}", new Date());
merge(ns, builder);
ns.dispose();
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/HierarchyConflictTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/HierarchyConflictTest.java?rev=1700548&r1=1700547&r2=1700548&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/HierarchyConflictTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/HierarchyConflictTest.java Tue Sep 1 13:44:43 2015
@@ -34,6 +34,8 @@ import org.apache.jackrabbit.oak.spi.sta
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.collect.Lists;
@@ -47,6 +49,8 @@ import static org.junit.Assert.fail;
*/
public class HierarchyConflictTest {
+ private static final Logger LOG = LoggerFactory.getLogger(HierarchyConflictTest.class);
+
private List<Throwable> exceptions;
private CountDownLatch nodeRemoved;
private CountDownLatch nodeAdded;
@@ -118,7 +122,7 @@ public class HierarchyConflictTest {
" to a removed parent");
} catch (CommitFailedException e) {
// expected
- System.out.println("expected: " + e.toString());
+ LOG.info("expected: {}", e.toString());
}
}
@@ -176,7 +180,7 @@ public class HierarchyConflictTest {
" when child is added concurrently");
} catch (CommitFailedException e) {
// expected
- System.out.println("expected: " + e.toString());
+ LOG.info("expected: {}", e.toString());
}
}
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java?rev=1700548&r1=1700547&r2=1700548&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java Tue Sep 1 13:44:43 2015
@@ -42,10 +42,15 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static org.junit.Assert.assertFalse;
public class NodeStoreDiffTest {
+
+ private static final Logger LOG = LoggerFactory.getLogger(NodeStoreDiffTest.class);
+
private NodeStore ns;
private final TestDocumentStore tds = new TestDocumentStore();
@@ -174,7 +179,7 @@ public class NodeStoreDiffTest {
private void prRev(NodeState ns){
if(ns instanceof DocumentNodeState){
DocumentNodeState dns = ((DocumentNodeState) ns);
- System.out.printf("Root at %s (%s) %n", dns.getRevision(), dns.getLastRevision());
+ LOG.info("Root at {} ({})", dns.getRevision(), dns.getLastRevision());
}
}
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/SerializerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/SerializerTest.java?rev=1700548&r1=1700547&r2=1700548&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/SerializerTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/SerializerTest.java Tue Sep 1 13:44:43 2015
@@ -33,11 +33,16 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.document.Revision;
import org.apache.jackrabbit.oak.plugins.document.StableRevisionComparator;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
public class SerializerTest {
+
+ private static final Logger LOG = LoggerFactory.getLogger(SerializerTest.class);
+
private DocumentStore store = new MemoryDocumentStore();
@Test
@@ -85,7 +90,7 @@ public class SerializerTest {
Input input = new Input(o.getBuffer(), 0, o.position());
Object result = k.readObject(input,data.getClass());
input.close();
- System.out.printf("Size %d %s %n",o.position(), data);
+ LOG.info("Size {} {}", o.position(), data);
return result;
}