commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ohe...@apache.org
Subject svn commit: r1172307 [1/3] - in /commons/proper/configuration/trunk: ./ conf/ conf/01/ conf/config/ src/test/java/org/apache/commons/configuration/ src/test/java/org/apache/commons/configuration/event/ src/test/java/org/apache/commons/configuration/int...
Date Sun, 18 Sep 2011 17:47:12 GMT
Author: oheger
Date: Sun Sep 18 17:47:07 2011
New Revision: 1172307

URL: http://svn.apache.org/viewvc?rev=1172307&view=rev
Log:
[CONFIGURATION-461] Moved test files to maven default location. Updated tests to access the files in the new location.

Added:
    commons/proper/configuration/trunk/src/test/resources/
    commons/proper/configuration/trunk/src/test/resources/01/
      - copied from r1164869, commons/proper/configuration/trunk/conf/01/
    commons/proper/configuration/trunk/src/test/resources/catalog.xml   (contents, props changed)
      - copied, changed from r1164911, commons/proper/configuration/trunk/conf/catalog.xml
    commons/proper/configuration/trunk/src/test/resources/catalog2.xml   (contents, props changed)
      - copied, changed from r1164911, commons/proper/configuration/trunk/conf/catalog2.xml
    commons/proper/configuration/trunk/src/test/resources/config/
      - copied from r1164869, commons/proper/configuration/trunk/conf/config/
    commons/proper/configuration/trunk/src/test/resources/configA.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/configA.xml
    commons/proper/configuration/trunk/src/test/resources/configB.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/configB.xml
    commons/proper/configuration/trunk/src/test/resources/dataset.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/dataset.xml
    commons/proper/configuration/trunk/src/test/resources/include-interpol.properties   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/include-interpol.properties
    commons/proper/configuration/trunk/src/test/resources/include.properties   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/include.properties
    commons/proper/configuration/trunk/src/test/resources/jndi.properties   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/jndi.properties
    commons/proper/configuration/trunk/src/test/resources/log4j-test.xml   (contents, props changed)
      - copied, changed from r1164911, commons/proper/configuration/trunk/conf/log4j-test.xml
    commons/proper/configuration/trunk/src/test/resources/resolver.dtd   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/resolver.dtd
    commons/proper/configuration/trunk/src/test/resources/resources.jar   (props changed)
      - copied unchanged from r1164869, commons/proper/configuration/trunk/conf/resources.jar
    commons/proper/configuration/trunk/src/test/resources/sample.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/sample.xml
    commons/proper/configuration/trunk/src/test/resources/sample.xsd   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/sample.xsd
    commons/proper/configuration/trunk/src/test/resources/sample_1001.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/sample_1001.xml
    commons/proper/configuration/trunk/src/test/resources/test.ini   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/test.ini
    commons/proper/configuration/trunk/src/test/resources/test.plist
      - copied unchanged from r1164869, commons/proper/configuration/trunk/conf/test.plist
    commons/proper/configuration/trunk/src/test/resources/test.plist.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/test.plist.xml
    commons/proper/configuration/trunk/src/test/resources/test.properties   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/test.properties
    commons/proper/configuration/trunk/src/test/resources/test.properties.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/test.properties.xml
    commons/proper/configuration/trunk/src/test/resources/test.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/test.xml
    commons/proper/configuration/trunk/src/test/resources/test2.plist.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/test2.plist.xml
    commons/proper/configuration/trunk/src/test/resources/test2.properties   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/test2.properties
    commons/proper/configuration/trunk/src/test/resources/testClasspath.properties   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testClasspath.properties
    commons/proper/configuration/trunk/src/test/resources/testComplexInitialization.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testComplexInitialization.xml
    commons/proper/configuration/trunk/src/test/resources/testConfigurationInterpolatorUpdate.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testConfigurationInterpolatorUpdate.xml
    commons/proper/configuration/trunk/src/test/resources/testConfigurationProvider.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testConfigurationProvider.xml
    commons/proper/configuration/trunk/src/test/resources/testConfigurationXMLDocument.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testConfigurationXMLDocument.xml
    commons/proper/configuration/trunk/src/test/resources/testDigesterBadXML.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testDigesterBadXML.xml
    commons/proper/configuration/trunk/src/test/resources/testDigesterConfiguration.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testDigesterConfiguration.xml
    commons/proper/configuration/trunk/src/test/resources/testDigesterConfiguration2.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testDigesterConfiguration2.xml
    commons/proper/configuration/trunk/src/test/resources/testDigesterConfiguration3.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testDigesterConfiguration3.xml
    commons/proper/configuration/trunk/src/test/resources/testDigesterConfigurationBasePath.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testDigesterConfigurationBasePath.xml
    commons/proper/configuration/trunk/src/test/resources/testDigesterConfigurationInclude1.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testDigesterConfigurationInclude1.xml
    commons/proper/configuration/trunk/src/test/resources/testDigesterConfigurationInclude2.properties   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testDigesterConfigurationInclude2.properties
    commons/proper/configuration/trunk/src/test/resources/testDigesterConfigurationNamespaceAware.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testDigesterConfigurationNamespaceAware.xml
    commons/proper/configuration/trunk/src/test/resources/testDigesterConfigurationOverwrite.properties   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testDigesterConfigurationOverwrite.properties
    commons/proper/configuration/trunk/src/test/resources/testDigesterConfigurationReverseOrder.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testDigesterConfigurationReverseOrder.xml
    commons/proper/configuration/trunk/src/test/resources/testDigesterConfigurationSysProps.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testDigesterConfigurationSysProps.xml
    commons/proper/configuration/trunk/src/test/resources/testDigesterConfigurationWJNDI.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testDigesterConfigurationWJNDI.xml
    commons/proper/configuration/trunk/src/test/resources/testDigesterConfigurationWithProps.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testDigesterConfigurationWithProps.xml
    commons/proper/configuration/trunk/src/test/resources/testDigesterCreateObject.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testDigesterCreateObject.xml
    commons/proper/configuration/trunk/src/test/resources/testDigesterOptionalConfiguration.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testDigesterOptionalConfiguration.xml
    commons/proper/configuration/trunk/src/test/resources/testDigesterOptionalConfigurationEx.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testDigesterOptionalConfigurationEx.xml
    commons/proper/configuration/trunk/src/test/resources/testDtd.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testDtd.xml
    commons/proper/configuration/trunk/src/test/resources/testEncoding.xml   (props changed)
      - copied unchanged from r1164869, commons/proper/configuration/trunk/conf/testEncoding.xml
    commons/proper/configuration/trunk/src/test/resources/testEqual.properties   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testEqual.properties
    commons/proper/configuration/trunk/src/test/resources/testEqualDigester.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testEqualDigester.xml
    commons/proper/configuration/trunk/src/test/resources/testExpression.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testExpression.xml
    commons/proper/configuration/trunk/src/test/resources/testExtendedClass.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testExtendedClass.xml
    commons/proper/configuration/trunk/src/test/resources/testExtendedXMLConfigurationProvider.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testExtendedXMLConfigurationProvider.xml
    commons/proper/configuration/trunk/src/test/resources/testFactoryPropertiesInclude.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testFactoryPropertiesInclude.xml
    commons/proper/configuration/trunk/src/test/resources/testFileReloadConfigurationBuilder.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testFileReloadConfigurationBuilder.xml
    commons/proper/configuration/trunk/src/test/resources/testFileReloadConfigurationBuilder2.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testFileReloadConfigurationBuilder2.xml
    commons/proper/configuration/trunk/src/test/resources/testFileSystem.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testFileSystem.xml
    commons/proper/configuration/trunk/src/test/resources/testGlobalLookup.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testGlobalLookup.xml
    commons/proper/configuration/trunk/src/test/resources/testHierarchicalXMLConfiguration.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testHierarchicalXMLConfiguration.xml
    commons/proper/configuration/trunk/src/test/resources/testHierarchicalXMLConfiguration2.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testHierarchicalXMLConfiguration2.xml
    commons/proper/configuration/trunk/src/test/resources/testMultiConfiguration.xsd   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testMultiConfiguration.xsd
    commons/proper/configuration/trunk/src/test/resources/testMultiConfiguration_1001.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testMultiConfiguration_1001.xml
    commons/proper/configuration/trunk/src/test/resources/testMultiConfiguration_1002.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testMultiConfiguration_1002.xml
    commons/proper/configuration/trunk/src/test/resources/testMultiConfiguration_1003.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testMultiConfiguration_1003.xml
    commons/proper/configuration/trunk/src/test/resources/testMultiConfiguration_1004.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testMultiConfiguration_1004.xml
    commons/proper/configuration/trunk/src/test/resources/testMultiConfiguration_2001.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testMultiConfiguration_2001.xml
    commons/proper/configuration/trunk/src/test/resources/testMultiConfiguration_2002.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testMultiConfiguration_2002.xml
    commons/proper/configuration/trunk/src/test/resources/testMultiConfiguration_3001.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testMultiConfiguration_3001.xml
    commons/proper/configuration/trunk/src/test/resources/testMultiConfiguration_3002.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testMultiConfiguration_3002.xml
    commons/proper/configuration/trunk/src/test/resources/testMultiConfiguration_default.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testMultiConfiguration_default.xml
    commons/proper/configuration/trunk/src/test/resources/testMultiDynamic_default.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testMultiDynamic_default.xml
    commons/proper/configuration/trunk/src/test/resources/testMultiDynamic_default2.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testMultiDynamic_default2.xml
    commons/proper/configuration/trunk/src/test/resources/testMultiTenentConfigurationBuilder.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testMultiTenentConfigurationBuilder.xml
    commons/proper/configuration/trunk/src/test/resources/testMultiTenentConfigurationBuilder2.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testMultiTenentConfigurationBuilder2.xml
    commons/proper/configuration/trunk/src/test/resources/testMultiTenentConfigurationBuilder3.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testMultiTenentConfigurationBuilder3.xml
    commons/proper/configuration/trunk/src/test/resources/testMultiTenentConfigurationBuilder4.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testMultiTenentConfigurationBuilder4.xml
    commons/proper/configuration/trunk/src/test/resources/testMultiTenentConfigurationBuilder5.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testMultiTenentConfigurationBuilder5.xml
    commons/proper/configuration/trunk/src/test/resources/testPatternSubtreeConfig.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testPatternSubtreeConfig.xml
    commons/proper/configuration/trunk/src/test/resources/testResolver.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testResolver.xml
    commons/proper/configuration/trunk/src/test/resources/testSequence.properties   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testSequence.properties
    commons/proper/configuration/trunk/src/test/resources/testSequenceDigester.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testSequenceDigester.xml
    commons/proper/configuration/trunk/src/test/resources/testSystemProperties.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testSystemProperties.xml
    commons/proper/configuration/trunk/src/test/resources/testVFSMultiTenentConfigurationBuilder1.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testVFSMultiTenentConfigurationBuilder1.xml
    commons/proper/configuration/trunk/src/test/resources/testVFSMultiTenentConfigurationBuilder2.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testVFSMultiTenentConfigurationBuilder2.xml
    commons/proper/configuration/trunk/src/test/resources/testValidateInvalid.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testValidateInvalid.xml
    commons/proper/configuration/trunk/src/test/resources/testValidateValid.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testValidateValid.xml
    commons/proper/configuration/trunk/src/test/resources/testValidation.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testValidation.xml
    commons/proper/configuration/trunk/src/test/resources/testValidation2.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testValidation2.xml
    commons/proper/configuration/trunk/src/test/resources/testValidation3.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testValidation3.xml
    commons/proper/configuration/trunk/src/test/resources/testcombine1.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testcombine1.xml
    commons/proper/configuration/trunk/src/test/resources/testcombine2.xml   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testcombine2.xml
    commons/proper/configuration/trunk/src/test/resources/testdb.script   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/testdb.script
    commons/proper/configuration/trunk/src/test/resources/threesome.properties   (contents, props changed)
      - copied, changed from r1164869, commons/proper/configuration/trunk/conf/threesome.properties
