jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mreut...@apache.org
Subject svn commit: r1857632 - in /jackrabbit/branches/2.18: ./ jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/AbstractJCRTest.java jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/NodeSetPrimaryTypeTest.java
Date Tue, 16 Apr 2019 08:25:28 GMT
Author: mreutegg
Date: Tue Apr 16 08:25:28 2019
New Revision: 1857632

URL: http://svn.apache.org/viewvc?rev=1857632&view=rev
Log:
JCR-4425: NodeSetPrimaryTypeTest.testSetPrimaryType() must not use nt:activity

Merged revision 1857631 from trunk

Modified:
    jackrabbit/branches/2.18/   (props changed)
    jackrabbit/branches/2.18/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/AbstractJCRTest.java
    jackrabbit/branches/2.18/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/NodeSetPrimaryTypeTest.java

Propchange: jackrabbit/branches/2.18/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 16 08:25:28 2019
@@ -1,3 +1,3 @@
 /jackrabbit/branches/JCR-2272:1173165-1176545
 /jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1850224,1851360,1851369,1851372,1851380,1851384,1851904,1851946,1851953,1851961,1852417,1853927,1854018,1856855,1856969
+/jackrabbit/trunk:1850224,1851360,1851369,1851372,1851380,1851384,1851904,1851946,1851953,1851961,1852417,1853927,1854018,1856855,1856969,1857631

Modified: jackrabbit/branches/2.18/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/AbstractJCRTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.18/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/AbstractJCRTest.java?rev=1857632&r1=1857631&r2=1857632&view=diff
==============================================================================
--- jackrabbit/branches/2.18/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/AbstractJCRTest.java
(original)
+++ jackrabbit/branches/2.18/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/AbstractJCRTest.java
Tue Apr 16 08:25:28 2019
@@ -228,6 +228,11 @@ public abstract class AbstractJCRTest ex
     protected String ntQuery;
 
     /**
+     * JCR Name nt:activity using the namespace resolver of the current session.
+     */
+    protected String ntActivity;
+
+    /**
      * Relative path to the test root node.
      */
     protected String testPath;
@@ -386,6 +391,7 @@ public abstract class AbstractJCRTest ex
         mixShareable = superuser.getNamespacePrefix(NS_MIX_URI) + ":shareable";
         mixTitle = superuser.getNamespacePrefix(NS_MIX_URI) + ":title";
         ntQuery = superuser.getNamespacePrefix(NS_NT_URI) + ":query";
+        ntActivity = superuser.getNamespacePrefix(NS_NT_URI) + ":activity";
 
         // setup custom namespaces
         if (isSupported(Repository.LEVEL_2_SUPPORTED)) {

Modified: jackrabbit/branches/2.18/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/NodeSetPrimaryTypeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.18/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/NodeSetPrimaryTypeTest.java?rev=1857632&r1=1857631&r2=1857632&view=diff
==============================================================================
--- jackrabbit/branches/2.18/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/NodeSetPrimaryTypeTest.java
(original)
+++ jackrabbit/branches/2.18/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/NodeSetPrimaryTypeTest.java
Tue Apr 16 08:25:28 2019
@@ -58,7 +58,9 @@ public class NodeSetPrimaryTypeTest exte
         while (nts.hasNext()) {
             NodeType nt = nts.nextNodeType();
             String ntName = nt.getName();
-            if (!nt.isAbstract() && !ntFrozenNode.equals(ntName)) {
+            if (!nt.isAbstract()
+                    && !ntFrozenNode.equals(ntName)
+                    && !ntActivity.equals(ntName)) {
                 try {
                     node.setPrimaryType(ntName);
                     // property value must be adjusted immediately



Mime
View raw message