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 an...@apache.org on 2013/10/25 15:16:48 UTC
svn commit: r1535726 - in /jackrabbit/oak/trunk/oak-jcr: pom.xml
src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/MixinTest.java
Author: angela
Date: Fri Oct 25 13:16:47 2013
New Revision: 1535726
URL: http://svn.apache.org/r1535726
Log:
OAK-1118 : test case(s)
Modified:
jackrabbit/oak/trunk/oak-jcr/pom.xml
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/MixinTest.java
Modified: jackrabbit/oak/trunk/oak-jcr/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/pom.xml?rev=1535726&r1=1535725&r2=1535726&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-jcr/pom.xml Fri Oct 25 13:16:47 2013
@@ -178,6 +178,7 @@
<!-- Node Types -->
org.apache.jackrabbit.oak.jcr.nodetype.NodeDefinitionTest#testRootType <!-- OAK-901 -->
+ org.apache.jackrabbit.oak.jcr.nodetype.MixinTest#testRemoveAddMixVersionable1 <!-- OAK-1118 -->
</known.issues>
</properties>
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=1535726&r1=1535725&r2=1535726&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 Fri Oct 25 13:16:47 2013
@@ -16,8 +16,6 @@
*/
package org.apache.jackrabbit.oak.jcr.nodetype;
-import static org.apache.jackrabbit.JcrConstants.NT_UNSTRUCTURED;
-
import javax.jcr.Node;
import javax.jcr.nodetype.NoSuchNodeTypeException;
@@ -28,8 +26,11 @@ import org.apache.jackrabbit.test.Abstra
import org.apache.jackrabbit.test.NotExecutableException;
import org.junit.After;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
+import static org.apache.jackrabbit.JcrConstants.NT_UNSTRUCTURED;
+
/**
*
*/
@@ -100,4 +101,50 @@ public class MixinTest extends AbstractJ
}
}
+ @Test
+ public void testRemoveMixVersionable() throws Exception {
+ testRootNode.addMixin(mixVersionable);
+ superuser.save();
+
+ testRootNode.removeMixin(mixVersionable);
+ superuser.save();
+ }
+
+ @Test
+ public void testRemoveMixVersionable1() throws Exception {
+ testRootNode.addMixin(mixReferenceable);
+ testRootNode.addMixin(mixVersionable);
+ superuser.save();
+
+ testRootNode.removeMixin(mixVersionable);
+ superuser.save();
+ }
+
+ @Test
+ public void testRemoveAddMixVersionable() throws Exception {
+ testRootNode.addMixin(mixVersionable);
+ superuser.save();
+ String vhId = testRootNode.getVersionHistory().getUUID();
+
+ testRootNode.removeMixin(mixVersionable);
+ testRootNode.addMixin(mixVersionable);
+ superuser.save();
+
+ assertFalse(vhId.equals(testRootNode.getVersionHistory().getUUID()));
+ }
+
+ @Ignore("OAK-1118") // FIXME: OAK-1118
+ @Test
+ public void testRemoveAddMixVersionable1() throws Exception {
+ testRootNode.addMixin(mixReferenceable);
+ testRootNode.addMixin(mixVersionable);
+ superuser.save();
+ String vhId = testRootNode.getVersionHistory().getUUID();
+
+ testRootNode.removeMixin(mixVersionable);
+ testRootNode.addMixin(mixVersionable);
+ superuser.save();
+
+ assertFalse(vhId.equals(testRootNode.getVersionHistory().getUUID()));
+ }
}
\ No newline at end of file