chemistry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fguilla...@apache.org
Subject svn commit: r1004332 - in /incubator/chemistry/opencmis/trunk: chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/atompub/ chemistry-opencmis-client/chemistry-opencmis-client-binding...
Date Mon, 04 Oct 2010 17:42:37 GMT
Author: fguillaume
Date: Mon Oct  4 17:42:36 2010
New Revision: 1004332

URL: http://svn.apache.org/viewvc?rev=1004332&view=rev
Log:
Make console output of test runs less verbose

Added:
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/test/resources/
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/test/resources/log4j.properties
  (with props)
Modified:
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/atompub/AtomParserTest.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/resources/log4j.properties
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/test/resources/log4j.properties
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/test/java/log4j.properties
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/test/java/org/apache/chemistry/opencmis/commons/impl/misc/ConverterTest.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-dist/pom.xml
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/query/QueryParseTest.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/resources/log4j.properties
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/
  (props changed)
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/bindings/AbstractBindingIT.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/AbstractSessionTest.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/resources/log4j.properties

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/atompub/AtomParserTest.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/atompub/AtomParserTest.java?rev=1004332&r1=1004331&r2=1004332&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/atompub/AtomParserTest.java
(original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/atompub/AtomParserTest.java
Mon Oct  4 17:42:36 2010
@@ -42,9 +42,9 @@ import org.apache.chemistry.opencmis.com
 
 /**
  * Minimal test for AtomEntryWriter and AtomPubParser.
- * 
+ *
  * @author <a href="mailto:fmueller@opentext.com">Florian M&uuml;ller</a>
- * 
+ *
  */
 public class AtomParserTest extends TestCase {
 
@@ -86,9 +86,6 @@ public class AtomParserTest extends Test
         byte[] entryContent = bao.toByteArray();
         assertTrue(entryContent.length > 0);
 
-        String entryContentStr = new String(entryContent, "UTF-8");
-        System.out.println(entryContentStr);
-
         // parse it
         AtomPubParser parser = new AtomPubParser(new ByteArrayInputStream(entryContent));
         parser.parse();

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/resources/log4j.properties?rev=1004332&r1=1004331&r2=1004332&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/resources/log4j.properties
(original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/resources/log4j.properties
Mon Oct  4 17:42:36 2010
@@ -1,6 +1,6 @@
 #sample log4j.properties
 
-log4j.rootCategory=DEBUG, R, O
+log4j.rootCategory=WARN, R, O
 
 # Stdout
 log4j.appender.O=org.apache.log4j.ConsoleAppender
@@ -19,4 +19,4 @@ log4j.appender.O.layout=org.apache.log4j
 log4j.appender.R.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c: %m%n
 log4j.appender.O.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c: %m%n
 
-log4j.logger.org.apache.opencmis.client.bindings.spi=O
\ No newline at end of file
+log4j.logger.org.apache.opencmis.client.bindings.spi=O

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/test/resources/log4j.properties?rev=1004332&r1=1004331&r2=1004332&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/test/resources/log4j.properties
(original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/test/resources/log4j.properties
Mon Oct  4 17:42:36 2010
@@ -21,7 +21,7 @@
 
 #sample log4j.properties
 
-log4j.rootCategory=DEBUG, R, O
+log4j.rootCategory=WARN, R, O
 
 # Stdout
 log4j.appender.O=org.apache.log4j.ConsoleAppender

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/test/java/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/test/java/log4j.properties?rev=1004332&r1=1004331&r2=1004332&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/test/java/log4j.properties
(original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/test/java/log4j.properties
Mon Oct  4 17:42:36 2010
@@ -21,7 +21,7 @@
 
 #sample log4j.properties
 
-log4j.rootCategory=DEBUG, R, O
+log4j.rootCategory=WARN, R, O
 
 # Stdout
 log4j.appender.O=org.apache.log4j.ConsoleAppender

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/test/java/org/apache/chemistry/opencmis/commons/impl/misc/ConverterTest.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/test/java/org/apache/chemistry/opencmis/commons/impl/misc/ConverterTest.java?rev=1004332&r1=1004331&r2=1004332&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/test/java/org/apache/chemistry/opencmis/commons/impl/misc/ConverterTest.java
(original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/test/java/org/apache/chemistry/opencmis/commons/impl/misc/ConverterTest.java
Mon Oct  4 17:42:36 2010
@@ -56,9 +56,9 @@ import org.apache.chemistry.opencmis.com
 
 /**
  * Tests converter methods.
- * 
+ *
  * @author <a href="mailto:fmueller@opentext.com">Florian M&uuml;ller</a>
- * 
+ *
  */
 public class ConverterTest extends TestCase {
 
@@ -175,7 +175,6 @@ public class ConverterTest extends TestC
      * Asserts OpenCMIS data objects.
      */
     protected void assertDataObjectsEquals(String name, Object expected, Object actual) throws
Exception {
-        System.out.println(name);
 
         if ((expected == null) && (actual == null)) {
             return;

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-dist/pom.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-dist/pom.xml?rev=1004332&r1=1004331&r2=1004332&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-dist/pom.xml (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-dist/pom.xml Mon Oct  4 17:42:36
2010
@@ -25,7 +25,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>chemistry-opencmis-dist</artifactId>
-    <name>Distribution project for OpenCmis assemblies</name>
+    <name>OpenCMIS Assemblies Distribution</name>
     <packaging>pom</packaging>
     
     <properties>
@@ -151,4 +151,4 @@
         </profile>
     </profiles>
 
-</project>
\ No newline at end of file
+</project>

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/query/QueryParseTest.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/query/QueryParseTest.java?rev=1004332&r1=1004331&r2=1004332&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/query/QueryParseTest.java
(original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/query/QueryParseTest.java
Mon Oct  4 17:42:36 2010
@@ -37,7 +37,6 @@ import org.apache.chemistry.opencmis.ser
 import org.apache.chemistry.opencmis.server.support.query.ColumnReference;
 import org.apache.chemistry.opencmis.server.support.query.FunctionReference;
 import org.apache.chemistry.opencmis.server.support.query.QueryObject;
-import org.apache.chemistry.opencmis.server.support.query.FunctionReference.CmisQlFunction;
 import org.apache.chemistry.opencmis.server.support.query.QueryObject.SortSpec;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -54,7 +53,7 @@ public class QueryParseTest extends Abst
         // initialize query object, we do not need a type manager for just testing parsing
         super.setUp(new QueryObject(null, null));
     }
-    
+
     @After
     public void tearDown() throws Exception {
         super.tearDown();
@@ -62,8 +61,8 @@ public class QueryParseTest extends Abst
 
     @Test
     public void simpleSelectTest1() throws Exception {
-        String statement = "SELECT SCORE() FROM cmis:document"; 
-        
+        String statement = "SELECT SCORE() FROM cmis:document";
+
         CmisQueryWalker walker = traverseStatementAndCatchExc(statement);
         QueryObject select = walker.queryObj;
         List<CmisSelector> selects = select.getSelectReferences();
@@ -72,10 +71,10 @@ public class QueryParseTest extends Abst
         FunctionReference funcRef = ((FunctionReference)selects.get(0));
         assertTrue(FunctionReference.CmisQlFunction.SCORE == funcRef.getFunction());
     }
-    
+
     @Test
     public void simpleSelectTest2() throws Exception {
-        String statement = "SELECT abc FROM cmis:document";         
+        String statement = "SELECT abc FROM cmis:document";
         CmisQueryWalker walker = traverseStatementAndCatchExc(statement);
         QueryObject select = walker.queryObj;
         List<CmisSelector> selects = queryObj.getSelectReferences();
@@ -86,12 +85,12 @@ public class QueryParseTest extends Abst
         ColumnReference colRef = ((ColumnReference)selects.get(0));
         assertTrue(selects.get(0) instanceof ColumnReference);
         assertEquals("abc", colRef.getPropertyQueryName());
-        
+
     }
-    
+
     @Test
     public void simpleSelectTest3() throws Exception {
-        String statement = "SELECT t1.abc FROM cmis:document";        
+        String statement = "SELECT t1.abc FROM cmis:document";
         CmisQueryWalker walker = traverseStatementAndCatchExc(statement);
         QueryObject select = walker.queryObj;
         List<CmisSelector> selects = select.getSelectReferences();
@@ -104,10 +103,10 @@ public class QueryParseTest extends Abst
         assertEquals("abc", colRef.getPropertyQueryName());
 
     }
-    
+
     @Test
     public void simpleSelectTest4() throws Exception {
-        String statement = "SELECT * FROM cmis:document";        
+        String statement = "SELECT * FROM cmis:document";
         CmisQueryWalker walker = traverseStatementAndCatchExc(statement);
         QueryObject select = walker.queryObj;
         List<CmisSelector> selects = select.getSelectReferences();
@@ -119,12 +118,12 @@ public class QueryParseTest extends Abst
         assertEquals(null, colRef.getTypeQueryName());
         assertEquals("*", colRef.getPropertyQueryName());
 
-        
+
     }
-    
+
     @Test
     public void simpleSelectTest5() throws Exception {
-        String statement = "SELECT t1.* FROM cmis:document";        
+        String statement = "SELECT t1.* FROM cmis:document";
         CmisQueryWalker walker = traverseStatementAndCatchExc(statement);
         QueryObject select = walker.queryObj;
         List<CmisSelector> selects = select.getSelectReferences();
@@ -135,12 +134,12 @@ public class QueryParseTest extends Abst
         ColumnReference colRef = ((ColumnReference)selects.get(0));
         assertEquals("t1", colRef.getTypeQueryName());
         assertEquals("*", colRef.getPropertyQueryName());
-        
+
     }
-    
+
     @Test
     public void simpleSelectTest6() throws Exception {
-        String statement = "SELECT t2.aaa myalias FROM cmis:document";        
+        String statement = "SELECT t2.aaa myalias FROM cmis:document";
         CmisQueryWalker walker = traverseStatementAndCatchExc(statement);
         QueryObject select = walker.queryObj;
         List<CmisSelector> selects = select.getSelectReferences();
@@ -153,24 +152,24 @@ public class QueryParseTest extends Abst
         assertEquals("aaa", colRef.getPropertyQueryName());
 
     }
-    
+
     @Test
     public void simpleSelectTest7() throws Exception {
         // error processing
-        String statement = "SELECTXXX t2.aaa myalias FROM cmis:document WHERE a < t1";
       
+        String statement = "SELECTXXX t2.aaa myalias FROM cmis:document WHERE a < t1";
         try {
             CmisQueryWalker walker = traverseStatement(statement);
-            fail("Walking of statement should with RecognitionException but succeeded");

+            fail("Walking of statement should with RecognitionException but succeeded");
         } catch (Exception e) {
             assertTrue(e instanceof RecognitionException || e instanceof MismatchedTokenException);
         }
 
     }
-    
+
     @Test
     public void simpleFromTest1() throws Exception {
-        String statement = "SELECT * FROM MyType MyAlias"; 
-        
+        String statement = "SELECT * FROM MyType MyAlias";
+
         CmisQueryWalker walker = traverseStatementAndCatchExc(statement);
         QueryObject from = walker.queryObj;
         Map<String,String> types = from.getTypes();
@@ -179,10 +178,10 @@ public class QueryParseTest extends Abst
         assertEquals("MyAlias", key);
         assertEquals("MyType", types.get(key));
     }
-    
+
     @Test
     public void simpleFromTest2() throws Exception {
-        String statement = "SELECT * FROM MyType";        
+        String statement = "SELECT * FROM MyType";
         CmisQueryWalker walker = traverseStatementAndCatchExc(statement);
         QueryObject from = walker.queryObj;
         Map<String,String> types = from.getTypes();
@@ -190,12 +189,12 @@ public class QueryParseTest extends Abst
         String key = types.keySet().iterator().next();
         assertEquals("MyType", key);
         assertEquals("MyType", types.get(key));
-    
+
     }
-    
+
     @Test
     public void simpleFromTest3() throws Exception {
-        String statement = "SELECT t2.aaa FROM MyType abc123";        
+        String statement = "SELECT t2.aaa FROM MyType abc123";
         CmisQueryWalker walker = traverseStatementAndCatchExc(statement);
         QueryObject from = walker.queryObj;
         Map<String,String> types = from.getTypes();
@@ -204,11 +203,11 @@ public class QueryParseTest extends Abst
         assertEquals("abc123", key);
         assertEquals("MyType", types.get(key));
     }
-    
+
     @Test
     public void simpleWhereTest() throws Exception {
-        String statement = "SELECT * FROM MyType WHERE MyProp1=123"; 
-        
+        String statement = "SELECT * FROM MyType WHERE MyProp1=123";
+
         CmisQueryWalker walker = traverseStatementAndCatchExc(statement);
         QueryObject qo = walker.queryObj;
         List<CmisSelector> whereRefs = qo.getWhereReferences();
@@ -221,21 +220,21 @@ public class QueryParseTest extends Abst
         assertTrue(1 == qo.getSelectReferences().size());
 
         CommonTree tree = (CommonTree) walker.getTreeNodeStream().getTreeSource();
-        
+
         // System.out.println("simpleWhereTest printing Tree ...");
         // System.out.println("id in map: " + System.identityHashCode(whereRefs.keySet().iterator().next()));
 //        assertTrue(traverseTreeAndFindNodeInColumnMap(tree, colRefs));
         traverseTreeAndFindNodeInColumnMap2(tree, colRefs);
         // System.out.println("... simpleWhereTest printing Tree done.");
     }
-    
+
     // check if the map containing all column references in the where clause has an existing
node as key
     private boolean traverseTreeAndFindNodeInColumnMap(Tree node, Map<Object, CmisSelector>
colRefs) {
         boolean found = false;
 //        System.out.println("cmp to: " + System.identityHashCode(node) + " is: " + node.toString());
         if (null != colRefs.get(node))
             return true;
-        
+
         int count = node.getChildCount();
         for (int i=0; i<count && !found; i++) {
             Tree child = node.getChild(i);
@@ -264,11 +263,11 @@ public class QueryParseTest extends Abst
         }
         return found;
     }
-    
+
     @Test
     public void simpleSortTest1() throws Exception {
-        String statement = "SELECT * FROM MyType ORDER BY abc.def ASC"; 
-        
+        String statement = "SELECT * FROM MyType ORDER BY abc.def ASC";
+
         CmisQueryWalker walker = traverseStatementAndCatchExc(statement);
         List<SortSpec> orderBys = walker.queryObj.getOrderBys();
         assertTrue(1 == orderBys.size());
@@ -279,10 +278,10 @@ public class QueryParseTest extends Abst
         assertEquals("abc", ((ColumnReference)sortSpec).getTypeQueryName());
         assertEquals("def", ((ColumnReference)sortSpec).getPropertyQueryName());
     }
-    
+
     @Test
     public void simpleSortTest2() throws Exception {
-        String statement = "SELECT * FROM MyType ORDER BY def DESC";        
+        String statement = "SELECT * FROM MyType ORDER BY def DESC";
         CmisQueryWalker walker = traverseStatementAndCatchExc(statement);
         List<SortSpec> orderBys = walker.queryObj.getOrderBys();
         assertTrue(1 == orderBys.size());
@@ -293,15 +292,15 @@ public class QueryParseTest extends Abst
         assertNull(((ColumnReference)sortSpec).getTypeQueryName());
         assertEquals("def", ((ColumnReference)sortSpec).getPropertyQueryName());
     }
-    
+
     @Test
     public void printTreeTest() {
-        System.out.println("printTreeTest():");        
-        String statement = "SELECT p1, p2, p3.t3 mycol FROM MyType AS MyAlias WHERE p1='abc'
and p2=123 ORDER BY abc.def ASC";         
+        // System.out.println("printTreeTest():");
+        String statement = "SELECT p1, p2, p3.t3 mycol FROM MyType AS MyAlias WHERE p1='abc'
and p2=123 ORDER BY abc.def ASC";
         try {
             getWalker(statement);
             printTree(parserTree, statement);
-            
+
         } catch (Exception e) {
             fail("Cannot parse query: " + statement + " (" + e + ")");
         }
@@ -309,28 +308,28 @@ public class QueryParseTest extends Abst
 
     @Test
     public void extractWhereTreeTest() {
-        System.out.println("extractWhereTreeTest():");
-        String statement = "SELECT p1, p2, p3.t3 mycol FROM MyType AS MyAlias WHERE p1='abc'
and p2=123 ORDER BY abc.def ASC"; 
-        
+        // System.out.println("extractWhereTreeTest():");
+        String statement = "SELECT p1, p2, p3.t3 mycol FROM MyType AS MyAlias WHERE p1='abc'
and p2=123 ORDER BY abc.def ASC";
+
         try {
             getWalker(statement);
             Tree whereTree = getWhereTree(parserTree);
             printTree(whereTree);
-            System.out.println("Evaluate WHERE subtree: ...");
+            LOG.info("Evaluate WHERE subtree: ...");
             evalWhereTree(whereTree);
-            
+
         } catch (Exception e) {
             fail("Cannot parse query: " + statement + " (" + e + ")");
         }
     }
-    
+
     @Test
     public void whereTestIn() {
-        System.out.println("extractWhereTestIN():");
-        String statement = "SELECT p1 FROM MyType WHERE p1 IN ('Red', 'Green', 'Blue', 'Black')";

+        // System.out.println("extractWhereTestIN():");
+        String statement = "SELECT p1 FROM MyType WHERE p1 IN ('Red', 'Green', 'Blue', 'Black')";
         checkTreeWhere(statement);
     }
-    
+
     @Test
     public void whereTestEq() {
       String statement = "SELECT p1 FROM MyType WHERE p1='abc'";
@@ -390,29 +389,29 @@ public class QueryParseTest extends Abst
       String statement = "SELECT p1 FROM MyType WHERE IN_FOLDER('myfolder')";
       checkTreeWhere(statement);
     }
-    
+
     @Test
     public void whereTestInTree() {
       String statement = "SELECT p1 FROM MyType WHERE IN_TREE('myfolder')";
       checkTreeWhere(statement);
     }
-        
+
     @Test
     public void whereTestAny() {
-      String statement = "SELECT p1 FROM MyType WHERE 'Smith' = ANY Authors "; 
+      String statement = "SELECT p1 FROM MyType WHERE 'Smith' = ANY Authors ";
       checkTreeWhere(statement);
     }
 
-    
+
     @Test
     public void whereTestAnyIn() {
-      String statement = "SELECT p1 FROM MyType WHERE ANY Colors IN ('Red', 'Green', 'Blue')";

+      String statement = "SELECT p1 FROM MyType WHERE ANY Colors IN ('Red', 'Green', 'Blue')";
       checkTreeWhere(statement);
     }
-    
+
     @Test
     public void whereTestLike() {
-      String statement = "SELECT p1 FROM MyType WHERE p1 LIKE 'abc*' "; 
+      String statement = "SELECT p1 FROM MyType WHERE p1 LIKE 'abc*' ";
       checkTreeWhere(statement);
     }
 
@@ -421,7 +420,7 @@ public class QueryParseTest extends Abst
       String statement = "SELECT p1 FROM MyType WHERE p1 NOT LIKE 'abc*'";
       checkTreeWhere(statement);
     }
-    
+
     @Test
     public void whereTestNull() {
       String statement = "SELECT p1 FROM MyType WHERE p1 IS NULL";
@@ -433,7 +432,7 @@ public class QueryParseTest extends Abst
       String statement = "SELECT p1 FROM MyType WHERE p1 IS NOT NULL";
       checkTreeWhere(statement);
     }
-    
+
     @Test
     public void whereTestContains() {
       String statement = "SELECT p1 FROM MyType WHERE CONTAINS('Beethoven')";
@@ -454,19 +453,19 @@ public class QueryParseTest extends Abst
 
     @Test
     public void doubleFromTest() throws Exception {
-        String statement = "SELECT * FROM MyType JOIN YourType WHERE a='1'"; 
-        
+        String statement = "SELECT * FROM MyType JOIN YourType WHERE a='1'";
+
         CmisQueryWalker walker = traverseStatementAndCatchExc(statement);
         QueryObject from = walker.queryObj;
         Map<String,String> types = from.getTypes();
         assertTrue(2 == types.size());
     }
-    
+
     @Test
     public void duplicatedAliasTestSelect() throws Exception {
         String statement = "SELECT p1.T1 MyAlias, p2.T1 AS MyAlias FROM T1";
         try {
-            traverseStatement(statement);            
+            traverseStatement(statement);
         } catch (Exception e) {
             assertTrue(e.getMessage().contains("more than once as alias in a select"));
         }
@@ -476,15 +475,14 @@ public class QueryParseTest extends Abst
     public void duplicatedAliasTestFrom() throws Exception {
         String statement = "SELECT * FROM T1 MyAlias JOIN T2 AS MyAlias";
         try {
-            traverseStatement(statement);            
+            traverseStatement(statement);
         } catch (Exception e) {
             assertTrue(e.getMessage().contains("more than once as alias in a from"));
         }
     }
-    
+
     private void checkTreeWhere(String statement) {
-        System.out.println();
-        System.out.println("checkTreeWhere: " + statement);
+        LOG.info("\ncheckTreeWhere: " + statement);
         traverseStatementAndCatchExc(statement);
         Tree whereTree = getWhereTree(walkerTree);
         evalWhereTree(whereTree);
@@ -500,11 +498,11 @@ public class QueryParseTest extends Abst
     }
 
     private void printTree(Tree tree, String statement) {
-        System.out.println("Printing the abstract syntax tree for statement:");
-        System.out.println("  " + statement);
+        LOG.info("Printing the abstract syntax tree for statement:");
+        LOG.info("  " + statement);
         printTree(tree);
     }
-    
+
     private int indent = 1;
 
     private String indentString() {
@@ -516,16 +514,16 @@ public class QueryParseTest extends Abst
     }
 
     private void printTree(Tree node) {
-        System.out.println(indentString() + printNode(node));
+        LOG.info(indentString() + printNode(node));
         ++indent;
         int count = node.getChildCount();
         for (int i=0;i<count;i++) {
             Tree child = node.getChild(i);
             printTree(child);
         }
-        --indent;     
-    } 
-       
+        --indent;
+    }
+
     private String printNode(Tree node) {
         switch (node.getType()) {
         case CmisQlStrictLexer.TABLE:
@@ -552,7 +550,7 @@ public class QueryParseTest extends Abst
             return "#IS_NOT_NULL";
         case CmisQlStrictLexer.ORDER_BY:
             return "#ORDER_BY";
-          
+
         case CmisQlStrictLexer.WHERE:;
         case CmisQlStrictLexer.LT:
         case CmisQlStrictLexer.STAR:
@@ -607,11 +605,11 @@ public class QueryParseTest extends Abst
             return "[Unknown token: " + node.toString() + "]";
         }
     }
-    
-    
+
+
     // Ensure that we receive only valid tokens and nodes in the where clause:
     private void evaluateWhereNode(Tree node) {
-        System.out.println("evaluating node: " + node.toString());
+        LOG.info("evaluating node: " + node.toString());
         switch (node.getType()) {
         case CmisQlStrictLexer.WHERE:;
             break; // ignore

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/resources/log4j.properties?rev=1004332&r1=1004331&r2=1004332&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/resources/log4j.properties
(original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/resources/log4j.properties
Mon Oct  4 17:42:36 2010
@@ -15,7 +15,7 @@
 
 # sample log4j.properties
 
-log4j.rootCategory=DEBUG, R, O
+log4j.rootCategory=WARN, R, O
 
 # Stdout
 log4j.appender.O=org.apache.log4j.ConsoleAppender

Propchange: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Oct  4 17:42:36 2010
@@ -4,3 +4,4 @@ target
 *.ipr
 *.iml
 .*
+log4j.log*

Added: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/test/resources/log4j.properties?rev=1004332&view=auto
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/test/resources/log4j.properties
(added)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/test/resources/log4j.properties
Mon Oct  4 17:42:36 2010
@@ -0,0 +1,37 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# sample log4j.properties
+
+log4j.rootCategory=WARN, R, O
+
+# Stdout
+log4j.appender.O=org.apache.log4j.ConsoleAppender
+
+# File
+log4j.appender.R=org.apache.log4j.RollingFileAppender
+log4j.appender.R.File=log4j.log
+
+# Control the maximum log file size
+log4j.appender.R.MaxFileSize=100KB
+
+# Archive log files (one backup file here)
+log4j.appender.R.MaxBackupIndex=1
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.O.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c: %m%n
+log4j.appender.O.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c: %m%n
+
+log4j.logger.org.apache.chemistry.opencmis.server.support=WARN

Propchange: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/test/resources/log4j.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/test/resources/log4j.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/test/resources/log4j.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/bindings/AbstractBindingIT.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/bindings/AbstractBindingIT.java?rev=1004332&r1=1004331&r2=1004332&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/bindings/AbstractBindingIT.java
(original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/bindings/AbstractBindingIT.java
Mon Oct  4 17:42:36 2010
@@ -36,9 +36,9 @@ import org.junit.BeforeClass;
 /**
  * Base class for binding layer tests. It makes sure that the provider object is
  * only created once and that there is a test folder.
- * 
+ *
  * @author <a href="mailto:fmueller@opentext.com">Florian M&uuml;ller</a>
- * 
+ *
  */
 public abstract class AbstractBindingIT {
     public static String FOLDER_TYPE = "cmis:folder";
@@ -81,7 +81,7 @@ public abstract class AbstractBindingIT 
     public void setUpTest() {
         // only the first test creates the test environment
         if (binding == null) {
-            System.out.println("Creating provider...");
+            // System.out.println("Creating provider...");
 
             binding = createBinding();
             fRepositoryId = getRepositoryId();
@@ -99,7 +99,7 @@ public abstract class AbstractBindingIT 
      * Creates a folder that will be used by all read-write tests.
      */
     private void createTestFolder() {
-        System.out.println("Creating test folder...");
+        // System.out.println("Creating test folder...");
 
         // get root folder id
         RepositoryInfo ri = getBinding().getRepositoryService().getRepositoryInfo(fRepositoryId,
null);
@@ -129,7 +129,7 @@ public abstract class AbstractBindingIT 
             return;
         }
 
-        System.out.println("Deleting test folder...");
+        // System.out.println("Deleting test folder...");
 
         // delete the whole tree
         getBinding().getObjectService().deleteTree(fRepositoryId, fTestFolderId, true, UnfileObject.DELETE,
true, null);

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/AbstractSessionTest.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/AbstractSessionTest.java?rev=1004332&r1=1004331&r2=1004332&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/AbstractSessionTest.java
(original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/AbstractSessionTest.java
Mon Oct  4 17:42:36 2010
@@ -62,7 +62,7 @@ public abstract class AbstractSessionTes
 
     @BeforeClass
     public static void classSetup() {
-        AbstractSessionTest.initializeLogging();
+        // AbstractSessionTest.initializeLogging();
         Fixture.logHeader();
 
     }

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/resources/log4j.properties?rev=1004332&r1=1004331&r2=1004332&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/resources/log4j.properties
(original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/resources/log4j.properties
Mon Oct  4 17:42:36 2010
@@ -19,7 +19,7 @@
 #
 #
 
-log4j.rootCategory=DEBUG, R, O
+log4j.rootCategory=WARN, R, O
 
 # Stdout
 log4j.appender.O=org.apache.log4j.ConsoleAppender
@@ -38,7 +38,7 @@ log4j.appender.O.layout=org.apache.log4j
 log4j.appender.R.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c: %m%n
 log4j.appender.O.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c: %m%n
 
-log4j.logger.org.apache.chemistry.opencmis.fit=O
+log4j.logger.org.apache.chemistry.opencmis.fit=WARN
 log4j.logger.org.apache.chemistry.opencmis.inmemory=WARN
 log4j.logger.org.apache.chemistry.opencmis.util=WARN
-log4j.logger.org.apache.chemistry.opencmis.client=WARN
\ No newline at end of file
+log4j.logger.org.apache.chemistry.opencmis.client=WARN



Mime
View raw message