commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ebo...@apache.org
Subject svn commit: r658686 - in /commons/proper/configuration/branches/configuration2_experimental: conf/ src/test/java/org/apache/commons/configuration2/ src/test/java/org/apache/commons/configuration2/plist/ xdocs/
Date Wed, 21 May 2008 13:48:52 GMT
Author: ebourg
Date: Wed May 21 06:48:51 2008
New Revision: 658686

URL: http://svn.apache.org/viewvc?rev=658686&view=rev
Log:
Replaced tabs with spaces

Modified:
    commons/proper/configuration/branches/configuration2_experimental/conf/CommonsConfiguration.xsd
    commons/proper/configuration/branches/configuration2_experimental/conf/checkstyle.xml
    commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationUtils.java
    commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestHierarchicalConfiguration.java
    commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java
    commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestInMemoryConfiguration.java
    commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java
    commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListConfiguration.java
    commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/plist/TestXMLPropertyListConfiguration.java
    commons/proper/configuration/branches/configuration2_experimental/xdocs/changes.xml

Modified: commons/proper/configuration/branches/configuration2_experimental/conf/CommonsConfiguration.xsd
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/conf/CommonsConfiguration.xsd?rev=658686&r1=658685&r2=658686&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/conf/CommonsConfiguration.xsd
(original)
+++ commons/proper/configuration/branches/configuration2_experimental/conf/CommonsConfiguration.xsd
Wed May 21 06:48:51 2008
@@ -16,128 +16,128 @@
    limitations under the License.
 -->
 <!-- 
