Return-Path: 
 <derby-commits-return-10695-apmail-db-derby-commits-archive=db.apache.org@db.apache.org>
Delivered-To: apmail-db-derby-commits-archive@www.apache.org
Received: (qmail 45789 invoked from network); 21 Aug 2008 10:56:19 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 21 Aug 2008 10:56:19 -0000
Received: (qmail 29936 invoked by uid 500); 21 Aug 2008 10:56:18 -0000
Delivered-To: apmail-db-derby-commits-archive@db.apache.org
Received: (qmail 29917 invoked by uid 500); 21 Aug 2008 10:56:17 -0000
Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:derby-commits-help@db.apache.org>
list-unsubscribe: <mailto:derby-commits-unsubscribe@db.apache.org>
List-Post: <mailto:derby-commits@db.apache.org>
Reply-To: "Derby Development" <derby-dev@db.apache.org>
List-Id: <derby-commits.db.apache.org>
Delivered-To: mailing list derby-commits@db.apache.org
Received: (qmail 29908 invoked by uid 99); 21 Aug 2008 10:56:17 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Aug 2008 03:56:17 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Aug 2008 10:55:29 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 9C9E7238898E; Thu, 21 Aug 2008 03:55:28 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r687708 -
 /db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java
Date: Thu, 21 Aug 2008 10:55:28 -0000
To: derby-commits@db.apache.org
From: kahatlen@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080821105528.9C9E7238898E@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: kahatlen
Date: Thu Aug 21 03:55:27 2008
New Revision: 687708

URL: http://svn.apache.org/viewvc?rev=687708&view=rev
Log:
Improved error reporting in BaseTestCase.assertExecJavaCmdAsExpected()
to help debugging a problem in NetworkServerControlApiTest.

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java?rev=687708&r1=687707&r2=687708&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java Thu Aug 21 03:55:27 2008
@@ -497,7 +497,7 @@
                output = output + new String(ca).trim();
            }
        } catch (Exception e) {
-           fail("Exception accessing inputstream from javacommand");
+           fail("Exception accessing inputstream from javacommand", e);
        }
        
        // wait until the process exits
@@ -508,7 +508,10 @@
        {
            for (int i=0 ; i<expectedString.length ; i++)
            {
-               assertFalse(output.indexOf(expectedString[i]) < 0);
+               if (output.indexOf(expectedString[i]) == -1) {
+                   fail("Didn't find expected string: " + expectedString[i] +
+                        "\nFull output from the command:\n" + output);
+               }
            }
        }
    }