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 fr...@apache.org on 2018/11/14 12:44:46 UTC
svn commit: r1846579 - in /jackrabbit/oak/trunk/oak-segment-tar/src:
main/java/org/apache/jackrabbit/oak/segment/LoggingHook.java
test/java/org/apache/jackrabbit/oak/segment/LoggingHookTest.java
Author: frm
Date: Wed Nov 14 12:44:46 2018
New Revision: 1846579
URL: http://svn.apache.org/viewvc?rev=1846579&view=rev
Log:
OAK-7878 - Add unit tests for LoggingHook
Added:
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/LoggingHookTest.java (with props)
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/LoggingHook.java
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/LoggingHook.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/LoggingHook.java?rev=1846579&r1=1846578&r2=1846579&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/LoggingHook.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/LoggingHook.java Wed Nov 14 12:44:46 2018
@@ -54,24 +54,24 @@ public class LoggingHook implements Comm
}
public void leave(NodeState before, NodeState after) {
- log("n!");
+ writer.accept("n!");
}
@Override
public boolean propertyAdded(PropertyState after) {
- log("p+ " + toString(after));
+ writer.accept("p+ " + toString(after));
return true;
}
@Override
public boolean propertyChanged(PropertyState before, PropertyState after) {
- log("p^ " + toString(after));
+ writer.accept("p^ " + toString(after));
return true;
}
@Override
public boolean propertyDeleted(PropertyState before) {
- log("p- " + toString(before));
+ writer.accept("p- " + toString(before));
return true;
}
@@ -85,7 +85,7 @@ public class LoggingHook implements Comm
@Override
public boolean childNodeAdded(String name, NodeState after) {
- log("n+ " + safeEncode(name));
+ writer.accept("n+ " + safeEncode(name));
this.enter(null, after);
boolean ret = after.compareAgainstBaseState(EmptyNodeState.EMPTY_NODE, this);
this.leave(null, after);
@@ -94,7 +94,7 @@ public class LoggingHook implements Comm
@Override
public boolean childNodeChanged(String name, NodeState before, NodeState after) {
- log("n^ " + safeEncode(name));
+ writer.accept("n^ " + safeEncode(name));
this.enter(before, after);
boolean ret = after.compareAgainstBaseState(before, this);
this.leave(before, after);
@@ -103,7 +103,7 @@ public class LoggingHook implements Comm
@Override
public boolean childNodeDeleted(String name, NodeState before) {
- log("n- " + safeEncode(name));
+ writer.accept("n- " + safeEncode(name));
return true;
}
@@ -145,10 +145,6 @@ public class LoggingHook implements Comm
}
}
- private void log(String s) {
- writer.accept(System.currentTimeMillis() + " " + safeEncode(Thread.currentThread().getName()) + " " + s);
- }
-
private static void appendBlob(StringBuilder sb, Blob blob) {
final InputStream is = blob.getNewStream();
final char[] hex = "0123456789ABCDEF".toCharArray();
Added: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/LoggingHookTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/LoggingHookTest.java?rev=1846579&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/LoggingHookTest.java (added)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/LoggingHookTest.java Wed Nov 14 12:44:46 2018
@@ -0,0 +1,79 @@
+/*
+ * 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.jackrabbit.oak.segment;
+
+import static org.apache.jackrabbit.oak.segment.file.FileStoreBuilder.fileStoreBuilder;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.IOException;
+import java.time.Instant;
+import java.util.Date;
+import java.util.function.Consumer;
+import java.util.regex.Pattern;
+
+import org.apache.jackrabbit.oak.api.CommitFailedException;
+import org.apache.jackrabbit.oak.api.Type;
+import org.apache.jackrabbit.oak.segment.file.FileStore;
+import org.apache.jackrabbit.oak.segment.file.InvalidFileStoreVersionException;
+import org.apache.jackrabbit.oak.segment.test.TemporaryFileStore;
+import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
+import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
+import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
+import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.RuleChain;
+import org.junit.rules.TemporaryFolder;
+
+public class LoggingHookTest {
+
+ private TemporaryFolder folder = new TemporaryFolder(new File("target"));
+
+ private TemporaryFileStore fileStore = new TemporaryFileStore(folder, false);
+
+ @Rule
+ public RuleChain chain = RuleChain.outerRule(folder)
+ .around(fileStore);
+
+ @Test
+ public void testChildNode() throws Exception {
+ String result =
+ "n+ child\n" +
+ "n!\n" +
+ "n!\n";
+ assertCommitProduces(result, root -> root.setChildNode("child"));
+ }
+
+ private void assertCommitProduces(String expected, Consumer<NodeBuilder> committer) throws Exception {
+ StringBuilder result = new StringBuilder();
+
+ SegmentNodeStore store = SegmentNodeStoreBuilders.builder(fileStore.fileStore())
+ .withLoggingHook(s -> result.append(s).append("\n"))
+ .build();
+
+ NodeBuilder root = store.getRoot().builder();
+ committer.accept(root);
+ store.merge(root, EmptyHook.INSTANCE, CommitInfo.EMPTY);
+
+ assertEquals(expected, result.toString());
+ }
+
+}
Propchange: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/LoggingHookTest.java
------------------------------------------------------------------------------
svn:eol-style = native