Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 93456 invoked from network); 16 Feb 2007 20:07:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 16 Feb 2007 20:07:09 -0000 Received: (qmail 34562 invoked by uid 500); 16 Feb 2007 20:07:14 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 34514 invoked by uid 500); 16 Feb 2007 20:07:14 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 34479 invoked by uid 99); 16 Feb 2007 20:07:14 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Feb 2007 12:07:14 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Feb 2007 12:07:05 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id AEA591A981A; Fri, 16 Feb 2007 12:06:45 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r508555 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetHarnessJavaTest.java Date: Fri, 16 Feb 2007 20:06:45 -0000 To: derby-commits@db.apache.org From: djd@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070216200645.AEA591A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: djd Date: Fri Feb 16 12:06:44 2007 New Revision: 508555 URL: http://svn.apache.org/viewvc?view=rev&rev=508555 Log: Make NetHarnessjavaTest run no fixtures if network server is not in the classpath. Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetHarnessJavaTest.java Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetHarnessJavaTest.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetHarnessJavaTest.java?view=diff&rev=508555&r1=508554&r2=508555 ============================================================================== --- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetHarnessJavaTest.java (original) +++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetHarnessJavaTest.java Fri Feb 16 12:06:44 2007 @@ -24,6 +24,7 @@ import junit.framework.TestSuite; import org.apache.derbyTesting.functionTests.util.HarnessJavaTest; +import org.apache.derbyTesting.junit.Derby; import org.apache.derbyTesting.junit.TestConfiguration; import org.apache.derbyTesting.junit.SecurityManagerSetup; import org.apache.derbyTesting.junit.SupportFilesSetup; @@ -68,7 +69,10 @@ public static Test suite() { - TestSuite suite = new TestSuite("jdbcapi: old harness java tests"); + TestSuite suite = new TestSuite("derbynet: old harness java tests"); + + if (!Derby.hasServer()) + return suite; suite.addTest(TestConfiguration.clientServerDecorator( decorate(new NetHarnessJavaTest("executeUpdate"))));