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/02/07 16:19:26 UTC
svn commit: r1443545 -
/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserQueryTest.java
Author: angela
Date: Thu Feb 7 15:19:25 2013
New Revision: 1443545
URL: http://svn.apache.org/viewvc?rev=1443545&view=rev
Log:
OAK-50 : Implement User Management
- resolve TODO related to OAK-343
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserQueryTest.java
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserQueryTest.java?rev=1443545&r1=1443544&r2=1443545&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserQueryTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserQueryTest.java Thu Feb 7 15:19:25 2013
@@ -59,11 +59,10 @@ public class UserQueryTest extends Abstr
Iterator<Authorizable> systemAuthorizables = userMgr.findAuthorizables("rep:principalName", null);
while (systemAuthorizables.hasNext()) {
- Authorizable authorizable = systemAuthorizables.next();
+ Authorizable authorizable = systemAuthorizables.next();
if (authorizable.isGroup()) {
groups.add((Group) authorizable);
- }
- else {
+ } else {
users.add((User) authorizable);
}
systemDefined.add(authorizable);
@@ -128,7 +127,7 @@ public class UserQueryTest extends Abstr
addMembers(amphibians, salamander, goldenToad, poisonDartFrog);
setProperty("canFly", vf.createValue(true), bee, fly, kestrel, goose, pelican, dove);
- setProperty("poisonous",vf.createValue(true), blackWidow, bee, poisonDartFrog);
+ setProperty("poisonous", vf.createValue(true), blackWidow, bee, poisonDartFrog);
setProperty("poisonous", vf.createValue(false), turtle, lemur);
setProperty("hasWings", vf.createValue(false), blackWidow, gardenSpider, jumpingSpider, ant,
jackrabbit, deer, opposum, kangaroo, elephant, lemur, gibbon, crocodile, turtle, lizard,
@@ -196,11 +195,9 @@ public class UserQueryTest extends Abstr
if (User.class.isAssignableFrom(s)) {
assertSameElements(result, users.iterator());
- }
- else if (Group.class.isAssignableFrom(s)) {
+ } else if (Group.class.isAssignableFrom(s)) {
assertSameElements(result, groups.iterator());
- }
- else {
+ } else {
assertSameElements(result, authorizables.iterator());
}
}
@@ -434,8 +431,7 @@ public class UserQueryTest extends Abstr
Value[] food = user.getProperty("profile/food");
if (food == null || food.length != 1) {
return false;
- }
- else {
+ } else {
String value = food[0].getString();
return value.startsWith("m");
}
@@ -623,8 +619,8 @@ public class UserQueryTest extends Abstr
@Test
public void testOffset() throws RepositoryException {
- long[] offsets = {2, 0, 3, 0, 100000};
- long[] counts = {4, 4, 0, 100000, 100000};
+ long[] offsets = {2, 0, 3, 0, 100000};
+ long[] counts = {4, 4, 0, 100000, 100000};
for (int k = 0; k < offsets.length; k++) {
final long offset = offsets[k];
@@ -764,16 +760,11 @@ public class UserQueryTest extends Abstr
private Group createGroup(String name) throws RepositoryException {
Group group = userMgr.createGroup(name);
groups.add(group);
- // TODO: remove again once OAK-343 is fixed.
- superuser.save();
return group;
}
private User createUser(String name, String food, double weight, boolean cute) throws RepositoryException {
User user = userMgr.createUser(name, "");
- // TODO: remove again once OAK-343 is fixed.
- superuser.save();
-
user.setProperty("profile/food", vf.createValue(food));
user.setProperty("profile/weight", vf.createValue(weight));
user.setProperty("profile/cute", vf.createValue(cute));