juergen     2003/09/09 00:05:46

  Modified:    
testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor
                        XMLResponseBodyAssert.java
  Log:
  fix a bug in reporting non existing errors.
  
  Revision  Changes    Path
  1.25      +10 -6     
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.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- XMLResponseBodyAssert.java        3 Sep 2003 15:29:35 -0000       1.24
  +++ XMLResponseBodyAssert.java        9 Sep 2003 07:05:46 -0000       1.25
  @@ -214,8 +214,9 @@
           // check the count of children
           if (children1.size() != children2.size()){
               if (!element1.getTextTrim().equals("*")) {
  -                reportDifferentSizeError(children1, children2, pathName, 
elementName);
  -                result = false;
  +                if (reportDifferentSizeError(children1, children2, pathName, 
elementName)) {
  +                    result = false;
  +                }
               }
               List children1Result = repairElementList(children1, children2, 
getPathName(pathName, elementName));
               children2 = repairElementList(children2, children1, 
getPathName(pathName, elementName));
  @@ -263,7 +264,8 @@
           return result;
       }
   
  -    private void reportDifferentSizeError(List expected, List received, String 
path, String name) {
  +    private boolean reportDifferentSizeError(List expected, List received, String 
path, String name) {
  +        boolean result = false;
           String pathName = getPathName(path, name);
           List expectedAndNotReceived = getChildNames(expected, pathName);
           List receivedAndNotExpected = getChildNames(received, pathName);
  @@ -293,7 +295,9 @@
                   xmlresult.writeElement("receivedAndNotExpected", 
receivedAndNotExpected.toString());
               }
               xmlresult.writeElementEnd("XMLSizeError");
  +            result = true;
           }
  +        return result;
       }
   
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to