Index: modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/IntrospectorTest.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/IntrospectorTest.java (revision 463563) +++ modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/IntrospectorTest.java (working copy) @@ -1352,21 +1352,41 @@ } public static class Bean3BeanInfo extends SimpleBeanInfo { - } + } - /* - * - */ - public void testGetPropertyDescriptors() throws IntrospectionException { - Class clazz = Bean2.class; - BeanInfo info = Introspector.getBeanInfo(clazz); - // printInfo(info); - PropertyDescriptor[] pds = info.getPropertyDescriptors(); - assertEquals(2, pds.length); - assertEquals("property1", pds[0].getName()); - assertEquals("property8", pds[1].getName()); - } + public void testGetPropertyDescriptors_H1838() + throws IntrospectionException { + // Regression for HARMONY-1838 + PropertyDescriptor[] propertyDescriptors = Introspector.getBeanInfo( + Bean.class).getPropertyDescriptors(); + assertEquals("class", propertyDescriptors[0].getName()); + assertEquals("prop1", propertyDescriptors[1].getName()); + assertEquals("prop2", propertyDescriptors[2].getName()); + assertEquals(3, propertyDescriptors.length); + } + public static class Bean { + public String getProp1(int i) { + return null; + } + + public void setProp2(int i, String str) { + } + } + + /* + * + */ + public void testGetPropertyDescriptors() throws IntrospectionException { + Class clazz = Bean2.class; + BeanInfo info = Introspector.getBeanInfo(clazz); + // printInfo(info); + PropertyDescriptor[] pds = info.getPropertyDescriptors(); + assertEquals(2, pds.length); + assertEquals("property1", pds[0].getName()); + assertEquals("property8", pds[1].getName()); + } + public static class Bean1 { private int i;