Author: fmui
Date: Sat Jul 21 13:10:06 2012
New Revision: 1364078
URL: http://svn.apache.org/viewvc?rev=1364078&view=rev
Log:
enhanced TCK tests
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/tests/crud/CreateAndDeleteDocumentTest.java
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/tests/crud/NameCharsetTest.java
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/tests/query/QuerySmokeTest.java
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/tests/crud/CreateAndDeleteDocumentTest.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/tests/crud/CreateAndDeleteDocumentTest.java?rev=1364078&r1=1364077&r2=1364078&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/tests/crud/CreateAndDeleteDocumentTest.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/tests/crud/CreateAndDeleteDocumentTest.java
Sat Jul 21 13:10:06 2012
@@ -19,6 +19,7 @@
package org.apache.chemistry.opencmis.tck.tests.crud;
import static org.apache.chemistry.opencmis.tck.CmisTestResultStatus.FAILURE;
+import static org.apache.chemistry.opencmis.tck.CmisTestResultStatus.WARNING;
import java.io.IOException;
import java.util.ArrayList;
@@ -108,6 +109,16 @@ public class CreateAndDeleteDocumentTest
f = createResult(FAILURE, "Returned number of children doesn't
match the page size!");
addResult(assertEquals(pageSize, count, null, f));
+ if (page1.getTotalNumItems() == -1) {
+ addResult(createResult(WARNING, "Repository did not return
numItems for the first test page."));
+ } else {
+ f = createResult(FAILURE, "Returned numItems doesn't match the
number of documents!");
+ addResult(assertEquals((long) numOfDocuments,
page1.getTotalNumItems(), null, f));
+ }
+
+ f = createResult(FAILURE, "hasMoreItems of the first test page
must be 'true'!");
+ // addResult(assertEquals(true, page1.getHasMoreItems(), null, f));
+
count = 0;
ItemIterable<CmisObject> page2 =
testFolder.getChildren(SELECT_ALL_NO_CACHE_OC_ORDER_BY_NAME)
.skipTo(pageSize - 1).getPage(pageSize);
@@ -124,6 +135,16 @@ public class CreateAndDeleteDocumentTest
f = createResult(FAILURE, "Returned number of children doesn't
match the page size!");
addResult(assertEquals(pageSize, count, null, f));
+ if (page2.getTotalNumItems() == -1) {
+ addResult(createResult(WARNING, "Repository did not return
numItems for the second test page."));
+ } else {
+ f = createResult(FAILURE, "Returned numItems doesn't match the
number of documents!");
+ addResult(assertEquals((long) numOfDocuments,
page2.getTotalNumItems(), null, f));
+ }
+
+ f = createResult(FAILURE, "hasMoreItems of the second test page
must be 'true'!");
+ // addResult(assertEquals(true, page2.getHasMoreItems(), null, f));
+
// check content
for (Document document : documents.values()) {
ContentStream contentStream = document.getContentStream();
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/tests/crud/NameCharsetTest.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/tests/crud/NameCharsetTest.java?rev=1364078&r1=1364077&r2=1364078&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/tests/crud/NameCharsetTest.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/tests/crud/NameCharsetTest.java
Sat Jul 21 13:10:06 2012
@@ -100,7 +100,7 @@ public class NameCharsetTest extends Abs
}
}
- addResult(createInfoResult("Tested " + NAMES.length + "different
names."));
+ addResult(createInfoResult("Tested " + NAMES.length + " different
names."));
} finally {
// delete the test folder
deleteTestFolder();
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/tests/query/QuerySmokeTest.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/tests/query/QuerySmokeTest.java?rev=1364078&r1=1364077&r2=1364078&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/tests/query/QuerySmokeTest.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/tests/query/QuerySmokeTest.java
Sat Jul 21 13:10:06 2012
@@ -21,6 +21,7 @@ package org.apache.chemistry.opencmis.tc
import static org.apache.chemistry.opencmis.tck.CmisTestResultStatus.FAILURE;
import static org.apache.chemistry.opencmis.tck.CmisTestResultStatus.OK;
import static org.apache.chemistry.opencmis.tck.CmisTestResultStatus.SKIPPED;
+import static org.apache.chemistry.opencmis.tck.CmisTestResultStatus.WARNING;
import java.util.ArrayList;
import java.util.List;
@@ -87,7 +88,8 @@ public class QuerySmokeTest extends Abst
} else {
int i = 0;
// testing 100 results should be sufficient for this test
- for (QueryResult qr : resultSet.getPage(pageSize)) {
+ ItemIterable<QueryResult> queryIterable =
resultSet.getPage(pageSize);
+ for (QueryResult qr : queryIterable) {
if (qr == null) {
addResult(createResult(FAILURE, "Query result is null!
(OpenCMIS issue???)"));
} else {
@@ -114,6 +116,10 @@ public class QuerySmokeTest extends Abst
+ ")!");
addResult(assertIsFalse((i > pageSize), null, f));
+ if (queryIterable.getTotalNumItems() == -1) {
+ addResult(createResult(WARNING, "Repository did not return
numItems."));
+ }
+
addResult(createInfoResult(i + " query results for \"" +
statement + "\" (page size = " + pageSize
+ ")"));
}
