Author: oheger
Date: Sun Dec 22 20:36:06 2013
New Revision: 1553024
URL: http://svn.apache.org/r1553024
Log:
The tests for property access on builder parameters now use BeanHelper.
Due to the specially configured BeanUtilsBean instance managed by BeanHelper,
it is able to set properties on objects which do not fully comply to the Java
Beans specification.
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestDatabaseBuilderParametersImpl.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestFileBasedBuilderParameters.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestHierarchicalBuilderParametersImpl.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestJndiBuilderParametersImpl.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestPropertiesBuilderParametersImpl.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestXMLBuilderParametersImpl.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestCombinedBuilderParametersImpl.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestMultiFileBuilderParametersImpl.java
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestDatabaseBuilderParametersImpl.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestDatabaseBuilderParametersImpl.java?rev=1553024&r1=1553023&r2=1553024&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestDatabaseBuilderParametersImpl.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestDatabaseBuilderParametersImpl.java
Sun Dec 22 20:36:06 2013
@@ -23,7 +23,7 @@ import java.util.Map;
import javax.sql.DataSource;
-import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.configuration.beanutils.BeanHelper;
import org.easymock.EasyMock;
import org.junit.Before;
import org.junit.Test;
@@ -136,8 +136,8 @@ public class TestDatabaseBuilderParamete
@Test
public void testBeanProperties() throws Exception
{
- PropertyUtils.setProperty(params, "table", "testTable");
- PropertyUtils.setProperty(params, "autoCommit", Boolean.FALSE);
+ BeanHelper.setProperty(params, "table", "testTable");
+ BeanHelper.setProperty(params, "autoCommit", Boolean.FALSE);
Map<String, Object> map = params.getParameters();
assertEquals("Wrong table name", "testTable", map.get("table"));
assertEquals("Wrong auto commit", Boolean.FALSE,
map.get("autoCommit"));
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestFileBasedBuilderParameters.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestFileBasedBuilderParameters.java?rev=1553024&r1=1553023&r2=1553024&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestFileBasedBuilderParameters.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestFileBasedBuilderParameters.java
Sun Dec 22 20:36:06 2013
@@ -28,8 +28,8 @@ import java.net.URL;
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.configuration.ConfigurationAssert;
+import org.apache.commons.configuration.beanutils.BeanHelper;
import org.apache.commons.configuration.io.FileBased;
import org.apache.commons.configuration.io.FileHandler;
import org.apache.commons.configuration.io.FileLocationStrategy;
@@ -270,9 +270,9 @@ public class TestFileBasedBuilderParamet
{
FileBasedBuilderParametersImpl params =
new FileBasedBuilderParametersImpl();
- PropertyUtils.setProperty(params, "throwExceptionOnMissing",
+ BeanHelper.setProperty(params, "throwExceptionOnMissing",
Boolean.TRUE);
- PropertyUtils.setProperty(params, "fileName", "test.xml");
+ BeanHelper.setProperty(params, "fileName", "test.xml");
assertEquals("File name not set", "test.xml", params.getFileHandler()
.getFileName());
Map<String, Object> map = params.getParameters();
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestHierarchicalBuilderParametersImpl.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestHierarchicalBuilderParametersImpl.java?rev=1553024&r1=1553023&r2=1553024&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestHierarchicalBuilderParametersImpl.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestHierarchicalBuilderParametersImpl.java
Sun Dec 22 20:36:06 2013
@@ -21,7 +21,7 @@ import static org.junit.Assert.assertSam
import java.util.Map;
-import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.configuration.beanutils.BeanHelper;
import org.apache.commons.configuration.tree.ExpressionEngine;
import org.easymock.EasyMock;
import org.junit.Before;
@@ -63,8 +63,8 @@ public class TestHierarchicalBuilderPara
public void testBeanPropertiesAccess() throws Exception
{
ExpressionEngine engine = EasyMock.createMock(ExpressionEngine.class);
- PropertyUtils.setProperty(params, "expressionEngine", engine);
- PropertyUtils.setProperty(params, "throwExceptionOnMissing",
+ BeanHelper.setProperty(params, "expressionEngine", engine);
+ BeanHelper.setProperty(params, "throwExceptionOnMissing",
Boolean.TRUE);
Map<String, Object> map = params.getParameters();
assertSame("Wrong expression engine", engine,
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestJndiBuilderParametersImpl.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestJndiBuilderParametersImpl.java?rev=1553024&r1=1553023&r2=1553024&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestJndiBuilderParametersImpl.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestJndiBuilderParametersImpl.java
Sun Dec 22 20:36:06 2013
@@ -23,7 +23,7 @@ import java.util.Map;
import javax.naming.Context;
-import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.configuration.beanutils.BeanHelper;
import org.easymock.EasyMock;
import org.junit.Before;
import org.junit.Test;
@@ -91,8 +91,8 @@ public class TestJndiBuilderParametersIm
Context ctx = EasyMock.createMock(Context.class);
EasyMock.replay(ctx);
String prefix = "testJndiPrefix";
- PropertyUtils.setProperty(params, "context", ctx);
- PropertyUtils.setProperty(params, "prefix", prefix);
+ BeanHelper.setProperty(params, "context", ctx);
+ BeanHelper.setProperty(params, "prefix", prefix);
Map<String, Object> paramsMap = params.getParameters();
assertSame("Context not in map", ctx, paramsMap.get("context"));
assertEquals("Prefix not in map", prefix, paramsMap.get("prefix"));
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestPropertiesBuilderParametersImpl.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestPropertiesBuilderParametersImpl.java?rev=1553024&r1=1553023&r2=1553024&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestPropertiesBuilderParametersImpl.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestPropertiesBuilderParametersImpl.java
Sun Dec 22 20:36:06 2013
@@ -21,9 +21,9 @@ import static org.junit.Assert.assertSam
import java.util.Map;
-import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.commons.configuration.PropertiesConfigurationLayout;
+import org.apache.commons.configuration.beanutils.BeanHelper;
import org.easymock.EasyMock;
import org.junit.Before;
import org.junit.Test;
@@ -91,10 +91,10 @@ public class TestPropertiesBuilderParame
PropertiesConfiguration.IOFactory factory =
EasyMock.createMock(PropertiesConfiguration.IOFactory.class);
EasyMock.replay(factory);
- PropertyUtils.setProperty(params, "iOFactory", factory);
- PropertyUtils.setProperty(params, "throwExceptionOnMissing",
+ BeanHelper.setProperty(params, "iOFactory", factory);
+ BeanHelper.setProperty(params, "throwExceptionOnMissing",
Boolean.TRUE);
- PropertyUtils.setProperty(params, "fileName", "test.properties");
+ BeanHelper.setProperty(params, "fileName", "test.properties");
assertEquals("Wrong file name", "test.properties", params
.getFileHandler().getFileName());
Map<String, Object> paramsMap = params.getParameters();
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestXMLBuilderParametersImpl.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestXMLBuilderParametersImpl.java?rev=1553024&r1=1553023&r2=1553024&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestXMLBuilderParametersImpl.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestXMLBuilderParametersImpl.java
Sun Dec 22 20:36:06 2013
@@ -23,7 +23,7 @@ import java.util.Map;
import javax.xml.parsers.DocumentBuilder;
-import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.configuration.beanutils.BeanHelper;
import org.easymock.EasyMock;
import org.junit.Before;
import org.junit.Test;
@@ -127,11 +127,11 @@ public class TestXMLBuilderParametersImp
EntityResolver resolver = EasyMock.createMock(EntityResolver.class);
DocumentBuilder builder = EasyMock.createMock(DocumentBuilder.class);
EasyMock.replay(resolver, builder);
- PropertyUtils.setProperty(params, "throwExceptionOnMissing",
+ BeanHelper.setProperty(params, "throwExceptionOnMissing",
Boolean.TRUE);
- PropertyUtils.setProperty(params, "fileName", "test.xml");
- PropertyUtils.setProperty(params, "entityResolver", resolver);
- PropertyUtils.setProperty(params, "documentBuilder", builder);
+ BeanHelper.setProperty(params, "fileName", "test.xml");
+ BeanHelper.setProperty(params, "entityResolver", resolver);
+ BeanHelper.setProperty(params, "documentBuilder", builder);
assertEquals("Wrong file name", "test.xml", params.getFileHandler()
.getFileName());
Map<String, Object> paramsMap = params.getParameters();
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestCombinedBuilderParametersImpl.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestCombinedBuilderParametersImpl.java?rev=1553024&r1=1553023&r2=1553024&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestCombinedBuilderParametersImpl.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestCombinedBuilderParametersImpl.java
Sun Dec 22 20:36:06 2013
@@ -26,9 +26,9 @@ import static org.junit.Assert.assertTru
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.configuration.ConfigurationAssert;
import org.apache.commons.configuration.XMLConfiguration;
+import org.apache.commons.configuration.beanutils.BeanHelper;
import org.apache.commons.configuration.builder.BasicConfigurationBuilder;
import org.apache.commons.configuration.builder.BuilderParameters;
import org.apache.commons.configuration.builder.ConfigurationBuilder;
@@ -315,8 +315,8 @@ public class TestCombinedBuilderParamete
EasyMock.replay(defparams);
CombinedBuilderParametersImpl params =
new CombinedBuilderParametersImpl();
- PropertyUtils.setProperty(params, "basePath", "testPath");
- PropertyUtils.setProperty(params, "definitionBuilderParameters",
+ BeanHelper.setProperty(params, "basePath", "testPath");
+ BeanHelper.setProperty(params, "definitionBuilderParameters",
defparams);
assertEquals("Wrong path", "testPath", params.getBasePath());
assertSame("Wrong def parameters", defparams,
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestMultiFileBuilderParametersImpl.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestMultiFileBuilderParametersImpl.java?rev=1553024&r1=1553023&r2=1553024&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestMultiFileBuilderParametersImpl.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestMultiFileBuilderParametersImpl.java
Sun Dec 22 20:36:06 2013
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertSam
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.configuration.beanutils.BeanHelper;
import org.apache.commons.configuration.builder.BuilderParameters;
import org.apache.commons.configuration.builder.FileBasedBuilderParametersImpl;
import org.easymock.EasyMock;
@@ -117,9 +117,9 @@ public class TestMultiFileBuilderParamet
BuilderParameters bp = EasyMock.createMock(BuilderParameters.class);
EasyMock.replay(bp);
String pattern = "testPattern";
- PropertyUtils.setProperty(params, "filePattern", pattern);
- PropertyUtils.setProperty(params, "managedBuilderParameters", bp);
- PropertyUtils.setProperty(params, "throwExceptionOnMissing",
+ BeanHelper.setProperty(params, "filePattern", pattern);
+ BeanHelper.setProperty(params, "managedBuilderParameters", bp);
+ BeanHelper.setProperty(params, "throwExceptionOnMissing",
Boolean.TRUE);
Map<String, Object> map = params.getParameters();
assertEquals("Exception flag not set", Boolean.TRUE,
