jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r1487869 - /jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/NodeTypeDefinitionManagementTest.java
Date Thu, 30 May 2013 14:16:03 GMT
Author: jukka
Date: Thu May 30 14:16:02 2013
New Revision: 1487869

URL: http://svn.apache.org/r1487869
Log:
OAK-840: Intermittent test failure for testRegisterNodeType on JDK 7

Use different node type names in separate tests since the test repository is shared across
test cases and thus the ordering of tests could confuse a test with an already existing node
type.

Modified:
    jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/NodeTypeDefinitionManagementTest.java

Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/NodeTypeDefinitionManagementTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/NodeTypeDefinitionManagementTest.java?rev=1487869&r1=1487868&r2=1487869&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/NodeTypeDefinitionManagementTest.java
(original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/NodeTypeDefinitionManagementTest.java
Thu May 30 14:16:02 2013
@@ -61,7 +61,7 @@ public class NodeTypeDefinitionManagemen
         Workspace testWsp = testSession.getWorkspace();
         NodeTypeManager ntm = testWsp.getNodeTypeManager();
         NodeTypeTemplate ntd = ntm.createNodeTypeTemplate();
-        ntd.setName("testNodeType");
+        ntd.setName("testRegisterNodeType");
         ntd.setMixin(true);
 
         try {
@@ -80,7 +80,7 @@ public class NodeTypeDefinitionManagemen
         NodeTypeTemplate[] ntds = new NodeTypeTemplate[2];
         ntds[0] = ntd;
         ntds[1] = ntm.createNodeTypeTemplate();
-        ntds[1].setName("anotherNodeType");
+        ntds[1].setName("anotherRegisterNodeType");
         ntds[1].setDeclaredSuperTypeNames(new String[] {"nt:file"});
         try {
             ntm.registerNodeTypes(ntds, true);
@@ -113,14 +113,14 @@ public class NodeTypeDefinitionManagemen
             Workspace testWsp = testSession.getWorkspace();
             NodeTypeManager ntm = testWsp.getNodeTypeManager();
             NodeTypeTemplate ntd = ntm.createNodeTypeTemplate();
-            ntd.setName("testNodeType");
+            ntd.setName("testRegisterNodeTypeWithPrivilege");
             ntd.setMixin(true);
             ntm.registerNodeType(ntd, true);
 
             NodeTypeTemplate[] ntds = new NodeTypeTemplate[2];
             ntds[0] = ntd;
             ntds[1] = ntm.createNodeTypeTemplate();
-            ntds[1].setName("anotherNodeType");
+            ntds[1].setName("anotherRegisterNodeTypeWithPrivilege");
             ntds[1].setDeclaredSuperTypeNames(new String[] {"nt:file"});
             ntm.registerNodeTypes(ntds, true);
         } finally {
@@ -132,7 +132,7 @@ public class NodeTypeDefinitionManagemen
     public void testUnRegisterNodeType() throws Exception {
         NodeTypeManager ntm = superuser.getWorkspace().getNodeTypeManager();
         NodeTypeTemplate ntd = ntm.createNodeTypeTemplate();
-        ntd.setName("testNodeType");
+        ntd.setName("testUnregisterNodeType");
         ntd.setMixin(true);
         ntm.registerNodeType(ntd, true);
 



Mime
View raw message