-	Apache Commons Configuration XML Schema for configuration.xml
-	version: 0.1
-	author : Borut Bolčina
-	date    : January 2nd, 2006
+    Apache Commons Configuration XML Schema for configuration.xml
+    version: 0.1
+    author : Borut Bolčina
+    date    : January 2nd, 2006
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
attributeFormDefault="unqualified">
-	<xs:element name="configuration">
-		<xs:annotation>
-			<xs:documentation>Commons Configuration v0.1</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="sources">
-					<xs:sequence minOccurs="0">
-						<xs:element name="override" type="sources" minOccurs="0"/>
-						<xs:element name="additional" type="sources" minOccurs="0"/>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<xs:complexType name="abstractConfiguration">
-		<xs:attribute name="delimiter" type="xs:string" use="optional"/>
-		<xs:attribute name="throwExceptionOnMissing" type="xs:boolean" use="optional"/>
-	</xs:complexType>
-	<xs:complexType name="hierarhicalConfiguration">
-		<xs:complexContent>
-			<xs:extension base="abstractConfiguration">
-				<xs:attribute name="root" type="xs:string" use="optional"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="abstractHierarchicalFileConfiguration">
-		<xs:complexContent>
-			<xs:extension base="hierarhicalConfiguration">
-				<xs:attribute name="fileName" use="required">
-					<xs:simpleType>
-						<xs:restriction base="xs:string">
-							<xs:minLength value="1"/>
-							<xs:pattern value=".+\.properties"/>
-							<xs:pattern value=".+\.xml"/>
-							<xs:pattern value=".+\.plist"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-				<xs:attribute name="autosave" type="xs:boolean" use="optional"/>
-				<xs:attribute name="basePath" type="xs:string" use="optional"/>
-				<xs:attribute name="encoding" type="xs:string" use="optional"/>
-				<xs:attribute name="url" type="xs:anyURI" use="optional"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="abstractFileConfiguration">
-		<xs:complexContent>
-			<xs:extension base="abstractConfiguration">
-				<xs:attribute name="fileName" use="required">
-					<xs:simpleType>
-						<xs:restriction base="xs:string">
-							<xs:minLength value="1"/>
-							<xs:pattern value=".+\.properties"/>
-							<xs:pattern value=".+\.xml"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-				<xs:attribute name="encoding" type="xs:string" use="optional"/>
-				<xs:attribute name="basePath" type="xs:string" use="optional"/>
-				<xs:attribute name="autosave" type="xs:boolean" use="optional"/>
-				<xs:attribute name="path" type="xs:string" use="optional"/>
-				<xs:attribute name="url" type="xs:anyURI" use="optional"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="propertiesConfiguration">
-		<xs:complexContent>
-			<xs:extension base="abstractFileConfiguration">
-				<xs:attribute name="header" type="xs:string" use="optional"/>
-				<xs:attribute name="include" type="xs:string" use="optional"/>
-				<xs:attribute name="includesAllowed" type="xs:boolean" use="optional"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="xmlPropertiesConfiguration">
-		<xs:complexContent>
-			<xs:extension base="propertiesConfiguration"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="xmlConfiguration">
-		<xs:complexContent>
-			<xs:extension base="abstractHierarchicalFileConfiguration">
-				<xs:attribute name="rootElementName" type="xs:string" use="optional"/>
-				<xs:attribute name="validating" type="xs:boolean" use="optional"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="jndiConfiguration">
-		<xs:complexContent>
-			<xs:extension base="abstractConfiguration">
-				<xs:attribute name="prefix" type="xs:string" use="required"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="databaseConfiguration">
-		<xs:complexContent>
-			<xs:extension base="abstractConfiguration">
-				<xs:attribute name="jndi" type="xs:string" use="required"/>
-				<xs:attribute name="table" type="xs:string" use="required"/>
-				<xs:attribute name="keyColumn" type="xs:string" use="required"/>
-				<xs:attribute name="valueColumn" type="xs:string" use="required"/>
-				<xs:attribute name="nameColumn" type="xs:string" use="optional"/>
-				<xs:attribute name="name" type="xs:string" use="optional"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
+    <xs:element name="configuration">
+        <xs:annotation>
+            <xs:documentation>Commons Configuration v0.1</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:complexContent>
+                <xs:extension base="sources">
+                    <xs:sequence minOccurs="0">
+                        <xs:element name="override" type="sources" minOccurs="0"/>
+                        <xs:element name="additional" type="sources" minOccurs="0"/>
+                    </xs:sequence>
+                </xs:extension>
+            </xs:complexContent>
+        </xs:complexType>
+    </xs:element>
+    <xs:complexType name="abstractConfiguration">
+        <xs:attribute name="delimiter" type="xs:string" use="optional"/>
+        <xs:attribute name="throwExceptionOnMissing" type="xs:boolean" use="optional"/>
+    </xs:complexType>
+    <xs:complexType name="hierarhicalConfiguration">
+        <xs:complexContent>
+            <xs:extension base="abstractConfiguration">
+                <xs:attribute name="root" type="xs:string" use="optional"/>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+    <xs:complexType name="abstractHierarchicalFileConfiguration">
+        <xs:complexContent>
+            <xs:extension base="hierarhicalConfiguration">
+                <xs:attribute name="fileName" use="required">
+                    <xs:simpleType>
+                        <xs:restriction base="xs:string">
+                            <xs:minLength value="1"/>
+                            <xs:pattern value=".+\.properties"/>
+                            <xs:pattern value=".+\.xml"/>
+                            <xs:pattern value=".+\.plist"/>
+                        </xs:restriction>
+                    </xs:simpleType>
+                </xs:attribute>
+                <xs:attribute name="autosave" type="xs:boolean" use="optional"/>
+                <xs:attribute name="basePath" type="xs:string" use="optional"/>
+                <xs:attribute name="encoding" type="xs:string" use="optional"/>
+                <xs:attribute name="url" type="xs:anyURI" use="optional"/>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+    <xs:complexType name="abstractFileConfiguration">
+        <xs:complexContent>
+            <xs:extension base="abstractConfiguration">
+                <xs:attribute name="fileName" use="required">
+                    <xs:simpleType>
+                        <xs:restriction base="xs:string">
+                            <xs:minLength value="1"/>
+                            <xs:pattern value=".+\.properties"/>
+                            <xs:pattern value=".+\.xml"/>
+                        </xs:restriction>
+                    </xs:simpleType>
+                </xs:attribute>
+                <xs:attribute name="encoding" type="xs:string" use="optional"/>
+                <xs:attribute name="basePath" type="xs:string" use="optional"/>
+                <xs:attribute name="autosave" type="xs:boolean" use="optional"/>
+                <xs:attribute name="path" type="xs:string" use="optional"/>
+                <xs:attribute name="url" type="xs:anyURI" use="optional"/>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+    <xs:complexType name="propertiesConfiguration">
+        <xs:complexContent>
+            <xs:extension base="abstractFileConfiguration">
+                <xs:attribute name="header" type="xs:string" use="optional"/>
+                <xs:attribute name="include" type="xs:string" use="optional"/>
+                <xs:attribute name="includesAllowed" type="xs:boolean" use="optional"/>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+    <xs:complexType name="xmlPropertiesConfiguration">
+        <xs:complexContent>
+            <xs:extension base="propertiesConfiguration"/>
+        </xs:complexContent>
+    </xs:complexType>
+    <xs:complexType name="xmlConfiguration">
+        <xs:complexContent>
+            <xs:extension base="abstractHierarchicalFileConfiguration">
+                <xs:attribute name="rootElementName" type="xs:string" use="optional"/>
+                <xs:attribute name="validating" type="xs:boolean" use="optional"/>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+    <xs:complexType name="jndiConfiguration">
+        <xs:complexContent>
+            <xs:extension base="abstractConfiguration">
+                <xs:attribute name="prefix" type="xs:string" use="required"/>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+    <xs:complexType name="databaseConfiguration">
+        <xs:complexContent>
+            <xs:extension base="abstractConfiguration">
+                <xs:attribute name="jndi" type="xs:string" use="required"/>
+                <xs:attribute name="table" type="xs:string" use="required"/>
+                <xs:attribute name="keyColumn" type="xs:string" use="required"/>
+                <xs:attribute name="valueColumn" type="xs:string" use="required"/>
+                <xs:attribute name="nameColumn" type="xs:string" use="optional"/>
+                <xs:attribute name="name" type="xs:string" use="optional"/>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
     <xs:complexType name="sources">
