inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix QueryTest after merges.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18884 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2010-02-26 12:56:16 +00:00
parent 14a0a5623f
commit f527228cfd
2 changed files with 17 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/alfresco/model/cmisModel.xml
View File

@@ -202,9 +202,7 @@
<protected>true</protected> <protected>true</protected>
<mandatory enforced="true">true</mandatory> <mandatory enforced="true">true</mandatory>
<multiple>false</multiple> <multiple>false</multiple>
<index enabled="true"> <index enabled="false"/>
<tokenised>true</tokenised>
</index>
</property> </property>
<property name="cmis:versionSeriesId"> <property name="cmis:versionSeriesId">
<title>Version series id</title> <title>Version series id</title>

53
source/java/org/alfresco/cmis/search/QueryTest.java
View File

@@ -60,6 +60,7 @@ import org.alfresco.cmis.mapping.DirectProperty;
import org.alfresco.cmis.mapping.ObjectIdProperty; import org.alfresco.cmis.mapping.ObjectIdProperty;
import org.alfresco.cmis.mapping.ObjectTypeIdProperty; import org.alfresco.cmis.mapping.ObjectTypeIdProperty;
import org.alfresco.cmis.mapping.ParentProperty; import org.alfresco.cmis.mapping.ParentProperty;
import org.alfresco.cmis.mapping.VersionLabelProperty;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.repo.dictionary.M2Model; import org.alfresco.repo.dictionary.M2Model;
import org.alfresco.repo.node.BaseNodeServiceTest; import org.alfresco.repo.node.BaseNodeServiceTest;
@@ -1240,52 +1241,30 @@ public class QueryTest extends BaseCMISTest
assertEquals(file_count, rs.length()); assertEquals(file_count, rs.length());
for (CMISResultSetRow row : rs) for (CMISResultSetRow row : rs)
{ {
// Serializable sValue = row.getValue("cmis:versionLabel"); // NOt queryable
// String value = DefaultTypeConverter.INSTANCE.convert(String.class, sValue);
// could be anything
// assertNotNull(value);
// assertEquals(Boolean.TRUE, value);
CMISResultSetColumn column = rs.getResultSetMetaData().getColumn("cmis:versionLabel");
assertNotNull(column);
assertEquals(CMISDataTypeEnum.STRING, column.getCMISDataType());
assertEquals(CMISCardinalityEnum.SINGLE_VALUED, column.getCMISPropertyDefinition().getCardinality());
assertTrue(column.getCMISPropertyDefinition().getPropertyAccessor() instanceof DirectProperty);
}
rs.close();
options = new CMISQueryOptions("SELECT * FROM cmis:document WHERE cmis:versionLabel = 'label'", rootNodeRef.getStoreRef());
options.setDefaultFTSConnective(Connective.OR);
options.setDefaultFTSFieldConnective(Connective.OR);
rs = cmisQueryService.query(options);
assertEquals(1, rs.length());
for (CMISResultSetRow row : rs)
{
Serializable sValue = row.getValue("cmis:versionLabel"); Serializable sValue = row.getValue("cmis:versionLabel");
String value = DefaultTypeConverter.INSTANCE.convert(String.class, sValue); String value = DefaultTypeConverter.INSTANCE.convert(String.class, sValue);
assertNotNull(value); assertNull(value);
assertEquals("label", value);
CMISResultSetColumn column = rs.getResultSetMetaData().getColumn("cmis:versionLabel"); CMISResultSetColumn column = rs.getResultSetMetaData().getColumn("cmis:versionLabel");
assertEquals(CMISDataTypeEnum.STRING, column.getCMISDataType()); assertNull(column);
assertEquals(CMISCardinalityEnum.SINGLE_VALUED, column.getCMISPropertyDefinition().getCardinality());
assertTrue(column.getCMISPropertyDefinition().getPropertyAccessor() instanceof DirectProperty);
} }
rs.close(); rs.close();
testQuery("SELECT cmis:versionLabel FROM cmis:document WHERE cmis:versionLabel = 'company'", 0, false, "cmis:objectId", new String(), false); testQuery("SELECT cmis:versionLabel FROM cmis:document WHERE cmis:versionLabel = 'company'", 0, false, "cmis:objectId", new String(), true);
testQuery("SELECT cmis:versionLabel FROM cmis:document WHERE cmis:versionLabel <> 'company'", 10, false, "cmis:objectId", new String(), false); testQuery("SELECT cmis:versionLabel FROM cmis:document WHERE cmis:versionLabel <> 'company'", 10, false, "cmis:objectId", new String(), true);
testQuery("SELECT cmis:versionLabel FROM cmis:document WHERE cmis:versionLabel < 'company'", 0, false, "cmis:objectId", new String(), false); testQuery("SELECT cmis:versionLabel FROM cmis:document WHERE cmis:versionLabel < 'company'", 0, false, "cmis:objectId", new String(), true);
testQuery("SELECT cmis:versionLabel FROM cmis:document WHERE cmis:versionLabel <= 'company'", 0, false, "cmis:objectId", new String(), false); testQuery("SELECT cmis:versionLabel FROM cmis:document WHERE cmis:versionLabel <= 'company'", 0, false, "cmis:objectId", new String(), true);
testQuery("SELECT cmis:versionLabel FROM cmis:document WHERE cmis:versionLabel > 'company'", 1, false, "cmis:objectId", new String(), false); testQuery("SELECT cmis:versionLabel FROM cmis:document WHERE cmis:versionLabel > 'company'", 1, false, "cmis:objectId", new String(), true);
testQuery("SELECT cmis:versionLabel FROM cmis:document WHERE cmis:versionLabel >= 'company'", 1, false, "cmis:objectId", new String(), false); testQuery("SELECT cmis:versionLabel FROM cmis:document WHERE cmis:versionLabel >= 'company'", 1, false, "cmis:objectId", new String(), true);
testQuery("SELECT cmis:versionLabel FROM cmis:document WHERE cmis:versionLabel IN ('company')", 0, false, "cmis:objectId", new String(), false); testQuery("SELECT cmis:versionLabel FROM cmis:document WHERE cmis:versionLabel IN ('company')", 0, false, "cmis:objectId", new String(), true);
testQuery("SELECT cmis:versionLabel FROM cmis:document WHERE cmis:versionLabel NOT IN ('company')", 10, false, "cmis:objectId", new String(), false); testQuery("SELECT cmis:versionLabel FROM cmis:document WHERE cmis:versionLabel NOT IN ('company')", 10, false, "cmis:objectId", new String(), true);
testQuery("SELECT cmis:versionLabel FROM cmis:document WHERE cmis:versionLabel LIKE 'company'", 0, false, "cmis:objectId", new String(), false); testQuery("SELECT cmis:versionLabel FROM cmis:document WHERE cmis:versionLabel LIKE 'company'", 0, false, "cmis:objectId", new String(), true);
testQuery("SELECT cmis:versionLabel FROM cmis:document WHERE cmis:versionLabel NOT LIKE 'company'", 10, false, "cmis:objectId", new String(), false); testQuery("SELECT cmis:versionLabel FROM cmis:document WHERE cmis:versionLabel NOT LIKE 'company'", 10, false, "cmis:objectId", new String(), true);
testQuery("SELECT cmis:versionLabel FROM cmis:document WHERE cmis:versionLabel IS NOT NULL", 1, false, "cmis:objectId", new String(), false); testQuery("SELECT cmis:versionLabel FROM cmis:document WHERE cmis:versionLabel IS NOT NULL", 1, false, "cmis:objectId", new String(), true);
testQuery("SELECT cmis:versionLabel FROM cmis:document WHERE cmis:versionLabel IS NULL", 9, false, "cmis:objectId", new String(), false); testQuery("SELECT cmis:versionLabel FROM cmis:document WHERE cmis:versionLabel IS NULL", 9, false, "cmis:objectId", new String(), true);
testQuery("SELECT cmis:versionLabel FROM cmis:document WHERE 'company' = ANY cmis:versionLabel", 0, false, "cmis:objectId", new String(), true); testQuery("SELECT cmis:versionLabel FROM cmis:document WHERE 'company' = ANY cmis:versionLabel", 0, false, "cmis:objectId", new String(), true);
testQuery("SELECT cmis:versionLabel FROM cmis:document WHERE 'company' <> ANY cmis:versionLabel", 10, false, "cmis:objectId", new String(), true); testQuery("SELECT cmis:versionLabel FROM cmis:document WHERE 'company' <> ANY cmis:versionLabel", 10, false, "cmis:objectId", new String(), true);