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 2013/12/12 17:53:55 UTC
svn commit: r1550452 -
/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/MixinTest.java
Author: mreutegg
Date: Thu Dec 12 16:53:54 2013
New Revision: 1550452
URL: http://svn.apache.org/r1550452
Log:
OAK-1118: Removing and readding mix:versionable fails if node is referenceable
- do not use testRootNode for test but rather create a child node and perform test there. this avoids side effects with other tests.
- @Test, @Before and @After annotation are redundant because these are old school JUnit tests
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/MixinTest.java
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/MixinTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/MixinTest.java?rev=1550452&r1=1550451&r2=1550452&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/MixinTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/MixinTest.java Thu Dec 12 16:53:54 2013
@@ -36,19 +36,6 @@ import static org.apache.jackrabbit.JcrC
*/
public class MixinTest extends AbstractJCRTest {
- @Override
- @Before()
- public void setUp() throws Exception {
- super.setUp();
- }
-
- @Override
- @After()
- public void tearDown() throws Exception {
- super.tearDown();
- }
-
- @Test
public void testRemoveMixinWithoutMixinProperty() throws Exception {
Node node = testRootNode.addNode(
"testRemoveMixinWithoutMixinProperty", NT_UNSTRUCTURED);
@@ -65,7 +52,6 @@ public class MixinTest extends AbstractJ
}
- @Test
public void testRemoveInheritedMixin() throws Exception {
Node node = testRootNode.addNode(
"testRemoveInheritedMixin", NT_UNSTRUCTURED);
@@ -83,7 +69,6 @@ public class MixinTest extends AbstractJ
}
}
- @Test
public void testRemoveInheritedMixin2() throws Exception {
try {
Authorizable user = ((JackrabbitSession) superuser).getUserManager().getAuthorizable("admin");
@@ -101,50 +86,50 @@ public class MixinTest extends AbstractJ
}
}
- @Test
public void testRemoveMixVersionable() throws Exception {
- testRootNode.addMixin(mixVersionable);
+ Node node = testRootNode.addNode(nodeName1);
+ node.addMixin(mixVersionable);
superuser.save();
- testRootNode.removeMixin(mixVersionable);
+ node.removeMixin(mixVersionable);
superuser.save();
}
- @Test
public void testRemoveMixVersionable1() throws Exception {
- testRootNode.addMixin(mixReferenceable);
- testRootNode.addMixin(mixVersionable);
+ Node node = testRootNode.addNode(nodeName1);
+ node.addMixin(mixReferenceable);
+ node.addMixin(mixVersionable);
superuser.save();
- testRootNode.removeMixin(mixVersionable);
+ node.removeMixin(mixVersionable);
superuser.save();
}
- @Test
public void testRemoveAddMixVersionable() throws Exception {
- testRootNode.addMixin(mixVersionable);
+ Node node = testRootNode.addNode(nodeName1);
+ node.addMixin(mixVersionable);
superuser.save();
- String vhId = testRootNode.getVersionHistory().getUUID();
+ String vhId = node.getVersionHistory().getUUID();
- testRootNode.removeMixin(mixVersionable);
- testRootNode.addMixin(mixVersionable);
+ node.removeMixin(mixVersionable);
+ node.addMixin(mixVersionable);
superuser.save();
- assertFalse(vhId.equals(testRootNode.getVersionHistory().getUUID()));
+ assertFalse(vhId.equals(node.getVersionHistory().getUUID()));
}
- @Ignore("OAK-1118") // FIXME: OAK-1118
- @Test
+ // FIXME: OAK-1118
public void testRemoveAddMixVersionable1() throws Exception {
- testRootNode.addMixin(mixReferenceable);
- testRootNode.addMixin(mixVersionable);
+ Node node = testRootNode.addNode(nodeName1);
+ node.addMixin(mixReferenceable);
+ node.addMixin(mixVersionable);
superuser.save();
- String vhId = testRootNode.getVersionHistory().getUUID();
+ String vhId = node.getVersionHistory().getUUID();
- testRootNode.removeMixin(mixVersionable);
- testRootNode.addMixin(mixVersionable);
+ node.removeMixin(mixVersionable);
+ node.addMixin(mixVersionable);
superuser.save();
- assertFalse(vhId.equals(testRootNode.getVersionHistory().getUUID()));
+ assertFalse(vhId.equals(node.getVersionHistory().getUUID()));
}
}
\ No newline at end of file