Return-Path: Delivered-To: apmail-commons-commits-archive@locus.apache.org Received: (qmail 67183 invoked from network); 10 Jan 2008 19:48:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 10 Jan 2008 19:48:06 -0000 Received: (qmail 18310 invoked by uid 500); 10 Jan 2008 19:47:54 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 18244 invoked by uid 500); 10 Jan 2008 19:47:53 -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 18235 invoked by uid 99); 10 Jan 2008 19:47:53 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Jan 2008 11:47:53 -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:47:49 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 91AA51A9832; Thu, 10 Jan 2008 11:47:41 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r610898 - /commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestHierarchicalXMLConfiguration.java Date: Thu, 10 Jan 2008 19:47:41 -0000 To: commits@commons.apache.org From: oheger@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080110194741.91AA51A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: oheger Date: Thu Jan 10 11:47:40 2008 New Revision: 610898 URL: http://svn.apache.org/viewvc?rev=610898&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/TestHierarchicalXMLConfiguration.java Modified: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestHierarchicalXMLConfiguration.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestHierarchicalXMLConfiguration.java?rev=610898&r1=610897&r2=610898&view=diff ============================================================================== --- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestHierarchicalXMLConfiguration.java (original) +++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration/TestHierarchicalXMLConfiguration.java Thu Jan 10 11:47:40 2008 @@ -35,9 +35,6 @@ */ public class TestHierarchicalXMLConfiguration extends TestCase { - /** Test resources directory. */ - private static final String TEST_DIR = "conf"; - /** Test file #1 **/ private static final String TEST_FILENAME = "testHierarchicalXMLConfiguration.xml"; @@ -45,19 +42,19 @@ private static final String TEST_FILENAME2 = "testHierarchicalXMLConfiguration2.xml"; /** Test file path #1 **/ - private static final String TEST_FILE = TEST_DIR + File.separator + TEST_FILENAME; + private static final String TEST_FILE = ConfigurationAssert.getTestFile(TEST_FILENAME).getAbsolutePath(); /** Test file path #2 **/ - private static final String TEST_FILE2 = TEST_DIR + File.separator + TEST_FILENAME2; + private static final String TEST_FILE2 = ConfigurationAssert.getTestFile(TEST_FILENAME2).getAbsolutePath(); /** Test file path #3.*/ - private static final String TEST_FILE3 = TEST_DIR + File.separator + "test.xml"; + private static final String TEST_FILE3 = ConfigurationAssert.getTestFile("test.xml").getAbsolutePath(); /** File name for saving.*/ private static final String TEST_SAVENAME = "testhierarchicalsave.xml"; /** File path for saving.*/ - private static final String TEST_SAVE = "target" + File.separator + TEST_SAVENAME; + private static final String TEST_SAVE = ConfigurationAssert.getOutFile(TEST_SAVENAME).getAbsolutePath(); /** Instance config used for tests. */ private XMLConfiguration config; @@ -106,7 +103,7 @@ public void testLoadBasePath1() throws Exception { - config.setBasePath(TEST_DIR); + config.setBasePath(ConfigurationAssert.TEST_DIR_NAME); config.setFileName(TEST_FILENAME); config.load(); configTest(config);