You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by gh...@apache.org on 2006/05/15 11:41:12 UTC
svn commit: r406595 [3/6] - in
/incubator/harmony/enhanced/classlib/trunk/modules/beans: ./ make/common/
src/main/java/org/apache/harmony/beans/ src/test/java-internal/
src/test/java-internal/java/ src/test/java-internal/java/beans/
src/test/java-inter...
Copied: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyChangeListenerProxyTest.java (from r405685, incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/PropertyChangeListenerProxyTest.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyChangeListenerProxyTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyChangeListenerProxyTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/PropertyChangeListenerProxyTest.java&r1=405685&r2=406595&rev=406595&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/PropertyChangeListenerProxyTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyChangeListenerProxyTest.java Mon May 15 02:40:33 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.beans;
+package org.apache.harmony.beans.tests.java.beans;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyChangeListenerTest.java (from r405685, incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/PropertyChangeListenerTest.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyChangeListenerTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyChangeListenerTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/PropertyChangeListenerTest.java&r1=405685&r2=406595&rev=406595&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/PropertyChangeListenerTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyChangeListenerTest.java Mon May 15 02:40:33 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.beans;
+package org.apache.harmony.beans.tests.java.beans;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyChangeSupportTest.java (from r405685, incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/PropertyChangeSupportTest.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyChangeSupportTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyChangeSupportTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/PropertyChangeSupportTest.java&r1=405685&r2=406595&rev=406595&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/PropertyChangeSupportTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyChangeSupportTest.java Mon May 15 02:40:33 2006
@@ -13,18 +13,30 @@
* limitations under the License.
*/
-package tests.api.java.beans;
+package org.apache.harmony.beans.tests.java.beans;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeListenerProxy;
import java.beans.PropertyChangeSupport;
import java.io.Serializable;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+
import java.util.Arrays;
+import junit.framework.Test;
import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
import tests.util.SerializationTester;
+import org.apache.harmony.beans.tests.java.beans.auxiliary.SerializablePropertyChangeListener;
+import org.apache.harmony.beans.tests.java.beans.auxiliary.NonSerializablePropertyChangeListener;
+
/**
* Test class PropertyeChangeSupport.
*/
@@ -1264,7 +1276,7 @@
PropertyChangeSupport deSup = (PropertyChangeSupport) SerializationTester
.readObject(sup,
- "tests/api/java/beans/PropertyChangeSupport.ser");
+ "serialization/java/beans/PropertyChangeSupport.ser");
assertEquals(sup2.getPropertyChangeListeners()[0], deSup
.getPropertyChangeListeners()[0]);
assertEquals(((PropertyChangeListenerProxy) sup2
@@ -1345,4 +1357,161 @@
public void propertyChange(PropertyChangeEvent event) {
}
}
+
+
+ /**
+ * @tests java.beans.PropertyChangeSupport#PropertyChangeSupport(
+ * java.lang.Object)
+ */
+ public void testConstructor_Null() {
+ // Regression for HARMONY-227
+ try {
+ new PropertyChangeSupport(null);
+ fail("Should throw NullPointerException!");
+ } catch (NullPointerException ex) {
+ // expected
+ }
+ }
+
+ /**
+ * @tests java.beans.PropertyChangeSupport#addPropertyChangeSupport
+ *
+ */
+ public void test_addPropertyChangeListenerNullNull() throws Exception {
+ // Regression for HARMONY-441
+ new PropertyChangeSupport("bean1")
+ .addPropertyChangeListener(null, null);
+ }
+
+ /**
+ * @tests java.beans.PropertyChangeSupport#removePropertyChangeListener(
+ * java.lang.String, java.beans.PropertyChangeListener)
+ */
+ public void testRemovePropertyChangeListener() {
+ // Regerssion for HARMONY-386
+ PropertyChangeSupport prop = new PropertyChangeSupport(new Object());
+
+ PropertyChangeListener lis1 = new PropertyChangeListener() {
+ public void propertyChange(PropertyChangeEvent event) {}
+ };
+
+ PropertyChangeListener lis2 = new PropertyChangeListenerProxy("name",
+ lis1);
+
+ assertEquals(0, prop.getPropertyChangeListeners().length);
+
+ prop.addPropertyChangeListener(lis2);
+ assertEquals(1, prop.getPropertyChangeListeners().length);
+
+ prop.removePropertyChangeListener("name", lis1);
+ assertEquals(0, prop.getPropertyChangeListeners().length);
+ }
+
+
+ /**
+ * @tests java.beans.PropertyChangeSupport#removePropertyChangeListener(
+ * java.lang.String, java.beans.PropertyChangeListener)
+ */
+ public void testRemovePropertyChangeListener2() {
+ // Regerssion for HARMONY-320
+ PropertyChangeListener listener = new PropertyChangeListener() {
+ public void propertyChange(PropertyChangeEvent arg0) {}
+ };
+
+ PropertyChangeSupport pcs = new PropertyChangeSupport(this);
+
+ pcs.addPropertyChangeListener("property", listener);
+ PropertyChangeListener[] listeners = pcs.getPropertyChangeListeners();
+ assertEquals(1, listeners.length);
+
+ pcs.removePropertyChangeListener(listeners[0]);
+ listeners = pcs.getPropertyChangeListeners();
+ assertEquals(0, listeners.length);
+ }
+
+
+ /**
+ * The test checks the serialization for listeners supporting serialization
+ */
+ public void testSerializableListener() {
+ writePropertyChangeListeners(new PropertyChangeListener[] {
+ new SerializablePropertyChangeListener()
+ });
+ PropertyChangeListener[] pcls = readPropertyChangeListeners();
+ }
+
+ /**
+ * The test checks the serialization for listeners not supporting
+ * serialization
+ */
+ public void testNonSerializableListener() {
+ writePropertyChangeListeners(new PropertyChangeListener[] {
+ new NonSerializablePropertyChangeListener()
+ });
+ PropertyChangeListener[] pcls = readPropertyChangeListeners();
+ }
+
+ /**
+ *
+ */
+ public static Test suite() {
+ return new TestSuite(PropertyChangeSupportTest.class);
+ }
+
+ /**
+ *
+ */
+ public static void main(String[] args) {
+ TestRunner.run(suite());
+ }
+
+ private void writePropertyChangeListeners(PropertyChangeListener[] array) {
+ ObjectOutputStream oos = null;
+ try {
+ oos = new ObjectOutputStream(new FileOutputStream("x.ser"));
+ PropertyChangeSupport pcs = new PropertyChangeSupport("bean");
+ if(array != null && array.length > 0) {
+ for(int i = 0; i < array.length; ++i) {
+ pcs.addPropertyChangeListener(array[i]);
+ }
+ }
+ oos.writeObject(pcs);
+ oos.flush();
+ } catch (Exception e) {
+ System.out.println(e.getClass() + ": " + e.getMessage());
+ fail("Exception is thrown in testNonSerializableListener");
+ } finally {
+ if(oos != null) {
+ try {
+ oos.close();
+ } catch (IOException ioe) {
+ fail("Exception while closing ObjectOutputStream");
+ }
+ }
+ }
+ }
+
+ private PropertyChangeListener[] readPropertyChangeListeners() {
+ ObjectInputStream ois = null;
+ PropertyChangeSupport pcs = null;
+ try {
+ ois = new ObjectInputStream(new FileInputStream("x.ser"));
+ pcs = (PropertyChangeSupport) ois.readObject();
+ } catch (Exception e) {
+ System.out.println(e.getClass() + ": " + e.getMessage());
+ fail("Exception is thrown in testNonSerializableListener while "
+ + "reading");
+ } finally {
+ if(ois != null) {
+ try {
+ ois.close();
+ } catch (IOException ioe) {
+ fail("Exception while closing ObjectInputStream");
+ }
+ }
+ }
+
+ return pcs.getPropertyChangeListeners();
+
+ }
}
Copied: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyDescriptorTest.java (from r405685, incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/PropertyDescriptorTest.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyDescriptorTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyDescriptorTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/PropertyDescriptorTest.java&r1=405685&r2=406595&rev=406595&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/PropertyDescriptorTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyDescriptorTest.java Mon May 15 02:40:33 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.beans;
+package org.apache.harmony.beans.tests.java.beans;
import java.beans.IntrospectionException;
import java.beans.PropertyDescriptor;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyEditorManagerTest.java (from r405685, incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/PropertyEditorManagerTest.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyEditorManagerTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyEditorManagerTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/PropertyEditorManagerTest.java&r1=405685&r2=406595&rev=406595&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/PropertyEditorManagerTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyEditorManagerTest.java Mon May 15 02:40:33 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.beans;
+package org.apache.harmony.beans.tests.java.beans;
import java.awt.Component;
import java.awt.Graphics;
@@ -24,13 +24,21 @@
import java.util.Arrays;
import junit.framework.TestCase;
-import tests.api.java.beans.mock.Foz;
-import tests.api.java.beans.mock.FozDefault;
-import tests.api.java.beans.mock.Fozz;
-import tests.api.java.beans.mock.FozzEditor;
-import tests.api.java.beans.mock.Fozzz;
-import tests.api.java.beans.mock.MockButton;
-import tests.api.java.beans.mock.MockFoo;
+import org.apache.harmony.beans.tests.java.beans.mock.Foz;
+import org.apache.harmony.beans.tests.java.beans.mock.FozDefault;
+import org.apache.harmony.beans.tests.java.beans.mock.Fozz;
+import org.apache.harmony.beans.tests.java.beans.mock.FozzEditor;
+import org.apache.harmony.beans.tests.java.beans.mock.Fozzz;
+import org.apache.harmony.beans.tests.java.beans.mock.MockButton;
+import org.apache.harmony.beans.tests.java.beans.mock.MockFoo;
+
+import org.apache.harmony.beans.tests.java.beans.auxiliary.AnotherSampleProperty;
+import org.apache.harmony.beans.tests.java.beans.auxiliary.SampleProperty;
+import org.apache.harmony.beans.tests.java.beans.auxiliary.SamplePropertyEditor;
+import org.apache.harmony.beans.tests.java.beans.auxiliary.OtherEditor;
+
+import org.apache.harmony.beans.tests.java.beans.editors.AnotherSamplePropertyEditor;
+
/**
* Unit test for PropertyEditorManager
@@ -71,7 +79,7 @@
public void testFindEditor_DifferentPackage() {
String[] original = PropertyEditorManager.getEditorSearchPath();
PropertyEditorManager
- .setEditorSearchPath(new String[] { "tests.api.java.beans" });
+ .setEditorSearchPath(new String[] { "org.apache.harmony.beans.tests.java.beans" });
PropertyEditor editor = PropertyEditorManager.findEditor(Fozzz.class);
assertTrue(editor instanceof FozzzEditor);
assertEquals(FozzzEditor.class, editor.getClass());
@@ -112,7 +120,7 @@
String[] original = PropertyEditorManager.getEditorSearchPath();
String[] path = new String[] { "java.beans",
- "tests.api.java.beans.editor", "", };
+ "org.apache.harmony.beans.tests.java.beans.editor", "", };
PropertyEditorManager.setEditorSearchPath(path);
String[] newPath = PropertyEditorManager.getEditorSearchPath();
@@ -689,5 +697,49 @@
}
}
-
+
+
+ /**
+ * The test checks the method findEditor() for registered editors
+ */
+ public void testFindRegisteredEditor() {
+ PropertyEditorManager.registerEditor(SampleProperty.class,
+ OtherEditor.class);
+ PropertyEditor pe = PropertyEditorManager.findEditor(
+ SampleProperty.class);
+ if(pe == null) {
+ fail("No property editor found");
+ } else {
+ assertTrue(pe instanceof OtherEditor);
+ }
+ PropertyEditorManager.registerEditor(SampleProperty.class, null);
+ }
+
+ /**
+ * The test checks the method findEditor() for editors found by name
+ */
+ public void testFindEditorByNameAddOn() {
+ PropertyEditor pe = PropertyEditorManager.findEditor(
+ SampleProperty.class);
+ if(pe == null) {
+ fail("No property editor found");
+ } else {
+ assertTrue(pe instanceof SamplePropertyEditor);
+ }
+ }
+
+ /**
+ * The test checks the method findEditor() for editors on search path
+ */
+ public void testFindEditorByDefaultLocation() {
+ PropertyEditorManager.setEditorSearchPath(
+ new String[] {"org.apache.harmony.beans.tests.java.beans.editors"});
+ PropertyEditor pe = PropertyEditorManager.findEditor(
+ AnotherSampleProperty.class);
+ if(pe == null) {
+ fail("No property editor found");
+ } else {
+ assertTrue(pe instanceof AnotherSamplePropertyEditor);
+ }
+ }
}
Copied: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyEditorSupportTest.java (from r405685, incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/PropertyEditorSupportTest.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyEditorSupportTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyEditorSupportTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/PropertyEditorSupportTest.java&r1=405685&r2=406595&rev=406595&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/PropertyEditorSupportTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyEditorSupportTest.java Mon May 15 02:40:33 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.beans;
+package org.apache.harmony.beans.tests.java.beans;
import java.beans.EventHandler;
import java.beans.PropertyChangeEvent;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyEditorTest.java (from r405685, incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/PropertyEditorTest.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyEditorTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyEditorTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/PropertyEditorTest.java&r1=405685&r2=406595&rev=406595&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/PropertyEditorTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyEditorTest.java Mon May 15 02:40:33 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.beans;
+package org.apache.harmony.beans.tests.java.beans;
import java.awt.Component;
import java.awt.Graphics;
@@ -21,7 +21,7 @@
import java.beans.PropertyChangeListener;
import java.beans.PropertyEditor;
-import tests.api.java.beans.PropertyChangeListenerTest.DummyPropertyChangeListener;
+import org.apache.harmony.beans.tests.java.beans.PropertyChangeListenerTest.DummyPropertyChangeListener;
import junit.framework.TestCase;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyVetoExceptionTest.java (from r405685, incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/PropertyVetoExceptionTest.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyVetoExceptionTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyVetoExceptionTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/PropertyVetoExceptionTest.java&r1=405685&r2=406595&rev=406595&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/PropertyVetoExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyVetoExceptionTest.java Mon May 15 02:40:33 2006
@@ -13,8 +13,9 @@
* limitations under the License.
*/
-package tests.api.java.beans;
+package org.apache.harmony.beans.tests.java.beans;
+import java.beans.Beans;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyVetoException;
import java.io.IOException;
@@ -90,7 +91,7 @@
assertSame(event, e.getPropertyChangeEvent());
PropertyVetoException deserializedException = (PropertyVetoException) SerializationTester
- .readObject(e, "tests/api/java/beans/PropertyVetoException.ser");
+ .readObject(e, "serialization/java/beans/PropertyVetoException.ser");
assertEquals(message, deserializedException.getMessage());
assertEquals(event.getNewValue(), deserializedException
@@ -103,5 +104,15 @@
.getPropertyChangeEvent().getPropagationId());
assertNull(deserializedException.getPropertyChangeEvent().getSource());
}
-
+
+ public void testPropertyVetoExceptionMessage() {
+ // Regression for HARMONY-235 (tracking the similar bug)
+ PropertyChangeEvent event = new PropertyChangeEvent(new Beans(),
+ "propertyName", "oldValue", "newValue");
+
+ String message = "test message";
+
+ PropertyVetoException e = new PropertyVetoException(message, event);
+ assertEquals(message, e.getMessage());
+ }
}
Copied: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/SimpleBeanInfoTest.java (from r405685, incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/SimpleBeanInfoTest.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/SimpleBeanInfoTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/SimpleBeanInfoTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/SimpleBeanInfoTest.java&r1=405685&r2=406595&rev=406595&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/SimpleBeanInfoTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/SimpleBeanInfoTest.java Mon May 15 02:40:33 2006
@@ -13,13 +13,16 @@
* limitations under the License.
*/
-package tests.api.java.beans;
+package org.apache.harmony.beans.tests.java.beans;
import java.awt.Image;
import java.beans.SimpleBeanInfo;
-import tests.api.java.beans.mock.MockSimpleBeanInfo;
+import org.apache.harmony.beans.tests.java.beans.mock.MockSimpleBeanInfo;
import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+
/**
* Unit test for SimpleBeanInfo
@@ -66,11 +69,16 @@
assertNull(info.getPropertyDescriptors());
}
- public void testLoadImage() {
- // TODO The bahavior is not implemented
- MockSimpleBeanInfo info = new MockSimpleBeanInfo();
- Image image = info.loadImage("harmony-logo.gif");
- // assertTrue(image instanceof Image);
- }
-
+ // Depends on AWT functionality that is currently stubbed out.
+// public void testLoadImage() {
+// // TODO The bahavior is not implemented
+// MockSimpleBeanInfo info = new MockSimpleBeanInfo();
+// Image image = info.loadImage("/gif/harmony-logo.gif");
+// // assertTrue(image instanceof Image);
+//
+// // TODO The bahavior is not implemented
+// SimpleBeanInfo sbi = new SimpleBeanInfo();
+// image = sbi.loadImage("/gif/test.gif");
+// // assertNotNull(image);
+// }
}
Copied: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/StatementTest.java (from r405685, incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/StatementTest.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/StatementTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/StatementTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/StatementTest.java&r1=405685&r2=406595&rev=406595&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/StatementTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/StatementTest.java Mon May 15 02:40:33 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.beans;
+package org.apache.harmony.beans.tests.java.beans;
import java.beans.Statement;
import java.beans.DefaultPersistenceDelegate;
@@ -22,13 +22,244 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import junit.framework.Test;
import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+
+import org.apache.harmony.beans.tests.java.beans.auxiliary.SampleException;
/**
* Test the class java.beans.Statement.
*/
public class StatementTest extends TestCase {
+ private static int testId = -1;
+
+ /**
+ *
+ */
+ public StatementTest() {
+ super();
+ }
+
+ /**
+ *
+ */
+ public StatementTest(String name) {
+ super(name);
+ }
+
+ /**
+ * The test checks the method execute() for setter
+ */
+ public void testSetter() {
+ Bean bean = new Bean();
+ Statement s = new Statement(bean, "setText", new Object[] { "hello" });
+ try {
+ s.execute();
+ assertEquals("hello", bean.getText());
+ } catch (Exception e) {
+ System.out.println(e.getClass() + ": " + e.getMessage());
+ fail("Exception is thrown while trying to invoke Bean.getText()");
+ }
+ }
+
+ /**
+ * The test checks the method execute() for indexed setter
+ */
+ public void testIndexedSetter() {
+ Bean bean = new Bean("hello");
+ Statement s = new Statement(bean, "setChar",
+ new Object[] { new Integer(1), new Character('a') });
+ try {
+ s.execute();
+ assertEquals("hallo", bean.getText());
+ } catch (Exception e) {
+ System.out.println(e.getClass() + ": " + e.getMessage());
+ fail("Exception is thrown while trying to invoke Bean.getText()");
+ }
+ }
+
+ /**
+ * The test checks the method execute() for array setter
+ */
+ public void testArraySetter() {
+ int[] a = {1, 2, 3};
+ Statement s = new Statement(a, "set",
+ new Object[] { new Integer(1), new Integer(7) });
+ try {
+ s.execute();
+ assertEquals(7, a[1]);
+ } catch (Exception e) {
+ System.out.println(e.getClass() + ": " + e.getMessage());
+ fail("Exception is thrown while trying to invoke array[i] =");
+ }
+ }
+
+ /**
+ * The test checks the method execute() for static method
+ */
+ public void testStatic() {
+ int currentId = getTestId();
+ Statement s = new Statement(StatementTest.class, "nextTestId",
+ new Object[] { });
+ try {
+ s.execute();
+ assertEquals(++currentId, getTestId());
+ } catch (Exception e) {
+ System.out.println(e.getClass() + ": " + e.getMessage());
+ fail("Exception is thrown while trying to invoke "
+ + "StatementTest.nextTestId()");
+ }
+ }
+
+ /**
+ * The test checks the method execute() if exception is thrown on method call
+ */
+ public void testExceptionThrownOnMethodCall() {
+ Bean bean = new Bean("hello");
+ Statement s = new Statement(bean, "setChar",
+ new Object[] { new Integer(5), new Character('a') });
+ try {
+ s.execute();
+ assertFalse("Exception must be thrown while Bean.setChar(5, 'a') "
+ + "invocation.", true);
+ } catch (Exception e) {
+ assertTrue(true);
+ }
+ }
+
+ /**
+ * The test checks the method execute() if exception is thrown on
+ * static method call
+ */
+ public void testExceptionThrownOnStaticMethodCall() {
+ Statement s = new Statement(StatementTest.class, "methodWithException",
+ new Object[] {} );
+ try {
+ s.execute();
+ assertFalse(
+ "Exception must be thrown with methodWithException call",
+ true);
+ } catch (SampleException se) {
+ assertTrue("SampleException is thrown as expected", true);
+ } catch (Exception e) {
+ assertTrue("Non expected exception: " + e.getClass(), false);
+ }
+ }
+
+ /**
+ * The test checks the method execute() with array as parameter
+ */
+ public void testMethodWithArrayParam() {
+ Statement s = new Statement(StatementTest.class, "methodWithIntArray",
+ new Object[] { new int[] { 3 } } );
+ try {
+ s.execute();
+ assertTrue("No exception is thrown for methodWithIntArray call",
+ true);
+ } catch (Exception e) {
+ assertTrue("Non expected exception: " + e.getClass(), false);
+ }
+ }
+
+ /**
+ *
+ */
+ public static int getTestId() {
+ return testId;
+ }
+
+ /**
+ *
+ */
+ public static void nextTestId() {
+ ++testId;
+ }
+
+ /**
+ *
+ */
+ public static void methodWithException() throws Exception {
+ throw new SampleException("sample");
+ }
+
+ /**
+ *
+ */
+ public static void methodWithIntArray(int[] array) {
+ }
+
+ /**
+ *
+ */
+ public static Test suite() {
+ return new TestSuite(StatementTest.class);
+ }
+
+ /**
+ *
+ */
+ public static void main(String[] args) {
+ TestRunner.run(suite());
+ }
+
+ public class Bean {
+
+ private String text;
+
+ public Bean() {
+ text = null;
+ }
+
+ public Bean(String text) {
+ this.text = text;
+ }
+
+ public String getText() {
+ return text;
+ }
+
+ public void setText(String text) {
+ this.text = text;
+ }
+
+ public char getChar(int idx) throws IllegalAccessException {
+ if(text == null) {
+ throw new IllegalAccessException("Text property is null.");
+ } else {
+ return text.charAt(idx);
+ }
+ }
+
+ public void setChar(int idx, char value) throws IllegalAccessException {
+ if(text == null) {
+ throw new IllegalAccessException("Text property is null.");
+ } else {
+ // IndexOutOfBounds exception is thrown, if indexed bounds are violated
+ char oldValue = text.charAt(idx);
+
+ String newText = "";
+
+ if(idx > 0) {
+ newText += text.substring(0, idx);
+ }
+
+ newText += value;
+
+ if(idx < (text.length() - 1)) {
+ newText += text.substring(idx + 1);
+ }
+
+ text = newText;
+
+ }
+ }
+ }
+
+
+
/*
* Test the constructor under normal conditions.
*/
Copied: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/VetoableChangeListenerProxyTest.java (from r405685, incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/VetoableChangeListenerProxyTest.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/VetoableChangeListenerProxyTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/VetoableChangeListenerProxyTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/VetoableChangeListenerProxyTest.java&r1=405685&r2=406595&rev=406595&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/VetoableChangeListenerProxyTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/VetoableChangeListenerProxyTest.java Mon May 15 02:40:33 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.beans;
+package org.apache.harmony.beans.tests.java.beans;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListenerProxy;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/VetoableChangeListenerTest.java (from r405685, incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/VetoableChangeListenerTest.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/VetoableChangeListenerTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/VetoableChangeListenerTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/VetoableChangeListenerTest.java&r1=405685&r2=406595&rev=406595&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/VetoableChangeListenerTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/VetoableChangeListenerTest.java Mon May 15 02:40:33 2006
@@ -13,14 +13,14 @@
* limitations under the License.
*/
-package tests.api.java.beans;
+package org.apache.harmony.beans.tests.java.beans;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyEditor;
import java.beans.PropertyVetoException;
import java.beans.VetoableChangeListener;
-import tests.api.java.beans.PropertyEditorTest.DummyPropertyEditor;
+import org.apache.harmony.beans.tests.java.beans.PropertyEditorTest.DummyPropertyEditor;
import junit.framework.TestCase;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/VetoableChangeSupportTest.java (from r405685, incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/VetoableChangeSupportTest.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/VetoableChangeSupportTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/VetoableChangeSupportTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/VetoableChangeSupportTest.java&r1=405685&r2=406595&rev=406595&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/VetoableChangeSupportTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/VetoableChangeSupportTest.java Mon May 15 02:40:33 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.beans;
+package org.apache.harmony.beans.tests.java.beans;
import java.beans.EventHandler;
import java.beans.PropertyChangeEvent;
@@ -21,14 +21,21 @@
import java.beans.VetoableChangeListener;
import java.beans.VetoableChangeListenerProxy;
import java.beans.VetoableChangeSupport;
+
+import java.beans.beancontext.BeanContextChildSupport;
+
import java.io.IOException;
import java.io.Serializable;
import java.util.ArrayList;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
import junit.framework.TestCase;
-import tests.api.java.beans.beancontext.mock.MockVetoableChangeListener;
-import tests.api.java.beans.mock.NonSerializedVCListener;
-import tests.api.java.beans.mock.SerializedVCListener;
+import org.apache.harmony.beans.tests.java.beans.beancontext.mock.MockVetoableChangeListener;
+import org.apache.harmony.beans.tests.java.beans.mock.NonSerializedVCListener;
+import org.apache.harmony.beans.tests.java.beans.mock.SerializedVCListener;
import tests.util.SerializationTester;
/**
@@ -1612,7 +1619,7 @@
VetoableChangeSupport deserializedSupport = (VetoableChangeSupport) SerializationTester
.readObject(support,
- "tests/api/java/beans/VetoableChangeSupport.ser");
+ "serialization/java/beans/VetoableChangeSupport.ser");
assertTrue(deserializedSupport.hasListeners(propertyName1));
assertFalse(deserializedSupport.hasListeners(propertyName2));
@@ -1787,4 +1794,101 @@
}
+
+ /**
+ * @tests java.beans.VetoableChangeSupport#VetoableChangeSupport(
+ * java.lang.Object)
+ */
+ public void testVetoableChangeSupport_null() {
+ // Regression for HARMONY-228
+ try {
+ new VetoableChangeSupport(null);
+ fail("Should throw NullPointerException.");
+ } catch (NullPointerException e) {
+ }
+ }
+
+ /**
+ * @tests java.beans.VetoableChangeSupport#addVetoableChangeListener(java.lang.String,
+ * java.beans.VetoableChangeListener)
+ */
+ public void test_addPropertyChangeListenerNullNull() throws Exception {
+ // Regression for HARMONY-441
+ new VetoableChangeSupport("bean1")
+ .addVetoableChangeListener(null, null);
+ }
+
+
+ public void test_readObject() throws Exception {
+ // Regression for HARMONY-421
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
+ ObjectOutputStream oos = new ObjectOutputStream(baos);
+ oos.writeObject(new BeanContextChildSupport());
+ oos.flush();
+
+ ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(
+ baos.toByteArray()));
+ ois.readObject();
+
+ ois.close();
+ oos.close();
+ }
+
+
+ /**
+ * The test checks the method add() with no property specified
+ */
+ public void testAddVetoableChangeListener() {
+ VetoableChangeSupport vcs = new VetoableChangeSupport("bean1");
+ VetoableChangeListener vcl = new VetoableChangeListener() {
+ public void vetoableChange(PropertyChangeEvent pce) {
+ }
+ };
+ vcs.addVetoableChangeListener(vcl);
+ VetoableChangeListener[] vcls = vcs.getVetoableChangeListeners();
+
+ assertNotNull("Returned listeners is null.", vcls);
+ assertEquals(1, vcls.length);
+ assertEquals(vcl, vcls[0]);
+ }
+
+ /**
+ * The test checks the method add() for property specified
+ */
+ public void testAddVetoableChangeListenerByPropertyName() {
+ VetoableChangeSupport vcs = new VetoableChangeSupport("bean1");
+ VetoableChangeListener vcl = new VetoableChangeListener() {
+ public void vetoableChange(PropertyChangeEvent pce) {
+ }
+ };
+ vcs.addVetoableChangeListener("property1", vcl);
+ VetoableChangeListener[] vcls = vcs.getVetoableChangeListeners(
+ "property1");
+
+ assertNotNull("Returned listeners is null.", vcls);
+ assertEquals(1, vcls.length);
+ assertEquals(vcl, vcls[0]);
+ }
+
+ /**
+ * The test checks the method add() for VetoableChangeListenerProxy
+ */
+ public void testAddVetoableChangeListenerProxy() {
+ VetoableChangeSupport vcs = new VetoableChangeSupport("bean1");
+ VetoableChangeListener vcl = new VetoableChangeListener() {
+ public void vetoableChange(PropertyChangeEvent pce) {}
+ };
+ vcs.addVetoableChangeListener("property1", vcl);
+ VetoableChangeListener[] vcls = vcs.getVetoableChangeListeners();
+
+ assertNotNull("Returned listeners is null.", vcls);
+ assertEquals(1, vcls.length);
+
+ assertTrue("Listener is not of VetoableChangeListenerProxy type",
+ vcls[0] instanceof VetoableChangeListenerProxy);
+ assertEquals(vcl, ((VetoableChangeListenerProxy) vcls[0]).getListener());
+ assertEquals("property1", ((VetoableChangeListenerProxy) vcls[0])
+ .getPropertyName());
+ }
}
Copied: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/VisibilityTest.java (from r405685, incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/VisibilityTest.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/VisibilityTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/VisibilityTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/VisibilityTest.java&r1=405685&r2=406595&rev=406595&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/VisibilityTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/VisibilityTest.java Mon May 15 02:40:33 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.beans;
+package org.apache.harmony.beans.tests.java.beans;
import java.beans.Visibility;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/XMLDecoderTest.java (from r405685, incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/XMLDecoderTest.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/XMLDecoderTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/XMLDecoderTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/XMLDecoderTest.java&r1=405685&r2=406595&rev=406595&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/XMLDecoderTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/XMLDecoderTest.java Mon May 15 02:40:33 2006
@@ -13,19 +13,23 @@
* limitations under the License.
*/
-package tests.api.java.beans;
+package org.apache.harmony.beans.tests.java.beans;
import java.beans.ExceptionListener;
import java.beans.XMLDecoder;
import java.beans.XMLEncoder;
+import java.beans.Introspector;
+import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import junit.framework.Test;
import junit.framework.TestCase;
-import tests.api.java.beans.EncoderTest.SampleBean;
-import tests.api.java.beans.XMLEncoderTest.DependencyBean;
-import tests.api.java.beans.mock.MockBean4Codec;
-import tests.api.java.beans.mock.MockExceptionListener;
+import junit.framework.TestSuite;
+import org.apache.harmony.beans.tests.java.beans.EncoderTest.SampleBean;
+import org.apache.harmony.beans.tests.java.beans.XMLEncoderTest.DependencyBean;
+import org.apache.harmony.beans.tests.java.beans.mock.MockBean4Codec;
+import org.apache.harmony.beans.tests.java.beans.mock.MockExceptionListener;
/**
* Tests XMLDecoder
@@ -84,21 +88,21 @@
public void testReadObject_Null() {
XMLDecoder dec = new XMLDecoder(this.getClass().getResourceAsStream(
- "null.xml"));
+ "/xml/null.xml"));
Object obj = dec.readObject();
assertNull(obj);
}
public void testReadObject_Integer() {
XMLDecoder dec = new XMLDecoder(this.getClass().getResourceAsStream(
- "int.xml"));
+ "/xml/int.xml"));
Object obj = dec.readObject();
assertEquals(Integer.valueOf("3"), obj);
}
public void testReadObject_StringCodec() {
XMLDecoder dec = new XMLDecoder(this.getClass().getResourceAsStream(
- "SampleBean_StringCodec.xml"));
+ "/xml/SampleBean_StringCodec.xml"));
SampleBean obj = (SampleBean) dec.readObject();
assertEquals("<Li Yang> & \"liyang'", obj.getMyid());
assertEquals("a child", obj.getRef().getMyid());
@@ -106,7 +110,7 @@
public void testReadObject_IntArray() {
XMLDecoder dec = new XMLDecoder(this.getClass().getResourceAsStream(
- "IntArray.xml"));
+ "/xml/IntArray.xml"));
int ints[] = (int[]) dec.readObject();
assertEquals(1, ints[0]);
assertEquals(2, ints[1]);
@@ -115,7 +119,7 @@
public void testReadObject_PropertyDependency() {
XMLDecoder dec = new XMLDecoder(this.getClass().getResourceAsStream(
- "DependencyBean.xml"));
+ "/xml/DependencyBean.xml"));
DependencyBean b = (DependencyBean) dec.readObject();
assertEquals(888, b.getInts()[0]);
assertSame(b.getInts(), b.getRef());
@@ -123,13 +127,13 @@
public void testReadObject_NoChange() {
XMLDecoder dec = new XMLDecoder(this.getClass().getResourceAsStream(
- "MockBean4Codec_NoChange.xml"));
+ "/xml/MockBean4Codec_NoChange.xml"));
MockBean4Codec b = (MockBean4Codec) dec.readObject();
}
public void testReadObject_BornFriendChange() {
XMLDecoder dec = new XMLDecoder(this.getClass().getResourceAsStream(
- "MockBean4Codec_BornFriendChange.xml"));
+ "/xml/MockBean4Codec_BornFriendChange.xml"));
MockBean4Codec b = (MockBean4Codec) dec.readObject();
assertEquals(888, b.getBornFriend().getZarr()[0]);
assertEquals(b.getBornFriend(), b.getNill());
@@ -137,7 +141,7 @@
public void testReadObject_ManyChanges() {
XMLDecoder dec = new XMLDecoder(this.getClass().getResourceAsStream(
- "MockBean4Codec_ManyChanges.xml"));
+ "/xml/MockBean4Codec_ManyChanges.xml"));
MockBean4Codec b = (MockBean4Codec) dec.readObject();
assertEquals(127, b.getB());
assertSame(b, b.getBackRef());
@@ -175,11 +179,11 @@
public void testReadObject_StaticField() {
XMLDecoder dec1 = new XMLDecoder(this.getClass().getResourceAsStream(
- "MockBean4StaticField_Original.xml"));
+ "/xml/MockBean4StaticField_Original.xml"));
MockBean4StaticField o1 = (MockBean4StaticField) dec1.readObject();
XMLDecoder dec2 = new XMLDecoder(this.getClass().getResourceAsStream(
- "MockBean4StaticField.xml"));
+ "/xml/MockBean4StaticField.xml"));
MockBean4StaticField o2 = (MockBean4StaticField) dec2.readObject();
if (!o1.equals(o2)) {
@@ -196,7 +200,7 @@
public void testReadObject_Owner() {
MockBean4Owner_Owner o1 = new MockBean4Owner_Owner();
XMLDecoder dec1 = new XMLDecoder(this.getClass().getResourceAsStream(
- "MockBean4Owner_SetOwner.xml"), o1);
+ "/xml/MockBean4Owner_SetOwner.xml"), o1);
MockBean4Owner_Target t1 = (MockBean4Owner_Target) dec1.readObject();
assertEquals(o1.getV(), 1);
@@ -206,7 +210,7 @@
public void testReadObject_Owner_WithWriteStatement() {
MockBean4Owner_Owner o2 = new MockBean4Owner_Owner();
XMLDecoder dec2 = new XMLDecoder(this.getClass().getResourceAsStream(
- "MockBean4Owner_SetOwnerWithWriteStatement.xml"), o2);
+ "/xml/MockBean4Owner_SetOwnerWithWriteStatement.xml"), o2);
MockBean4Owner_Target t2 = (MockBean4Owner_Target) dec2.readObject();
assertEquals(o2.getV(), 999);
@@ -228,7 +232,7 @@
public void testSetExceptionListener_CatchException() {
MockExceptionListener l = new MockExceptionListener();
XMLDecoder dec = new XMLDecoder(XMLDecoderTest.class
- .getResourceAsStream("bad_int.xml"), null, l);
+ .getResourceAsStream("/xml/bad_int.xml"), null, l);
assertTrue(l.size() > 0);
}
@@ -277,5 +281,93 @@
assertSame(owner, dec.getOwner());
assertSame(l, dec.getExceptionListener());
}
-
+
+
+ /**
+ * The test checks the code generation for XML from Test1.xml
+ */
+ public void testDecodeLinkedList() {
+ decode("xml/Test1.xml");
+ }
+
+ /**
+ * The test checks the code generation for XML from Test2.xml
+ */
+ public void testDecodePrimitiveArrayByLength() {
+ decode("xml/Test2.xml");
+ }
+
+ /**
+ * The test checks the code generation for XML from Test3.xml
+ */
+ public void testDecodePrimitiveArrayByElements() {
+ decode("xml/Test3.xml");
+ }
+
+ /**
+ * The test checks the code generation for XML from Test4.xml
+ */
+ public void testDecodeObjectArrayByLength() {
+ decode("xml/Test4.xml");
+ }
+
+ /**
+ * The test checks the code generation for XML from Test5.xml
+ */
+ public void testDecodeObjectArrayByElements() {
+ decode("xml/Test5.xml");
+ }
+
+ /**
+ * The test checks the code generation for XML from Test6.xml
+ */
+ public void testDecodeReference() {
+ decode("xml/Test6.xml");
+ }
+
+ /**
+ * The test checks the code generation for XML from Test7.xml
+ */
+ public void testDecodeStringArray() {
+ decode("xml/Test7.xml");
+ }
+
+ /*
+ * The test checks the code generation for XML from MainTest.xml
+ *
+ public void testMain() {
+ decode("xml/MainTest.xml");
+ }
+ */
+
+ /**
+ *
+ */
+ public static Test suite() {
+ return new TestSuite(XMLDecoderTest.class);
+ }
+
+ /**
+ *
+ */
+ private void decode(String resourceName) {
+ XMLDecoder d = null;
+ try {
+ Introspector.setBeanInfoSearchPath(new String[] {});
+ d = new XMLDecoder(new BufferedInputStream(
+ ClassLoader.getSystemClassLoader().getResourceAsStream(resourceName)));
+ while(true) {
+ Object obj = d.readObject();
+ }
+ } catch (ArrayIndexOutOfBoundsException aibe) {
+ assertTrue(true);
+ } catch (Exception e) {
+ System.out.println(e.getClass() + " :" + e.getMessage());
+ fail("Exception " + e.getClass() + " is thrown");
+ } finally {
+ if(d != null) {
+ d.close();
+ }
+ }
+ }
}
Copied: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/XMLEncoderTest.java (from r405685, incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/XMLEncoderTest.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/XMLEncoderTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/XMLEncoderTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/XMLEncoderTest.java&r1=405685&r2=406595&rev=406595&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/tests/api/java/beans/XMLEncoderTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/XMLEncoderTest.java Mon May 15 02:40:33 2006
@@ -13,9 +13,12 @@
* limitations under the License.
*/
-package tests.api.java.beans;
+package org.apache.harmony.beans.tests.java.beans;
+import java.beans.DefaultPersistenceDelegate;
+import java.beans.Encoder;
import java.beans.Expression;
+import java.beans.ExceptionListener;
import java.beans.PersistenceDelegate;
import java.beans.Statement;
import java.beans.XMLEncoder;
@@ -29,8 +32,11 @@
import java.io.PrintWriter;
import junit.framework.TestCase;
-import tests.api.java.beans.EncoderTest.SampleBean;
-import tests.api.java.beans.mock.MockBean4Codec;
+import org.apache.harmony.beans.tests.java.beans.EncoderTest.SampleBean;
+import org.apache.harmony.beans.tests.java.beans.mock.MockBean4Codec;
+
+import org.apache.harmony.beans.tests.java.beans.auxiliary.StandardBean;
+import org.apache.harmony.beans.tests.java.beans.auxiliary.AType;
/**
* Tests for XMLEncoder
@@ -175,11 +181,11 @@
}
public void testWriteObject_Null() throws IOException {
- assertCodedXML(null, "null.xml");
+ assertCodedXML(null, "/xml/null.xml");
}
public void testWriteObject_Integer() throws IOException {
- assertCodedXML(new Integer(3), "int.xml");
+ assertCodedXML(new Integer(3), "/xml/int.xml");
}
public void testWriteObject_StringCodec() throws IOException {
@@ -188,22 +194,22 @@
SampleBean c = new SampleBean();
c.setMyid("a child");
b.setRef(c);
- assertCodedXML(b, "SampleBean_StringCodec.xml");
+ assertCodedXML(b, "/xml/SampleBean_StringCodec.xml");
}
public void testWriteObject_IntArray() throws IOException {
- assertCodedXML(new int[] { 1, 2, 3 }, "IntArray.xml");
+ assertCodedXML(new int[] { 1, 2, 3 }, "/xml/IntArray.xml");
}
public void testWriteObject_PropertyDependency() throws IOException {
DependencyBean b = new DependencyBean();
b.getInts()[0] = 888;
b.setRef(b.getInts());
- assertCodedXML(b, "DependencyBean.xml");
+ assertCodedXML(b, "/xml/DependencyBean.xml");
}
public void testWriteObject_NoChange() throws IOException {
- assertCodedXML(new MockBean4Codec(), "MockBean4Codec_NoChange.xml");
+ assertCodedXML(new MockBean4Codec(), "/xml/MockBean4Codec_NoChange.xml");
}
public void testWriteObject_BornFriendChange() throws IOException {
@@ -211,17 +217,17 @@
b.getBornFriend().getZarr()[0] = 888;
b.setNill(b.getBornFriend());
- assertCodedXML(b, "MockBean4Codec_BornFriendChange.xml");
+ assertCodedXML(b, "/xml/MockBean4Codec_BornFriendChange.xml");
}
public void testWriteObject_ManyChanges() throws IOException {
assertCodedXML(MockBean4Codec.getInstanceOfManyChanges(),
- "MockBean4Codec_ManyChanges.xml");
+ "/xml/MockBean4Codec_ManyChanges.xml");
}
public void testWriteObject_ManyChanges_2() throws IOException {
assertCodedXML(MockBean4Codec.getInstanceOfManyChanges2(),
- "MockBean4Codec_ManyChanges_2.xml");
+ "/xml/MockBean4Codec_ManyChanges_2.xml");
}
public void testWriteObject_SetOwner() throws IOException {
@@ -233,7 +239,7 @@
t.setV(o);
enc.setOwner(o);
- assertCodedXML(t, "MockBean4Owner_SetOwner.xml", temp, enc);
+ assertCodedXML(t, "/xml/MockBean4Owner_SetOwner.xml", temp, enc);
}
@@ -248,7 +254,7 @@
enc.writeStatement(new Statement(o, "loading", new Object[] {}));
- assertCodedXML(t, "MockBean4Owner_SetOwnerWithWriteStatement.xml",
+ assertCodedXML(t, "/xml/MockBean4Owner_SetOwnerWithWriteStatement.xml",
temp, enc);
}
@@ -260,7 +266,7 @@
enc.setPersistenceDelegate(MockBean4StaticField.class,
new MockBean4StaticField_PD());
- assertCodedXML(MockBean4StaticField.inst, "MockBean4StaticField.xml",
+ assertCodedXML(MockBean4StaticField.inst, "/xml/MockBean4StaticField.xml",
temp, enc);
}
@@ -407,4 +413,338 @@
}
}
+
+ /**
+ * The test checks that java.lang.Boolean exemplar store is correct
+ */
+ public void testEncodeBoolean() {
+ XMLEncoder e = new XMLEncoder(System.out);
+ e.setExceptionListener(new ExceptionListener() {
+ public void exceptionThrown(Exception e) {
+ fail("Exception " + e.getClass() +" is thrown: "
+ + e.getMessage());
+ }
+ });
+
+ try {
+ e.writeObject(new Boolean(true));
+ } catch (Exception excp) {
+ fail("Exception " + excp.getClass() +" is thrown: "
+ + excp.getMessage());
+ } finally {
+ e.close();
+ }
+ }
+
+ /**
+ * The test checks that java.lang.Byte exemplar store is correct
+ */
+ public void testEncodeByte() {
+ XMLEncoder e = new XMLEncoder(System.out);
+ e.setExceptionListener(new ExceptionListener() {
+ public void exceptionThrown(Exception e) {
+ fail("Exception " + e.getClass() +" is thrown: "
+ + e.getMessage());
+ }
+ });
+
+ try {
+ e.writeObject(new Byte((byte) 123));
+ } catch (Exception excp) {
+ fail("Exception " + excp.getClass() +" is thrown: "
+ + excp.getMessage());
+ } finally {
+ e.close();
+ }
+ }
+
+ /**
+ * The test checks that java.lang.Character exemplar store is correct
+ */
+ public void testEncodeCharacter() {
+ XMLEncoder e = new XMLEncoder(System.out);
+ e.setExceptionListener(new ExceptionListener() {
+ public void exceptionThrown(Exception e) {
+ fail("Exception " + e.getClass() +" is thrown: "
+ + e.getMessage());
+ }
+ });
+
+ try {
+ e.writeObject(new Character('a'));
+ } catch (Exception excp) {
+ fail("Exception " + excp.getClass() +" is thrown: "
+ + excp.getMessage());
+ } finally {
+ e.close();
+ }
+ }
+
+ /**
+ * The test checks that java.lang.Class exemplar store is correct
+ */
+ public void testEncodeClass() {
+ XMLEncoder e = new XMLEncoder(System.out);
+ e.setExceptionListener(new ExceptionListener() {
+ public void exceptionThrown(Exception e) {
+ fail("Exception " + e.getClass() +" is thrown: "
+ + e.getMessage());
+ }
+ });
+
+ try {
+ e.writeObject(Object.class);
+ } catch (Exception excp) {
+ fail("Exception " + excp.getClass() +" is thrown: "
+ + excp.getMessage());
+ } finally {
+ e.close();
+ }
+ }
+
+ /**
+ * The test checks that java.lang.Double exemplar store is correct
+ */
+ public void testEncodeDouble() {
+ XMLEncoder e = new XMLEncoder(System.out);
+ e.setExceptionListener(new ExceptionListener() {
+ public void exceptionThrown(Exception e) {
+ fail("Exception " + e.getClass() +" is thrown: "
+ + e.getMessage());
+ }
+ });
+
+ try {
+ e.writeObject(new Double((double) 0.01));
+ } catch (Exception excp) {
+ fail("Exception " + excp.getClass() +" is thrown: "
+ + excp.getMessage());
+ } finally {
+ e.close();
+ }
+ }
+
+ /**
+ * The test checks that java.lang.Float exemplar store is correct
+ */
+ public void testEncodeFloat() {
+ XMLEncoder e = new XMLEncoder(System.out);
+ e.setExceptionListener(new ExceptionListener() {
+ public void exceptionThrown(Exception e) {
+ fail("Exception " + e.getClass() +" is thrown: "
+ + e.getMessage());
+ }
+ });
+
+ try {
+ e.writeObject(new Float((float) 0.01));
+ } catch (Exception excp) {
+ fail("Exception " + excp.getClass() +" is thrown: "
+ + excp.getMessage());
+ } finally {
+ e.close();
+ }
+ }
+
+ /**
+ * The test checks that java.lang.Integer exemplar store is correct
+ */
+ public void testEncodeInteger() {
+ XMLEncoder e = new XMLEncoder(System.out);
+ e.setExceptionListener(new ExceptionListener() {
+ public void exceptionThrown(Exception e) {
+ fail("Exception " + e.getClass() +" is thrown: "
+ + e.getMessage());
+ }
+ });
+
+ try {
+ e.writeObject(new Integer(1));
+ } catch (Exception excp) {
+ fail("Exception " + excp.getClass() +" is thrown: "
+ + excp.getMessage());
+ } finally {
+ e.close();
+ }
+ }
+
+ /**
+ * The test checks that java.lang.Long exemplar store is correct
+ */
+ public void testEncodeLong() {
+ XMLEncoder e = new XMLEncoder(System.out);
+ e.setExceptionListener(new ExceptionListener() {
+ public void exceptionThrown(Exception e) {
+ fail("Exception " + e.getClass() +" is thrown: "
+ + e.getMessage());
+ }
+ });
+
+ try {
+ e.writeObject(new Long(1));
+ } catch (Exception excp) {
+ fail("Exception " + excp.getClass() +" is thrown: "
+ + excp.getMessage());
+ } finally {
+ e.close();
+ }
+ }
+
+ /**
+ * The test checks that java.lang.Short exemplar store is correct
+ */
+ public void testEncodeShort() {
+ XMLEncoder e = new XMLEncoder(System.out);
+ e.setExceptionListener(new ExceptionListener() {
+ public void exceptionThrown(Exception e) {
+ fail("Exception " + e.getClass() +" is thrown: "
+ + e.getMessage());
+ }
+ });
+
+ try {
+ e.writeObject(new Short((short) 1));
+ } catch (Exception excp) {
+ fail("Exception " + excp.getClass() +" is thrown: "
+ + excp.getMessage());
+ } finally {
+ e.close();
+ }
+ }
+
+ /**
+ * The test checks that java.lang.String exemplar store is correct
+ */
+ public void testEncodeString() {
+ XMLEncoder e = new XMLEncoder(System.out);
+ e.setExceptionListener(new ExceptionListener() {
+ public void exceptionThrown(Exception e) {
+ fail("Exception " + e.getClass() +" is thrown: "
+ + e.getMessage());
+ }
+ });
+
+ try {
+ e.writeObject(new String("hello"));
+ } catch (Exception excp) {
+ fail("Exception " + excp.getClass() +" is thrown: "
+ + excp.getMessage());
+ } finally {
+ e.close();
+ }
+ }
+
+ /**
+ * The test checks that array exemplar store is correct
+ */
+ public void testEncodeArray() {
+ XMLEncoder e = new XMLEncoder(System.out);
+ e.setExceptionListener(new ExceptionListener() {
+ public void exceptionThrown(Exception e) {
+ fail("Exception " + e.getClass() +" is thrown: "
+ + e.getMessage());
+ }
+ });
+
+ try {
+ e.writeObject(new int[] {1, 2, 3});
+ } catch (Exception excp) {
+ fail("Exception " + excp.getClass() +" is thrown: "
+ + excp.getMessage());
+ } finally {
+ e.close();
+ }
+ }
+
+ /**
+ * The test checks that null exemplar store is correct
+ */
+ public void testEncodeNull() {
+ XMLEncoder e = new XMLEncoder(System.out);
+ e.setExceptionListener(new ExceptionListener() {
+ public void exceptionThrown(Exception e) {
+ fail("Exception " + e.getClass() +" is thrown: "
+ + e.getMessage());
+ }
+ });
+
+ try {
+ e.writeObject(null);
+ } catch (Exception excp) {
+ fail("Exception " + excp.getClass() +" is thrown: "
+ + excp.getMessage());
+ } finally {
+ e.close();
+ }
+ }
+
+ /**
+ * The test checks that complex scenario store is correct
+ */
+ public void testEncodingScenario() {
+ XMLEncoder e = new XMLEncoder(System.out);
+ e.setExceptionListener(new ExceptionListener() {
+ public void exceptionThrown(Exception e) {
+ fail("Exception " + e.getClass() +" is thrown: "
+ + e.getMessage());
+ }
+ });
+
+ StandardBean bean1 = new StandardBean("bean1");
+
+ StandardBean bean2 = new StandardBean();
+ bean2.setText(null);
+
+ bean1.setPeer(bean2);
+ bean2.setPeer(bean1);
+
+ try {
+ e.writeObject(bean1);
+ e.writeObject(bean2);
+ } catch (Exception excp) {
+ fail("Exception " + excp.getClass() +" is thrown: "
+ + excp.getMessage());
+ } finally {
+ e.close();
+ }
+ }
+
+ /**
+ * The test checks that encoder can handle writeExpression in initialize
+ */
+ public void testEncodeExpressionAsStatement() {
+ XMLEncoder e = new XMLEncoder(System.out);
+ e.setExceptionListener(new ExceptionListener() {
+ public void exceptionThrown(Exception e) {
+ fail("Exception " + e.getClass() +" is thrown: "
+ + e.getMessage());
+ }
+ });
+
+ try {
+ final Object object = new Object();
+ e.setPersistenceDelegate(AType.class,
+ new DefaultPersistenceDelegate() {
+ protected void initialize(
+ Class type,
+ Object oldInstance,
+ Object newInstance,
+ Encoder out) {
+ out.writeExpression(new Expression(
+ object, oldInstance, "go", new Object[] {}
+ ));
+ }
+ });
+ AType a = new AType();
+
+ //e.writeObject(object);
+ e.writeObject(a);
+ e.writeObject(object);
+ } catch (Exception excp) {
+ fail("Exception " + excp.getClass() +" is thrown: "
+ + excp.getMessage());
+ } finally {
+ e.close();
+ }
+ }
}
Copied: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/AType.java (from r405685, incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/auxiliary/AType.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/AType.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/AType.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/auxiliary/AType.java&r1=405685&r2=406595&rev=406595&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/auxiliary/AType.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/AType.java Mon May 15 02:40:33 2006
@@ -18,7 +18,7 @@
* @author Maxim V. Berkultsev
* @version $Revision: 1.1.6.3 $
*/
-package org.apache.harmony.tests.java.beans.auxiliary;
+package org.apache.harmony.beans.tests.java.beans.auxiliary;
/**
* @author Maxim V. Berkultsev
Copied: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/AnotherSampleProperty.java (from r405685, incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/auxiliary/AnotherSampleProperty.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/AnotherSampleProperty.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/AnotherSampleProperty.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/auxiliary/AnotherSampleProperty.java&r1=405685&r2=406595&rev=406595&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/auxiliary/AnotherSampleProperty.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/AnotherSampleProperty.java Mon May 15 02:40:33 2006
@@ -18,7 +18,7 @@
* @author Maxim V. Berkultsev
* @version $Revision: 1.2.6.2 $
*/
-package org.apache.harmony.tests.java.beans.auxiliary;
+package org.apache.harmony.beans.tests.java.beans.auxiliary;
/**
* @author Maxim V. Berkultsev
Copied: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/ChildBean.java (from r405685, incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/auxiliary/ChildBean.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/ChildBean.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/ChildBean.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/auxiliary/ChildBean.java&r1=405685&r2=406595&rev=406595&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/auxiliary/ChildBean.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/ChildBean.java Mon May 15 02:40:33 2006
@@ -18,7 +18,7 @@
* @author Maxim V. Berkultsev
* @version $Revision: 1.2.6.2 $
*/
-package org.apache.harmony.tests.java.beans.auxiliary;
+package org.apache.harmony.beans.tests.java.beans.auxiliary;
/**
* @author Maxim V. Berkultsev
Copied: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/ChildBeanBeanInfo.java (from r405685, incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/auxiliary/ChildBeanBeanInfo.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/ChildBeanBeanInfo.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/ChildBeanBeanInfo.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/auxiliary/ChildBeanBeanInfo.java&r1=405685&r2=406595&rev=406595&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/auxiliary/ChildBeanBeanInfo.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/ChildBeanBeanInfo.java Mon May 15 02:40:33 2006
@@ -18,7 +18,7 @@
* @author Maxim V. Berkultsev
* @version $Revision: 1.2.6.3 $
*/
-package org.apache.harmony.tests.java.beans.auxiliary;
+package org.apache.harmony.beans.tests.java.beans.auxiliary;
import java.beans.IntrospectionException;
import java.beans.PropertyDescriptor;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/GrannyBean.java (from r405685, incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/auxiliary/GrannyBean.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/GrannyBean.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/GrannyBean.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/auxiliary/GrannyBean.java&r1=405685&r2=406595&rev=406595&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/auxiliary/GrannyBean.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/GrannyBean.java Mon May 15 02:40:33 2006
@@ -18,7 +18,7 @@
* @author Maxim V. Berkultsev
* @version $Revision: 1.2.6.3 $
*/
-package org.apache.harmony.tests.java.beans.auxiliary;
+package org.apache.harmony.beans.tests.java.beans.auxiliary;
/**
* @author Maxim V. Berkultsev
Copied: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/GrannyBeanBeanInfo.java (from r405685, incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/auxiliary/GrannyBeanBeanInfo.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/GrannyBeanBeanInfo.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/GrannyBeanBeanInfo.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/auxiliary/GrannyBeanBeanInfo.java&r1=405685&r2=406595&rev=406595&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/auxiliary/GrannyBeanBeanInfo.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/GrannyBeanBeanInfo.java Mon May 15 02:40:33 2006
@@ -18,7 +18,7 @@
* @author Maxim V. Berkultsev
* @version $Revision: 1.2.6.3 $
*/
-package org.apache.harmony.tests.java.beans.auxiliary;
+package org.apache.harmony.beans.tests.java.beans.auxiliary;
import java.beans.IntrospectionException;
import java.beans.PropertyDescriptor;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/InvocationObject.java (from r405685, incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/auxiliary/InvocationObject.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/InvocationObject.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/InvocationObject.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/auxiliary/InvocationObject.java&r1=405685&r2=406595&rev=406595&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/auxiliary/InvocationObject.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/InvocationObject.java Mon May 15 02:40:33 2006
@@ -18,9 +18,9 @@
* @author Maxim V. Berkultsev
* @version $Revision: 1.3.6.3 $
*/
-package org.apache.harmony.tests.java.beans.auxiliary;
+package org.apache.harmony.beans.tests.java.beans.auxiliary;
-import org.apache.harmony.tests.java.beans.EventHandlerTest;
+import org.apache.harmony.beans.tests.java.beans.EventHandlerTest;
/**
* @author Maxim V. Berkultsev
Copied: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/MisprintBean.java (from r405685, incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/auxiliary/MisprintBean.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/MisprintBean.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/MisprintBean.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/auxiliary/MisprintBean.java&r1=405685&r2=406595&rev=406595&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/auxiliary/MisprintBean.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/MisprintBean.java Mon May 15 02:40:33 2006
@@ -18,7 +18,7 @@
* @author Maxim V. Berkultsev
* @version $Revision: 1.2.6.3 $
*/
-package org.apache.harmony.tests.java.beans.auxiliary;
+package org.apache.harmony.beans.tests.java.beans.auxiliary;
/**
* @author Maxim V. Berkultsev
Copied: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/MisprintEvent.java (from r405685, incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/auxiliary/MisprintEvent.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/MisprintEvent.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/MisprintEvent.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/auxiliary/MisprintEvent.java&r1=405685&r2=406595&rev=406595&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/auxiliary/MisprintEvent.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/MisprintEvent.java Mon May 15 02:40:33 2006
@@ -18,7 +18,7 @@
* @author Maxim V. Berkultsev
* @version $Revision: 1.2.6.3 $
*/
-package org.apache.harmony.tests.java.beans.auxiliary;
+package org.apache.harmony.beans.tests.java.beans.auxiliary;
import java.util.EventObject;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/MisprintListenerr.java (from r405685, incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/auxiliary/MisprintListenerr.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/MisprintListenerr.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/MisprintListenerr.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/auxiliary/MisprintListenerr.java&r1=405685&r2=406595&rev=406595&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/auxiliary/MisprintListenerr.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/MisprintListenerr.java Mon May 15 02:40:33 2006
@@ -18,7 +18,7 @@
* @author Maxim V. Berkultsev
* @version $Revision: 1.2.6.3 $
*/
-package org.apache.harmony.tests.java.beans.auxiliary;
+package org.apache.harmony.beans.tests.java.beans.auxiliary;
import java.util.EventListener;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/NonSerializablePropertyChangeListener.java (from r405685, incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/auxiliary/NonSerializablePropertyChangeListener.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/NonSerializablePropertyChangeListener.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/NonSerializablePropertyChangeListener.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/auxiliary/NonSerializablePropertyChangeListener.java&r1=405685&r2=406595&rev=406595&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/auxiliary/NonSerializablePropertyChangeListener.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/NonSerializablePropertyChangeListener.java Mon May 15 02:40:33 2006
@@ -18,7 +18,7 @@
* @author Maxim V. Berkultsev
* @version $Revision: 1.2.6.3 $
*/
-package org.apache.harmony.tests.java.beans.auxiliary;
+package org.apache.harmony.beans.tests.java.beans.auxiliary;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/OtherBean.java (from r405685, incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/auxiliary/OtherBean.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/OtherBean.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/OtherBean.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/auxiliary/OtherBean.java&r1=405685&r2=406595&rev=406595&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/auxiliary/OtherBean.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/OtherBean.java Mon May 15 02:40:33 2006
@@ -18,7 +18,7 @@
* @author Maxim V. Berkultsev
* @version $Revision: 1.2.6.3 $
*/
-package org.apache.harmony.tests.java.beans.auxiliary;
+package org.apache.harmony.beans.tests.java.beans.auxiliary;
/**
* @author Maxim V. Berkultsev
Copied: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/OtherEditor.java (from r405685, incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/auxiliary/OtherEditor.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/OtherEditor.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/OtherEditor.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/auxiliary/OtherEditor.java&r1=405685&r2=406595&rev=406595&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/auxiliary/OtherEditor.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/auxiliary/OtherEditor.java Mon May 15 02:40:33 2006
@@ -18,7 +18,7 @@
* @author Maxim V. Berkultsev
* @version $Revision: 1.2.6.2 $
*/
-package org.apache.harmony.tests.java.beans.auxiliary;
+package org.apache.harmony.beans.tests.java.beans.auxiliary;
import java.beans.PropertyEditorSupport;