-		<xs:choice maxOccurs="unbounded">
-			<xs:element name="system" type="xs:string"/>
-			<xs:element name="environment" type="xs:string"/>
-			<xs:element name="properties" type="propertiesConfiguration"/>
-			<xs:element name="xml" type="xmlConfiguration"/>
-			<xs:element name="plist" type="abstractHierarchicalFileConfiguration"/>
-			<xs:element name="jndi" type="jndiConfiguration"/>
-			<xs:element name="database" type="databaseConfiguration"/>
-		</xs:choice>
-	</xs:complexType>
+        <xs:choice maxOccurs="unbounded">
+            <xs:element name="system" type="xs:string"/>
+            <xs:element name="environment" type="xs:string"/>
+            <xs:element name="properties" type="propertiesConfiguration"/>
+            <xs:element name="xml" type="xmlConfiguration"/>
+            <xs:element name="plist" type="abstractHierarchicalFileConfiguration"/>
+            <xs:element name="jndi" type="jndiConfiguration"/>
+            <xs:element name="database" type="databaseConfiguration"/>
+        </xs:choice>
+    </xs:complexType>
 </xs:schema>

Modified: commons/proper/configuration/branches/configuration2_experimental/conf/checkstyle.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/conf/checkstyle.xml?rev=658686&r1=658685&r2=658686&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/conf/checkstyle.xml
(original)
+++ commons/proper/configuration/branches/configuration2_experimental/conf/checkstyle.xml
Wed May 21 06:48:51 2008
@@ -34,7 +34,7 @@
         <module name="JavadocMethod">
             <property name="scope" value="public"/>
             <property name="allowUndeclaredRTE" value="true"/>
