Return-Path: Delivered-To: apmail-jakarta-slide-dev-archive@apache.org Received: (qmail 30173 invoked from network); 2 Aug 2002 12:12:44 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 2 Aug 2002 12:12:44 -0000 Received: (qmail 4086 invoked by uid 97); 2 Aug 2002 12:12:50 -0000 Delivered-To: qmlist-jakarta-archive-slide-dev@jakarta.apache.org Received: (qmail 3960 invoked by uid 97); 2 Aug 2002 12:12:49 -0000 Mailing-List: contact slide-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Slide Developers Mailing List" Reply-To: "Slide Developers Mailing List" Delivered-To: mailing list slide-dev@jakarta.apache.org Received: (qmail 3761 invoked by uid 97); 2 Aug 2002 12:12:47 -0000 X-Antivirus: nagoya (v4198 created Apr 24 2002) Date: 2 Aug 2002 12:12:22 -0000 Message-ID: <20020802121222.79738.qmail@icarus.apache.org> From: juergen@apache.org To: jakarta-slide-cvs@apache.org Subject: cvs commit: jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor XMLResponseBodyAssert.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N juergen 2002/08/02 05:12:22 Modified: testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor XMLResponseBodyAssert.java Log: 1) 409 may deliver a response body. 2) report an error if only one of received and expected response body is available Revision Changes Path 1.12 +41 -15 jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/XMLResponseBodyAssert.java Index: XMLResponseBodyAssert.java =================================================================== RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/XMLResponseBodyAssert.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- XMLResponseBodyAssert.java 1 Aug 2002 13:32:17 -0000 1.11 +++ XMLResponseBodyAssert.java 2 Aug 2002 12:12:22 -0000 1.12 @@ -124,14 +124,47 @@ * checks if Expected Response and Response are same */ public boolean assertResponseBody(){ - if (method.getStatusCode() == 409 ){ // 409/conflict never delievers a XML body + + // check if both expected and received bodies are not available + if ((expectedXmlTree == null) && + ((responseDocument() == null) || responseDocument().getRootElement() == null) ) return true; - } +// // some debugging output +// // START +// System.out.println("#########################"); +// System.out.println("####### method = " + method.getName()); +// System.out.println("####### expected ########"); +// if (expectedXmlTree != null) +// System.out.println(TProcessors.getElementString(expectedXmlTree)); +// else +// System.out.println("####### NOT PRESENT"); +// System.out.println("####### received ########"); +// if (responseDocument() != null && responseDocument().getRootElement() != null) +// System.out.println(TProcessors.getElementString(responseDocument().getRootElement())); +// else +// System.out.println("####### NOT PRESENT"); +// System.out.println("#########################"); +// System.out.println(); +// // STOP +// // some debugging output + + + + // check if either expected and received bodies are not available if (expectedXmlTree == null || responseDocument() == null || - responseDocument().getRootElement()== null) - return true; + responseDocument().getRootElement()== null) { + + xmlresult.writeElementStart("XMLValueError"); + xmlresult.writeElement("expectedValue", expectedXmlTree==null?"not present":"present"); + xmlresult.writeElement("receivedValue", responseDocument()==null?"not present":"present"); + xmlresult.writeElementEnd("XMLValueError"); + + return false; + } + + // both expected and received bodies are now available return compareTrees(expectedXmlTree, responseDocument().getRootElement()); } @@ -140,14 +173,6 @@ public boolean compareTrees(Element element1, Element element2) { -// System.out.println("#########################"); -// System.out.println("####### method = " + method.getName()); -// System.out.println("####### expected ########"); -// System.out.println(TProcessors.getElementString(element1)); -// System.out.println("####### received ########"); -// System.out.println(TProcessors.getElementString(element2)); -// System.out.println("#########################"); -// System.out.println(); return compareTrees("", element1, element2); } @@ -439,5 +464,6 @@ } + -- To unsubscribe, e-mail: For additional commands, e-mail: