JCRVLT-551 improve documentation

check references in tests

Author: kwin

src/site/markdown/referenceablenodes.md

@@ -24,11 +24,11 @@
 The JCR 2.0 specification defines [referenceable nodes][1]. Those carry a `jcr:uuid` property which uniquely identifies a node within a repository workspace. Each FileVault export contains this (protected) property `jcr:uuid` as well which is important to keep [referential integrity][2].
 The import behavior depends on the used FileVault version.
 
-## Behaviour prior FileVault 3.5.2
+## Import behavior prior FileVault 3.5.2
 
-The ids of referenceable nodes are only kept during import when a node with the same name (independent of its `jcr:uuid` value) does not yet exist in the repository. For existing nodes the ids are never updated with the value from the package. They either get a new id or keep their old one (in case the old node was already a referenceable node). In case of conflicts with nodes at a different path, the existing conflicting node is [removed][5].
+The ids of referenceable nodes are only kept during import when a node with the same name (independent of its `jcr:uuid` value) does not yet exist in the repository. For existing nodes the ids are never updated with the value from the package. They either get a new id or keep their old one (in case the old node was already a referenceable node). In case of conflicts with nodes at a different path, the existing conflicting node is [removed][5] but all its references are kept (i.e. they point to a different path after the import).
 
-## Behavior since FileVault 3.5.2
+## Import behavior since FileVault 3.5.2
 
 Since version 3.5.2 ([JCRVLT-551](https://issues.apache.org/jira/browse/JCRVLT-551)) FileVault tries to use the `jcr:uuid` of the node in the package even if a same named node does already exist. In case this cannot be achieved while keeping referential integrity of old and new nodes an exception is thrown. Existing nodes with conflicting identifiers or reference properties towards conflicting identifiers are removed in advance if they are contained in the [filter rules][4] to reduce the conflict potential.
 

vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ReferenceableIdentifiersImportIT.java

@@ -183,25 +183,32 @@ public void testIdentifierCollisionInsideFilterWithReferencesOutsideFilter() thr
         admin.save();
         assertProperty("/tmp/reference/" + PROPERTY_NAME, UUID_REFERENCEABLE_CHILD);
 
-        PropertyIterator propIter = referenceableNode.getReferences();
-        assertTrue(propIter.hasNext());
-
         // install package again (with default policy IdConflictPolicy.FAIL)
         Exception e = assertThrows(Exception.class, () -> { extractVaultPackageStrict("/test-packages/referenceable.zip"); } );
         assertEquals(ReferentialIntegrityException.class, e.getClass());
         admin.refresh(false);
-        
+        assertProperty("/tmp/reference/" + PROPERTY_NAME, UUID_REFERENCEABLE_CHILD);
+        referenceableNode = admin.getNode("/tmp/reference").getProperty(PROPERTY_NAME).getNode();
+        assertEquals("/tmp/referenceable/collision", referenceableNode.getPath());
+
         // now try to remove the referenced node (with policy IdConflictPolicy.CREATE_NEW_ID)
         ImportOptions options = getDefaultOptions();
         options.setStrict(true);
         options.setIdConflictPolicy(IdConflictPolicy.CREATE_NEW_ID);
         e = assertThrows(Exception.class, () -> { extractVaultPackage("/test-packages/referenceable.zip", options);});
         assertEquals(ReferentialIntegrityException.class, e.getClass());
         admin.refresh(false);
-        
+        assertProperty("/tmp/reference/" + PROPERTY_NAME, UUID_REFERENCEABLE_CHILD);
+        referenceableNode = admin.getNode("/tmp/reference").getProperty(PROPERTY_NAME).getNode();
+        assertEquals("/tmp/referenceable/collision", referenceableNode.getPath());
+
         // now try to remove the referenced node (with default policy IdConflictPolicy.FORCE_REMOVE_CONFLICTING_ID)
         options.setIdConflictPolicy(IdConflictPolicy.FORCE_REMOVE_CONFLICTING_ID);
         extractVaultPackage("/test-packages/referenceable.zip", options);
+        // make sure that reference does still exist but now again points to the original path
+        assertProperty("/tmp/reference/" + PROPERTY_NAME, UUID_REFERENCEABLE_CHILD);
+        referenceableNode = admin.getNode("/tmp/reference").getProperty(PROPERTY_NAME).getNode();
+        assertEquals("/tmp/referenceable/child", referenceableNode.getPath());
     }
 
     @Test