You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by sm...@apache.org on 2006/04/19 13:38:25 UTC
svn commit: r395217 - in /incubator/harmony/enhanced/classlib/trunk/modules:
applet/make/common/ archive/make/common/ auth/make/common/ awt/make/common/
beans/make/common/ beans/src/test/java/org/apache/harmony/tests/java/beans/
beans/src/test/resource...
Author: smishura
Date: Wed Apr 19 04:38:21 2006
New Revision: 395217
URL: http://svn.apache.org/viewcvs?rev=395217&view=rev
Log:
Apply updated patch for HARMONY-345 (Fix and enable beans.XMLDecoderTest)
Modified:
incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/hyproperties.xml
incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/hyproperties.xml
incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/hyproperties.xml
incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/hyproperties.xml
incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/hyproperties.xml
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/XMLDecoderTest.java (contents, props changed)
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/resources/xml/Test6.xml (contents, props changed)
incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/hyproperties.xml
incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/hyproperties.xml (contents, props changed)
incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/hyproperties.xml
incubator/harmony/enhanced/classlib/trunk/modules/math/make/common/hyproperties.xml (contents, props changed)
incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/hyproperties.xml
incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/hyproperties.xml
incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/hyproperties.xml (contents, props changed)
incubator/harmony/enhanced/classlib/trunk/modules/regex/make/common/hyproperties.xml
incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/hyproperties.xml
incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/hyproperties.xml
incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/hyproperties.xml (contents, props changed)
incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/hyproperties.xml
incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/hyproperties.xml
Modified: incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/hyproperties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/hyproperties.xml?rev=395217&r1=395216&r2=395217&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/hyproperties.xml Wed Apr 19 04:38:21 2006
@@ -24,7 +24,7 @@
</main>
<test>
<java location="src/test/java" />
- <resources location="src/main/resources" />
+ <resources location="src/test/resources" />
</test>
<natives location="src/natives" />
</src>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/hyproperties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/hyproperties.xml?rev=395217&r1=395216&r2=395217&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/hyproperties.xml Wed Apr 19 04:38:21 2006
@@ -24,7 +24,7 @@
</main>
<test>
<java location="src/test/java" />
- <resources location="src/main/resources" />
+ <resources location="src/test/resources" />
</test>
<natives location="src/natives" />
</src>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/hyproperties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/hyproperties.xml?rev=395217&r1=395216&r2=395217&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/hyproperties.xml Wed Apr 19 04:38:21 2006
@@ -24,7 +24,7 @@
</main>
<test>
<java location="src/test/java/common" />
- <resources location="src/main/resources" />
+ <resources location="src/test/resources" />
</test>
<natives location="src/natives" />
</src>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/hyproperties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/hyproperties.xml?rev=395217&r1=395216&r2=395217&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/hyproperties.xml Wed Apr 19 04:38:21 2006
@@ -24,7 +24,7 @@
</main>
<test>
<java location="src/test/java" />
- <resources location="src/main/resources" />
+ <resources location="src/test/resources" />
</test>
<natives location="src/natives" />
</src>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/build.xml?rev=395217&r1=395216&r2=395217&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/build.xml Wed Apr 19 04:38:21 2006
@@ -88,6 +88,7 @@
<classpath>
<pathelement path="${hy.beans.bin.test}"/>
+ <pathelement path="${hy.beans.src.test.resources}"/>
</classpath>
<classpath location="../../../../build/tests" />
@@ -104,8 +105,6 @@
<exclude name="**/PropertyChangeSupportTest.java" />
<exclude name="**/SimpleBeanInfoTest.java" />
<exclude name="**/VetoableChangeSupportTest.java" />
- <exclude name="**/XMLDecoderTest.java" />
- <exclude name="**/XMLEncoderTest.java" />
<exclude name="tests/api/java/beans/BeanDescriptorTest.java" />
<exclude name="tests/api/java/beans/CustomizedPersistenceDelegateTest.java" />
@@ -127,6 +126,8 @@
<exclude name="tests/api/java/beans/PropertyVetoExceptionTest.java" />
<exclude name="tests/api/java/beans/StatementTest.java" />
<exclude name="tests/api/java/beans/VetoableChangeListenerProxyTest.java" />
+ <exclude name="tests/api/java/beans/XMLDecoderTest.java" />
+ <exclude name="tests/api/java/beans/XMLEncoderTest.java" />
<exclude name="tests/api/java/beans/beancontext/BeanContextChildSupportTest.java" />
<exclude name="tests/api/java/beans/beancontext/BeanContextMembershipEventTest.java" />
<exclude name="tests/api/java/beans/beancontext/BeanContextServiceAvailableEventTest.java" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/hyproperties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/hyproperties.xml?rev=395217&r1=395216&r2=395217&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/hyproperties.xml Wed Apr 19 04:38:21 2006
@@ -20,11 +20,11 @@
<src>
<main>
<java location="src/main/java" />
- <resources location="src/main/resources" />
+ <resources location="src/main/resources" />
</main>
<test>
<java location="src/test/java" />
- <resources location="src/main/resources" />
+ <resources location="src/test/resources" />
</test>
<natives location="src/natives" />
</src>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/XMLDecoderTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/XMLDecoderTest.java?rev=395217&r1=395216&r2=395217&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/XMLDecoderTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/XMLDecoderTest.java Wed Apr 19 04:38:21 2006
@@ -56,56 +56,56 @@
* The test checks the code generation for XML from Test1.xml
*/
public void testDecodeLinkedList() {
- decode("/java/beans/xml/Test1.xml");
+ decode("xml/Test1.xml");
}
/**
* The test checks the code generation for XML from Test2.xml
*/
public void testDecodePrimitiveArrayByLength() {
- decode("/java/beans/xml/Test2.xml");
+ decode("xml/Test2.xml");
}
/**
* The test checks the code generation for XML from Test3.xml
*/
public void testDecodePrimitiveArrayByElements() {
- decode("/java/beans/xml/Test3.xml");
+ decode("xml/Test3.xml");
}
/**
* The test checks the code generation for XML from Test4.xml
*/
public void testDecodeObjectArrayByLength() {
- decode("/java/beans/xml/Test4.xml");
+ decode("xml/Test4.xml");
}
/**
* The test checks the code generation for XML from Test5.xml
*/
public void testDecodeObjectArrayByElements() {
- decode("/java/beans/xml/Test5.xml");
+ decode("xml/Test5.xml");
}
/**
* The test checks the code generation for XML from Test6.xml
*/
public void testDecodeReference() {
- decode("/java/beans/xml/Test6.xml");
+ decode("xml/Test6.xml");
}
/**
* The test checks the code generation for XML from Test7.xml
*/
public void testDecodeStringArray() {
- decode("/java/beans/xml/Test7.xml");
+ decode("xml/Test7.xml");
}
/*
* The test checks the code generation for XML from MainTest.xml
*
public void testMain() {
- decode("/java/beans/xml/MainTest.xml");
+ decode("xml/MainTest.xml");
}
*/
@@ -131,7 +131,7 @@
try {
Introspector.setBeanInfoSearchPath(new String[] {});
d = new XMLDecoder(new BufferedInputStream(
- FileInputStream.class.getResourceAsStream(resourceName)));
+ ClassLoader.getSystemClassLoader().getResourceAsStream(resourceName)));
while(true) {
Object obj = d.readObject();
}
Propchange: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/XMLDecoderTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/resources/xml/Test6.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/resources/xml/Test6.xml?rev=395217&r1=395216&r2=395217&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/resources/xml/Test6.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/resources/xml/Test6.xml Wed Apr 19 04:38:21 2006
@@ -20,11 +20,11 @@
Version: $Revision: 1.1.6.3 $
-->
<java version="1.4.2_04" class="java.beans.XMLDecoder">
- <object id="SampleBean0" class="java.beans.auxiliary.SampleBean">
+ <object id="SampleBean0" class="org.apache.harmony.tests.java.beans.auxiliary.SampleBean">
<void property="object">
- <object id="SampleBean1" class="java.beans.auxiliary.SampleBean">
+ <object id="SampleBean1" class="org.apache.harmony.tests.java.beans.auxiliary.SampleBean">
<void property="object">
- <object id="SampleBean2" class="java.beans.auxiliary.SampleBean">
+ <object id="SampleBean2" class="org.apache.harmony.tests.java.beans.auxiliary.SampleBean">
<void property="object">
<object idref="SampleBean0"/>
</void>
@@ -61,4 +61,4 @@
</object>
<object idref="SampleBean1"/>
<object idref="SampleBean2"/>
-</java>
\ No newline at end of file
+</java>
Propchange: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/resources/xml/Test6.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/hyproperties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/hyproperties.xml?rev=395217&r1=395216&r2=395217&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/hyproperties.xml Wed Apr 19 04:38:21 2006
@@ -24,7 +24,7 @@
</main>
<test>
<java location="src/test/java" />
- <resources location="src/main/resources" />
+ <resources location="src/test/resources" />
</test>
<natives location="src/natives" />
</src>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/hyproperties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/hyproperties.xml?rev=395217&r1=395216&r2=395217&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/hyproperties.xml Wed Apr 19 04:38:21 2006
@@ -24,7 +24,7 @@
</main>
<test>
<java location="src/test/java" />
- <resources location="src/main/resources" />
+ <resources location="src/test/resources" />
</test>
<natives location="src/natives" />
</src>
Propchange: incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/hyproperties.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/hyproperties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/hyproperties.xml?rev=395217&r1=395216&r2=395217&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/hyproperties.xml Wed Apr 19 04:38:21 2006
@@ -24,7 +24,7 @@
</main>
<test>
<java location="src/test/java" />
- <resources location="src/main/resources" />
+ <resources location="src/test/resources" />
<injected location="src/test/java.injected" />
</test>
<natives location="src/natives" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/math/make/common/hyproperties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/math/make/common/hyproperties.xml?rev=395217&r1=395216&r2=395217&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/math/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/math/make/common/hyproperties.xml Wed Apr 19 04:38:21 2006
@@ -24,7 +24,7 @@
</main>
<test>
<java location="src/test/java" />
- <resources location="src/main/resources" />
+ <resources location="src/test/resources" />
</test>
<natives location="src/natives" />
</src>
Propchange: incubator/harmony/enhanced/classlib/trunk/modules/math/make/common/hyproperties.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/hyproperties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/hyproperties.xml?rev=395217&r1=395216&r2=395217&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/hyproperties.xml Wed Apr 19 04:38:21 2006
@@ -24,7 +24,7 @@
</main>
<test>
<java location="src/test/java" />
- <resources location="src/main/resources" />
+ <resources location="src/test/resources" />
</test>
<natives location="src/natives" />
</src>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/hyproperties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/hyproperties.xml?rev=395217&r1=395216&r2=395217&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/hyproperties.xml Wed Apr 19 04:38:21 2006
@@ -24,7 +24,7 @@
</main>
<test>
<java location="src/test/java" />
- <resources location="src/main/resources" />
+ <resources location="src/test/resources" />
</test>
<natives location="src/natives" />
</src>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/hyproperties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/hyproperties.xml?rev=395217&r1=395216&r2=395217&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/hyproperties.xml Wed Apr 19 04:38:21 2006
@@ -24,7 +24,7 @@
</main>
<test>
<java location="src/test/java" />
- <resources location="src/main/resources" />
+ <resources location="src/test/resources" />
</test>
<natives location="src/natives" />
</src>
Propchange: incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/hyproperties.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/make/common/hyproperties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/regex/make/common/hyproperties.xml?rev=395217&r1=395216&r2=395217&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/make/common/hyproperties.xml Wed Apr 19 04:38:21 2006
@@ -24,7 +24,7 @@
</main>
<test>
<java location="src/test/java" />
- <resources location="src/main/resources" />
+ <resources location="src/test/resources" />
</test>
<natives location="src/natives" />
</src>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/hyproperties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/hyproperties.xml?rev=395217&r1=395216&r2=395217&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/hyproperties.xml Wed Apr 19 04:38:21 2006
@@ -24,7 +24,7 @@
</main>
<test>
<java location="src/test/java" />
- <resources location="src/main/resources" />
+ <resources location="src/test/resources" />
</test>
<natives location="src/natives" />
</src>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/hyproperties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/hyproperties.xml?rev=395217&r1=395216&r2=395217&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/hyproperties.xml Wed Apr 19 04:38:21 2006
@@ -24,7 +24,7 @@
</main>
<test>
<java location="src/test/java/common" />
- <resources location="src/main/resources" />
+ <resources location="src/test/resources" />
</test>
<natives location="src/natives" />
</src>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/hyproperties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/hyproperties.xml?rev=395217&r1=395216&r2=395217&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/hyproperties.xml Wed Apr 19 04:38:21 2006
@@ -24,7 +24,7 @@
</main>
<test>
<java location="src/test/java" />
- <resources location="src/main/resources" />
+ <resources location="src/test/resources" />
</test>
<natives location="src/natives" />
</src>
Propchange: incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/hyproperties.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/hyproperties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/hyproperties.xml?rev=395217&r1=395216&r2=395217&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/hyproperties.xml Wed Apr 19 04:38:21 2006
@@ -24,7 +24,7 @@
</main>
<test>
<java location="src/test/java" />
- <resources location="src/main/resources" />
+ <resources location="src/test/resources" />
</test>
<natives location="src/natives" />
</src>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/hyproperties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/hyproperties.xml?rev=395217&r1=395216&r2=395217&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/hyproperties.xml Wed Apr 19 04:38:21 2006
@@ -24,7 +24,7 @@
</main>
<test>
<java location="src/test/java" />
- <resources location="src/main/resources" />
+ <resources location="src/test/resources" />
</test>
<natives location="src/natives" />
</src>