You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by mi...@apache.org on 2010/02/22 23:38:54 UTC
svn commit: r915100 - in
/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.content/src:
main/java/org/apache/clerezza/platform/content/hierarchy/
test/java/org/apache/clerezza/platform/c...
Author: mir
Date: Mon Feb 22 22:38:53 2010
New Revision: 915100
URL: http://svn.apache.org/viewvc?rev=915100&view=rev
Log:
CLEREZZA-133: fixed move bug
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/hierarchy/CollectionNode.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.content/src/test/java/org/apache/clerezza/platform/content/hierarchy/HierarchyTest.java
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/hierarchy/CollectionNode.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/hierarchy/CollectionNode.java?rev=915100&r1=915099&r2=915100&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/hierarchy/CollectionNode.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/hierarchy/CollectionNode.java Mon Feb 22 22:38:53 2010
@@ -143,7 +143,7 @@
} catch(IllegalArgumentException e) {
HierarchyNode memberResource = new HierarchyNode(memberUri,
getGraph(), hierarchyService);
- UriRef newUri = new UriRef(getNode().getUnicodeString() + "/" +
+ UriRef newUri = new UriRef(getNode().getUnicodeString() +
memberResource.getName());
memberResource.replaceWith(newUri);
}
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.content/src/test/java/org/apache/clerezza/platform/content/hierarchy/HierarchyTest.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.content/src/test/java/org/apache/clerezza/platform/content/hierarchy/HierarchyTest.java?rev=915100&r1=915099&r2=915100&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.content/src/test/java/org/apache/clerezza/platform/content/hierarchy/HierarchyTest.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.content/src/test/java/org/apache/clerezza/platform/content/hierarchy/HierarchyTest.java Mon Feb 22 22:38:53 2010
@@ -49,13 +49,15 @@
private UriRef fooResource = new UriRef("http://localhost:8282/foo/resource");
private UriRef fooResource2 = new UriRef("http://localhost:8282/foo/resource2");
private UriRef fooResource3 = new UriRef("http://localhost:8282/foo/resource3");
- private UriRef fooTest = new UriRef("http://localhost:8282/foo/test/");
- private UriRef fooTestResource4 = new UriRef("http://localhost:8282/foo/test/resource4");
+ private UriRef fooTest = new UriRef("http://localhost:8282/foo/test/");
+ private UriRef fooTestResource4 = new UriRef("http://localhost:8282/foo/test/resource4");
private UriRef fooFolder1 = new UriRef("http://localhost:8282/foo/folder1/");
private UriRef bar = new UriRef("http://localhost:8282/bar/");
private UriRef barResource = new UriRef("http://localhost:8282/bar/resource");
private UriRef barResource2 = new UriRef("http://localhost:8282/bar/resource2");
private UriRef barFoo = new UriRef("http://localhost:8282/bar/foo/");
+ private UriRef barFooResource = new UriRef("http://localhost:8282/bar/foo/resource");
+ private UriRef barFooTest = new UriRef("http://localhost:8282/bar/foo/test/");
private UriRef newRoot = new UriRef("http://newRoot/");
private UriRef newRootTest = new UriRef("http://newRoot/test/");
private UriRef newRoot2Resource = new UriRef("http://newRoot2/resource");
@@ -156,6 +158,24 @@
Assert.assertEquals(movedResourceNode, barList.get(0));
Assert.assertEquals(barResource2Node, barList.get(1));
}
+
+ @Test
+ public void nonCollectionMoveTest2() throws Exception{
+ HierarchyService hierarchyService = getHierarchyService();
+ hierarchyService.createNonCollectionNode(fooResource);
+ CollectionNode barNode = hierarchyService.createCollectionNode(bar);
+
+ CollectionNode fooNode = (CollectionNode)hierarchyService.getHierarchyNode(foo);
+ fooNode.move(barNode, 0);
+ List<HierarchyNode> barList = barNode.getMembers();
+ CollectionNode barFooNode = hierarchyService.getCollectionNode(barFoo);
+ Assert.assertEquals(1, barList.size());
+ Assert.assertEquals(barFooNode, barList.get(0));
+ List<HierarchyNode> barFooList = barFooNode.getMembers();
+ Assert.assertEquals(1, barFooList.size());
+ HierarchyNode barFooResourceNode = hierarchyService.getHierarchyNode(barFooResource);
+ Assert.assertEquals(barFooResourceNode, barFooList.get(0));
+ }
@Test
public void collectionMoveTest() throws Exception{
@@ -173,6 +193,24 @@
}
@Test
+ public void collectionMoveTest2() throws Exception{
+ HierarchyService hierarchyService = getHierarchyService();
+ hierarchyService.createCollectionNode(fooTest);
+ CollectionNode barNode = hierarchyService.createCollectionNode(bar);
+
+ CollectionNode fooNode = (CollectionNode)hierarchyService.getHierarchyNode(foo);
+ fooNode.move(barNode, 0);
+ List<HierarchyNode> barList = barNode.getMembers();
+ CollectionNode barFooNode = hierarchyService.getCollectionNode(barFoo);
+ Assert.assertEquals(1, barList.size());
+ Assert.assertEquals(barFooNode, barList.get(0));
+ List<HierarchyNode> barFooList = barFooNode.getMembers();
+ Assert.assertEquals(1, barFooList.size());
+ HierarchyNode barFooTestNode = hierarchyService.getHierarchyNode(barFooTest);
+ Assert.assertEquals(barFooTestNode, barFooList.get(0));
+ }
+
+ @Test
public void rootAutoCreationTest() throws Exception{
HierarchyService hierarchyService = getHierarchyService();
hierarchyService.createCollectionNode(newRootTest);