Removed:
    commons/proper/configuration/trunk/conf/01/
    commons/proper/configuration/trunk/conf/catalog.xml
    commons/proper/configuration/trunk/conf/catalog2.xml
    commons/proper/configuration/trunk/conf/config/
    commons/proper/configuration/trunk/conf/configA.xml
    commons/proper/configuration/trunk/conf/configB.xml
    commons/proper/configuration/trunk/conf/dataset.xml
    commons/proper/configuration/trunk/conf/include-interpol.properties
    commons/proper/configuration/trunk/conf/include.properties
    commons/proper/configuration/trunk/conf/jndi.properties
    commons/proper/configuration/trunk/conf/log4j-test.xml
    commons/proper/configuration/trunk/conf/resolver.dtd
    commons/proper/configuration/trunk/conf/resources.jar
    commons/proper/configuration/trunk/conf/sample.xml
    commons/proper/configuration/trunk/conf/sample.xsd
    commons/proper/configuration/trunk/conf/sample_1001.xml
    commons/proper/configuration/trunk/conf/test.ini
    commons/proper/configuration/trunk/conf/test.plist
    commons/proper/configuration/trunk/conf/test.plist.xml
    commons/proper/configuration/trunk/conf/test.properties
    commons/proper/configuration/trunk/conf/test.properties.xml
    commons/proper/configuration/trunk/conf/test.xml
    commons/proper/configuration/trunk/conf/test2.plist.xml
    commons/proper/configuration/trunk/conf/test2.properties
    commons/proper/configuration/trunk/conf/testClasspath.properties
    commons/proper/configuration/trunk/conf/testComplexInitialization.xml
    commons/proper/configuration/trunk/conf/testConfigurationInterpolatorUpdate.xml
    commons/proper/configuration/trunk/conf/testConfigurationProvider.xml
    commons/proper/configuration/trunk/conf/testConfigurationXMLDocument.xml
    commons/proper/configuration/trunk/conf/testDigesterBadXML.xml
    commons/proper/configuration/trunk/conf/testDigesterConfiguration.xml
    commons/proper/configuration/trunk/conf/testDigesterConfiguration2.xml
    commons/proper/configuration/trunk/conf/testDigesterConfiguration3.xml
    commons/proper/configuration/trunk/conf/testDigesterConfigurationBasePath.xml
    commons/proper/configuration/trunk/conf/testDigesterConfigurationInclude1.xml
    commons/proper/configuration/trunk/conf/testDigesterConfigurationInclude2.properties
    commons/proper/configuration/trunk/conf/testDigesterConfigurationNamespaceAware.xml
    commons/proper/configuration/trunk/conf/testDigesterConfigurationOverwrite.properties
    commons/proper/configuration/trunk/conf/testDigesterConfigurationReverseOrder.xml
    commons/proper/configuration/trunk/conf/testDigesterConfigurationSysProps.xml
    commons/proper/configuration/trunk/conf/testDigesterConfigurationWJNDI.xml
    commons/proper/configuration/trunk/conf/testDigesterConfigurationWithProps.xml
    commons/proper/configuration/trunk/conf/testDigesterCreateObject.xml
    commons/proper/configuration/trunk/conf/testDigesterOptionalConfiguration.xml
    commons/proper/configuration/trunk/conf/testDigesterOptionalConfigurationEx.xml
    commons/proper/configuration/trunk/conf/testDtd.xml
    commons/proper/configuration/trunk/conf/testEncoding.xml
    commons/proper/configuration/trunk/conf/testEqual.properties
    commons/proper/configuration/trunk/conf/testEqualDigester.xml
    commons/proper/configuration/trunk/conf/testExpression.xml
    commons/proper/configuration/trunk/conf/testExtendedClass.xml
    commons/proper/configuration/trunk/conf/testExtendedXMLConfigurationProvider.xml
    commons/proper/configuration/trunk/conf/testFactoryPropertiesInclude.xml
    commons/proper/configuration/trunk/conf/testFileReloadConfigurationBuilder.xml
    commons/proper/configuration/trunk/conf/testFileReloadConfigurationBuilder2.xml
    commons/proper/configuration/trunk/conf/testFileSystem.xml
    commons/proper/configuration/trunk/conf/testGlobalLookup.xml
    commons/proper/configuration/trunk/conf/testHierarchicalXMLConfiguration.xml
    commons/proper/configuration/trunk/conf/testHierarchicalXMLConfiguration2.xml
    commons/proper/configuration/trunk/conf/testMultiConfiguration.xsd
    commons/proper/configuration/trunk/conf/testMultiConfiguration_1001.xml
    commons/proper/configuration/trunk/conf/testMultiConfiguration_1002.xml
    commons/proper/configuration/trunk/conf/testMultiConfiguration_1003.xml
    commons/proper/configuration/trunk/conf/testMultiConfiguration_1004.xml
    commons/proper/configuration/trunk/conf/testMultiConfiguration_2001.xml
    commons/proper/configuration/trunk/conf/testMultiConfiguration_2002.xml
    commons/proper/configuration/trunk/conf/testMultiConfiguration_3001.xml
    commons/proper/configuration/trunk/conf/testMultiConfiguration_3002.xml
    commons/proper/configuration/trunk/conf/testMultiConfiguration_default.xml
    commons/proper/configuration/trunk/conf/testMultiDynamic_default.xml
    commons/proper/configuration/trunk/conf/testMultiDynamic_default2.xml
    commons/proper/configuration/trunk/conf/testMultiTenentConfigurationBuilder.xml
    commons/proper/configuration/trunk/conf/testMultiTenentConfigurationBuilder2.xml
    commons/proper/configuration/trunk/conf/testMultiTenentConfigurationBuilder3.xml
    commons/proper/configuration/trunk/conf/testMultiTenentConfigurationBuilder4.xml
    commons/proper/configuration/trunk/conf/testMultiTenentConfigurationBuilder5.xml
    commons/proper/configuration/trunk/conf/testPatternSubtreeConfig.xml
    commons/proper/configuration/trunk/conf/testResolver.xml
    commons/proper/configuration/trunk/conf/testSequence.properties
    commons/proper/configuration/trunk/conf/testSequenceDigester.xml
    commons/proper/configuration/trunk/conf/testSystemProperties.xml
    commons/proper/configuration/trunk/conf/testVFSMultiTenentConfigurationBuilder1.xml
    commons/proper/configuration/trunk/conf/testVFSMultiTenentConfigurationBuilder2.xml
    commons/proper/configuration/trunk/conf/testValidateInvalid.xml
    commons/proper/configuration/trunk/conf/testValidateValid.xml
    commons/proper/configuration/trunk/conf/testValidation.xml
    commons/proper/configuration/trunk/conf/testValidation2.xml
    commons/proper/configuration/trunk/conf/testValidation3.xml
    commons/proper/configuration/trunk/conf/testcombine1.xml
    commons/proper/configuration/trunk/conf/testcombine2.xml
    commons/proper/configuration/trunk/conf/testdb.script
    commons/proper/configuration/trunk/conf/threesome.properties
