stefan-egli commented on a change in pull request #261: URL: https://github.com/apache/jackrabbit-oak/pull/261#discussion_r537563402
########## File path: oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/migration/version/VersionCopierTest.java ########## @@ -0,0 +1,167 @@ +/* + * 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.plugins.migration.version; + +import java.util.UUID; + +import javax.jcr.RepositoryException; + +import org.apache.jackrabbit.oak.api.CommitFailedException; +import org.apache.jackrabbit.oak.api.Root; +import org.apache.jackrabbit.oak.api.Tree; +import org.apache.jackrabbit.oak.api.Type; +import org.apache.jackrabbit.oak.commons.PathUtils; +import org.apache.jackrabbit.oak.core.ImmutableRoot; +import org.apache.jackrabbit.oak.namepath.NamePathMapper; +import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore; +import org.apache.jackrabbit.oak.plugins.migration.NodeStateCopier; +import org.apache.jackrabbit.oak.plugins.version.ReadOnlyVersionManager; +import org.apache.jackrabbit.oak.plugins.version.ReadWriteVersionManager; +import org.apache.jackrabbit.oak.spi.state.NodeBuilder; +import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.apache.jackrabbit.oak.spi.state.NodeStore; +import org.junit.Ignore; +import org.junit.Test; + +import static java.util.Collections.singletonList; +import static org.apache.jackrabbit.JcrConstants.JCR_FROZENNODE; +import static org.apache.jackrabbit.JcrConstants.JCR_MIXINTYPES; +import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE; +import static org.apache.jackrabbit.JcrConstants.JCR_UUID; +import static org.apache.jackrabbit.JcrConstants.MIX_VERSIONABLE; +import static org.apache.jackrabbit.JcrConstants.NT_UNSTRUCTURED; +import static org.apache.jackrabbit.oak.InitialContentHelper.INITIAL_CONTENT; +import static org.apache.jackrabbit.oak.InitialContentHelper.INITIAL_CONTENT_FROZEN_NODE_REFERENCEABLE; +import static org.apache.jackrabbit.oak.plugins.migration.NodeStateTestUtils.commit; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +public class VersionCopierTest { + + @Test + public void copyVersionSourceFrozenNodeReferenceable() throws Exception { + String path = "/foo"; + NodeStore source = createVersionFor(path, createStore(true)); + NodeStore target = createStore(false); + + copyContent(source, target, path); + copyVersionStorage(source, target); + assertVersionNotReferenceable(target.getRoot(), path); + } + + @Test + public void copyVersionSourceFrozenNodeNotReferenceable() throws Exception { + String path = "/foo"; + NodeStore source = createVersionFor(path, createStore(false)); + NodeStore target = createStore(false); + + copyContent(source, target, path); + copyVersionStorage(source, target); + assertVersionNotReferenceable(target.getRoot(), path); + } + + @Test + public void copyVersionTargetFrozenNodeReferenceable() throws Exception { + String path = "/foo"; + NodeStore source = createVersionFor(path, createStore(true)); + NodeStore target = createStore(true); + + copyContent(source, target, path); + copyVersionStorage(source, target); + assertVersionReferenceable(target.getRoot(), path); + } + + @Ignore("VersionCopier does not generate referenceable target nt:frozenNode from source frozen nodes that are not referenceable") Review comment: It seems if the assertion was inverted (to become `assertVersionNotReferenceable`) this test would succeed and could be included. Would that make sense? ########## File path: oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/migration/FilteringNodeStateTest.java ########## @@ -294,12 +301,25 @@ public void shouldDelegateHasProperty() { @Test public void exists() { - final NodeState decorated = wrap("/", rootNodeState, null, of("/content/foo"), null, null); + final NodeState decorated = wrap("/", rootNodeState, null, of("/content/foo"), null, null, true); assertTrue("/content should exist and be visible", getNodeState(decorated, "/content").exists()); assertFalse("/content/foo should be hidden", getNodeState(decorated, "/content/foo").exists()); assertFalse("/nonexisting should not exist", getNodeState(decorated, "/nonexisting").exists()); } + @Test + public void withoutReferenceableFrozenNode() { + final NodeState decorated = wrap("/", rootNodeState, null, of("/content/foo"), null, null, false); Review comment: It looks like this is the only test which uses `referenceableFrozenNodes=false` - while I assume `false` is now (with OAK-9134) the default. So I'm wondering if we shouldn't have more test cases that test `false`? (Ok, afterwards noticed that `VersionCopierTest` has more `false` tests - so that might be sufficient I guess) ########## File path: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/NodeStateCopier.java ########## @@ -308,6 +316,8 @@ private static NodeBuilder getChildNodeBuilder(@NotNull final NodeBuilder root, private Set<String> mergePaths = emptySet(); + private boolean referenceableFrozenNodes = true; Review comment: Was thinking if this should rather be `false` here - as that's the new default. But haven't checked all implications.. ########## File path: oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/migration/FilteringNodeStateTest.java ########## @@ -43,6 +46,7 @@ import static org.apache.jackrabbit.oak.plugins.migration.NodeStateTestUtils.createNodeStoreWithContent; import static org.apache.jackrabbit.oak.plugins.migration.NodeStateTestUtils.getNodeState; import static org.apache.jackrabbit.oak.plugins.tree.TreeConstants.OAK_CHILD_ORDER; +import static org.apache.jackrabbit.oak.spi.state.AbstractNodeState.getBoolean; Review comment: unused import? ########## File path: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/FilteringNodeState.java ########## @@ -60,6 +66,8 @@ public static final Set<String> NONE = ImmutableSet.of(); + private static final Set<String> JCR_SYSTEM_PATH_PREFIX = ImmutableSet.of("/", "/" + JcrConstants.JCR_SYSTEM); Review comment: IIUC "/" makes "/jcr:system" superfluous - why is "/" in this set, for tests only? ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected]
