You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chemistry.apache.org by fm...@apache.org on 2012/08/24 16:01:37 UTC
svn commit: r1376917 - in /chemistry/opencmis/trunk:
chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/
chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemist...
Author: fmui
Date: Fri Aug 24 14:01:36 2012
New Revision: 1376917
URL: http://svn.apache.org/viewvc?rev=1376917&view=rev
Log:
TCK improvements
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/DataObjectCreator.java
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/AbstractSessionTest.java
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/model/ClientModel.java
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/DataObjectCreator.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/DataObjectCreator.java?rev=1376917&r1=1376916&r2=1376917&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/DataObjectCreator.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/DataObjectCreator.java Fri Aug 24 14:01:36 2012
@@ -89,9 +89,9 @@ public class DataObjectCreator {
if (isFolder || isDocument) {
set.add(Action.CAN_GET_PROPERTIES);
if (!isRootFolder) {
- set.add(Action.CAN_GET_OBJECT_PARENTS);
+ set.add(Action.CAN_GET_OBJECT_PARENTS);
+ set.add(Action.CAN_MOVE_OBJECT);
}
- set.add(Action.CAN_MOVE_OBJECT);
}
if (isFolder) {
Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/AbstractSessionTest.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/AbstractSessionTest.java?rev=1376917&r1=1376916&r2=1376917&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/AbstractSessionTest.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/AbstractSessionTest.java Fri Aug 24 14:01:36 2012
@@ -46,6 +46,7 @@ import org.apache.chemistry.opencmis.cli
import org.apache.chemistry.opencmis.client.api.Folder;
import org.apache.chemistry.opencmis.client.api.ItemIterable;
import org.apache.chemistry.opencmis.client.api.ObjectId;
+import org.apache.chemistry.opencmis.client.api.ObjectType;
import org.apache.chemistry.opencmis.client.api.OperationContext;
import org.apache.chemistry.opencmis.client.api.Policy;
import org.apache.chemistry.opencmis.client.api.Property;
@@ -592,13 +593,12 @@ public abstract class AbstractSessionTes
protected boolean hasRelationships(Session session) {
if (supportsRelationships == null) {
- try {
- session.getTypeDefinition(BaseTypeId.CMIS_RELATIONSHIP.value());
- supportsRelationships = Boolean.TRUE;
- } catch (CmisInvalidArgumentException e) {
- supportsRelationships = Boolean.FALSE;
- } catch (CmisObjectNotFoundException e) {
- supportsRelationships = Boolean.FALSE;
+ supportsRelationships = Boolean.FALSE;
+ for (ObjectType type : session.getTypeChildren(null, false)) {
+ if (BaseTypeId.CMIS_RELATIONSHIP.value().equals(type.getId())) {
+ supportsRelationships = Boolean.TRUE;
+ break;
+ }
}
}
@@ -607,13 +607,12 @@ public abstract class AbstractSessionTes
protected boolean hasPolicies(Session session) {
if (supportsPolicies == null) {
- try {
- session.getTypeDefinition(BaseTypeId.CMIS_POLICY.value());
- supportsPolicies = Boolean.TRUE;
- } catch (CmisInvalidArgumentException e) {
- supportsPolicies = Boolean.FALSE;
- } catch (CmisObjectNotFoundException e) {
- supportsPolicies = Boolean.FALSE;
+ supportsPolicies = Boolean.FALSE;
+ for (ObjectType type : session.getTypeChildren(null, false)) {
+ if (BaseTypeId.CMIS_POLICY.value().equals(type.getId())) {
+ supportsPolicies = Boolean.TRUE;
+ break;
+ }
}
}
@@ -824,6 +823,9 @@ public abstract class AbstractSessionTes
f = createResult(FAILURE, "Root folder has CAN_GET_FOLDER_PARENT allowable action!");
addResult(results, assertNotAllowableAction(object, Action.CAN_GET_FOLDER_PARENT, null, f));
+
+ f = createResult(FAILURE, "Root folder has CAN_MOVE_OBJECT allowable action!");
+ addResult(results, assertNotAllowableAction(object, Action.CAN_MOVE_OBJECT, null, f));
}
} else {
f = createResult(FAILURE, "Non-Folder object has CAN_GET_DESCENDANTS allowable action!");
@@ -1067,7 +1069,7 @@ public abstract class AbstractSessionTes
}
f = createResult(FAILURE, "Content MIME types don't match!");
- addResult(results, assertEquals(docMimeType, contentMimeType, null, f));
+ addResult(results, assertEquals(contentMimeType, docMimeType, null, f));
if (contentStream.getMimeType() != null) {
if (contentMimeType.equals(docMimeType)) {
Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/model/ClientModel.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/model/ClientModel.java?rev=1376917&r1=1376916&r2=1376917&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/model/ClientModel.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/model/ClientModel.java Fri Aug 24 14:01:36 2012
@@ -51,7 +51,7 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.enums.CapabilityQuery;
import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
import org.apache.chemistry.opencmis.commons.enums.VersioningState;
-import org.apache.chemistry.opencmis.commons.exceptions.CmisObjectNotFoundException;
+import org.apache.chemistry.opencmis.commons.exceptions.CmisBaseException;
import org.apache.chemistry.opencmis.commons.impl.MimeTypes;
import org.apache.chemistry.opencmis.workbench.RandomInputStream;
@@ -315,7 +315,7 @@ public class ClientModel {
ObjectType rootType = null;
try {
rootType = clientSession.getSession().getTypeDefinition(rootTypeId);
- } catch (CmisObjectNotFoundException e) {
+ } catch (CmisBaseException e) {
return result;
}