You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chemistry.apache.org by je...@apache.org on 2013/08/23 10:53:50 UTC
svn commit: r1516753 [4/8] - in
/chemistry/opencmis/trunk/chemistry-opencmis-server:
chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/
chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis...
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/AclServiceTest.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/AclServiceTest.java?rev=1516753&r1=1516752&r2=1516753&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/AclServiceTest.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/AclServiceTest.java Fri Aug 23 08:53:49 2013
@@ -56,19 +56,20 @@ public class AclServiceTest extends Abst
private static final String ALICE = "alice";
private static final String BOB = "bob";
private static final String CHRIS = "chris";
- private static final String DAN = "dan";
+ private static final String DAN = "dan";
private Acl defaultAcl = null;
-
+
@Override
@Before
public void setUp() {
super.setTypeCreatorClass(ObjectTestTypeSystemCreator.class.getName());
super.setUp();
fCreator = new ObjectCreator(fFactory, fObjSvc, fRepositoryId);
-
+
List<Ace> defaultACEs = new ArrayList<Ace>(1);
- defaultACEs.add(fFactory.createAccessControlEntry(InMemoryAce.getAnyoneUser(), Collections.singletonList( EnumBasicPermissions.CMIS_ALL.value())));
- defaultAcl = fFactory.createAccessControlList(defaultACEs);
+ defaultACEs.add(fFactory.createAccessControlEntry(InMemoryAce.getAnyoneUser(),
+ Collections.singletonList(EnumBasicPermissions.CMIS_ALL.value())));
+ defaultAcl = fFactory.createAccessControlList(defaultACEs);
}
@@ -86,18 +87,19 @@ public class AclServiceTest extends Abst
String id = createDocument(fRootFolderId, acl, removeAces);
LOG.debug("created document with id: " + id);
-
+
// get ACL using AclService
- Acl aclReturn = fAclSvc.getAcl(fRepositoryId, id, true, null);
+ Acl aclReturn = fAclSvc.getAcl(fRepositoryId, id, true, null);
checkSimpleTestAcl(acl, aclReturn);
-
+
// get ACL using ObjectService getObject
- ObjectData objData = fObjSvc.getObject(fRepositoryId, id, "*", false, IncludeRelationships.NONE, null, false, true, null);
+ ObjectData objData = fObjSvc.getObject(fRepositoryId, id, "*", false, IncludeRelationships.NONE, null, false,
+ true, null);
checkSimpleTestAcl(acl, aclReturn);
-
+
// get ACL using ObjectService getObjectByPath
- objData = fObjSvc.getObjectByPath(fRepositoryId, "/" + DOCUMENT_NAME, "*", false, IncludeRelationships.NONE, null, false,
- true, null);
+ objData = fObjSvc.getObjectByPath(fRepositoryId, "/" + DOCUMENT_NAME, "*", false, IncludeRelationships.NONE,
+ null, false, true, null);
assertNotNull(objData);
aclReturn = objData.getAcl();
checkSimpleTestAcl(acl, aclReturn);
@@ -110,156 +112,156 @@ public class AclServiceTest extends Abst
LOG.info("starting testCreateFolderWithAcl() ...");
Acl removeAces = defaultAcl;
Acl acl = createSimpleTestAcl();
-
+
String id = createFolder(fRootFolderId, acl, removeAces);
LOG.debug("created folder with id: " + id);
-
+
// get ACL using AclService
- Acl aclReturn = fAclSvc.getAcl(fRepositoryId, id, true, null);
+ Acl aclReturn = fAclSvc.getAcl(fRepositoryId, id, true, null);
checkSimpleTestAcl(acl, aclReturn);
// get ACL using ObjectService getObject
- ObjectData objData = fObjSvc.getObject(fRepositoryId, id, "*", false, IncludeRelationships.NONE, null, false, true, null);
+ ObjectData objData = fObjSvc.getObject(fRepositoryId, id, "*", false, IncludeRelationships.NONE, null, false,
+ true, null);
checkSimpleTestAcl(acl, aclReturn);
-
+
// get ACL using ObjectService getObjectByPath
- objData = fObjSvc.getObjectByPath(fRepositoryId, "/" + FOLDER_NAME, "*", false, IncludeRelationships.NONE, null, false,
- true, null);
+ objData = fObjSvc.getObjectByPath(fRepositoryId, "/" + FOLDER_NAME, "*", false, IncludeRelationships.NONE,
+ null, false, true, null);
assertNotNull(objData);
aclReturn = objData.getAcl();
- checkSimpleTestAcl(acl, aclReturn);
+ checkSimpleTestAcl(acl, aclReturn);
LOG.info("... testCreateFolderWithAcl() finished.");
- }
-
+ }
+
@Test
public void testApplyAcl() {
LOG.info("starting testApplyAcl() ...");
Acl acl = createSimpleTestAcl();
-
+
String id = createDocument(fRootFolderId, null, null);
LOG.debug("created document with id: " + id);
-
+
// apply absolute ACL using AclService
- Acl acl1 = fAclSvc.applyAcl(fRepositoryId, id, acl, defaultAcl, AclPropagation.OBJECTONLY, null);
+ Acl acl1 = fAclSvc.applyAcl(fRepositoryId, id, acl, defaultAcl, AclPropagation.OBJECTONLY, null);
checkSimpleTestAcl(acl, acl1);
// get ACL using AclService
- Acl aclReturn = fAclSvc.getAcl(fRepositoryId, id, true, null);
+ Acl aclReturn = fAclSvc.getAcl(fRepositoryId, id, true, null);
checkSimpleTestAcl(acl, aclReturn);
LOG.info("... testApplyAcl() finished.");
}
-
+
@Test
public void testAddRemoveAcl() {
-
+
LOG.info("starting testAddRemoveAcl() ...");
- Acl acl = createAdvancedTestAcl();
-
+ Acl acl = createAdvancedTestAcl();
+
String id = createDocument(fRootFolderId, acl, defaultAcl);
LOG.debug("created document with id: " + id);
-
- Acl aclAdd = createAclAdd();
+
+ Acl aclAdd = createAclAdd();
Acl aclRemove = createAclRemove();
// apply absolute ACL using AclService
- Acl aclReturn = fAclSvc.applyAcl(fRepositoryId, id, aclAdd, aclRemove, AclPropagation.OBJECTONLY, null);
+ Acl aclReturn = fAclSvc.applyAcl(fRepositoryId, id, aclAdd, aclRemove, AclPropagation.OBJECTONLY, null);
checkAclAfterAddRemove(aclReturn);
-
+
LOG.info("... testAddRemoveAcl() finished.");
}
-
+
@Test
public void testAddRemoveDuplicatedAcl() {
final String DOCUMENT_NAME_1 = "DocumentWithAcl-1";
final String DOCUMENT_NAME_2 = "DocumentWithAcl-2";
LOG.info("starting testAddRemoveDuplicatedAcl() ...");
- Acl acl = createAdvancedTestAcl();
+ Acl acl = createAdvancedTestAcl();
String id1 = createDocument(DOCUMENT_NAME_1, fRootFolderId, acl, defaultAcl);
String id2 = createDocument(DOCUMENT_NAME_2, fRootFolderId, acl, defaultAcl);
-
-// // modify ACL of first doc
-// List<Ace> acesRemove = Arrays.asList(new Ace[] {
-// createAce(BOB, EnumBasicPermissions.CMIS_WRITE.value()),
-// });
-// Acl aclRemove = new AccessControlListImpl(acesRemove);
-// List<Ace> acesAdd = Arrays.asList(new Ace[] {
-// createAce(DAN, EnumBasicPermissions.CMIS_WRITE.value()),
-// });
-// Acl aclAdd = new AccessControlListImpl(acesAdd);
- Acl aclAdd = createAclAdd();
+
+ // // modify ACL of first doc
+ // List<Ace> acesRemove = Arrays.asList(new Ace[] {
+ // createAce(BOB, EnumBasicPermissions.CMIS_WRITE.value()),
+ // });
+ // Acl aclRemove = new AccessControlListImpl(acesRemove);
+ // List<Ace> acesAdd = Arrays.asList(new Ace[] {
+ // createAce(DAN, EnumBasicPermissions.CMIS_WRITE.value()),
+ // });
+ // Acl aclAdd = new AccessControlListImpl(acesAdd);
+ Acl aclAdd = createAclAdd();
Acl aclRemove = createAclRemove();
- Acl aclReturn = fAclSvc.applyAcl(fRepositoryId, id1, aclAdd, aclRemove, AclPropagation.OBJECTONLY, null);
+ Acl aclReturn = fAclSvc.applyAcl(fRepositoryId, id1, aclAdd, aclRemove, AclPropagation.OBJECTONLY, null);
checkAclAfterAddRemove(aclReturn);
-
+
// Ensure that ACL of second doc is unchanged
- aclReturn = fAclSvc.getAcl(fRepositoryId, id2, true, null);
+ aclReturn = fAclSvc.getAcl(fRepositoryId, id2, true, null);
checkAdvancedTestAcl(acl, aclReturn);
LOG.info("... testAddRemoveDuplicatedAcl() finished.");
}
-
+
@Test
- public void testApplyAclRecursiveSimple () {
+ public void testApplyAclRecursiveSimple() {
LOG.info("starting testApplyAclRecursiveSimple() ...");
Acl acl = createSimpleTestAcl();
String[] ids = createHierarchy(acl, defaultAcl);
- fAclSvc.applyAcl(fRepositoryId, ids[0], acl, null, AclPropagation.PROPAGATE, null);
- checkAclRecursiveSimple(ids, acl);
+ fAclSvc.applyAcl(fRepositoryId, ids[0], acl, null, AclPropagation.PROPAGATE, null);
+ checkAclRecursiveSimple(ids, acl);
LOG.info("... testApplyAclRecursiveSimple() finished.");
- }
+ }
@Test
public void testApplyAclRecursiveIncremental() {
LOG.info("starting testApplyAclRecursiveIncremental() ...");
- Acl acl = createAdvancedTestAcl();
+ Acl acl = createAdvancedTestAcl();
String[] ids = createHierarchy(acl, defaultAcl);
-
- Acl aclRemove = createAclRemove();
- Acl aclAdd = createAclAdd();
- Acl aclReturn = fAclSvc.applyAcl(fRepositoryId, ids[0], aclAdd, aclRemove, AclPropagation.PROPAGATE, null);
+ Acl aclRemove = createAclRemove();
+ Acl aclAdd = createAclAdd();
+
+ Acl aclReturn = fAclSvc.applyAcl(fRepositoryId, ids[0], aclAdd, aclRemove, AclPropagation.PROPAGATE, null);
checkAclAfterAddRemove(aclReturn);
for (String id : ids) {
- aclReturn = fAclSvc.getAcl(fRepositoryId, id, true, null);
+ aclReturn = fAclSvc.getAcl(fRepositoryId, id, true, null);
checkAclAfterAddRemove(aclReturn);
}
LOG.info("... testApplyAclRecursiveIncremental() finished.");
- }
+ }
@Test
public void testRemoveAllAcls() {
LOG.info("starting testRemoveAllAcls() ...");
- Acl acl = createAdvancedTestAcl();
+ Acl acl = createAdvancedTestAcl();
String id = createDocument(fRootFolderId, acl, defaultAcl);
LOG.debug("created document with id: " + id);
-
+
Acl aclReturn = fAclSvc.applyAcl(fRepositoryId, id, null, acl, AclPropagation.OBJECTONLY, null);
assertNotNull(aclReturn);
assertEquals(1, aclReturn.getAces().size());
- assertTrue(aclHasPermission(aclReturn, "anyone", EnumBasicPermissions.CMIS_ALL.value()));
+ assertTrue(aclHasPermission(aclReturn, "anyone", EnumBasicPermissions.CMIS_ALL.value()));
LOG.info("... testRemoveAllAcls() finished.");
- }
+ }
private String createDocument(String name, String folderId, Acl addAces, Acl removeAces) {
- return createDocumentNoCatch(name, folderId, DOCUMENT_TYPE_ID, VersioningState.NONE, false, addAces,
- removeAces);
+ return createDocumentNoCatch(name, folderId, DOCUMENT_TYPE_ID, VersioningState.NONE, false, addAces, removeAces);
}
-
+
private String createDocument(String folderId, Acl addAces, Acl removeAces) {
return createDocumentNoCatch(DOCUMENT_NAME, folderId, DOCUMENT_TYPE_ID, VersioningState.NONE, false, addAces,
- removeAces);
+ removeAces);
}
private String createFolder(String folderId, Acl addAces, Acl removeAces) {
- return createFolderNoCatch(FOLDER_NAME, folderId, FOLDER_TYPE_ID, addAces, removeAces);
+ return createFolderNoCatch(FOLDER_NAME, folderId, FOLDER_TYPE_ID, addAces, removeAces);
}
-
+
private String[] createHierarchy(Acl addAces, Acl removeAces) {
- String result[] = new String [6];
+ String result[] = new String[6];
String rootFolderId = createFolderNoCatch(FOLDER_NAME, fRootFolderId, FOLDER_TYPE_ID, addAces, removeAces);
result[0] = rootFolderId;
result[1] = createDocument(DOCUMENT_NAME + "-1", rootFolderId, addAces, removeAces);
@@ -270,87 +272,82 @@ public class AclServiceTest extends Abst
result[5] = createDocument(DOCUMENT_NAME + "-2", subFolderId, addAces, removeAces);
return result;
}
-
+
private void checkAclRecursiveSimple(String[] ids, Acl acl) {
// get ACL using ObjectService getObject
for (String id : ids) {
- ObjectData objData = fObjSvc.getObject(fRepositoryId, id, "*", false, IncludeRelationships.NONE, null, false, true, null);
+ ObjectData objData = fObjSvc.getObject(fRepositoryId, id, "*", false, IncludeRelationships.NONE, null,
+ false, true, null);
checkSimpleTestAcl(acl, objData.getAcl());
}
}
private Acl createSimpleTestAcl() {
List<Ace> aces = Arrays.asList(new Ace[] { createAce(USER, EnumBasicPermissions.CMIS_READ.value()) });
- return fFactory.createAccessControlList(aces);
+ return fFactory.createAccessControlList(aces);
}
-
+
private void checkSimpleTestAcl(Acl acl, Acl aclReturn) {
assertNotNull(aclReturn);
assertEquals(acl.getAces().size(), aclReturn.getAces().size());
- assertTrue(aclHasPermission(aclReturn, USER, EnumBasicPermissions.CMIS_READ.value()));
+ assertTrue(aclHasPermission(aclReturn, USER, EnumBasicPermissions.CMIS_READ.value()));
}
-
+
private Acl createAdvancedTestAcl() {
- List<Ace> aces = Arrays.asList(new Ace[] {
- createAce(ALICE, EnumBasicPermissions.CMIS_READ.value()),
+ List<Ace> aces = Arrays.asList(new Ace[] { createAce(ALICE, EnumBasicPermissions.CMIS_READ.value()),
createAce(BOB, EnumBasicPermissions.CMIS_WRITE.value()),
- createAce(CHRIS, EnumBasicPermissions.CMIS_ALL.value()),
- });
- return fFactory.createAccessControlList(aces);
+ createAce(CHRIS, EnumBasicPermissions.CMIS_ALL.value()), });
+ return fFactory.createAccessControlList(aces);
}
-
+
private Acl createAclAdd() {
- List<Ace> acesAdd = Arrays.asList(new Ace[] {
- createAce(DAN, EnumBasicPermissions.CMIS_WRITE.value()),
- });
- return fFactory.createAccessControlList(acesAdd);
+ List<Ace> acesAdd = Arrays.asList(new Ace[] { createAce(DAN, EnumBasicPermissions.CMIS_WRITE.value()), });
+ return fFactory.createAccessControlList(acesAdd);
}
-
+
private Acl createAclRemove() {
- List<Ace> acesRemove = Arrays.asList(new Ace[] {
- createAce(BOB, EnumBasicPermissions.CMIS_WRITE.value()),
- createAce(CHRIS, EnumBasicPermissions.CMIS_ALL.value())
- });
- return fFactory.createAccessControlList(acesRemove);
+ List<Ace> acesRemove = Arrays.asList(new Ace[] { createAce(BOB, EnumBasicPermissions.CMIS_WRITE.value()),
+ createAce(CHRIS, EnumBasicPermissions.CMIS_ALL.value()) });
+ return fFactory.createAccessControlList(acesRemove);
}
-
+
private void checkAclAfterAddRemove(Acl aclReturn) {
assertNotNull(aclReturn);
assertEquals(2, aclReturn.getAces().size());
- assertTrue(aclHasPermission(aclReturn, ALICE, EnumBasicPermissions.CMIS_READ.value()));
- assertTrue(aclHasPermission(aclReturn, DAN, EnumBasicPermissions.CMIS_WRITE.value()));
- assertFalse(aclHasPermission(aclReturn, BOB, EnumBasicPermissions.CMIS_WRITE.value()));
- assertFalse(aclHasPermission(aclReturn, CHRIS, EnumBasicPermissions.CMIS_ALL.value()));
- assertTrue(aclHasNoPermission(aclReturn, BOB));
- assertTrue(aclHasNoPermission(aclReturn, CHRIS));
+ assertTrue(aclHasPermission(aclReturn, ALICE, EnumBasicPermissions.CMIS_READ.value()));
+ assertTrue(aclHasPermission(aclReturn, DAN, EnumBasicPermissions.CMIS_WRITE.value()));
+ assertFalse(aclHasPermission(aclReturn, BOB, EnumBasicPermissions.CMIS_WRITE.value()));
+ assertFalse(aclHasPermission(aclReturn, CHRIS, EnumBasicPermissions.CMIS_ALL.value()));
+ assertTrue(aclHasNoPermission(aclReturn, BOB));
+ assertTrue(aclHasNoPermission(aclReturn, CHRIS));
}
-
- private void checkAdvancedTestAcl(Acl acl, Acl aclReturn) {
+
+ private void checkAdvancedTestAcl(Acl acl, Acl aclReturn) {
assertNotNull(aclReturn);
assertEquals(acl.getAces().size(), aclReturn.getAces().size());
- assertTrue(aclHasPermission(aclReturn, ALICE, EnumBasicPermissions.CMIS_READ.value()));
- assertTrue(aclHasPermission(aclReturn, BOB, EnumBasicPermissions.CMIS_WRITE.value()));
- assertTrue(aclHasPermission(aclReturn, CHRIS, EnumBasicPermissions.CMIS_ALL.value()));
+ assertTrue(aclHasPermission(aclReturn, ALICE, EnumBasicPermissions.CMIS_READ.value()));
+ assertTrue(aclHasPermission(aclReturn, BOB, EnumBasicPermissions.CMIS_WRITE.value()));
+ assertTrue(aclHasPermission(aclReturn, CHRIS, EnumBasicPermissions.CMIS_ALL.value()));
}
private Ace createAce(String principalId, String permission) {
- return fFactory.createAccessControlEntry(principalId, Collections.singletonList( permission ));
+ return fFactory.createAccessControlEntry(principalId, Collections.singletonList(permission));
}
-
+
private boolean aclHasPermission(Acl acl, String principalId, String permission) {
for (Ace ace : acl.getAces()) {
if (ace.getPrincipalId().equals(principalId) && aceContainsPermission(ace, permission)) {
return true;
- }
+ }
}
return false;
}
-
+
private boolean aclHasNoPermission(Acl acl, String principalId) {
if (null == acl) {
return false;
}
-
+
for (Ace ace : acl.getAces()) {
if (ace.getPrincipalId().equals(principalId)) {
return false;
@@ -358,7 +355,7 @@ public class AclServiceTest extends Abst
}
return true;
}
-
+
private boolean aceContainsPermission(Ace ace, String permission) {
for (String acePerm : ace.getPermissions()) {
if (permission.equals(acePerm)) {
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/AclTest.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/AclTest.java?rev=1516753&r1=1516752&r2=1516753&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/AclTest.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/AclTest.java Fri Aug 23 08:53:49 2013
@@ -48,7 +48,7 @@ public class AclTest {
final static String BERTA = "berta";
final static String CHRISTIAN = "christian";
final static String DOROTHEE = "dorothee";
-
+
final InMemoryAce aceN = new InMemoryAce(ANDREAS, Permission.NONE);
final InMemoryAce aceR = new InMemoryAce(BERTA, Permission.READ);
final InMemoryAce aceW = new InMemoryAce(CHRISTIAN, Permission.WRITE);
@@ -59,43 +59,43 @@ public class AclTest {
try {
new InMemoryAce(null, Permission.NONE);
fail("create an ACE with null principalId should fail.");
- } catch (RuntimeException e) {
+ } catch (RuntimeException e) {
}
try {
new InMemoryAce("xxx", null);
fail("create an ACE with null permission should fail.");
- } catch (RuntimeException e) {
+ } catch (RuntimeException e) {
}
}
-
+
@Test
public void testCreate() {
-
+
InMemoryAcl acl = new InMemoryAcl();
acl.addAce(aceA);
assertEquals(1, acl.getAces().size());
assertTrue(acl.getAces().get(0) == aceA);
-
+
acl = new InMemoryAcl(createAceList());
LOG.debug(acl.toString());
-
+
assertEquals(2, acl.getAces().size());
assertTrue(acl.getAces().get(0) == aceR);
assertTrue(acl.getAces().get(1) == aceA);
-
+
acl = createDefaultAcl();
checkDefaultAcl(acl);
-
+
try {
List<InMemoryAce> aces = createAceList();
aces.add(null);
acl = new InMemoryAcl(aces);
fail("create an ACL with a null ACE should fail.");
- } catch (RuntimeException e) {
+ } catch (RuntimeException e) {
}
}
-
+
@Test
public void testAdd() {
InMemoryAcl acl = new InMemoryAcl();
@@ -116,12 +116,12 @@ public class AclTest {
assertTrue(acl.getAces().get(0) == aceN);
assertTrue(acl.getAces().get(1) == aceR);
assertTrue(acl.getAces().get(2) == aceW);
- assertTrue(acl.getAces().get(3) == aceA);
+ assertTrue(acl.getAces().get(3) == aceA);
assertFalse("Adding an existing ACE to an ACL should fail.", acl.addAce(aceN));
assertFalse("Adding null to an ACL should fail.", acl.addAce(null));
}
-
+
@Test
public void testRemove() {
InMemoryAcl acl = createDefaultAcl();
@@ -141,7 +141,7 @@ public class AclTest {
assertTrue(acl.getAces().get(0) == aceA);
acl.removeAce(aceA);
assertEquals(0, acl.getAces().size());
-
+
acl = createDefaultAcl();
final InMemoryAce ace = new InMemoryAce("xyu", Permission.ALL);
assertFalse("Removing an unknown ACE from an ACL should fail.", acl.removeAce(ace));
@@ -150,12 +150,22 @@ public class AclTest {
@Test
public void testMerge() {
- final InMemoryAce aceNew = new InMemoryAce("Hugo", Permission.WRITE); // will be added
- final InMemoryAce aceRCopy = new InMemoryAce(BERTA, Permission.READ); // is same
- final InMemoryAce aceChange = new InMemoryAce(CHRISTIAN, Permission.ALL); // changes permission
+ final InMemoryAce aceNew = new InMemoryAce("Hugo", Permission.WRITE); // will
+ // be
+ // added
+ final InMemoryAce aceRCopy = new InMemoryAce(BERTA, Permission.READ); // is
+ // same
+ final InMemoryAce aceChange = new InMemoryAce(CHRISTIAN, Permission.ALL); // changes
+ // permission
InMemoryAcl acl1 = createDefaultAcl();
- InMemoryAcl acl2 = new InMemoryAcl(new ArrayList<InMemoryAce>() {{ add(aceNew); add(aceRCopy); add(aceChange); }});
+ InMemoryAcl acl2 = new InMemoryAcl(new ArrayList<InMemoryAce>() {
+ {
+ add(aceNew);
+ add(aceRCopy);
+ add(aceChange);
+ }
+ });
acl1.mergeAcl(acl2);
assertEquals(5, acl1.getAces().size());
assertEquals(Permission.NONE, acl1.getPermission(ANDREAS));
@@ -164,20 +174,33 @@ public class AclTest {
assertEquals(Permission.ALL, acl1.getPermission(DOROTHEE));
assertEquals(Permission.WRITE, acl1.getPermission("Hugo"));
}
-
+
@Test
public void testAclEquality() {
final InMemoryAce aceNew = new InMemoryAce("Hugo", Permission.WRITE);
final InMemoryAce aceRCopy = new InMemoryAce(BERTA, Permission.READ);
InMemoryAcl acl1 = createDefaultAcl();
- InMemoryAcl acl2 = new InMemoryAcl(new ArrayList<InMemoryAce>() {{ add(aceRCopy); add(aceA); add(aceW); add(aceN); }});
- InMemoryAcl acl3 = new InMemoryAcl(new ArrayList<InMemoryAce>() {{ add(aceR); add(aceNew); add(aceW); add(aceN); }});
+ InMemoryAcl acl2 = new InMemoryAcl(new ArrayList<InMemoryAce>() {
+ {
+ add(aceRCopy);
+ add(aceA);
+ add(aceW);
+ add(aceN);
+ }
+ });
+ InMemoryAcl acl3 = new InMemoryAcl(new ArrayList<InMemoryAce>() {
+ {
+ add(aceR);
+ add(aceNew);
+ add(aceW);
+ add(aceN);
+ }
+ });
assertEquals(acl1, acl2);
- assertFalse(acl1.equals(acl3));
+ assertFalse(acl1.equals(acl3));
}
-
-
+
@Test
public void testCheckPermissions() {
InMemoryAcl acl = createDefaultAcl();
@@ -191,7 +214,7 @@ public class AclTest {
assertTrue(acl.hasPermission(BERTA, Permission.READ));
assertFalse(acl.hasPermission(BERTA, Permission.WRITE));
assertFalse(acl.hasPermission(BERTA, Permission.ALL));
-
+
assertTrue(acl.hasPermission(CHRISTIAN, Permission.NONE));
assertTrue(acl.hasPermission(CHRISTIAN, Permission.READ));
assertTrue(acl.hasPermission(CHRISTIAN, Permission.WRITE));
@@ -205,26 +228,30 @@ public class AclTest {
@Test
public void testConvertFomCmisAcl() {
- List<Ace> aces = Arrays.asList(new Ace[] { createAce(ANDREAS, EnumBasicPermissions.CMIS_READ.value()), createAce(DOROTHEE, EnumBasicPermissions.CMIS_WRITE.value()) });
+ List<Ace> aces = Arrays.asList(new Ace[] { createAce(ANDREAS, EnumBasicPermissions.CMIS_READ.value()),
+ createAce(DOROTHEE, EnumBasicPermissions.CMIS_WRITE.value()) });
AccessControlListImpl cAcl = new AccessControlListImpl(aces);
- InMemoryAcl acl = InMemoryAcl.createFromCommonsAcl(cAcl);
+ InMemoryAcl acl = InMemoryAcl.createFromCommonsAcl(cAcl);
assertEquals(2, acl.size());
assertEquals(Permission.READ, acl.getPermission(ANDREAS));
assertEquals(Permission.WRITE, acl.getPermission(DOROTHEE));
-
+
try {
- List<Ace> aces2 = Arrays.asList(new Ace[] { new AccessControlEntryImpl(null, Arrays.asList(new String[] { EnumBasicPermissions.CMIS_READ.value()}))});
+ List<Ace> aces2 = Arrays.asList(new Ace[] { new AccessControlEntryImpl(null, Arrays
+ .asList(new String[] { EnumBasicPermissions.CMIS_READ.value() })) });
acl = InMemoryAcl.createFromCommonsAcl(new AccessControlListImpl(aces2));
fail("create Ace will null principal should raise exception.");
- } catch (RuntimeException e) { }
+ } catch (RuntimeException e) {
+ }
try {
- List<Ace> aces2 = Arrays.asList(new Ace[] { new AccessControlEntryImpl(new AccessControlPrincipalDataImpl(ANDREAS), null)});
+ List<Ace> aces2 = Arrays.asList(new Ace[] { new AccessControlEntryImpl(new AccessControlPrincipalDataImpl(
+ ANDREAS), null) });
acl = InMemoryAcl.createFromCommonsAcl(new AccessControlListImpl(aces2));
fail("create Ace will null permission should raise exception.");
- } catch (RuntimeException e) { }
+ } catch (RuntimeException e) {
+ }
}
-
-
+
@Test
public void testConvertToCmisAcl() {
Ace ace = aceN.toCommonsAce();
@@ -246,7 +273,7 @@ public class AclTest {
assertEquals(DOROTHEE, ace.getPrincipalId());
assertEquals(1, ace.getPermissions().size());
assertEquals(EnumBasicPermissions.CMIS_ALL.value(), ace.getPermissions().get(0));
-
+
InMemoryAcl acl = createDefaultAcl();
Acl commonsAcl = acl.toCommonsAcl();
assertEquals(4, commonsAcl.getAces().size());
@@ -258,7 +285,7 @@ public class AclTest {
assertTrue(hasCommonsAce(commonsAcl, CHRISTIAN, EnumBasicPermissions.CMIS_WRITE.value()));
assertTrue(hasCommonsAce(commonsAcl, DOROTHEE, EnumBasicPermissions.CMIS_ALL.value()));
}
-
+
@Test
public void testCloneAcl() {
InMemoryAcl acl = createDefaultAcl();
@@ -271,23 +298,35 @@ public class AclTest {
assertFalse(acl == acl2);
assertEquals(acl, acl2);
}
-
+
private InMemoryAcl createDefaultAcl() {
- return new InMemoryAcl(new ArrayList<InMemoryAce>() {{ add(aceA); add(aceR); add(aceN); add(aceW); }});
+ return new InMemoryAcl(new ArrayList<InMemoryAce>() {
+ {
+ add(aceA);
+ add(aceR);
+ add(aceN);
+ add(aceW);
+ }
+ });
}
-
+
private void checkDefaultAcl(InMemoryAcl acl) {
assertEquals(4, acl.getAces().size());
assertTrue(acl.getAces().get(0) == aceN);
assertTrue(acl.getAces().get(1) == aceR);
assertTrue(acl.getAces().get(2) == aceW);
- assertTrue(acl.getAces().get(3) == aceA);
+ assertTrue(acl.getAces().get(3) == aceA);
}
private List<InMemoryAce> createAceList() {
- return new ArrayList<InMemoryAce>() {{ add(aceA); add(aceR); }};
+ return new ArrayList<InMemoryAce>() {
+ {
+ add(aceA);
+ add(aceR);
+ }
+ };
}
-
+
private Ace createAce(String principalId, String permission) {
AccessControlEntryImpl ace = new AccessControlEntryImpl(new AccessControlPrincipalDataImpl(principalId),
Arrays.asList(new String[] { permission }));
@@ -301,6 +340,6 @@ public class AclTest {
}
}
return false;
-
+
}
}
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/DiscoveryServiceTest.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/DiscoveryServiceTest.java?rev=1516753&r1=1516752&r2=1516753&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/DiscoveryServiceTest.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/DiscoveryServiceTest.java Fri Aug 23 08:53:49 2013
@@ -50,7 +50,7 @@ public class DiscoveryServiceTest extend
}
@Override
- @After
+ @After
public void tearDown() {
super.tearDown();
}
@@ -59,7 +59,7 @@ public class DiscoveryServiceTest extend
public void testQuery() {
log.info("starting testQuery() ...");
- ObjectGenerator gen = new ObjectGenerator(fFactory, fNavSvc, fObjSvc, fRepSvc, fRepositoryId,
+ ObjectGenerator gen = new ObjectGenerator(fFactory, fNavSvc, fObjSvc, fRepSvc, fRepositoryId,
ObjectGenerator.ContentKind.LOREM_IPSUM_TEXT);
gen.setNumberOfDocumentsToCreatePerFolder(3);
gen.setDocumentTypeId(TEST_DOCUMENT_TYPE_ID);
@@ -82,16 +82,23 @@ public class DiscoveryServiceTest extend
BigInteger maxItems = null;
BigInteger skipCount = null;
- String statement = "SELECT * FROM " + TEST_DOCUMENT_TYPE_ID + " WHERE " + TEST_DOCUMENT_STRING_PROP_ID + "='My Doc StringProperty 1'";
+ String statement = "SELECT * FROM " + TEST_DOCUMENT_TYPE_ID + " WHERE " + TEST_DOCUMENT_STRING_PROP_ID
+ + "='My Doc StringProperty 1'";
ObjectList res = fDiscSvc.query(fRepositoryId, statement, searchAllVersions, includeAllowableActions,
includeRelationships, renditionFilter, maxItems, skipCount, null);
assertEquals(1, res.getObjects().size());
- statement = "SELECT " + TEST_DOCUMENT_STRING_PROP_ID + " FROM " + TEST_DOCUMENT_TYPE_ID + " WHERE " + TEST_DOCUMENT_STRING_PROP_ID + "='My Doc StringProperty 1'";
+ statement = "SELECT " + TEST_DOCUMENT_STRING_PROP_ID + " FROM " + TEST_DOCUMENT_TYPE_ID + " WHERE "
+ + TEST_DOCUMENT_STRING_PROP_ID + "='My Doc StringProperty 1'";
res = fDiscSvc.query(fRepositoryId, statement, searchAllVersions, includeAllowableActions,
includeRelationships, renditionFilter, maxItems, skipCount, null);
assertEquals(1, res.getObjects().size());
- assertEquals(1, res.getObjects().get(0).getProperties().getProperties().size()); // only one property should be delivered
+ assertEquals(1, res.getObjects().get(0).getProperties().getProperties().size()); // only
+ // one
+ // property
+ // should
+ // be
+ // delivered
statement = "SELECT * FROM cmis:folder";
res = fDiscSvc.query(fRepositoryId, statement, searchAllVersions, includeAllowableActions,
@@ -99,27 +106,27 @@ public class DiscoveryServiceTest extend
// root + 2 at level 1 + 2*2 at level 2 = 7
assertEquals(7, res.getObjects().size());
-
/*
- assertEquals(BigInteger.valueOf(9), res.getNumItems());
-
- statement = "SELECT * FROM cmis:folder";
- res = fDiscSvc.query(fRepositoryId, statement, searchAllVersions, includeAllowableActions,
- includeRelationships, renditionFilter, maxItems, skipCount, null);
- // root + 2 at level 1 + 2*2 at level 2 = 7
- assertEquals(BigInteger.valueOf(7), res.getNumItems());
-
- statement = "SELECT * FROM cmis:folder";
- res = fDiscSvc.query(fRepositoryId, statement, searchAllVersions, includeAllowableActions,
- includeRelationships, renditionFilter, maxItems, skipCount, null);
- // root + 2 at level 1 + 2*2 at level 2 = 7
- assertEquals(BigInteger.valueOf(7), res.getNumItems());
-
- statement = "SELECT * FROM cmis:folder WHERE name='Jens'";
- res = fDiscSvc.query(fRepositoryId, statement, searchAllVersions, includeAllowableActions,
- includeRelationships, renditionFilter, maxItems, skipCount, null);
- assertEquals(BigInteger.valueOf(0), res.getNumItems());
-*/
+ * assertEquals(BigInteger.valueOf(9), res.getNumItems());
+ *
+ * statement = "SELECT * FROM cmis:folder"; res =
+ * fDiscSvc.query(fRepositoryId, statement, searchAllVersions,
+ * includeAllowableActions, includeRelationships, renditionFilter,
+ * maxItems, skipCount, null); // root + 2 at level 1 + 2*2 at level 2 =
+ * 7 assertEquals(BigInteger.valueOf(7), res.getNumItems());
+ *
+ * statement = "SELECT * FROM cmis:folder"; res =
+ * fDiscSvc.query(fRepositoryId, statement, searchAllVersions,
+ * includeAllowableActions, includeRelationships, renditionFilter,
+ * maxItems, skipCount, null); // root + 2 at level 1 + 2*2 at level 2 =
+ * 7 assertEquals(BigInteger.valueOf(7), res.getNumItems());
+ *
+ * statement = "SELECT * FROM cmis:folder WHERE name='Jens'"; res =
+ * fDiscSvc.query(fRepositoryId, statement, searchAllVersions,
+ * includeAllowableActions, includeRelationships, renditionFilter,
+ * maxItems, skipCount, null); assertEquals(BigInteger.valueOf(0),
+ * res.getNumItems());
+ */
log.info("... testQuery() finished.");
}
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/FolderTest.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/FolderTest.java?rev=1516753&r1=1516752&r2=1516753&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/FolderTest.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/FolderTest.java Fri Aug 23 08:53:49 2013
@@ -52,7 +52,7 @@ public class FolderTest extends TestCase
private static final String USER = "user";
@Override
- @Before
+ @Before
protected void setUp() throws Exception {
fStore = new ObjectStoreImpl(TEST_REPOSITORY_ID);
createFolders();
@@ -167,11 +167,11 @@ public class FolderTest extends TestCase
f11 = (FolderImpl) createFolder("Folder 1.1", f1);
}
-
+
private Folder createFolder(String name, Folder parent) {
- return fStore.createFolder(name, null, "user", parent, null, null, null);
+ return fStore.createFolder(name, null, "user", parent, null, null, null);
}
-
+
private String getPath(Folder folder) {
return fStore.getFolderPath(folder.getId());
}
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/MultiFilingTest.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/MultiFilingTest.java?rev=1516753&r1=1516752&r2=1516753&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/MultiFilingTest.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/MultiFilingTest.java Fri Aug 23 08:53:49 2013
@@ -84,7 +84,7 @@ public class MultiFilingTest extends Abs
assertNotNull(res);
assertEquals(res.size(), 0);
-
+
// test with a different user than Admin:
switchCallContext("Alice");
docId = createDocument(UNFILED_DOC_NAME + "_2", null, DOCUMENT_TYPE_ID, true);
@@ -178,7 +178,6 @@ public class MultiFilingTest extends Abs
LOG.debug("End testRenameMultiFiledDocument()");
}
-
@Test
public void testRemoveDocumentFromAllFolders() {
LOG.debug("Begin testRemoveDocumentFromAllFolders()");
@@ -187,7 +186,7 @@ public class MultiFilingTest extends Abs
removeDocumentFromAllFolders(docId);
LOG.debug("End testRemoveDocumentFromAllFolders()");
}
-
+
@Test
public void testAddVersionedDocumentToFolder() {
LOG.debug("Begin testAddVersionedDocumentToFolder()");
@@ -213,7 +212,7 @@ public class MultiFilingTest extends Abs
removeDocumentFromAllFolders(docId);
LOG.debug("End testRemoveVersionedDocumentFromAllFolders()");
}
-
+
private void createFolders() {
fId1 = createFolder("folder1", fRootFolderId, FOLDER_TYPE_ID);
fId2 = createFolder("folder2", fRootFolderId, FOLDER_TYPE_ID);
@@ -276,7 +275,7 @@ public class MultiFilingTest extends Abs
IncludeRelationships.NONE, null, true, null);
assertEquals(0, parents.size());
}
-
+
private String createUnfiledDocument() {
return createDocument(UNFILED_DOC_NAME, null, DOCUMENT_TYPE_ID, true);
}
@@ -316,8 +315,8 @@ public class MultiFilingTest extends Abs
private String createVersionedDocument() {
- return createDocument(UNFILED_DOC_NAME, null, UnitTestTypeSystemCreator.VERSIONED_TYPE,
- VersioningState.MAJOR, true);
+ return createDocument(UNFILED_DOC_NAME, null, UnitTestTypeSystemCreator.VERSIONED_TYPE, VersioningState.MAJOR,
+ true);
}
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/NavigationServiceTest.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/NavigationServiceTest.java?rev=1516753&r1=1516752&r2=1516753&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/NavigationServiceTest.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/NavigationServiceTest.java Fri Aug 23 08:53:49 2013
@@ -144,8 +144,8 @@ public class NavigationServiceTest exten
int objCount = createFolderHierachy(numLevels, childrenPerLevel);
log.info("test getting all objects with getDescendants");
- List<ObjectInFolderContainer> result = fNavSvc.getDescendants(fRepositoryId, fRootFolderId, BigInteger
- .valueOf(-1), "*", Boolean.TRUE, IncludeRelationships.NONE, null, Boolean.TRUE, null);
+ List<ObjectInFolderContainer> result = fNavSvc.getDescendants(fRepositoryId, fRootFolderId,
+ BigInteger.valueOf(-1), "*", Boolean.TRUE, IncludeRelationships.NONE, null, Boolean.TRUE, null);
for (ObjectInFolderContainer obj : result) {
log.info(" found folder id " + obj.getObject().getObject().getId() + " path segment "
@@ -207,9 +207,9 @@ public class NavigationServiceTest exten
// create a folder
String folderId = super.createFolder("PagingFolder", fRootFolderId, DocumentTypeCreationHelper
.getCmisFolderType().getId());
-
+
// create some documents
- for (int i=0; i<10; i++) {
+ for (int i = 0; i < 10; i++) {
super.createDocument("File-" + i, folderId, "cmis:document", true);
}
log.info("test getting all objects with getChildren");
@@ -230,8 +230,8 @@ public class NavigationServiceTest exten
// get second page
maxItems = BigInteger.valueOf(3);
skipCount = BigInteger.valueOf(3);
- result = fNavSvc.getChildren(fRepositoryId, folderId, "*", null, false,
- IncludeRelationships.NONE, null, true, maxItems, skipCount, null);
+ result = fNavSvc.getChildren(fRepositoryId, folderId, "*", null, false, IncludeRelationships.NONE, null, true,
+ maxItems, skipCount, null);
files = result.getObjects();
log.info(" found " + files.size() + " files in getChildren()");
for (ObjectInFolderData file : files) {
@@ -240,12 +240,12 @@ public class NavigationServiceTest exten
assertEquals(3, files.size());
assertEquals(BigInteger.valueOf(10), result.getNumItems());
assertTrue(result.hasMoreItems());
-
+
// get third page
maxItems = BigInteger.valueOf(3);
skipCount = BigInteger.valueOf(9);
- result = fNavSvc.getChildren(fRepositoryId, folderId, "*", null, false,
- IncludeRelationships.NONE, null, true, maxItems, skipCount, null);
+ result = fNavSvc.getChildren(fRepositoryId, folderId, "*", null, false, IncludeRelationships.NONE, null, true,
+ maxItems, skipCount, null);
files = result.getObjects();
log.info(" found " + files.size() + " files in getChildren()");
for (ObjectInFolderData file : files) {
@@ -255,9 +255,9 @@ public class NavigationServiceTest exten
assertEquals(BigInteger.valueOf(10), result.getNumItems());
assertFalse(result.hasMoreItems());
log.info("... testGetPaging() finished.");
-
+
}
-
+
private int getSizeOfDescendants(List<ObjectInFolderContainer> objs) {
int sum = 0;
if (null != objs) {