juergen 2003/02/03 07:13:29 Modified: testsuite/testsuite/junit testCasesResults.dtd Log: minor adaptions: domException and received/expected Value added Revision Changes Path 1.3 +6 -5 jakarta-slide/testsuite/testsuite/junit/testCasesResults.dtd Index: testCasesResults.dtd =================================================================== RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/testCasesResults.dtd,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- testCasesResults.dtd 25 Feb 2002 09:43:19 -0000 1.2 +++ testCasesResults.dtd 3 Feb 2003 15:13:29 -0000 1.3 @@ -1,12 +1,13 @@ <!ELEMENT XMLSizeError (path, expectedSize, receivedSize, expectedElements, receivedElements, receivedAndNotExpected?, expectedAndNotReceived?, receivedAndNotExpected?)> -<!ELEMENT XMLValueError (path, expectedValue, receivedValue)> +<!ELEMENT XMLValueError ( (path, expectedValue, receivedValue) | (expectedValue, receivedValue) )> <!ELEMENT ContentLengthError (#PCDATA)> +<!ELEMENT expectedValue (#PCDATA)> +<!ELEMENT receivedValue (#PCDATA)> <!ELEMENT ContentValueError (#PCDATA)> <!ELEMENT exceuteStep (method, url, exception?, headerErrors?, XMLSizeError*, XMLValueError*, responseError?, ContentLengthError?, ContentValueError?, result, time)> <!ELEMENT expectedAndNotReceived (#PCDATA)> <!ELEMENT expectedElements (#PCDATA)> <!ELEMENT expectedSize (#PCDATA)> -<!ELEMENT expectedValue (#PCDATA)> <!ELEMENT fileName (#PCDATA)> <!ELEMENT headerErrors (nonExistingHeader+ | nonMatchingHeader)> <!ELEMENT method (#PCDATA)> @@ -22,15 +23,15 @@ <!ELEMENT receivedAndNotExpected (#PCDATA)> <!ELEMENT receivedElements (#PCDATA)> <!ELEMENT receivedSize (#PCDATA)> -<!ELEMENT receivedValue (#PCDATA)> <!ELEMENT responseError (receivedValue, expectedValue)> <!ELEMENT result (#PCDATA)> <!ELEMENT resultFileName (#PCDATA)> <!ELEMENT excecutionDate (#PCDATA)> -<!ELEMENT testCase (fileName, exceuteStep+, result, time, testElementCount, testElementErrors)> -<!ELEMENT testSuite (excecutionDate, resultFileName, testCase+, result, time, testElementCount, testElementErrors)> +<!ELEMENT testCase (fileName, (domException | exceuteStep*) , result, time, testElementCount, testElementErrors)> +<!ELEMENT testSuite (excecutionDate, resultFileName, testCase* , result, time, testElementCount, testElementErrors)> <!ELEMENT time (#PCDATA)> <!ELEMENT url (#PCDATA)> +<!ELEMENT domException (#PCDATA)> <!ELEMENT testElementCount (#PCDATA)> <!ELEMENT testElementErrors (#PCDATA)> <!ELEMENT exception (#PCDATA)>
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