Modified:
    commons/proper/configuration/trunk/pom.xml
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/DatabaseConfigurationTestHelper.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestCatalogResolver.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestCompositeConfiguration.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestCompositeConfigurationNonStringProperties.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestConfigurationFactory.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDatabaseConfiguration.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDefaultConfigurationBuilder.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestEqualBehaviour.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestEqualsProperty.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestFileConfiguration.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestHierarchicalConfigurationXMLReader.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestHierarchicalXMLConfiguration.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestNonStringProperties.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestNullCompositeConfiguration.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestPropertiesConfiguration.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestPropertiesSequence.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestSubsetConfiguration.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestVFSConfigurationBuilder.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestXMLConfiguration.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/TestPropertiesConfigurationEvents.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/TestXMLConfigurationEvents.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/interpol/TestExprLookup.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/plist/TestPropertyListConfiguration.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/plist/TestXMLPropertyListConfiguration.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/tree/AbstractCombinerTest.java

Modified: commons/proper/configuration/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/pom.xml?rev=1172307&r1=1172306&r2=1172307&view=diff
==============================================================================
--- commons/proper/configuration/trunk/pom.xml (original)
+++ commons/proper/configuration/trunk/pom.xml Sun Sep 18 17:47:07 2011
@@ -451,36 +451,14 @@
       </resources>
       <testResources>
         <testResource>
-          <directory>conf</directory>
-          <includes>
-            <include>*.xml</include>
-            <include>testdb.script</include>
-            <include>*.properties</include>
-            <include>*.dtd</include>
-            <include>*.xsd</include>
-          </includes>
-        </testResource>
-        <testResource>
-          <directory>conf</directory>
-          <targetPath>org/apache/commons/configuration</targetPath>
-          <includes>
-            <include>test.properties</include>
-            <include>include.properties</include>
-          </includes>
+          <directory>src/test/resources</directory>
         </testResource>
         <testResource>
-          <directory>conf/config</directory>
-          <targetPath>config</targetPath>
+          <directory>src/main/resources</directory>
           <includes>
-            <include>**/*.properties</include>
+            <include>*.dtd</include>
           </includes>
         </testResource>
-      <testResource>
-        <directory>src/main/resources</directory>
-        <includes>
-          <include>*.dtd</include>
-        </includes>
-      </testResource>
       </testResources>
       <plugins>
         <plugin>

Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/DatabaseConfigurationTestHelper.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/DatabaseConfigurationTestHelper.java?rev=1172307&r1=1172306&r2=1172307&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/DatabaseConfigurationTestHelper.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/DatabaseConfigurationTestHelper.java Sun Sep 18 17:47:07 2011
@@ -16,6 +16,7 @@
  */
 package org.apache.commons.configuration;
 
+import java.io.File;
 import java.io.FileInputStream;
 import java.sql.Connection;
 
