svn commit: r1833334 - in /jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user: UserImporterBaseTest.java UserImporterImpersonationIgnoreTest.java

Mon, 11 Jun 2018 07:21:48 -0700 

Author: stillalex
Date: Mon Jun 11 14:21:37 2018
New Revision: 1833334

URL: http://svn.apache.org/viewvc?rev=1833334&view=rev
Log:
OAK-6028 UserImporter.start: should return false for User tree
 - tweaked tests that are not compiling


Modified:
    
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserImporterBaseTest.java
    
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserImporterImpersonationIgnoreTest.java

Modified: 
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserImporterBaseTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserImporterBaseTest.java?rev=1833334&r1=1833333&r2=1833334&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserImporterBaseTest.java
 (original)
+++ 
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserImporterBaseTest.java
 Mon Jun 11 14:21:37 2018
@@ -145,7 +145,7 @@ public abstract class UserImporterBaseTe
         Tree folder = 
root.getTree(getUserConfiguration().getParameters().getConfigValue(PARAM_USER_PATH,
 DEFAULT_USER_PATH));
         Tree userTree = folder.addChild("userTree");
         userTree.setProperty(JcrConstants.JCR_PRIMARYTYPE, NT_REP_USER, 
Type.NAME);
-        userTree.setProperty(JcrConstants.JCR_UUID, new UserProvider(root, 
ConfigurationParameters.EMPTY).getContentID(TEST_USER_ID));
+        userTree.setProperty(JcrConstants.JCR_UUID, new UserProvider(root, 
ConfigurationParameters.EMPTY).getContentID(TEST_USER_ID, false));
         return userTree;
     }
 
@@ -156,7 +156,7 @@ public abstract class UserImporterBaseTe
         NodeUtil groupRoot = 
node.getOrAddTree(PathUtils.relativize(PathUtils.ROOT_PATH, groupPath), 
NT_REP_AUTHORIZABLE_FOLDER);
 
         Tree groupTree = groupRoot.addChild("testGroup", 
NT_REP_GROUP).getTree();
-        groupTree.setProperty(JcrConstants.JCR_UUID, new UserProvider(root, 
ConfigurationParameters.EMPTY).getContentID(TEST_GROUP_ID));
+        groupTree.setProperty(JcrConstants.JCR_UUID, new UserProvider(root, 
ConfigurationParameters.EMPTY).getContentID(TEST_GROUP_ID, false));
         return groupTree;
     }
 

Modified: 
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserImporterImpersonationIgnoreTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserImporterImpersonationIgnoreTest.java?rev=1833334&r1=1833333&r2=1833334&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserImporterImpersonationIgnoreTest.java
 (original)
+++ 
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserImporterImpersonationIgnoreTest.java
 Mon Jun 11 14:21:37 2018
@@ -106,7 +106,7 @@ public class UserImporterImpersonationIg
         Tree folder = 
root.getTree(getUserConfiguration().getParameters().getConfigValue(PARAM_USER_PATH,
 DEFAULT_USER_PATH));
         Tree impersonatorTree = folder.addChild("impersonatorTree");
         impersonatorTree.setProperty(JcrConstants.JCR_PRIMARYTYPE, 
NT_REP_USER, Type.NAME);
-        impersonatorTree.setProperty(JcrConstants.JCR_UUID, new 
UserProvider(root, 
ConfigurationParameters.EMPTY).getContentID("impersonator1"));
+        impersonatorTree.setProperty(JcrConstants.JCR_UUID, new 
UserProvider(root, ConfigurationParameters.EMPTY).getContentID("impersonator1", 
false));
 
         assertTrue(importer.handlePropInfo(userTree, 
createPropInfo(REP_IMPERSONATORS, "impersonator1"), 
mockPropertyDefinition(NT_REP_USER, true)));
         assertTrue(importer.handlePropInfo(impersonatorTree, 
createPropInfo(REP_PRINCIPAL_NAME, "impersonator1"), 
mockPropertyDefinition(NT_REP_AUTHORIZABLE, false)));
@@ -123,7 +123,7 @@ public class UserImporterImpersonationIg
         Tree folder = 
root.getTree(getUserConfiguration().getParameters().getConfigValue(PARAM_USER_PATH,
 DEFAULT_USER_PATH));
         Tree impersonatorTree = folder.addChild("impersonatorTree");
         impersonatorTree.setProperty(JcrConstants.JCR_PRIMARYTYPE, 
NT_REP_USER, Type.NAME);
-        impersonatorTree.setProperty(JcrConstants.JCR_UUID, new 
UserProvider(root, 
ConfigurationParameters.EMPTY).getContentID("impersonator1"));
+        impersonatorTree.setProperty(JcrConstants.JCR_UUID, new 
UserProvider(root, ConfigurationParameters.EMPTY).getContentID("impersonator1", 
false));
 
         // NOTE: reversed over of import compared to 'testNewImpersonator'
         assertTrue(importer.handlePropInfo(impersonatorTree, 
createPropInfo(REP_PRINCIPAL_NAME, "impersonator1"), 
mockPropertyDefinition(NT_REP_AUTHORIZABLE, false)));

Reply via email to