Return-Path: 
 <commits-return-5822-apmail-chemistry-commits-archive=chemistry.apache.org@chemistry.apache.org>
X-Original-To: apmail-chemistry-commits-archive@www.apache.org
Delivered-To: apmail-chemistry-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id C49D010CB0
	for <apmail-chemistry-commits-archive@www.apache.org>;
 Wed, 12 Jun 2013 10:50:07 +0000 (UTC)
Received: (qmail 85176 invoked by uid 500); 12 Jun 2013 10:50:07 -0000
Delivered-To: apmail-chemistry-commits-archive@chemistry.apache.org
Received: (qmail 85101 invoked by uid 500); 12 Jun 2013 10:50:04 -0000
Mailing-List: contact commits-help@chemistry.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@chemistry.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@chemistry.apache.org>
List-Post: <mailto:commits@chemistry.apache.org>
List-Id: <commits.chemistry.apache.org>
Reply-To: dev@chemistry.apache.org
Delivered-To: mailing list commits@chemistry.apache.org
Received: (qmail 85084 invoked by uid 99); 12 Jun 2013 10:50:03 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Jun 2013 10:50:03 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Jun 2013 10:49:59 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 903122388906;
	Wed, 12 Jun 2013 10:49:39 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1492139 -
 /chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/AbstractSessionTest.java
Date: Wed, 12 Jun 2013 10:49:39 -0000
To: commits@chemistry.apache.org
From: fmui@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20130612104939.903122388906@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: fmui
Date: Wed Jun 12 10:49:38 2013
New Revision: 1492139

URL: http://svn.apache.org/r1492139
Log:
TCK: added query name check

Modified:
    chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/AbstractSessionTest.java

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=1492139&r1=1492138&r2=1492139&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 Wed Jun 12 10:49:38 2013
@@ -2010,6 +2010,45 @@ public abstract class AbstractSessionTes
 
     // --- type checks ---
 
+    protected CmisTestResult checkQueryName(String queryName, boolean isRequired, String message) {
+        List<CmisTestResult> results = new ArrayList<CmisTestResult>();
+
+        CmisTestResult f;
+
+        if (queryName == null || queryName.length() == 0) {
+            addResult(results, createResult(isRequired ? FAILURE : WARNING, "Query name is not set!"));
+        } else {
+            f = createResult(FAILURE, "Query name contains invalid character: ' '");
+            addResult(results, assertIsTrue(queryName.indexOf(' ') < 0, null, f));
+
+            f = createResult(FAILURE, "Query name contains invalid character: ','");
+            addResult(results, assertIsTrue(queryName.indexOf(',') < 0, null, f));
+
+            f = createResult(FAILURE, "Query name contains invalid character: '\"'");
+            addResult(results, assertIsTrue(queryName.indexOf('"') < 0, null, f));
+
+            f = createResult(FAILURE, "Query name contains invalid character: '''");
+            addResult(results, assertIsTrue(queryName.indexOf('\'') < 0, null, f));
+
+            f = createResult(FAILURE, "Query name contains invalid character: '\\'");
+            addResult(results, assertIsTrue(queryName.indexOf('\\') < 0, null, f));
+
+            f = createResult(FAILURE, "Query name contains invalid character: '.'");
+            addResult(results, assertIsTrue(queryName.indexOf('.') < 0, null, f));
+
+            f = createResult(FAILURE, "Query name contains invalid character: '('");
+            addResult(results, assertIsTrue(queryName.indexOf('(') < 0, null, f));
+
+            f = createResult(FAILURE, "Query name contains invalid character: ')'");
+            addResult(results, assertIsTrue(queryName.indexOf(')') < 0, null, f));
+        }
+
+        CmisTestResultImpl result = createResult(getWorst(results), message);
+        result.getChildren().addAll(results);
+
+        return (result.getStatus().getLevel() <= OK.getLevel() ? null : result);
+    }
+
     protected CmisTestResult checkTypeDefinition(Session session, TypeDefinition type, String message) {
         List<CmisTestResult> results = new ArrayList<CmisTestResult>();
 
@@ -2031,8 +2070,9 @@ public abstract class AbstractSessionTes
             // f = createResult(FAILURE, "Local namespace is not set!");
             // addResult(results, assertStringNotEmpty(type.(), null, f));
 
-            f = createResult(FAILURE, "Query name is not set!");
-            addResult(results, assertStringNotEmpty(type.getQueryName(), null, f));
+            boolean isQueryNameRequired = Boolean.TRUE.equals(type.isQueryable());
+            addResult(results,
+                    checkQueryName(type.getQueryName(), isQueryNameRequired, "Type Query Name: " + type.getQueryName()));
 
             if ((type.getId() != null) && (type.getBaseTypeId() != null)) {
                 if (type.getBaseTypeId().value().equals(type.getId())) {
@@ -3259,6 +3299,10 @@ public abstract class AbstractSessionTes
                         addResult(results, f);
                     }
 
+                    boolean isPropertyQueryNameRequired = Boolean.TRUE.equals(queryable);
+                    checkQueryName(propDef.getQueryName(), isPropertyQueryNameRequired, "Property Query Name: "
+                            + propDef.getQueryName());
+
                     if ((orderable != null) && !orderable.equals(propDef.isOrderable())) {
                         f = createResult(FAILURE,
                                 "Orderable: expected: " + orderable + " / actual: " + propDef.isOrderable());