@@ -112,7 +113,8 @@ public class DatabaseConfigurationTestHe
      */
     public void setUp() throws Exception
     {
-        hsqlDB = new HsqlDB(DATABASE_URL, DATABASE_DRIVER, "conf/testdb.script");
+        File script = ConfigurationAssert.getTestFile("testdb.script");
+        hsqlDB = new HsqlDB(DATABASE_URL, DATABASE_DRIVER, script.getAbsolutePath());
     }
 
     /**
@@ -208,7 +210,7 @@ public class DatabaseConfigurationTestHe
         Connection conn = ds.getConnection();
         IDatabaseConnection connection = new DatabaseConnection(conn);
         IDataSet dataSet = new XmlDataSet(new FileInputStream(
-                "conf/dataset.xml"));
+                ConfigurationAssert.getTestFile("dataset.xml")));
 
         try
         {

Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestCatalogResolver.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestCatalogResolver.java?rev=1172307&r1=1172306&r2=1172307&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestCatalogResolver.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestCatalogResolver.java Sun Sep 18 17:47:07 2011
@@ -18,19 +18,22 @@
 package org.apache.commons.configuration;
 
 import junit.framework.TestCase;
+
 import org.apache.commons.configuration.resolver.CatalogResolver;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 /**
+ * Test class for CatalogResolver.
  *
+ * @version $Id:$
  */
 public class TestCatalogResolver extends TestCase
 {
-    private static final String CATALOG_FILES = "conf/catalog.xml";
-    private static final String PUBLIC_FILE = "conf/testResolver.xml";
-    private static final String REWRITE_SYSTEM_FILE = "conf/test.properties.xml";
-    private static final String REWRITE_SCHEMA_FILE = "conf/sample.xml";
+    private static final String CATALOG_FILES = "catalog.xml";
+    private static final String PUBLIC_FILE = "testResolver.xml";
+    private static final String REWRITE_SYSTEM_FILE = "test.properties.xml";
+    private static final String REWRITE_SCHEMA_FILE = "sample.xml";
 
     private CatalogResolver resolver;
     private XMLConfiguration config;

Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestCompositeConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestCompositeConfiguration.java?rev=1172307&r1=1172306&r2=1172307&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestCompositeConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestCompositeConfiguration.java Sun Sep 18 17:47:07 2011
@@ -51,9 +51,9 @@ public class TestCompositeConfiguration 
     /**
      * The File that we test with
      */
-    private String testProperties = new File("conf/test.properties").getAbsolutePath();
-    private String testProperties2 = new File("conf/test2.properties").getAbsolutePath();
-    private String testPropertiesXML = new File("conf/test.xml").getAbsolutePath();
+    private String testProperties = ConfigurationAssert.getTestFile("test.properties").getAbsolutePath();
+    private String testProperties2 = ConfigurationAssert.getTestFile("test2.properties").getAbsolutePath();
+    private String testPropertiesXML = ConfigurationAssert.getTestFile("test.xml").getAbsolutePath();
 
     protected void setUp() throws Exception
     {

Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestCompositeConfigurationNonStringProperties.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestCompositeConfigurationNonStringProperties.java?rev=1172307&r1=1172306&r2=1172307&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestCompositeConfigurationNonStringProperties.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestCompositeConfigurationNonStringProperties.java Sun Sep 18 17:47:07 2011
@@ -17,7 +17,6 @@
 
 package org.apache.commons.configuration;
 
-import java.io.File;
 
 /**
  * Test if non-string properties are handled correctly.
@@ -27,7 +26,7 @@ import java.io.File;
 public class TestCompositeConfigurationNonStringProperties extends BaseNonStringProperties
 {
     /** The File that we test with */
-    private String testProperties = new File("conf/test.properties").getAbsolutePath();
+    private String testProperties = ConfigurationAssert.getTestFile("test.properties").getAbsolutePath();
 
     public void setUp() throws Exception
     {

Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestConfigurationFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestConfigurationFactory.java?rev=1172307&r1=1172306&r2=1172307&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestConfigurationFactory.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestConfigurationFactory.java Sun Sep 18 17:47:07 2011
@@ -36,33 +36,32 @@ public class TestConfigurationFactory ex
 {
     /** The Files that we test with */
     private URL digesterRules = getClass().getResource("/digesterRules.xml");
-    private File testDigesterFile =
-            new File("conf/testDigesterConfiguration.xml");
+    private File testDigesterFile = ConfigurationAssert.getTestFile("testDigesterConfiguration.xml");
     private File testDigesterFileReverseOrder =
-            new File("conf/testDigesterConfigurationReverseOrder.xml");
+            ConfigurationAssert.getTestFile("testDigesterConfigurationReverseOrder.xml");
     private File testDigesterFileNamespaceAware =
-            new File("conf/testDigesterConfigurationNamespaceAware.xml");
+            ConfigurationAssert.getTestFile("testDigesterConfigurationNamespaceAware.xml");
     private File testDigesterFileBasePath =
-            new File("conf/testDigesterConfigurationBasePath.xml");
+            ConfigurationAssert.getTestFile("testDigesterConfigurationBasePath.xml");
     private File testDigesterFileEnhanced =
-            new File("conf/testDigesterConfiguration2.xml");
+            ConfigurationAssert.getTestFile("testDigesterConfiguration2.xml");
     private File testDigesterFileComplete =
-            new File("conf/testDigesterConfiguration3.xml");
+            ConfigurationAssert.getTestFile("testDigesterConfiguration3.xml");
     private File testDigesterFileOptional =
-            new File("conf/testDigesterOptionalConfiguration.xml");
+            ConfigurationAssert.getTestFile("testDigesterOptionalConfiguration.xml");
     private File testDigesterFileOptionalEx =
-            new File("conf/testDigesterOptionalConfigurationEx.xml");
+            ConfigurationAssert.getTestFile("testDigesterOptionalConfigurationEx.xml");
     private File testDigesterFileSysProps =
-            new File("conf/testDigesterConfigurationSysProps.xml");
+            ConfigurationAssert.getTestFile("testDigesterConfigurationSysProps.xml");
     private File testDigesterFileInitProps =
-            new File("conf/testDigesterConfigurationWithProps.xml");
+            ConfigurationAssert.getTestFile("testDigesterConfigurationWithProps.xml");
 
-    private File testDigesterBadXML = new File("conf/testDigesterBadXML.xml");
+    private File testDigesterBadXML = ConfigurationAssert.getTestFile("testDigesterBadXML.xml");
 
     private String testBasePath = new File("conf").getAbsolutePath();
 
-    private File testProperties = new File("conf/test.properties");
-    private File testAbsConfig = new File("target/testAbsConfig.xml");
+    private File testProperties = ConfigurationAssert.getTestFile("test.properties");
+    private File testAbsConfig = ConfigurationAssert.getOutFile("testAbsConfig.xml");
 
     private Configuration configuration;
     private CompositeConfiguration compositeConfiguration;

Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDatabaseConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDatabaseConfiguration.java?rev=1172307&r1=1172306&r2=1172307&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDatabaseConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDatabaseConfiguration.java Sun Sep 18 17:47:07 2011
@@ -33,7 +33,7 @@ import org.apache.commons.configuration.
  * Test in Eclipse it sometimes takes a couple tries. Otherwise you may get
  * database is already in use by another process errors.
  *
- * @version $Revision$, $Date$
+ * @version $Id$
  */
 public class TestDatabaseConfiguration extends TestCase
 {

Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDefaultConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDefaultConfigurationBuilder.java?rev=1172307&r1=1172306&r2=1172307&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDefaultConfigurationBuilder.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDefaultConfigurationBuilder.java Sun Sep 18 17:47:07 2011
@@ -57,50 +57,50 @@ import org.apache.log4j.WriterAppender;
 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");
 
-    private static final File CLASS_FILE = new File(
-            "conf/testExtendedClass.xml");
+    private static final File CLASS_FILE = ConfigurationAssert
+            .getTestFile("testExtendedClass.xml");
 
-    private static final File PROVIDER_FILE = new File(
-            "conf/testConfigurationProvider.xml");
+    private static final File PROVIDER_FILE = ConfigurationAssert
+            .getTestFile("testConfigurationProvider.xml");
 
-    private static final File EXTENDED_PROVIDER_FILE = new File(
-            "conf/testExtendedXMLConfigurationProvider.xml");
+    private static final File EXTENDED_PROVIDER_FILE = ConfigurationAssert
+            .getTestFile("testExtendedXMLConfigurationProvider.xml");
 
-    private static final File GLOBAL_LOOKUP_FILE = new File(
-            "conf/testGlobalLookup.xml");
+    private static final File GLOBAL_LOOKUP_FILE = ConfigurationAssert
+            .getTestFile("testGlobalLookup.xml");
 
-    private static final File SYSTEM_PROPS_FILE = new File(
-            "conf/testSystemProperties.xml");
+    private static final File SYSTEM_PROPS_FILE = ConfigurationAssert
+            .getTestFile("testSystemProperties.xml");
 
-    private static final File VALIDATION_FILE = new File(
-            "conf/testValidation.xml");
+    private static final File VALIDATION_FILE = ConfigurationAssert
+            .getTestFile("testValidation.xml");
 
-    private static final File VALIDATION3_FILE = new File(
-            "conf/testValidation3.xml");
+    private static final File VALIDATION3_FILE = ConfigurationAssert
+            .getTestFile("testValidation3.xml");
 
-    private static final File MULTI_TENENT_FILE = new File(
-            "conf/testMultiTenentConfigurationBuilder.xml");
+    private static final File MULTI_TENENT_FILE = ConfigurationAssert
+            .getTestFile("testMultiTenentConfigurationBuilder.xml");
 
-    private static final File EXPRESSION_FILE = new File(
-            "conf/testExpression.xml");
+    private static final File EXPRESSION_FILE = ConfigurationAssert
+            .getTestFile("testExpression.xml");
 
     /** Constant for the name of an optional configuration.*/
     private static final String OPTIONAL_NAME = "optionalConfig";
@@ -685,7 +685,7 @@ public class TestDefaultConfigurationBui
     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);

Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestEqualBehaviour.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestEqualBehaviour.java?rev=1172307&r1=1172306&r2=1172307&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestEqualBehaviour.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestEqualBehaviour.java Sun Sep 18 17:47:07 2011
@@ -17,7 +17,6 @@ package org.apache.commons.configuration
  * limitations under the License.
  */
 
-import java.io.File;
 import java.util.Iterator;
 import java.util.List;
 
@@ -26,22 +25,22 @@ import junit.framework.TestCase;
 /**
  * Compare the behaviour of various methods between CompositeConfiguration
  * and normal (Properties) Configuration
- * 
+ *
  * @version $Id$
  */
-public class TestEqualBehaviour  extends TestCase
+public class TestEqualBehaviour extends TestCase
 {
     private Configuration setupSimpleConfiguration()
             throws Exception
     {
-        String simpleConfigurationFile = new File("conf/testEqual.properties").getAbsolutePath();
+        String simpleConfigurationFile = ConfigurationAssert.getTestFile("testEqual.properties").getAbsolutePath();
         return new PropertiesConfiguration(simpleConfigurationFile);
     }
 
     private Configuration setupCompositeConfiguration()
             throws Exception
     {
-        String compositeConfigurationFile = new File("conf/testEqualDigester.xml").getAbsolutePath();
+        String compositeConfigurationFile = ConfigurationAssert.getTestFile("testEqualDigester.xml").getAbsolutePath();
 
         ConfigurationFactory configurationFactory = new ConfigurationFactory();
         configurationFactory.setConfigurationFileName(compositeConfigurationFile);
@@ -49,7 +48,7 @@ public class TestEqualBehaviour  extends
     }
 
     /**
-     * Checks whether two configurations have the same size, 
+     * Checks whether two configurations have the same size,
      * the same key sequence and contain the same key -> value mappings
      */
     private void checkEquality(String msg, Configuration c1, Configuration c2)

Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestEqualsProperty.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestEqualsProperty.java?rev=1172307&r1=1172306&r2=1172307&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestEqualsProperty.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestEqualsProperty.java Sun Sep 18 17:47:07 2011
@@ -17,8 +17,6 @@ package org.apache.commons.configuration
  * limitations under the License.
  */
 
-import java.io.File;
-
 import junit.framework.TestCase;
 
 /**
@@ -29,7 +27,7 @@ import junit.framework.TestCase;
 public class TestEqualsProperty extends TestCase
 {
     /** The File that we test with */
-    private String testProperties = new File("conf/test.properties").getAbsolutePath();
+    private String testProperties = ConfigurationAssert.getTestFile("test.properties").getAbsolutePath();
 
     public void testEquals() throws Exception
     {

Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestFileConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestFileConfiguration.java?rev=1172307&r1=1172306&r2=1172307&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestFileConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestFileConfiguration.java Sun Sep 18 17:47:07 2011
@@ -40,17 +40,11 @@ import org.apache.commons.configuration.
  */
 public class TestFileConfiguration extends TestCase
 {
-    /** Constant for the output directory.*/
-    private static final File TARGET_DIR = new File("target");
-
-    /** Constant for the directory with the test configuration files.*/
-    private static final File TEST_DIR = new File("conf");
-
     /** Constant for the name of a test file.*/
     private static final String TEST_FILENAME = "test.properties";
 
     /** Constant for a test file.*/
-    private static final File TEST_FILE = new File(TEST_DIR, TEST_FILENAME);
+    private static final File TEST_FILE = ConfigurationAssert.getTestFile(TEST_FILENAME);
 
     /** Constant for a test output file. */
     private static final File OUT_FILE = new File(
@@ -156,14 +150,14 @@ public class TestFileConfiguration exten
     {
         PropertiesConfiguration config = new PropertiesConfiguration();
 
-        File directory = TEST_DIR;
+        File directory = ConfigurationAssert.TEST_DIR;
         File file = TEST_FILE;
         config.setFile(file);
         assertEquals(directory.getAbsolutePath(), config.getBasePath());
         assertEquals(TEST_FILENAME, config.getFileName());
         assertEquals(file.getAbsolutePath(), config.getPath());
 
-        config.setPath("conf" + File.separator + TEST_FILENAME);
+        config.setPath(ConfigurationAssert.TEST_DIR_NAME + File.separator + TEST_FILENAME);
         assertEquals(TEST_FILENAME, config.getFileName());
         assertEquals(directory.getAbsolutePath(), config.getBasePath());
         assertEquals(file.getAbsolutePath(), config.getPath());
@@ -210,13 +204,12 @@ public class TestFileConfiguration exten
      */
     public void testWithConfigurationFactory() throws Exception
     {
-        File dir = new File("conf");
-        File file = new File(dir, "testFileConfiguration.properties");
+        File file = ConfigurationAssert.getOutFile("testFileConfiguration.properties");
         addTemporaryFile(file);
 
         ConfigurationFactory factory = new ConfigurationFactory();
-        factory.setConfigurationURL(new File(dir,
-                "testDigesterConfiguration2.xml").toURI().toURL());
+        factory.setConfigurationURL(ConfigurationAssert.getTestURL(
+                "testDigesterConfiguration2.xml"));
         CompositeConfiguration cc =
                 (CompositeConfiguration) factory.getConfiguration();
         PropertiesConfiguration config = null;
@@ -229,7 +222,7 @@ public class TestFileConfiguration exten
         }
 
         config.setProperty("test", "yes");
-        config.save(file.getName());
+        config.save(file);
         assertTrue(file.exists());
         config = new PropertiesConfiguration();
         config.setFile(file);
@@ -333,7 +326,7 @@ public class TestFileConfiguration exten
      */
     public void testReloadingWithAutoSave() throws Exception
     {
-        File configFile = new File(TARGET_DIR, TEST_FILENAME);
+        File configFile = ConfigurationAssert.getOutFile(TEST_FILENAME);
         addTemporaryFile(configFile);
         PrintWriter out = null;
 
@@ -368,7 +361,7 @@ public class TestFileConfiguration exten
      */
     public void testPathWithSpaces() throws Exception
     {
-        File path = new File(TARGET_DIR, "path with spaces");
+        File path = ConfigurationAssert.getOutFile("path with spaces");
         File confFile = new File(path, "config-test.properties");
         addTemporaryFile(confFile);
         addTemporaryFile(path);
@@ -382,7 +375,7 @@ public class TestFileConfiguration exten
             out.close();
             out = null;
 
-            URL url = new URL(TARGET_DIR.toURI().toURL()
+            URL url = new URL(ConfigurationAssert.OUT_DIR.toURI().toURL()
                     + "path%20with%20spaces/config-test.properties");
             PropertiesConfiguration config = new PropertiesConfiguration(url);
             config.load();
@@ -411,7 +404,7 @@ public class TestFileConfiguration exten
     public void testPathWithPlus() throws ConfigurationException, IOException
     {
         File saveFile =
-                new File(TARGET_DIR, "test+config.properties")
+                ConfigurationAssert.getOutFile("test+config.properties")
                         .getAbsoluteFile();
         saveFile.createNewFile();
         tempFiles.add(saveFile);
@@ -460,7 +453,7 @@ public class TestFileConfiguration exten
         config.load(TEST_FILE.getAbsolutePath());
         URL srcUrl = config.getURL();
         File srcFile = config.getFile();
-        File file2 = new File(TEST_DIR, "testEqual.properties");
+        File file2 = ConfigurationAssert.getTestFile("testEqual.properties");
         config.load(file2.getAbsolutePath());
         assertEquals("Source URL was changed", srcUrl, config.getURL());
         assertEquals("Source file was changed", srcFile, config.getFile());
@@ -579,7 +572,7 @@ public class TestFileConfiguration exten
     public void testLoadFromClassPath() throws ConfigurationException
     {
         DefaultConfigurationBuilder cf =
-            new DefaultConfigurationBuilder("conf/config/deep/testFileFromClasspath.xml");
+            new DefaultConfigurationBuilder("config/deep/testFileFromClasspath.xml");
         CombinedConfiguration config = cf.getConfiguration(true);
         Configuration config1 = config.getConfiguration("propConf");
         Configuration config2 = config.getConfiguration("propConfDeep");

Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestHierarchicalConfigurationXMLReader.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestHierarchicalConfigurationXMLReader.java?rev=1172307&r1=1172306&r2=1172307&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestHierarchicalConfigurationXMLReader.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestHierarchicalConfigurationXMLReader.java Sun Sep 18 17:47:07 2011
@@ -22,13 +22,13 @@ import javax.xml.transform.TransformerFa
 import javax.xml.transform.dom.DOMResult;
 import javax.xml.transform.sax.SAXSource;
 
+import junit.framework.TestCase;
+
 import org.apache.commons.jxpath.JXPathContext;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.xml.sax.InputSource;
 
-import junit.framework.TestCase;
-
 /**
  * Test class for HierarchicalConfigurationXMLReader.
  *
@@ -36,7 +36,8 @@ import junit.framework.TestCase;
  */
 public class TestHierarchicalConfigurationXMLReader extends TestCase
 {
-    private static final String TEST_FILE = "conf/testHierarchicalXMLConfiguration.xml";
+    private static final String TEST_FILE = ConfigurationAssert.getTestFile(
+            "testHierarchicalXMLConfiguration.xml").getAbsolutePath();
 
     private HierarchicalConfigurationXMLReader parser;
 

Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestHierarchicalXMLConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestHierarchicalXMLConfiguration.java?rev=1172307&r1=1172306&r2=1172307&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestHierarchicalXMLConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestHierarchicalXMLConfiguration.java Sun Sep 18 17:47:07 2011
@@ -17,12 +17,12 @@ package org.apache.commons.configuration
  * limitations under the License.
  */
 
-import junit.framework.TestCase;
-
 import java.io.File;
 import java.util.Collection;
 import java.util.Iterator;
 
+import junit.framework.TestCase;
+
 /**
  * Test class for XMLConfiguration. In addition to TestXMLConfiguration this
  * class especially tests the hierarchical nature of this class and structured
@@ -45,19 +45,19 @@ public class TestHierarchicalXMLConfigur
     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;
@@ -279,7 +279,7 @@ public class TestHierarchicalXMLConfigur
             removeTestSaveFile();
         }
     }
-    
+
     /**
      * Tests manipulation of the root element's name.
      *
@@ -289,7 +289,7 @@ public class TestHierarchicalXMLConfigur
         assertEquals("configuration", config.getRootElementName());
         config.setRootElementName("newRootName");
         assertEquals("newRootName", config.getRootElementName());
-        
+
         config.setFile(new File(TEST_FILE3));
         config.load();
         assertEquals("testconfig", config.getRootElementName());
@@ -305,7 +305,7 @@ public class TestHierarchicalXMLConfigur
     }
 
     /**
-     * Helper method that ensures that the test save file has been removed. 
+     * Helper method that ensures that the test save file has been removed.
      *
      */
     private void removeTestSaveFile()

Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestNonStringProperties.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestNonStringProperties.java?rev=1172307&r1=1172306&r2=1172307&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestNonStringProperties.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestNonStringProperties.java Sun Sep 18 17:47:07 2011
@@ -17,7 +17,6 @@
 
 package org.apache.commons.configuration;
 
-import java.io.File;
 
 /**
  * Test if non-string properties are handled correctly.
@@ -27,7 +26,7 @@ import java.io.File;
 public class TestNonStringProperties extends BaseNonStringProperties
 {
     /** The File that we test with */
-    private String testProperties = new File("conf/test.properties").getAbsolutePath();
+    private String testProperties = ConfigurationAssert.getTestFile("test.properties").getAbsolutePath();
 
     public void setUp() throws Exception
     {

Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestNullCompositeConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestNullCompositeConfiguration.java?rev=1172307&r1=1172306&r2=1172307&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestNullCompositeConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestNullCompositeConfiguration.java Sun Sep 18 17:47:07 2011
@@ -37,9 +37,9 @@ public class TestNullCompositeConfigurat
     protected CompositeConfiguration cc;
 
     /** The File that we test with */
-    private String testProperties = new File("conf/test.properties").getAbsolutePath();
-    private String testProperties2 = new File("conf/test2.properties").getAbsolutePath();
-    private String testPropertiesXML = new File("conf/test.xml").getAbsolutePath();
+    private String testProperties = ConfigurationAssert.getTestFile("test.properties").getAbsolutePath();
+    private String testProperties2 = ConfigurationAssert.getTestFile("test2.properties").getAbsolutePath();
+    private String testPropertiesXML = ConfigurationAssert.getTestFile("test.xml").getAbsolutePath();
 
     protected void setUp() throws Exception
     {
@@ -78,7 +78,7 @@ public class TestNullCompositeConfigurat
         assertTrue(l.contains("packagea"));
 
     }
-    
+
     public void testGetProperty() throws Exception
     {
         cc.addConfiguration(conf1);
@@ -330,7 +330,7 @@ public class TestNullCompositeConfigurat
         cc.addProperty("array", "value5");
 
         List list = cc.getList("array");
-        
+
         for (Iterator it = list.iterator(); it.hasNext(); )
         {
             Object value = it.next();
@@ -356,8 +356,8 @@ public class TestNullCompositeConfigurat
         assertEquals(orderedList.size(),iteratedList.size());
         for (int i =0;i<orderedList.size();i++){
             assertEquals(orderedList.get(i),iteratedList.get(i));
-        }        
-    }    
+        }
+    }
 
     /**
       * Tests <code>getKeys(String key)</code> preserves the order
@@ -376,16 +376,16 @@ public class TestNullCompositeConfigurat
         assertEquals(orderedList.size(),iteratedList.size());
         for (int i =0;i<orderedList.size();i++){
             assertEquals(orderedList.get(i),iteratedList.get(i));
-        }        
-    }        
-    
+        }
+    }
+
     public void testGetStringWithDefaults()
     {
         BaseConfiguration defaults = new BaseConfiguration();
         defaults.addProperty("default", "default string");
 
         Configuration c = new CompositeConfiguration(defaults);
-        
+
         c.addProperty("string", "test string");
 
         assertEquals("test string", c.getString("string"));
@@ -404,7 +404,7 @@ public class TestNullCompositeConfigurat
             "some default value",
             c.getString("XXX", "some default value"));
     }
-    
+
     public void testCheckingInMemoryConfiguration() throws Exception
     {
         String TEST_KEY = "testKey";
@@ -427,5 +427,5 @@ public class TestNullCompositeConfigurat
         assertTrue(foundTestKey);
         testConfiguration.clearProperty(TEST_KEY);
         assertFalse(testConfiguration.containsKey(TEST_KEY));
-    }    
+    }
 }

Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestPropertiesConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestPropertiesConfiguration.java?rev=1172307&r1=1172306&r2=1172307&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestPropertiesConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestPropertiesConfiguration.java Sun Sep 18 17:47:07 2011
@@ -62,11 +62,11 @@ public class TestPropertiesConfiguration
     private PropertiesConfiguration conf;
 
     /** The File that we test with */
-    private static String testProperties = new File("conf/test.properties").getAbsolutePath();
+    private static String testProperties = ConfigurationAssert.getTestFile("test.properties").getAbsolutePath();
 
-    private static String testBasePath = new File("conf").getAbsolutePath();
-    private static String testBasePath2 = new File("conf").getAbsoluteFile().getParentFile().getAbsolutePath();
-    private static File testSavePropertiesFile = new File("target/testsave.properties");
+    private static String testBasePath = ConfigurationAssert.TEST_DIR.getAbsolutePath();
+    private static String testBasePath2 = ConfigurationAssert.TEST_DIR.getParentFile().getAbsolutePath();
+    private static File testSavePropertiesFile = ConfigurationAssert.getOutFile("testsave.properties");
 
     protected void setUp() throws Exception
     {
@@ -92,7 +92,7 @@ public class TestPropertiesConfiguration
      */
     public void testAppend() throws Exception
     {
-        File file2 = new File("conf/threesome.properties");
+        File file2 = ConfigurationAssert.getTestFile("threesome.properties");
         conf.load(file2);
         assertEquals("aaa", conf.getString("test.threesome.one"));
         assertEquals("true", conf.getString("configuration.loaded"));
@@ -143,7 +143,7 @@ public class TestPropertiesConfiguration
 
         // load the configuration
         PropertiesConfiguration conf = new PropertiesConfiguration();
-        conf.load("conf/test.properties");
+        conf.load(ConfigurationAssert.getTestFile("test.properties"));
 
         // restore the previous value for the other tests
         PropertiesConfiguration.setInclude("include");
@@ -309,14 +309,14 @@ public class TestPropertiesConfiguration
     {
         PropertiesConfiguration pc = new PropertiesConfiguration();
         pc.setBasePath(testBasePath2);
-        pc.setFileName("conf/test.properties");
+        pc.setFileName("test.properties");
         pc.load();
 
         assertTrue("Make sure we have multiple keys", pc.getBoolean("test.boolean"));
 
         pc = new PropertiesConfiguration();
         pc.setBasePath(testBasePath2);
-        pc.setFileName("conf/test.properties");
+        pc.setFileName("test.properties");
         pc.load();
 
         assertTrue("Make sure we have multiple keys", pc.getBoolean("test.boolean"));
@@ -324,7 +324,7 @@ public class TestPropertiesConfiguration
 
     public void testLoadFromFile() throws Exception
     {
-        File file = new File("conf/test.properties");
+        File file = ConfigurationAssert.getTestFile("test.properties");
         conf = new PropertiesConfiguration(file);
 
         assertEquals("true", conf.getString("configuration.loaded"));

Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestPropertiesSequence.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestPropertiesSequence.java?rev=1172307&r1=1172306&r2=1172307&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestPropertiesSequence.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestPropertiesSequence.java Sun Sep 18 17:47:07 2011
@@ -17,8 +17,6 @@ package org.apache.commons.configuration
  * limitations under the License.
  */
 
-import java.io.File;
-
 import java.util.Iterator;
 import java.util.List;
 
@@ -26,12 +24,11 @@ import junit.framework.TestCase;
 
 import org.apache.commons.collections.IteratorUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.commons.configuration.BaseConfiguration;
 
 /**
  * Test that the configuration factory returns keys in the same
  * sequence as the properties configurator
- * 
+ *
  * @version $Id$
  */
 public class TestPropertiesSequence extends TestCase
@@ -39,8 +36,8 @@ public class TestPropertiesSequence exte
 
     public void testConfigurationValuesInSameOrderFromFile() throws Exception
     {
-        String simpleConfigurationFile = new File("conf/testSequence.properties").getAbsolutePath();
-        String compositeConfigurationFile = new File("conf/testSequenceDigester.xml").getAbsolutePath();
+        String simpleConfigurationFile = ConfigurationAssert.getTestFile("testSequence.properties").getAbsolutePath();
+        String compositeConfigurationFile = ConfigurationAssert.getTestFile("testSequenceDigester.xml").getAbsolutePath();
 
         Configuration simpleConfiguration = new PropertiesConfiguration(simpleConfigurationFile);
 
@@ -65,8 +62,8 @@ public class TestPropertiesSequence exte
 
     public void testConfigurationValuesInSameOrderWithManualAdd() throws Exception
     {
-        String simpleConfigurationFile = new File("conf/testSequence.properties").getAbsolutePath();
-        String compositeConfigurationFile = new File("conf/testSequenceDigester.xml").getAbsolutePath();
+        String simpleConfigurationFile = ConfigurationAssert.getTestFile("testSequence.properties").getAbsolutePath();
+        String compositeConfigurationFile = ConfigurationAssert.getTestFile("testSequenceDigester.xml").getAbsolutePath();
 
         Configuration simpleConfiguration = new PropertiesConfiguration(simpleConfigurationFile);
 
@@ -97,8 +94,8 @@ public class TestPropertiesSequence exte
 
     public void testMappingInSameOrder() throws Exception
     {
-        String simpleConfigurationFile = new File("conf/testSequence.properties").getAbsolutePath();
-        String compositeConfigurationFile = new File("conf/testSequenceDigester.xml").getAbsolutePath();
+        String simpleConfigurationFile = ConfigurationAssert.getTestFile("testSequence.properties").getAbsolutePath();
+        String compositeConfigurationFile = ConfigurationAssert.getTestFile("testSequenceDigester.xml").getAbsolutePath();
 
         Configuration simpleConfiguration = new PropertiesConfiguration(simpleConfigurationFile);
 

Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestSubsetConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestSubsetConfiguration.java?rev=1172307&r1=1172306&r2=1172307&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestSubsetConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestSubsetConfiguration.java Sun Sep 18 17:47:07 2011
@@ -25,19 +25,20 @@ import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.Set;
 
+import junit.framework.TestCase;
+
 import org.apache.commons.configuration.interpol.ConfigurationInterpolator;
 import org.apache.commons.lang.text.StrLookup;
-import junit.framework.TestCase;
 
 /**
  * Test case for the {@link SubsetConfiguration} class.
  *
  * @author Emmanuel Bourg
- * @version $Revision$, $Date$
+ * @version $Id$
  */
 public class TestSubsetConfiguration extends TestCase
 {
-    static final String TEST_DIR = "conf";
+    static final String TEST_DIR = ConfigurationAssert.TEST_DIR_NAME;
     static final String TEST_FILE = "testDigesterConfiguration2.xml";
 
     public void testGetProperty()
@@ -294,7 +295,7 @@ public class TestSubsetConfiguration ext
                 .subset("prefix");
         InterpolationTestHelper.testGetInterpolator(subset);
     }
-    
+
     public void testLocalLookupsInInterpolatorAreInherited() {
         BaseConfiguration config = new BaseConfiguration();
         ConfigurationInterpolator interpolator = config.getInterpolator();
@@ -303,7 +304,7 @@ public class TestSubsetConfiguration ext
             public String lookup(String key) {
                 return "(" + key +")";
             }
-            
+
         });
         config.setProperty("prefix.var", "${brackets:x}");
         AbstractConfiguration subset = (AbstractConfiguration) config
@@ -311,7 +312,7 @@ public class TestSubsetConfiguration ext
         assertEquals("Local lookup was not inherited", "(x)", subset
                 .getString("var", ""));
     }
-    
+
     public void testInterpolationForKeysOfTheParent() {
         BaseConfiguration config = new BaseConfiguration();
         config.setProperty("test", "junit");

Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestVFSConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestVFSConfigurationBuilder.java?rev=1172307&r1=1172306&r2=1172307&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestVFSConfigurationBuilder.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestVFSConfigurationBuilder.java Sun Sep 18 17:47:07 2011
@@ -36,7 +36,7 @@ import org.apache.commons.configuration.
 import org.apache.commons.configuration.tree.xpath.XPathExpressionEngine;
 
 /**
- * Test class for DefaultConfigurationBuilder.
+ * Test class for VFSConfigurationBuilder.
  *
  * @author Oliver Heger
  * @version $Id$
@@ -44,59 +44,59 @@ import org.apache.commons.configuration.
 public class TestVFSConfigurationBuilder 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");
 
-    private static final File CLASS_FILE = new File(
-            "conf/testExtendedClass.xml");
+    private static final File CLASS_FILE = ConfigurationAssert
+            .getTestFile("testExtendedClass.xml");
 
-    private static final File PROVIDER_FILE = new File(
-            "conf/testConfigurationProvider.xml");
+    private static final File PROVIDER_FILE = ConfigurationAssert
+            .getTestFile("testConfigurationProvider.xml");
 
-    private static final File EXTENDED_PROVIDER_FILE = new File(
-            "conf/testExtendedXMLConfigurationProvider.xml");
+    private static final File EXTENDED_PROVIDER_FILE = ConfigurationAssert
+            .getTestFile("testExtendedXMLConfigurationProvider.xml");
 
-    private static final File GLOBAL_LOOKUP_FILE = new File(
-            "conf/testGlobalLookup.xml");
+    private static final File GLOBAL_LOOKUP_FILE = ConfigurationAssert
+            .getTestFile("testGlobalLookup.xml");
 
-    private static final File SYSTEM_PROPS_FILE = new File(
-            "conf/testSystemProperties.xml");
+    private static final File SYSTEM_PROPS_FILE = ConfigurationAssert
+            .getTestFile("testSystemProperties.xml");
 
-    private static final File VALIDATION_FILE = new File(
-            "conf/testValidation.xml");
+    private static final File VALIDATION_FILE = ConfigurationAssert
+            .getTestFile("testValidation.xml");
 
-    private static final File VALIDATION2_FILE = new File(
-            "conf/testValidation2.xml");
+    private static final File VALIDATION2_FILE = ConfigurationAssert
+            .getTestFile("testValidation2.xml");
 
-    private static final File MULTI_TENENT_FILE = new File(
-            "conf/testMultiTenentConfigurationBuilder.xml");
+    private static final File MULTI_TENENT_FILE = ConfigurationAssert
+            .getTestFile("testMultiTenentConfigurationBuilder.xml");
 
-    private static final File FILESYSTEM_FILE = new File(
-            "conf/testFileSystem.xml");
+    private static final File FILESYSTEM_FILE = ConfigurationAssert
+            .getTestFile("testFileSystem.xml");
 
-    private static final File FILERELOAD_FILE = new File(
-            "target/test-classes/testFileReloadConfigurationBuilder.xml");
+    private static final File FILERELOAD_FILE = ConfigurationAssert
+            .getTestFile("testFileReloadConfigurationBuilder.xml");
 
-      private static final File MULTI_RELOAD_FILE1 = new File(
-            "target/test-classes/testVFSMultiTenentConfigurationBuilder1.xml");
+    private static final File MULTI_RELOAD_FILE1 = ConfigurationAssert
+            .getTestFile("testVFSMultiTenentConfigurationBuilder1.xml");
 
-    private static final File MULTI_RELOAD_FILE2 = new File(
-            "target/test-classes/testVFSMultiTenentConfigurationBuilder2.xml");
+    private static final File MULTI_RELOAD_FILE2 = ConfigurationAssert
+            .getTestFile("testVFSMultiTenentConfigurationBuilder2.xml");
 
     /** Constant for the name of an optional configuration.*/
     private static final String OPTIONAL_NAME = "optionalConfig";
@@ -640,7 +640,7 @@ public class TestVFSConfigurationBuilder
     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);

Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestXMLConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestXMLConfiguration.java?rev=1172307&r1=1172306&r2=1172307&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestXMLConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestXMLConfiguration.java Sun Sep 18 17:47:07 2011
@@ -52,7 +52,10 @@ import org.xml.sax.helpers.DefaultHandle
  */
 public class TestXMLConfiguration extends TestCase
 {
-    private static final String CATALOG_FILES = "conf/catalog.xml";
+    /** XML Catalog */
+    private static final String CATALOG_FILES = ConfigurationAssert
+            .getTestFile("catalog.xml").getAbsolutePath();
+
     /** Constant for the used encoding.*/
     static final String ENCODING = "ISO-8859-1";
 
@@ -72,12 +75,12 @@ public class TestXMLConfiguration extend
     static final String PROP_FACTORY = "javax.xml.transform.TransformerFactory";
 
     /** The File that we test with */
-    private String testProperties = new File("conf/test.xml").getAbsolutePath();
-    private String testProperties2 = new File("conf/testDigesterConfigurationInclude1.xml").getAbsolutePath();
-    private String testBasePath = new File("conf").getAbsolutePath();
-    private File testSaveConf = new File("target/testsave.xml");
-    private File testSaveFile = new File("target/testsample2.xml");
-    private String testFile2 = new File("conf/sample.xml").getAbsolutePath();
+    private String testProperties = ConfigurationAssert.getTestFile("test.xml").getAbsolutePath();
+    private String testProperties2 = ConfigurationAssert.getTestFile("testDigesterConfigurationInclude1.xml").getAbsolutePath();
+    private String testBasePath = ConfigurationAssert.TEST_DIR.getAbsolutePath();
+    private File testSaveConf = ConfigurationAssert.getOutFile("testsave.xml");
+    private File testSaveFile = ConfigurationAssert.getOutFile("testsample2.xml");
+    private String testFile2 = ConfigurationAssert.getTestFile("sample.xml").getAbsolutePath();
 
     /** Constant for the number of test threads. */
     private static final int THREAD_COUNT = 5;
@@ -724,7 +727,7 @@ public class TestXMLConfiguration extend
         // Load an invalid XML file with the default (non validating)
         // doc builder. This should work...
         conf = new XMLConfiguration();
-        conf.load(new File("conf/testValidateInvalid.xml"));
+        conf.load(ConfigurationAssert.getTestFile("testValidateInvalid.xml"));
         assertEquals("customers", conf.getString("table.name"));
         assertFalse(conf.containsKey("table.fields.field(1).type"));
 
@@ -753,7 +756,7 @@ public class TestXMLConfiguration extend
         // Try to load a valid document with a validating builder
         conf = new XMLConfiguration();
         conf.setDocumentBuilder(builder);
-        conf.load(new File("conf/testValidateValid.xml"));
+        conf.load(ConfigurationAssert.getTestFile("testValidateValid.xml"));
         assertTrue(conf.containsKey("table.fields.field(1).type"));
     }
 
@@ -800,7 +803,7 @@ public class TestXMLConfiguration extend
     public void testSubset() throws ConfigurationException
     {
         conf = new XMLConfiguration();
-        conf.load(new File("conf/testHierarchicalXMLConfiguration.xml"));
+        conf.load(ConfigurationAssert.getTestFile("testHierarchicalXMLConfiguration.xml"));
         conf.subset("tables.table(0)");
         conf.save(testSaveConf);
 
@@ -927,7 +930,7 @@ public class TestXMLConfiguration extend
      */
     public void testValidating() throws ConfigurationException
     {
-        File nonValidFile = new File("conf/testValidateInvalid.xml");
+        File nonValidFile = ConfigurationAssert.getTestFile("testValidateInvalid.xml");
         conf = new XMLConfiguration();
         assertFalse(conf.isValidating());
 
@@ -986,7 +989,7 @@ public class TestXMLConfiguration extend
      */
     public void testLoadWithEncoding() throws ConfigurationException
     {
-        File file = new File("conf/testEncoding.xml");
+        File file = ConfigurationAssert.getTestFile("testEncoding.xml");
         conf = new XMLConfiguration();
         conf.load(file);
         assertEquals("test3_yoge", conf.getString("yoge"));

Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/TestPropertiesConfigurationEvents.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/TestPropertiesConfigurationEvents.java?rev=1172307&r1=1172306&r2=1172307&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/TestPropertiesConfigurationEvents.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/TestPropertiesConfigurationEvents.java Sun Sep 18 17:47:07 2011
@@ -21,6 +21,7 @@ import java.io.IOException;
 import java.net.URL;
 
 import org.apache.commons.configuration.AbstractConfiguration;
+import org.apache.commons.configuration.ConfigurationAssert;
 import org.apache.commons.configuration.PropertiesConfiguration;
 
 /**
@@ -33,8 +34,8 @@ public class TestPropertiesConfiguration
         AbstractTestFileConfigurationEvents
 {
     /** The file to be loaded.*/
-    static final File TEST_FILE = new File("conf/test.properties");
-    
+    static final File TEST_FILE = ConfigurationAssert.getTestFile("test.properties");
+
     protected AbstractConfiguration createConfiguration()
     {
         return new PropertiesConfiguration();
@@ -42,6 +43,6 @@ public class TestPropertiesConfiguration
 
     protected URL getSourceURL() throws IOException
     {
-        return TEST_FILE.toURL();
+        return TEST_FILE.toURI().toURL();
     }
 }

Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/TestXMLConfigurationEvents.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/TestXMLConfigurationEvents.java?rev=1172307&r1=1172306&r2=1172307&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/TestXMLConfigurationEvents.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/TestXMLConfigurationEvents.java Sun Sep 18 17:47:07 2011
@@ -21,6 +21,7 @@ import java.io.IOException;
 import java.net.URL;
 
 import org.apache.commons.configuration.AbstractConfiguration;
+import org.apache.commons.configuration.ConfigurationAssert;
 import org.apache.commons.configuration.XMLConfiguration;
 
 /**
@@ -31,11 +32,11 @@ import org.apache.commons.configuration.
 public class TestXMLConfigurationEvents extends
         AbstractTestFileConfigurationEvents
 {
-    static final File TEST_FILE = new File("conf/test.xml");
+    static final File TEST_FILE = ConfigurationAssert.getTestFile("test.xml");
 
     protected URL getSourceURL() throws IOException
     {
-        return TEST_FILE.toURL();
+        return TEST_FILE.toURI().toURL();
     }
 
     protected AbstractConfiguration createConfiguration()



Mime
View raw message