-	    <property name="allowMissingJavadoc" value="true"/>
+            <property name="allowMissingJavadoc" value="true"/>
         </module>
         <module name="JavadocType">
             <property name="authorFormat" value="\S"/>

Modified: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationUtils.java?rev=658686&r1=658685&r2=658686&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationUtils.java
(original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationUtils.java
Wed May 21 06:48:51 2008
@@ -23,15 +23,9 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.commons.configuration2.Configuration;
-import org.apache.commons.configuration2.ConfigurationRuntimeException;
-import org.apache.commons.configuration2.ConfigurationUtils;
-import org.apache.commons.configuration2.HierarchicalConfiguration;
-import org.apache.commons.configuration2.PropertiesConfiguration;
 import org.apache.commons.configuration2.flat.BaseConfiguration;
 
 import com.mockobjects.dynamic.Mock;
-
 import junit.framework.TestCase;
 import junitx.framework.ListAssert;
 
@@ -105,8 +99,8 @@
             absFile.toURL(),
             ConfigurationUtils.getURL(null, absFile.getAbsolutePath()));
 
-		assertEquals(absFile.toURL(),
-		ConfigurationUtils.getURL(absFile.getParent(), "config.xml"));
+        assertEquals(absFile.toURL(),
+        ConfigurationUtils.getURL(absFile.getParent(), "config.xml"));
     }
 
     public void testGetBasePath() throws Exception

Modified: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestHierarchicalConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestHierarchicalConfiguration.java?rev=658686&r1=658685&r2=658686&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestHierarchicalConfiguration.java
(original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestHierarchicalConfiguration.java
Wed May 21 06:48:51 2008
@@ -753,25 +753,25 @@
         }
     }
 
-	/**
+    /**
      * Tests the copy constructor.
      */
-	public void testInitCopy()
-	{
-		HierarchicalConfiguration copy = new HierarchicalConfiguration(config);
-		checkContent(copy);
-	}
+    public void testInitCopy()
+    {
+        HierarchicalConfiguration copy = new HierarchicalConfiguration(config);
+        checkContent(copy);
+    }
 
-	/**
+    /**
      * Tests whether the nodes of a copied configuration are independent from
      * the source configuration.
      */
-	public void testInitCopyUpdate()
-	{
-		HierarchicalConfiguration copy = new HierarchicalConfiguration(config);
-		config.setProperty("tables.table(0).name", "NewTable");
-		checkContent(copy);
-	}
+    public void testInitCopyUpdate()
+    {
+        HierarchicalConfiguration copy = new HierarchicalConfiguration(config);
+        config.setProperty("tables.table(0).name", "NewTable");
+        checkContent(copy);
+    }
 
     /**
      * Tests interpolation facilities.
@@ -878,16 +878,16 @@
         testGetProperty();
     }
 
-	/**
+    /**
      * Tests the copy constructor when a null reference is passed.
      */
-	public void testInitCopyNull()
-	{
-		HierarchicalConfiguration copy = new HierarchicalConfiguration(null);
-		assertTrue("Configuration not empty", copy.isEmpty());
-	}
+    public void testInitCopyNull()
+    {
+        HierarchicalConfiguration copy = new HierarchicalConfiguration(null);
+        assertTrue("Configuration not empty", copy.isEmpty());
+    }
 
-	/**
+    /**
      * Helper method for testing the getKeys(String) method.
      *
      * @param prefix the key to pass into getKeys()
@@ -896,9 +896,9 @@
     private void checkKeys(String prefix, String[] expected)
     {
         Set<String> values = new HashSet<String>();
-        for(String exp : expected)
+        for (String exp : expected)
         {
-            values.add((exp.startsWith(prefix)) ? exp :  prefix + "." + exp);
+            values.add((exp.startsWith(prefix)) ? exp : prefix + "." + exp);
         }
 
         Iterator<?> itKeys = config.getKeys(prefix);
@@ -956,27 +956,27 @@
                 .contains("tables/table/fields/field/name"));
     }
 
-	/**
+    /**
      * Checks the content of the passed in configuration object. Used by some
      * tests that copy a configuration.
      *
      * @param c the configuration to check
      */
