Return-Path: Delivered-To: apmail-commons-commits-archive@locus.apache.org Received: (qmail 45872 invoked from network); 10 Jan 2008 19:11:16 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 10 Jan 2008 19:11:16 -0000 Received: (qmail 49808 invoked by uid 500); 10 Jan 2008 19:11:05 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 49627 invoked by uid 500); 10 Jan 2008 19:11:04 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 49618 invoked by uid 99); 10 Jan 2008 19:11:04 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Jan 2008 11:11:04 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED 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; Thu, 10 Jan 2008 19:10:49 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5A2CA1A9832; Thu, 10 Jan 2008 11:10:54 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r610880 - /commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestDefaultConfigurationBuilder.java Date: Thu, 10 Jan 2008 19:10:53 -0000 To: commits@commons.apache.org From: oheger@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080110191054.5A2CA1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: oheger Date: Thu Jan 10 11:10:47 2008 New Revision: 610880 URL: http://svn.apache.org/viewvc?rev=610880&view=rev Log: Adapted test to new location of test resources Modified: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestDefaultConfigurationBuilder.java Modified: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestDefaultConfigurationBuilder.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestDefaultConfigurationBuilder.java?rev=610880&r1=610879&r2=610880&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestDefaultConfigurationBuilder.java (original) +++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestDefaultConfigurationBuilder.java Thu Jan 10 11:10:47 2008 @@ -37,23 +37,23 @@ public class TestDefaultConfigurationBuilder extends TestCase { /** Test configuration definition file. */ - private static final File TEST_FILE = new File( - "conf/testDigesterConfiguration.xml"); + private static final File TEST_FILE = ConfigurationAssert + .getTestFile("testDigesterConfiguration.xml"); - private static final File ADDITIONAL_FILE = new File( - "conf/testDigesterConfiguration2.xml"); + private static final File ADDITIONAL_FILE = ConfigurationAssert + .getTestFile("testDigesterConfiguration2.xml"); - private static final File OPTIONAL_FILE = new File( - "conf/testDigesterOptionalConfiguration.xml"); + private static final File OPTIONAL_FILE = ConfigurationAssert + .getTestFile("testDigesterOptionalConfiguration.xml"); - private static final File OPTIONALEX_FILE = new File( - "conf/testDigesterOptionalConfigurationEx.xml"); + private static final File OPTIONALEX_FILE = ConfigurationAssert + .getTestFile("testDigesterOptionalConfigurationEx.xml"); - private static final File MULTI_FILE = new File( - "conf/testDigesterConfiguration3.xml"); + private static final File MULTI_FILE = ConfigurationAssert + .getTestFile("testDigesterConfiguration3.xml"); - private static final File INIT_FILE = new File( - "conf/testComplexInitialization.xml"); + private static final File INIT_FILE = ConfigurationAssert + .getTestFile("testComplexInitialization.xml"); /** Constant for the name of an optional configuration.*/ private static final String OPTIONAL_NAME = "optionalConfig"; @@ -589,7 +589,7 @@ public void testSetConfigurationBasePath() throws ConfigurationException { factory.addProperty("properties[@fileName]", "test.properties"); - File deepDir = new File("conf/config/deep"); + File deepDir = new File(ConfigurationAssert.TEST_DIR, "config/deep"); factory.setConfigurationBasePath(deepDir.getAbsolutePath()); Configuration config = factory.getConfiguration(false); @@ -710,8 +710,8 @@ public void testLoadXMLWithSettings() throws ConfigurationException, IOException { - File confDir = new File("conf"); - File targetDir = new File("target"); + File confDir = ConfigurationAssert.TEST_DIR; + File targetDir = ConfigurationAssert.OUT_DIR; File testXMLSource = new File(confDir, "testDtd.xml"); File testXMLValidationSource = new File(confDir, "testValidateInvalid.xml");