You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by ju...@apache.org on 2002/04/17 15:14:24 UTC

cvs commit: jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor TProcessors.java

juergen     02/04/17 06:14:24

  Modified:    testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor
                        TProcessors.java
  Log:
  minor change:
  1) the console protocol prints now the current date
  2) the var logging is switched off by default and can be enabled by -Dxdav.tracingRequest=var
  3) slide client logging can be switched on by -Dxdav.tracingRequest=client
  
  Revision  Changes    Path
  1.17      +22 -12    jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/TProcessors.java
  
  Index: TProcessors.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/TProcessors.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- TProcessors.java	28 Mar 2002 06:12:16 -0000	1.16
  +++ TProcessors.java	17 Apr 2002 13:14:24 -0000	1.17
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/TProcessors.java,v 1.16 2002/03/28 06:12:16 jericho Exp $
  - * $Revision: 1.16 $
  - * $Date: 2002/03/28 06:12:16 $
  + * $Header: /home/cvs/jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/TProcessors.java,v 1.17 2002/04/17 13:14:24 juergen Exp $
  + * $Revision: 1.17 $
  + * $Date: 2002/04/17 13:14:24 $
    *
    * ====================================================================
    *
  @@ -84,7 +84,7 @@
    * Main class to performe a test case and check and report the results
    *
    * @author Software AG
  - * @version $Revision: 1.16 $
  + * @version $Revision: 1.17 $
    */
   public class TProcessors {
       
  @@ -114,6 +114,10 @@
       String defaultUrlEncoding;
       
       
  +    /** Tracing required */
  +    String tracingRequest;
  +    
  +    
       /** hold all the variable defined **/
       KnownVariablesHashtable knownVariables = new KnownVariablesHashtable();
       
  @@ -145,6 +149,7 @@
           defaultUser = System.getProperty("xdav.user");
           defaultPassword = System.getProperty("xdav.password");
           defaultUrlEncoding = System.getProperty("xdav.urlencoding");
  +        tracingRequest = System.getProperty("xdav.tracingRequest",  "none");
           
           if (defaultUrlEncoding == null) {
               defaultUrlEncoding = "UTF-8";
  @@ -340,7 +345,7 @@
           
           
           System.out.println("");
  -        System.out.println("Starting test case: " + testfile.getAbsolutePath());
  +        System.out.println(new Date() + " Starting test case: " + testfile.getAbsolutePath());
           
           xmlresult.writeElementStart("testCase");
           xmlresult.writeElement("fileName", testfile.getAbsolutePath());
  @@ -369,7 +374,7 @@
           xmlresult.flush();
           
           
  -        if (testElementsExecutedWithError!=0) System.out.println("FAILED test case: " + testfile.getAbsolutePath());
  +        if (testElementsExecutedWithError!=0) System.out.println(new Date() + " FAILED test case: " + testfile.getAbsolutePath());
           //      System.out.println("Ending test case: " + testfile.getAbsolutePath());
           //      System.out.println("");
           //      try {System.in.read();} catch (Exception e) {}
  @@ -504,7 +509,12 @@
                                   ((Integer)startUp.get("port") ).intValue(),
                               new Credentials(user, password));
           client.setState(state);
  -        client.setDebug(0);
  +        if (tracingRequest.indexOf("client") != (-1)) {
  +            client.setDebug(100);
  +        }
  +        else {
  +            client.setDebug(0);
  +        }
           
           //              System.out.println("############### user " + user);
           //              System.out.println("############### pwd  " + password);
  @@ -1443,12 +1453,12 @@
                       result = (String)vars.get(key);
                   }
               }
  -            System.out.println("***VAR reading " + key + " = " + result + "  in Thread " + Thread.currentThread().getName());
  +            if (tracingRequest.indexOf("var") != (-1)) System.out.println("***VAR reading " + key + " = " + result + "  in Thread " + Thread.currentThread().getName());
               return result;
           }
           public void put(String key, String value) {
               getEnvironment().put(key, value);
  -            System.out.println("***VAR setting " + key + " = " + value + "  in Thread " + Thread.currentThread().getName());
  +            if (tracingRequest.indexOf("var") != (-1)) System.out.println("***VAR setting " + key + " = " + value + "  in Thread " + Thread.currentThread().getName());
           }
           public int size() {
               return getEnvironment().size()+1;
  @@ -1468,12 +1478,12 @@
                   vars = new HashtableStack();
               }
               knownVarsByThread.put(Thread.currentThread().getName(), vars);
  -            System.out.println("***********Frame("+knownVarsByThread.size()+"): created new Variable frame for " + Thread.currentThread().getName() + " based on  " + name);
  +            if (tracingRequest.indexOf("var") != (-1)) System.out.println("***********Frame("+knownVarsByThread.size()+"): created new Variable frame for " + Thread.currentThread().getName() + " based on  " + name);
               return vars;
           }
           public void removeEnvironment() {
               knownVarsByThread.remove(Thread.currentThread().getName());
  -            System.out.println("***********Frame("+knownVarsByThread.size()+"): removed Variable frame for " + Thread.currentThread().getName() );
  +            if (tracingRequest.indexOf("var") != (-1)) System.out.println("***********Frame("+knownVarsByThread.size()+"): removed Variable frame for " + Thread.currentThread().getName() );
           }
           public HashtableStack getEnvironment(Thread scope) {
               HashtableStack vars  = (HashtableStack)knownVarsByThread.get(scope.getName());
  @@ -1507,7 +1517,7 @@
               return super.put(key, value);
           }
           public Object pop() {
  -            System.out.println("***VAR removing " + stack.peek() + " = " + super.get(stack.peek()) + "  in Thread " + Thread.currentThread());
  +            if (tracingRequest.indexOf("var") != (-1)) System.out.println("***VAR removing " + stack.peek() + " = " + super.get(stack.peek()) + "  in Thread " + Thread.currentThread());
               return super.remove(stack.pop());
           }
       }
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>