Author: niallp
Date: Tue Jul 10 22:25:07 2007
New Revision: 555173

URL: http://svn.apache.org/viewvc?view=rev&rev=555173
Log:
BEANUTILS-157 - Beanutils's describe() method cannot determine reader methods 
for anonymous class - reported by Thorbjørn Ravn Andersen

Added:
    
jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/bugs/Jira157TestCase.java
   (with props)
Modified:
    
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BeanUtilsBean.java

Modified: 
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BeanUtilsBean.java
URL: 
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BeanUtilsBean.java?view=diff&rev=555173&r1=555172&r2=555173
==============================================================================
--- 
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BeanUtilsBean.java
 (original)
+++ 
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BeanUtilsBean.java
 Tue Jul 10 22:25:07 2007
@@ -509,8 +509,9 @@
                 getPropertyUtils().getPropertyDescriptors(bean);
             for (int i = 0; i < descriptors.length; i++) {
                 String name = descriptors[i].getName();
-                if (descriptors[i].getReadMethod() != null)
+                if (getPropertyUtils().getReadMethod(descriptors[i]) != null) {
                     description.put(name, getProperty(bean, name));
+                }
             }
         }
         return (description);

Added: 
jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/bugs/Jira157TestCase.java
URL: 
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/bugs/Jira157TestCase.java?view=auto&rev=555173
==============================================================================
--- 
jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/bugs/Jira157TestCase.java
 (added)
+++ 
jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/bugs/Jira157TestCase.java
 Tue Jul 10 22:25:07 2007
@@ -0,0 +1,184 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.beanutils.bugs;
+
+import java.io.Serializable;
+import java.util.Map;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Beanutils's describe() method cannot determine reader methods
+ * for anonymous class - see Jira issue# BEANUTILS-157.
+ * <p />
+ * See https://issues.apache.org/jira/browse/BEANUTILS-157
+ * <p />
+ *
+ * @version $Revision$ $Date$
+ */
+public class Jira157TestCase extends TestCase {
+
+    private Log log = LogFactory.getLog(Jira157TestCase.class);
+
+    /**
+     * Create a test case with the specified name.
+     *
+     * @param name The name of the test
+     */
+    public Jira157TestCase(String name) {
+        super(name);
+    }
+
+    /**
+     * Run the Test.
+     *
+     * @param args Arguments
+     */
+    public static void main(String[] args) {
+        junit.textui.TestRunner.run(suite());
+    }
+
+    /**
+     * Create a test suite for this test.
+     *
+     * @return a test suite
+     */
+    public static Test suite() {
+        return (new TestSuite(Jira157TestCase.class));
+    }
+
+    /**
+     * Set up.
+     *
+     * @throws java.lang.Exception
+     */
+    protected void setUp() throws Exception {
+        super.setUp();
+    }
+
+    /**
+     * Tear Down.
+     *
+     * @throws java.lang.Exception
+     */
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+    /**
+     * Test with an private class that overrides a public method
+     * of a "grand parent" public class.
+     * <p />
+     * See Jira issue# BEANUTILS-157.
+     */
+    public void testIssue_BEANUTILS_157_BeanUtils_Describe_Serializable() {
+        Object bean = new Serializable() {
+            public String getX() {
+                return "x-value";
+            }
+            public String getY() {
+                return "y-value";
+            }             
+        };
+        Map result = null;
+        try {
+            result = BeanUtils.describe(bean);
+        } catch (Throwable t) {
+            log.error("Describe Serializable: " + t.getMessage(), t);
+            fail("Describe Serializable Threw exception: " + t);
+        }
+        assertEquals("Check Size", 1, result.size());
+        assertTrue("Class", result.containsKey("class"));
+    }
+
+    /**
+     * Test with an private class that overrides a public method
+     * of a "grand parent" public class.
+     * <p />
+     * See Jira issue# BEANUTILS-157.
+     */
+    public void testIssue_BEANUTILS_157_BeanUtils_Describe_Interface() {
+        Object bean = new XY() {
+            public String getX() {
+                return "x-value";
+            }
+            public String getY() {
+                return "y-value";
+            }             
+        };
+        Map result = null;
+        try {
+            result = BeanUtils.describe(bean);
+        } catch (Throwable t) {
+            log.error("Describe Interface: " + t.getMessage(), t);
+            fail("Describe Interface Threw exception: " + t);
+        }
+        assertEquals("Check Size", 3, result.size());
+        assertTrue("Class", result.containsKey("class"));
+        assertTrue("X Key", result.containsKey("x"));
+        assertTrue("Y Key", result.containsKey("y"));
+        assertEquals("X Value", "x-value", result.get("x"));
+        assertEquals("Y Value", "y-value", result.get("y"));
+    }
+
+    /**
+     * Test with an private class that overrides a public method
+     * of a "grand parent" public class.
+     * <p />
+     * See Jira issue# BEANUTILS-157.
+     */
+    public void testIssue_BEANUTILS_157_BeanUtils_Describe_Bean() {
+        Object bean = new FooBar();
+        Map result = null;
+        try {
+            result = BeanUtils.describe(bean);
+        } catch (Throwable t) {
+            log.error("Describe Bean: " + t.getMessage(), t);
+            fail("Describe Bean Threw exception: " + t);
+        }
+        assertEquals("Check Size", 2, result.size());
+        assertTrue("Class", result.containsKey("class"));
+        assertTrue("publicFoo Key", result.containsKey("publicFoo"));
+        assertEquals("publicFoo Value", "PublicFoo Value", 
result.get("publicFoo"));
+    }
+
+    public static interface XY {
+        String getX();
+        String getY();
+    };
+
+    public static class FooBar {
+        String getPackageFoo() {
+            return "Package Value";
+        }
+        private String getPrivateFoo() {
+            return "PrivateFoo Value";
+        }
+        protected String getProtectedFoo() {
+            return "ProtectedFoo Value";
+        }
+        public String getPublicFoo() {
+            return "PublicFoo Value";
+        }
+    };
+}

Propchange: 
jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/bugs/Jira157TestCase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/bugs/Jira157TestCase.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to