Probable build fix for: ALF-11507 Test disabled: QueryTest.testBasicAllFolderColumns

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32017 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrew Hind
2011-11-16 14:31:55 +00:00
parent 36d2734915
commit 2da83be109
2 changed files with 22 additions and 1 deletions

View File

@@ -20,6 +20,7 @@ package org.alfresco.opencmis;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.GregorianCalendar;
import java.util.HashMap;
import java.util.List;
@@ -344,6 +345,11 @@ public class CMISNodeInfoImpl implements CMISNodeInfo
{
type = null;
if((objecVariant == CMISObjectVariant.INVALID_ID) || (objecVariant == CMISObjectVariant.NOT_A_CMIS_OBJECT) || (objecVariant == CMISObjectVariant.NOT_EXISTING) || (objecVariant == CMISObjectVariant.PERMISSION_DENIED))
{
return;
}
if (nodeRef != null)
{
QName typeQName = connector.getNodeService().getType(nodeRef);
@@ -528,6 +534,11 @@ public class CMISNodeInfoImpl implements CMISNodeInfo
public String getName()
{
if((objecVariant == CMISObjectVariant.INVALID_ID) || (objecVariant == CMISObjectVariant.NOT_A_CMIS_OBJECT) || (objecVariant == CMISObjectVariant.NOT_EXISTING) || (objecVariant == CMISObjectVariant.PERMISSION_DENIED))
{
return null;
}
if (name == null)
{
if (isRelationship())
@@ -545,6 +556,11 @@ public class CMISNodeInfoImpl implements CMISNodeInfo
public String getPath()
{
if((objecVariant == CMISObjectVariant.INVALID_ID) || (objecVariant == CMISObjectVariant.NOT_A_CMIS_OBJECT) || (objecVariant == CMISObjectVariant.NOT_EXISTING) || (objecVariant == CMISObjectVariant.PERMISSION_DENIED))
{
return null;
}
if (cmisPath == null)
{
StringBuilder displayPath = new StringBuilder(64);
@@ -783,6 +799,11 @@ public class CMISNodeInfoImpl implements CMISNodeInfo
@Override
public List<CMISNodeInfo> getParents()
{
if((objecVariant == CMISObjectVariant.INVALID_ID) || (objecVariant == CMISObjectVariant.NOT_A_CMIS_OBJECT) || (objecVariant == CMISObjectVariant.NOT_EXISTING) || (objecVariant == CMISObjectVariant.PERMISSION_DENIED))
{
return Collections.<CMISNodeInfo>emptyList();
}
if (parents == null)
{
parents = new ArrayList<CMISNodeInfo>();

View File

@@ -3517,7 +3517,7 @@ public class QueryTest extends BaseCMISTest
rs.close();
}
public void DISABLED_testBasicAllFolderColumns()
public void testBasicAllFolderColumns()
{
CMISQueryOptions options = new CMISQueryOptions("SELECT * FROM cmis:folder AS DOC", cmisConnector.getRootStoreRef());
CMISResultSet rs = cmisQueryService.query(options);