svn commit: r916254 - in /incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec: QueryPagingTest.java QueryTest.java

[dcaruana]

Author: dcaruana
Date: Thu Feb 25 11:28:46 2010
New Revision: 916254

URL: http://svn.apache.org/viewvc?rev=916254&view=rev
Log:
TCK query tests now issue statements compliant with CD07.
e.g. cmis:ObjectId => cmis:objectId

Modified:
    
incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/QueryPagingTest.java
    
incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/QueryTest.java

Modified: 
incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/QueryPagingTest.java
URL: 
http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/QueryPagingTest.java?rev=916254&r1=916253&r2=916254&view=diff
==============================================================================
--- 
incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/QueryPagingTest.java
 (original)
+++ 
incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/QueryPagingTest.java
 Thu Feb 25 11:28:46 2010
@@ -69,12 +69,11 @@
         Assert.assertEquals(15, unread.size());
 
         // query children
-        // TODO: use property query name
         IRI queryHREF = client.getQueryCollection(client.getWorkspace());
         String queryDoc = templates.load("query.cmisquery.xml");
         CMISObject testFolderObject = 
searchFolder.entry.getExtension(CMISConstants.OBJECT);
         String query = 
-                "SELECT cmis:ObjectId, cmis:ObjectTypeId, cmis:Name FROM 
cmis:document " +
+                "SELECT cmis:objectId, cmis:objectTypeId, cmis:name FROM 
cmis:document " +
                 "WHERE IN_FOLDER('" + 
testFolderObject.getObjectId().getStringValue() + "')";
         String queryReq = queryDoc.replace("${STATEMENT}", query);
         queryReq = queryReq.replace("${SKIPCOUNT}", "0");

Modified: 
incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/QueryTest.java
URL: 
http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/QueryTest.java?rev=916254&r1=916253&r2=916254&view=diff
==============================================================================
--- 
incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/QueryTest.java
 (original)
+++ 
incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/QueryTest.java
 Thu Feb 25 11:28:46 2010
@@ -104,7 +104,7 @@
         // TODO: use property query name
         String query = 
                 "SELECT * FROM cmis:folder " +
-                "WHERE cmis:ObjectId = '" + 
folderObject.getObjectId().getStringValue() + "'";
+                "WHERE cmis:objectId = '" + 
folderObject.getObjectId().getStringValue() + "'";
         String queryReq = queryDoc.replace("${STATEMENT}", query);
         queryReq = queryReq.replace("${SKIPCOUNT}", "0");
         queryReq = queryReq.replace("${MAXITEMS}", "5");
@@ -138,7 +138,7 @@
         String query =
                 "SELECT * FROM cmis:document " +
                 "WHERE IN_FOLDER('" + 
folderObject.getObjectId().getStringValue() + "') " + 
-                "AND cmis:Name = 'apple1'";
+                "AND cmis:name = 'apple1'";
         String queryReq = queryDoc.replace("${STATEMENT}", query);
         queryReq = queryReq.replace("${SKIPCOUNT}", "0");
         queryReq = queryReq.replace("${MAXITEMS}", "5");
@@ -171,7 +171,7 @@
         // TODO: use property query name
         String fullText = document2Object.getName().getStringValue();
         String query = 
-                "SELECT cmis:ObjectId, cmis:ObjectTypeId, cmis:Name FROM 
cmis:document " + 
+                "SELECT cmis:objectId, cmis:objectTypeId, cmis:name FROM 
cmis:document " + 
                 "WHERE CONTAINS('" + fullText + "')";
         String queryReq = queryDoc.replace("${STATEMENT}", query);
         queryReq = queryReq.replace("${SKIPCOUNT}", "0");
@@ -204,9 +204,9 @@
         // combined meta data and full text
         // TODO: use property query name
         String query = 
-                "SELECT cmis:ObjectId, cmis:ObjectTypeId, cmis:Name FROM 
cmis:document " + 
+                "SELECT cmis:objectId, cmis:objectTypeId, cmis:name FROM 
cmis:document " + 
                 "WHERE IN_FOLDER('" + 
folderObject.getObjectId().getStringValue() + "') " +
-                "AND cmis:Name = 'apple1' " +
+                "AND cmis:name = 'apple1' " +
                 "AND CONTAINS('apple1')";
         String queryReq = queryDoc.replace("${STATEMENT}", query);
         queryReq = queryReq.replace("${SKIPCOUNT}", "0");
@@ -239,9 +239,9 @@
         // combined meta data and full text
         // TODO: use property query name
         final String query = 
-                "SELECT cmis:ObjectId, cmis:ObjectTypeId, cmis:Name FROM 
cmis:document " + 
+                "SELECT cmis:objectId, cmis:objectTypeId, cmis:name FROM 
cmis:document " + 
                 "WHERE IN_FOLDER('" + 
folderObject.getObjectId().getStringValue() + "') " +
-                "AND cmis:Name = 'apple1' " +
+                "AND cmis:name = 'apple1' " +
                 "AND CONTAINS('apple1')";
         
         GatherRenditionsVisitor visitor = new GatherRenditionsVisitor(client);