You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by cs...@apache.org on 2006/07/07 19:02:13 UTC
svn commit: r419924 [1/4] - in /beehive/trunk/controls/test: ./
src/junit-tests/org/apache/beehive/controls/test/junit/beaninfo/
src/junit-tests/org/apache/beehive/controls/test/junit/inherit/
Author: cschoett
Date: Fri Jul 7 10:02:12 2006
New Revision: 419924
URL: http://svn.apache.org/viewvc?rev=419924&view=rev
Log:
updated beaninfo files which were causing an error during the checkin tests.
Modified:
beehive/trunk/controls/test/build.xml
beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/beaninfo/BeanInfoTest.java
beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/beaninfo/InfoTestBean.beaninfo
beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/inherit/Ext1Bean.beaninfo
beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/inherit/Ext2Bean.beaninfo
beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/inherit/Intf1Bean.beaninfo
beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/inherit/Intf2Bean.beaninfo
Modified: beehive/trunk/controls/test/build.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/controls/test/build.xml?rev=419924&r1=419923&r2=419924&view=diff
==============================================================================
--- beehive/trunk/controls/test/build.xml (original)
+++ beehive/trunk/controls/test/build.xml Fri Jul 7 10:02:12 2006
@@ -485,19 +485,20 @@
<target name="update.beaninfo" description="Refresh the .beaninfo files used to test BeanInfo creation during Controls testing.">
<path id="beaninfo.path">
- <pathelement path="../build/jars/beehive-controls.jar"/>
- <pathelement path="${build.beans}"/>
+ <pathelement path="${build.dir}/beehive-controls-junit-tests.jar"/>
+ <pathelement location="${build.dir}/junit-tests-classes"/>
+ <path refid="test-junit.dependency.path"/>
</path>
- <gen-beaninfo beaninfo="src/units/org/apache/beehive/controls/test/java/beaninfo/InfoTestBean.beaninfo"
+ <gen-beaninfo beaninfo="src/junit-tests/org/apache/beehive/controls/test/junit/beaninfo/InfoTestBean.beaninfo"
beanclass="org.apache.beehive.controls.test.controls.beaninfo.InfoTestBean"/>
- <gen-beaninfo beaninfo="src/units/org/apache/beehive/controls/test/java/inherit/Intf1Bean.beaninfo"
+ <gen-beaninfo beaninfo="src/junit-tests/org/apache/beehive/controls/test/junit/inherit/Intf1Bean.beaninfo"
beanclass="org.apache.beehive.controls.test.controls.inherit.Intf1Bean"/>
- <gen-beaninfo beaninfo="src/units/org/apache/beehive/controls/test/java/inherit/Intf2Bean.beaninfo"
+ <gen-beaninfo beaninfo="src/junit-tests/org/apache/beehive/controls/test/junit/inherit/Intf2Bean.beaninfo"
beanclass="org.apache.beehive.controls.test.controls.inherit.Intf2Bean"/>
- <gen-beaninfo beaninfo="src/units/org/apache/beehive/controls/test/java/inherit/Ext1Bean.beaninfo"
+ <gen-beaninfo beaninfo="src/junit-tests/org/apache/beehive/controls/test/junit/inherit/Ext1Bean.beaninfo"
beanclass="org.apache.beehive.controls.test.controls.inherit.Ext1Bean"/>
- <gen-beaninfo beaninfo="src/units/org/apache/beehive/controls/test/java/inherit/Ext2Bean.beaninfo"
+ <gen-beaninfo beaninfo="src/junit-tests/org/apache/beehive/controls/test/junit/inherit/Ext2Bean.beaninfo"
beanclass="org.apache.beehive.controls.test.controls.inherit.Ext2Bean"/>
</target>
@@ -627,7 +628,7 @@
<attribute name="beaninfo"/>
<attribute name="beanclass"/>
<sequential>
- <java classname="org.apache.beehive.controls.test.controls.util.ControlIntrospector" classpathref="beaninfo.path" fork="yes">
+ <java classname="org.apache.beehive.controls.test.junit.utils.ControlIntrospector" classpathref="beaninfo.path" fork="yes">
<arg line="-outputPath @{beaninfo} @{beanclass}"/>
</java>
</sequential>
Modified: beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/beaninfo/BeanInfoTest.java
URL: http://svn.apache.org/viewvc/beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/beaninfo/BeanInfoTest.java?rev=419924&r1=419923&r2=419924&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/beaninfo/BeanInfoTest.java (original)
+++ beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/beaninfo/BeanInfoTest.java Fri Jul 7 10:02:12 2006
@@ -55,7 +55,7 @@
InputStream valid = null;
InputStream current = null;
try {
- valid = this.getClass().getClassLoader().getResourceAsStream(org.apache.beehive.controls.test.junit.beaninfo.BeanInfoTest.BEANINFO);
+ valid = this.getClass().getClassLoader().getResourceAsStream(BEANINFO);
assertNotNull(valid);
current = new FileInputStream(tempFile);
Modified: beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/beaninfo/InfoTestBean.beaninfo
URL: http://svn.apache.org/viewvc/beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/beaninfo/InfoTestBean.beaninfo?rev=419924&r1=419923&r2=419924&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/beaninfo/InfoTestBean.beaninfo (original)
+++ beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/beaninfo/InfoTestBean.beaninfo Fri Jul 7 10:02:12 2006
@@ -1,196 +1,196 @@
-<bean-info name="org.apache.beehive.controls.test.controls.beaninfo.InfoTestBean">
- <bean-descriptor name="InfoTest display name">
- <feature-descriptor name="InfoTest display name"
- full-name="InfoTest name"
- is-expert=false
- is-hidden=false
- is-preferred=false>
- <short-description>
-
- </short-description>
- <attributes>
- <attribute name="persistenceDelegate" value="org.apache.beehive.controls.runtime.bean.BeanPersistenceDelegate@">
- </attributes>
- </feature-descriptor>
- <bean-class>
- org.apache.beehive.controls.test.controls.beaninfo.InfoTestBean
- </bean-class>
- </bean-descriptor>
- <method-descriptors>
- <method-descriptor name="infoTestMethod display name"
- <method>
- public abstract void org.apache.beehive.controls.test.controls.beaninfo.InfoTest.infoTestMethod(int,java.lang.Class)
- </method>
- <parameter-descriptors>
- <parameter-descriptor name="anIntArg">
- <feature-descriptor name="anIntArg"
- full-name="anIntArg"
- is-expert=false
- is-hidden=false
- is-preferred=false>
- <short-description>
- anIntArg
- </short-description>
- </feature-descriptor>
- </parameter-descriptor>
- <parameter-descriptor name="aClassArg">
- <feature-descriptor name="aClassArg"
- full-name="aClassArg"
- is-expert=false
- is-hidden=false
- is-preferred=false>
- <short-description>
- aClassArg
- </short-description>
- </feature-descriptor>
- </parameter-descriptor>
- </parameter-descriptors>
- <feature-descriptor name="infoTestMethod display name"
- full-name="infoTestMethod name"
- is-expert=true
- is-hidden=true
- is-preferred=false>
- <short-description>
-
- </short-description>
- </feature-descriptor>
- </method-descriptor>
- </method-descriptors>
- <property-descriptors default-index=-1>
- <property-descriptor name="InfoTest prop1">
- type="int"
- isBound=true
- isConstrained=false
- isDefault=false>
- <read-method>
- public int org.apache.beehive.controls.test.controls.beaninfo.InfoTestBean.getProp1()
- </read-method>
- <write-method>
- public synchronized void org.apache.beehive.controls.test.controls.beaninfo.InfoTestBean.setProp1(int)
- </write-method>
- <feature-descriptor name="InfoTest prop1"
- full-name="InfoTest prop1"
- is-expert=false
- is-hidden=false
- is-preferred=false>
- <short-description>
-
- </short-description>
- </feature-descriptor>
- </property-descriptor>
- <property-descriptor name="controlImplementation">
- type="java.lang.String"
- isBound=false
- isConstrained=false
- isDefault=false>
- <read-method>
- public java.lang.String org.apache.beehive.controls.test.controls.beaninfo.InfoTestBean.getControlImplementation()
- </read-method>
- <write-method>
- public synchronized void org.apache.beehive.controls.test.controls.beaninfo.InfoTestBean.setControlImplementation(java.lang.String)
- </write-method>
- <feature-descriptor name="controlImplementation"
- full-name="controlImplementation"
- is-expert=false
- is-hidden=false
- is-preferred=false>
- <short-description>
- controlImplementation
- </short-description>
- </feature-descriptor>
- </property-descriptor>
- <property-descriptor name="prop2">
- type="boolean"
- isBound=false
- isConstrained=false
- isDefault=false>
- <read-method>
- public boolean org.apache.beehive.controls.test.controls.beaninfo.InfoTestBean.isProp2()
- </read-method>
- <write-method>
- public synchronized void org.apache.beehive.controls.test.controls.beaninfo.InfoTestBean.setProp2(boolean)
- </write-method>
- <feature-descriptor name="prop2"
- full-name="prop2"
- is-expert=false
- is-hidden=false
- is-preferred=false>
- <short-description>
- prop2
- </short-description>
- </feature-descriptor>
- </property-descriptor>
- </property-descriptors>
- <event-set-descriptors default-index=-1>
- <event-descriptor name="testEvents"
- is-unicast=true
- is-in-default=true
- is-default=false>
- <listener-type>
- org.apache.beehive.controls.test.controls.beaninfo.InfoTest$TestEvents
- </listener-type>
- <add-listener-method>
- public synchronized void org.apache.beehive.controls.test.controls.beaninfo.InfoTestBean.addTestEventsListener(org.apache.beehive.controls.test.controls.beaninfo.InfoTest$TestEvents) throws java.util.TooManyListenersException
- </add-listener-method>
- <remove-listener-method>
- public synchronized void org.apache.beehive.controls.test.controls.beaninfo.InfoTestBean.removeTestEventsListener(org.apache.beehive.controls.test.controls.beaninfo.InfoTest$TestEvents)
- </remove-listener-method>
- <get-listener-method>
- public synchronized org.apache.beehive.controls.test.controls.beaninfo.InfoTest$TestEvents[] org.apache.beehive.controls.test.controls.beaninfo.InfoTestBean.getTestEventsListeners()
- </get-listener-method>
- <listener-method-descriptors>
- <method-descriptor name="InfoTest eventMethod1"
- <method>
- public abstract void org.apache.beehive.controls.test.controls.beaninfo.InfoTest$TestEvents.eventMethod1()
- </method>
- <param-descriptors/>
- <feature-descriptor name="InfoTest eventMethod1"
- full-name="InfoTest eventMethod1"
- is-expert=true
- is-hidden=true
- is-preferred=false>
- <short-description>
-
- </short-description>
- </feature-descriptor>
- </method-descriptor>
- <method-descriptor name="eventMethod2"
- <method>
- public abstract int org.apache.beehive.controls.test.controls.beaninfo.InfoTest$TestEvents.eventMethod2(java.lang.String)
- </method>
- <parameter-descriptors>
- <parameter-descriptor name="stringArg">
- <feature-descriptor name="stringArg"
- full-name="stringArg"
- is-expert=false
- is-hidden=false
- is-preferred=false>
- <short-description>
- stringArg
- </short-description>
- </feature-descriptor>
- </parameter-descriptor>
- </parameter-descriptors>
- <feature-descriptor name="eventMethod2"
- full-name="eventMethod2"
- is-expert=false
- is-hidden=false
- is-preferred=false>
- <short-description>
- eventMethod2
- </short-description>
- </feature-descriptor>
- </method-descriptor>
- </listener-method-descriptors>
- <feature-descriptor name="testEvents"
- full-name="testEvents"
- is-expert=false
- is-hidden=false
- is-preferred=false>
- <short-description>
- testEvents
- </short-description>
- </feature-descriptor>
- </event-set-descriptors>
- <additional-bean-info/>
-</bean-info>
+<bean-info name="org.apache.beehive.controls.test.controls.beaninfo.InfoTestBean">
+ <bean-descriptor name="InfoTest display name">
+ <feature-descriptor name="InfoTest display name"
+ full-name="InfoTest name"
+ is-expert=false
+ is-hidden=false
+ is-preferred=false>
+ <short-description>
+
+ </short-description>
+ <attributes>
+ <attribute name="persistenceDelegate" value="org.apache.beehive.controls.runtime.bean.BeanPersistenceDelegate@">
+ </attributes>
+ </feature-descriptor>
+ <bean-class>
+ org.apache.beehive.controls.test.controls.beaninfo.InfoTestBean
+ </bean-class>
+ </bean-descriptor>
+ <method-descriptors>
+ <method-descriptor name="infoTestMethod display name"
+ <method>
+ public abstract void org.apache.beehive.controls.test.controls.beaninfo.InfoTest.infoTestMethod(int,java.lang.Class)
+ </method>
+ <parameter-descriptors>
+ <parameter-descriptor name="anIntArg">
+ <feature-descriptor name="anIntArg"
+ full-name="anIntArg"
+ is-expert=false
+ is-hidden=false
+ is-preferred=false>
+ <short-description>
+ anIntArg
+ </short-description>
+ </feature-descriptor>
+ </parameter-descriptor>
+ <parameter-descriptor name="aClassArg">
+ <feature-descriptor name="aClassArg"
+ full-name="aClassArg"
+ is-expert=false
+ is-hidden=false
+ is-preferred=false>
+ <short-description>
+ aClassArg
+ </short-description>
+ </feature-descriptor>
+ </parameter-descriptor>
+ </parameter-descriptors>
+ <feature-descriptor name="infoTestMethod display name"
+ full-name="infoTestMethod name"
+ is-expert=true
+ is-hidden=true
+ is-preferred=false>
+ <short-description>
+
+ </short-description>
+ </feature-descriptor>
+ </method-descriptor>
+ </method-descriptors>
+ <property-descriptors default-index=-1>
+ <property-descriptor name="InfoTest prop1">
+ type="int"
+ isBound=true
+ isConstrained=false
+ isDefault=false>
+ <read-method>
+ public int org.apache.beehive.controls.test.controls.beaninfo.InfoTestBean.getProp1()
+ </read-method>
+ <write-method>
+ public synchronized void org.apache.beehive.controls.test.controls.beaninfo.InfoTestBean.setProp1(int)
+ </write-method>
+ <feature-descriptor name="InfoTest prop1"
+ full-name="InfoTest prop1"
+ is-expert=false
+ is-hidden=false
+ is-preferred=false>
+ <short-description>
+
+ </short-description>
+ </feature-descriptor>
+ </property-descriptor>
+ <property-descriptor name="controlImplementation">
+ type="java.lang.String"
+ isBound=false
+ isConstrained=false
+ isDefault=false>
+ <read-method>
+ public java.lang.String org.apache.beehive.controls.test.controls.beaninfo.InfoTestBean.getControlImplementation()
+ </read-method>
+ <write-method>
+ public synchronized void org.apache.beehive.controls.test.controls.beaninfo.InfoTestBean.setControlImplementation(java.lang.String)
+ </write-method>
+ <feature-descriptor name="controlImplementation"
+ full-name="controlImplementation"
+ is-expert=false
+ is-hidden=false
+ is-preferred=false>
+ <short-description>
+ controlImplementation
+ </short-description>
+ </feature-descriptor>
+ </property-descriptor>
+ <property-descriptor name="prop2">
+ type="boolean"
+ isBound=false
+ isConstrained=false
+ isDefault=false>
+ <read-method>
+ public boolean org.apache.beehive.controls.test.controls.beaninfo.InfoTestBean.isProp2()
+ </read-method>
+ <write-method>
+ public synchronized void org.apache.beehive.controls.test.controls.beaninfo.InfoTestBean.setProp2(boolean)
+ </write-method>
+ <feature-descriptor name="prop2"
+ full-name="prop2"
+ is-expert=false
+ is-hidden=false
+ is-preferred=false>
+ <short-description>
+ prop2
+ </short-description>
+ </feature-descriptor>
+ </property-descriptor>
+ </property-descriptors>
+ <event-set-descriptors default-index=-1>
+ <event-descriptor name="testEvents"
+ is-unicast=true
+ is-in-default=true
+ is-default=false>
+ <listener-type>
+ org.apache.beehive.controls.test.controls.beaninfo.InfoTest$TestEvents
+ </listener-type>
+ <add-listener-method>
+ public synchronized void org.apache.beehive.controls.test.controls.beaninfo.InfoTestBean.addTestEventsListener(org.apache.beehive.controls.test.controls.beaninfo.InfoTest$TestEvents) throws java.util.TooManyListenersException
+ </add-listener-method>
+ <remove-listener-method>
+ public synchronized void org.apache.beehive.controls.test.controls.beaninfo.InfoTestBean.removeTestEventsListener(org.apache.beehive.controls.test.controls.beaninfo.InfoTest$TestEvents)
+ </remove-listener-method>
+ <get-listener-method>
+ public synchronized org.apache.beehive.controls.test.controls.beaninfo.InfoTest$TestEvents[] org.apache.beehive.controls.test.controls.beaninfo.InfoTestBean.getTestEventsListeners()
+ </get-listener-method>
+ <listener-method-descriptors>
+ <method-descriptor name="InfoTest eventMethod1"
+ <method>
+ public abstract void org.apache.beehive.controls.test.controls.beaninfo.InfoTest$TestEvents.eventMethod1()
+ </method>
+ <param-descriptors/>
+ <feature-descriptor name="InfoTest eventMethod1"
+ full-name="InfoTest eventMethod1"
+ is-expert=true
+ is-hidden=true
+ is-preferred=false>
+ <short-description>
+
+ </short-description>
+ </feature-descriptor>
+ </method-descriptor>
+ <method-descriptor name="eventMethod2"
+ <method>
+ public abstract int org.apache.beehive.controls.test.controls.beaninfo.InfoTest$TestEvents.eventMethod2(java.lang.String)
+ </method>
+ <parameter-descriptors>
+ <parameter-descriptor name="stringArg">
+ <feature-descriptor name="stringArg"
+ full-name="stringArg"
+ is-expert=false
+ is-hidden=false
+ is-preferred=false>
+ <short-description>
+ stringArg
+ </short-description>
+ </feature-descriptor>
+ </parameter-descriptor>
+ </parameter-descriptors>
+ <feature-descriptor name="eventMethod2"
+ full-name="eventMethod2"
+ is-expert=false
+ is-hidden=false
+ is-preferred=false>
+ <short-description>
+ eventMethod2
+ </short-description>
+ </feature-descriptor>
+ </method-descriptor>
+ </listener-method-descriptors>
+ <feature-descriptor name="testEvents"
+ full-name="testEvents"
+ is-expert=false
+ is-hidden=false
+ is-preferred=false>
+ <short-description>
+ testEvents
+ </short-description>
+ </feature-descriptor>
+ </event-set-descriptors>
+ <additional-bean-info/>
+</bean-info>