-	private void checkContent(Configuration c)
-	{
-		for (int i = 0; i < tables.length; i++)
-		{
-			assertEquals(tables[i], c.getString("tables.table(" + i + ").name"));
-			for (int j = 0; j < fields[i].length; j++)
-			{
-				assertEquals(fields[i][j], c.getString("tables.table(" + i
-						+ ").fields.field(" + j + ").name"));
-			}
-		}
-	}
+    private void checkContent(Configuration c)
+    {
+        for (int i = 0; i < tables.length; i++)
+        {
+            assertEquals(tables[i], c.getString("tables.table(" + i + ").name"));
+            for (int j = 0; j < fields[i].length; j++)
+            {
+                assertEquals(fields[i][j], c.getString("tables.table(" + i
+                        + ").fields.field(" + j + ").name"));
+            }
+        }
+    }
 
-	private ExpressionEngine createAlternativeExpressionEngine()
-	{
+    private ExpressionEngine createAlternativeExpressionEngine()
+    {
         DefaultExpressionEngine engine = new DefaultExpressionEngine();
         engine.setPropertyDelimiter("/");
         engine.setIndexStart("[");

Modified: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java?rev=658686&r1=658685&r2=658686&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java
(original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java
Wed May 21 06:48:51 2008
@@ -41,7 +41,7 @@
     private static String LINE_SEPARATOR = System.getProperty("line.separator");
 
     /** Constant for the content of an ini file. */
-	private static final String INI_DATA =
+    private static final String INI_DATA =
             "[section1]" + LINE_SEPARATOR
             + "var1 = foo" + LINE_SEPARATOR
             + "var2 = 451" + LINE_SEPARATOR
@@ -57,7 +57,7 @@
             + "multi = bar" + LINE_SEPARATOR
             + LINE_SEPARATOR;
 
-	private static final String INI_DATA2 =
+    private static final String INI_DATA2 =
             "[section4]" + LINE_SEPARATOR
             + "var1 = \"quoted value\"" + LINE_SEPARATOR
             + "var2 = \"quoted value\\nwith \\\"quotes\\\"\"" + LINE_SEPARATOR
@@ -68,97 +68,97 @@
     /**
      * Test of save method, of class {@link INIConfiguration}.
      */
-	public void testSave() throws Exception
-	{
-		Writer writer = new StringWriter();
-		INIConfiguration instance = new INIConfiguration();
-		instance.addProperty("section1.var1", "foo");
-		instance.addProperty("section1.var2", "451");
-		instance.addProperty("section2.var1", "123.45");
-		instance.addProperty("section2.var2", "bar");
-		instance.addProperty("section3.var1", "true");
-		instance.addProperty("section3.interpolated", "${section3.var1}");
-		instance.addProperty("section3.multi", "foo");
-		instance.addProperty("section3.multi", "bar");
-		instance.save(writer);
-        
+    public void testSave() throws Exception
+    {
+        Writer writer = new StringWriter();
+        INIConfiguration instance = new INIConfiguration();
+        instance.addProperty("section1.var1", "foo");
+        instance.addProperty("section1.var2", "451");
+        instance.addProperty("section2.var1", "123.45");
+        instance.addProperty("section2.var2", "bar");
+        instance.addProperty("section3.var1", "true");
+        instance.addProperty("section3.interpolated", "${section3.var1}");
+        instance.addProperty("section3.multi", "foo");
+        instance.addProperty("section3.multi", "bar");
+        instance.save(writer);
+
         assertEquals("Wrong content of ini file", INI_DATA, writer.toString());
-	}
+    }
 
-	/**
+    /**
      * Test of load method, of class {@link INIConfiguration}.
      */
-	public void testLoad() throws Exception
-	{
-		checkLoad(INI_DATA);
-	}
+    public void testLoad() throws Exception
+    {
+        checkLoad(INI_DATA);
+    }
 
-	/**
+    /**
      * Tests the load() method when the alternative value separator is used (a
      * ':' for '=').
      */
-	public void testLoadAlternativeSeparator() throws Exception
-	{
-		checkLoad(INI_DATA.replace('=', ':'));
-	}
+    public void testLoadAlternativeSeparator() throws Exception
+    {
+        checkLoad(INI_DATA.replace('=', ':'));
+    }
 
-	/**
+    /**
      * Helper method for testing the load operation. Loads the specified content
      * into a configuration and then checks some properties.
      *
      * @param data the data to load
      */
-	private void checkLoad(String data) throws ConfigurationException, IOException
-	{
-		Reader reader = new StringReader(data);
-		INIConfiguration instance = new INIConfiguration();
-		instance.load(reader);
-		reader.close();
-		assertTrue(instance.getString("section1.var1").equals("foo"));
-		assertTrue(instance.getInt("section1.var2") == 451);
-		assertTrue(instance.getDouble("section2.var1") == 123.45);
-		assertTrue(instance.getString("section2.var2").equals("bar"));
-		assertTrue(instance.getBoolean("section3.var1"));
-		assertTrue(instance.getSections().size() == 3);
-	}
+    private void checkLoad(String data) throws ConfigurationException, IOException
+    {
+        Reader reader = new StringReader(data);
+        INIConfiguration instance = new INIConfiguration();
+        instance.load(reader);
+        reader.close();
+        assertTrue(instance.getString("section1.var1").equals("foo"));
+        assertTrue(instance.getInt("section1.var2") == 451);
+        assertTrue(instance.getDouble("section2.var1") == 123.45);
+        assertTrue(instance.getString("section2.var2").equals("bar"));
+        assertTrue(instance.getBoolean("section3.var1"));
+        assertTrue(instance.getSections().size() == 3);
+    }
 
-	/**
+    /**
      * Test of isCommentLine method, of class {@link INIConfiguration}.
      */
-	public void testIsCommentLine()
-	{
-		INIConfiguration instance = new INIConfiguration();
-		assertTrue(instance.isCommentLine("#comment1"));
-		assertTrue(instance.isCommentLine(";comment1"));
-		assertFalse(instance.isCommentLine("nocomment=true"));
-		assertFalse(instance.isCommentLine(null));
-	}
+    public void testIsCommentLine()
+    {
+        INIConfiguration instance = new INIConfiguration();
+        assertTrue(instance.isCommentLine("#comment1"));
+        assertTrue(instance.isCommentLine(";comment1"));
+        assertFalse(instance.isCommentLine("nocomment=true"));
+        assertFalse(instance.isCommentLine(null));
+    }
 
-	/**
+    /**
      * Test of isSectionLine method, of class {@link INIConfiguration}.
      */
-	public void testIsSectionLine()
-	{
-		INIConfiguration instance = new INIConfiguration();
-		assertTrue(instance.isSectionLine("[section]"));
-		assertFalse(instance.isSectionLine("nosection=true"));
-		assertFalse(instance.isSectionLine(null));
-	}
+    public void testIsSectionLine()
+    {
+        INIConfiguration instance = new INIConfiguration();
+        assertTrue(instance.isSectionLine("[section]"));
+        assertFalse(instance.isSectionLine("nosection=true"));
+        assertFalse(instance.isSectionLine(null));
+    }
 
-	/**
+    /**
      * Test of getSections method, of class {@link INIConfiguration}.
      */
-	public void testGetSections()
-	{
-		INIConfiguration instance = new INIConfiguration();
-		instance.addProperty("test1.foo", "bar");
-		instance.addProperty("test2.foo", "abc");
-		Set<String> expResult = new HashSet<String>();
-		expResult.add("test1");
-		expResult.add("test2");
-		Set<String> result = instance.getSections();
-		assertEquals(expResult, result);
-	}
+    public void testGetSections()
+    {
+        INIConfiguration instance = new INIConfiguration();
+        instance.addProperty("test1.foo", "bar");
+        instance.addProperty("test2.foo", "abc");
+        Set<String> expResult = new HashSet<String>();
+        expResult.add("test1");
+        expResult.add("test2");
+        Set<String> result = instance.getSections();
+        assertEquals(expResult, result);
+    }
 
     public void testQuotedValue() throws Exception
     {

Modified: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestInMemoryConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestInMemoryConfiguration.java?rev=658686&r1=658685&r2=658686&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestInMemoryConfiguration.java
(original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestInMemoryConfiguration.java
Wed May 21 06:48:51 2008
@@ -792,25 +792,25 @@
         }
     }
 
-	/**
+    /**
      * Tests the copy constructor.
      */
-	public void testInitCopy()
-	{
-		InMemoryConfiguration copy = new InMemoryConfiguration(config);
-		checkContent(copy);
-	}
+    public void testInitCopy()
+    {
+        InMemoryConfiguration copy = new InMemoryConfiguration(config);
+        checkContent(copy);
+    }
 
-	/**
+    /**
      * Tests whether the nodes of a copied configuration are independent from
      * the source configuration.
      */
-	public void testInitCopyUpdate()
-	{
-	    InMemoryConfiguration copy = new InMemoryConfiguration(config);
-		config.setProperty("tables.table(0).name", "NewTable");
-		checkContent(copy);
-	}
+    public void testInitCopyUpdate()
+    {
+        InMemoryConfiguration copy = new InMemoryConfiguration(config);
+        config.setProperty("tables.table(0).name", "NewTable");
+        checkContent(copy);
+    }
 
     /**
      * Tests interpolation facilities.
@@ -917,16 +917,16 @@
         testGetProperty();
     }
 
-	/**
+    /**
      * Tests the copy constructor when a null reference is passed.
      */
-	public void testInitCopyNull()
-	{
-	    InMemoryConfiguration copy = new InMemoryConfiguration(null);
-		assertTrue("Configuration not empty", copy.isEmpty());
-	}
+    public void testInitCopyNull()
+    {
+        InMemoryConfiguration copy = new InMemoryConfiguration(null);
+        assertTrue("Configuration not empty", copy.isEmpty());
+    }
 
-	/**
+    /**
      * Tests adding multiple values to an attribute.
      */
     public void testAddMultipleAttributeValues()
@@ -969,7 +969,7 @@
         assertEquals("Wrong value 3", "test", values.get(2));
     }
 
-	/**
+    /**
      * Helper method for testing the getKeys(String) method.
      *
      * @param prefix the key to pass into getKeys()
@@ -1039,31 +1039,27 @@
         assertTrue("Attr key not found", keys.contains("tables/table[@sysTab]"));
     }
 
-	/**
+    /**
      * Checks the content of the passed in configuration object. Used by some
      * tests that copy a configuration.
      *
      * @param c the configuration to check
      */
-	private void checkContent(Configuration c)
-	{
-		for (int i = 0; i < TABLES.length; i++)
+    private void checkContent(Configuration c)
+    {
+        for (int i = 0; i < TABLES.length; i++)
         {
-            assertEquals("Wrong table name", TABLES[i], c
-                    .getString("tables.table(" + i + ").name"));
-            assertEquals("Wrong system flag", SYS_TABLES[i].booleanValue(), c
-                    .getBoolean("tables.table(" + i + ")[@sysTab]"));
+            assertEquals("Wrong table name", TABLES[i], c.getString("tables.table(" + i +
").name"));
+            assertEquals("Wrong system flag", SYS_TABLES[i].booleanValue(), c.getBoolean("tables.table("
+ i + ")[@sysTab]"));
             for (int j = 0; j < FIELDS[i].length; j++)
             {
-                assertEquals("Wrong field", FIELDS[i][j], c
-                        .getString("tables.table(" + i + ").fields.field(" + j
-                                + ").name"));
+                assertEquals("Wrong field", FIELDS[i][j], c.getString("tables.table(" + i
+ ").fields.field(" + j+ ").name"));
             }
         }
-	}
+    }
 
-	private ExpressionEngine createAlternativeExpressionEngine()
-	{
+    private ExpressionEngine createAlternativeExpressionEngine()
+    {
         DefaultExpressionEngine engine = new DefaultExpressionEngine();
         engine.setPropertyDelimiter("/");
         engine.setIndexStart("[");

Modified: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java?rev=658686&r1=658685&r2=658686&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java
(original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java
Wed May 21 06:48:51 2008
@@ -981,13 +981,13 @@
      */
     public void testInitCopy() throws ConfigurationException
     {
-    	XMLConfiguration copy = new XMLConfiguration(conf);
+        XMLConfiguration copy = new XMLConfiguration(conf);
         assertEquals("value", copy.getProperty("element"));
         assertNull("Document was copied, too", copy.getDocument());
         ConfigurationNode root = copy.getRootNode();
-        for(ConfigurationNode node : root.getChildren())
+        for (ConfigurationNode node : root.getChildren())
         {
-        	assertNull("Reference was not cleared", node.getReference());
+            assertNull("Reference was not cleared", node.getReference());
         }
 
         removeTestFile();

Modified: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListConfiguration.java?rev=658686&r1=658685&r2=658686&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListConfiguration.java
(original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListConfiguration.java
Wed May 21 06:48:51 2008
@@ -333,8 +333,8 @@
 
     public void testInitCopy()
     {
-    	PropertyListConfiguration copy = new PropertyListConfiguration(config);
-    	assertFalse("Nothing was copied", copy.isEmpty());
+        PropertyListConfiguration copy = new PropertyListConfiguration(config);
+        assertFalse("Nothing was copied", copy.isEmpty());
     }
 
     /**

Modified: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/plist/TestXMLPropertyListConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/plist/TestXMLPropertyListConfiguration.java?rev=658686&r1=658685&r2=658686&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/plist/TestXMLPropertyListConfiguration.java
(original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/plist/TestXMLPropertyListConfiguration.java
Wed May 21 06:48:51 2008
@@ -313,9 +313,9 @@
     }
 
     public void testInitCopy()
-	{
-		XMLPropertyListConfiguration copy = new XMLPropertyListConfiguration((InMemoryConfiguration)
config);
-		StrictConfigurationComparator comp = new StrictConfigurationComparator();
-		assertTrue("Configurations are not equal", comp.compare(config, copy));
-	}
+    {
+        XMLPropertyListConfiguration copy = new XMLPropertyListConfiguration((InMemoryConfiguration)
config);
+        StrictConfigurationComparator comp = new StrictConfigurationComparator();
+        assertTrue("Configurations are not equal", comp.compare(config, copy));
+    }
 }

Modified: commons/proper/configuration/branches/configuration2_experimental/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/xdocs/changes.xml?rev=658686&r1=658685&r2=658686&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/xdocs/changes.xml (original)
+++ commons/proper/configuration/branches/configuration2_experimental/xdocs/changes.xml Wed
May 21 06:48:51 2008
@@ -29,8 +29,7 @@
       </action>
       <action dev="oheger" type="update">
         To avoid incompatibilities with older versions the package structure
-	    has been changed. The main package is now
-	    org.apache.commons.configuration2.
+        has been changed. The main package is now org.apache.commons.configuration2.
       </action>
       <action dev="oheger,ebourg" type="update">
         The dependencies on commons-collections, commons-codec and commons-digester are no
longer needed.



Mime
View raw message