commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject cvs commit: jakarta-commons/docs/latka/dtds/1.0 tests.ent suite.ent
Date Fri, 29 Mar 2002 13:28:46 GMT
dion        02/03/29 05:28:46

  Modified:    docs/latka/dtds/1.0 tests.ent suite.ent
  Log:
  Refactored for custom tests
  
  Revision  Changes    Path
  1.2       +45 -10    jakarta-commons/docs/latka/dtds/1.0/tests.ent
  
  Index: tests.ent
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/docs/latka/dtds/1.0/tests.ent,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- tests.ent	28 Jan 2002 23:51:39 -0000	1.1
  +++ tests.ent	29 Mar 2002 13:28:45 -0000	1.2
  @@ -1,19 +1,54 @@
  -<!-- validations and custom tests
  -     alter this file to add new custom tests -->
   
  -<!-- add new tests to this array (add top-level element only) -->
  -<!ENTITY % tests "statusCode | regexp | byteLength |
  -                  maxRequestTime | cookie | goldenFile | responseHeader | xpath">
  +<!ENTITY % custom-tests.ent SYSTEM "custom-tests.ent">
  +%custom-tests.ent;
   
  -<!-- 
  +<!-- all Latka test top level elements are here -->
  +<!ENTITY % tests "byteLength | cookie | goldenFile | maxRequestTime | regexp | 
  +                  responseHeader | statusCode | xpath">
   
  -add definition of custom test elements here
  +<!ELEMENT byteLength EMPTY>
  +<!ATTLIST byteLength min   CDATA "0"
  +                      max   CDATA #IMPLIED
  +                      label CDATA #IMPLIED>
   
  -###example only
  -###actual definitions of built-in tasks are located in the 
  -###main suite.dtd file
  +<!-- start cookie validator-->
   <!ELEMENT cookie EMPTY>
   <!ATTLIST cookie name  CDATA #REQUIRED
                    value CDATA #IMPLIED
                    label CDATA #IMPLIED>
  +<!-- end cookie validator -->
  +
  +<!ELEMENT goldenFile EMPTY>
  +<!ATTLIST goldenFile fileName         CDATA          #REQUIRED
  +                      ignoreWhitespace (true | false) "false"
  +                      label            CDATA          #IMPLIED>
  +
  +<!ELEMENT maxRequestTime EMPTY>
  +<!-- defaults to 30 seconds -->
  +<!ATTLIST maxRequestTime millis CDATA "30000"
  +                           label  CDATA #IMPLIED>
  +
  +<!ELEMENT regexp EMPTY>
  +<!ATTLIST regexp pattern    CDATA          #REQUIRED
  +                 cond       (true | false) "true"
  +                 ignoreCase (true | false) "false"
  +                 label      CDATA          #IMPLIED>
  +
  +<!-- 
  +  if you omit the headerValue, Latka assumes that you
  +  simply want to make sure the header exists 
   -->
  +<!ELEMENT responseHeader EMPTY>
  +<!ATTLIST responseHeader headerName  CDATA #REQUIRED
  +                         headerValue CDATA #IMPLIED
  +                         label       CDATA #IMPLIED>
  +
  +<!ELEMENT statusCode EMPTY>
  +<!ATTLIST statusCode code  CDATA "200"
  +                      label CDATA #IMPLIED>
  +
  +<!ELEMENT xpath EMPTY>
  +<!ATTLIST xpath select    CDATA          #REQUIRED
  +                cond       (true | false) "true"
  +                value     CDATA          #IMPLIED  
  +                label     CDATA          #IMPLIED>
  
  
  
  1.2       +1 -48     jakarta-commons/docs/latka/dtds/1.0/suite.ent
  
  Index: suite.ent
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/docs/latka/dtds/1.0/suite.ent,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- suite.ent	28 Jan 2002 23:51:39 -0000	1.1
  +++ suite.ent	29 Mar 2002 13:28:45 -0000	1.2
  @@ -40,51 +40,4 @@
   
   <!ELEMENT paramValue (#PCDATA)>
   
  -<!ELEMENT validate ( (%tests;)+ )>
  -
  -<!ELEMENT statusCode EMPTY>
  -<!ATTLIST statusCode code  CDATA "200"
  -                      label CDATA #IMPLIED>
  -
  -<!ELEMENT regexp EMPTY>
  -<!ATTLIST regexp pattern    CDATA          #REQUIRED
  -                 cond       (true | false) "true"
  -                 ignoreCase (true | false) "false"
  -                 label      CDATA          #IMPLIED>
  -
  -<!ELEMENT xpath EMPTY>
  -<!ATTLIST xpath select    CDATA          #REQUIRED
  -                cond       (true | false) "true"
  -                value     CDATA          #IMPLIED  
  -                label     CDATA          #IMPLIED>
  -
  -<!ELEMENT goldenFile EMPTY>
  -<!ATTLIST goldenFile fileName         CDATA          #REQUIRED
  -                      ignoreWhitespace (true | false) "false"
  -                      label            CDATA          #IMPLIED>
  -
  -<!ELEMENT byteLength EMPTY>
  -<!ATTLIST byteLength min   CDATA "0"
  -                      max   CDATA #IMPLIED
  -                      label CDATA #IMPLIED>
  -
  -<!ELEMENT maxRequestTime EMPTY>
  -<!-- defaults to 30 seconds -->
  -<!ATTLIST maxRequestTime millis CDATA "30000"
  -                           label  CDATA #IMPLIED>
  -
  -<!-- start cookie validator-->
  -<!ELEMENT cookie EMPTY>
  -<!ATTLIST cookie name  CDATA #REQUIRED
  -                 value CDATA #IMPLIED
  -                 label CDATA #IMPLIED>
  -<!-- end cookie validator -->
  -
  -<!-- 
  -  if you omit the headerValue, Latka assumes that you
  -  simply want to make sure the header exists 
  --->
  -<!ELEMENT responseHeader EMPTY>
  -<!ATTLIST responseHeader headerName  CDATA #REQUIRED
  -                         headerValue CDATA #IMPLIED
  -                         label       CDATA #IMPLIED>
  +<!ELEMENT validate ( (%tests; %custom-tests;)+ )>
  \ No newline at end of file
  
  
  

--
To unsubscribe, e-mail:   <mailto:commons-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:commons-dev-help@jakarta.apache.org>


Mime
View raw message