--- old/modules/base/src/test/java/javafx/event/EventSerializationTest.java 2015-08-31 10:25:08.901216333 -0400 +++ /dev/null 2015-08-30 16:31:40.093001923 -0400 @@ -1,101 +0,0 @@ -/* - * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -package javafx.event; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InvalidObjectException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.util.ArrayList; -import java.util.List; -import javafx.event.EventType.EventTypeSerialization; -import org.junit.Before; -import org.junit.Test; - -import static org.junit.Assert.*; -import org.junit.Ignore; - -/** - * - */ -public class EventSerializationTest { - private ByteArrayOutputStream byteArrayOutputStream; - private ObjectOutputStream objectOutputStream; - private ObjectInputStream objectInputStream; - - @Before - public void setUp() throws IOException { - byteArrayOutputStream = new ByteArrayOutputStream(); - objectOutputStream = new ObjectOutputStream(byteArrayOutputStream); - } - - public void turnToInput() throws IOException { - objectInputStream = new ObjectInputStream(new ByteArrayInputStream(byteArrayOutputStream.toByteArray())); - } - - @Test - public void testPreDefinedEventSerialization() throws IOException, ClassNotFoundException { - ActionEvent a = new ActionEvent(); - - objectOutputStream.writeObject(a); - turnToInput(); - - ActionEvent ra = (ActionEvent) objectInputStream.readObject(); - assertEquals(a.getEventType(), ra.getEventType()); - assertEquals(a.isConsumed(), ra.isConsumed()); - assertEquals(Event.NULL_SOURCE_TARGET, ra.getSource()); - assertEquals(Event.NULL_SOURCE_TARGET, ra.getTarget()); - } - - @Test - public void testNewEventTypeSerialization() throws IOException, ClassNotFoundException { - EventType eventType = new EventType(Event.ANY, "MY_TYPE"); - Event e = new Event(eventType); - - objectOutputStream.writeObject(e); - turnToInput(); - Event re = (Event) objectInputStream.readObject(); - assertEquals(e.getEventType(), re.getEventType()); - assertEquals(e.isConsumed(), re.isConsumed()); - assertEquals(Event.NULL_SOURCE_TARGET, re.getSource()); - assertEquals(Event.NULL_SOURCE_TARGET, re.getTarget()); - - } - - @Test(expected=InvalidObjectException.class) - public void testUnknownEventTypeSerialization() throws IOException, ClassNotFoundException { - List l = new ArrayList(); - l.add("UNKNOWN"); - EventTypeSerialization e = new EventTypeSerialization(l); - - objectOutputStream.writeObject(e); - turnToInput(); - EventType eType = (EventType) objectInputStream.readObject(); - - } -} --- /dev/null 2015-08-30 16:31:40.093001923 -0400 +++ new/modules/base/src/test/java/test/javafx/event/EventSerializationTest.java 2015-08-31 10:25:08.769216335 -0400 @@ -0,0 +1,103 @@ +/* + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package test.javafx.event; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InvalidObjectException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.util.ArrayList; +import java.util.List; +import javafx.event.ActionEvent; +import javafx.event.Event; +import javafx.event.EventType; +import javafx.event.EventTypeShim; +import javafx.event.EventTypeShim.EventTypeSerializationShim; +import org.junit.Before; +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * + */ +public class EventSerializationTest { + private ByteArrayOutputStream byteArrayOutputStream; + private ObjectOutputStream objectOutputStream; + private ObjectInputStream objectInputStream; + + @Before + public void setUp() throws IOException { + byteArrayOutputStream = new ByteArrayOutputStream(); + objectOutputStream = new ObjectOutputStream(byteArrayOutputStream); + } + + public void turnToInput() throws IOException { + objectInputStream = new ObjectInputStream(new ByteArrayInputStream(byteArrayOutputStream.toByteArray())); + } + + @Test + public void testPreDefinedEventSerialization() throws IOException, ClassNotFoundException { + ActionEvent a = new ActionEvent(); + + objectOutputStream.writeObject(a); + turnToInput(); + + ActionEvent ra = (ActionEvent) objectInputStream.readObject(); + assertEquals(a.getEventType(), ra.getEventType()); + assertEquals(a.isConsumed(), ra.isConsumed()); + assertEquals(Event.NULL_SOURCE_TARGET, ra.getSource()); + assertEquals(Event.NULL_SOURCE_TARGET, ra.getTarget()); + } + + @Test + public void testNewEventTypeSerialization() throws IOException, ClassNotFoundException { + EventType eventType = new EventType(Event.ANY, "MY_TYPE"); + Event e = new Event(eventType); + + objectOutputStream.writeObject(e); + turnToInput(); + Event re = (Event) objectInputStream.readObject(); + assertEquals(e.getEventType(), re.getEventType()); + assertEquals(e.isConsumed(), re.isConsumed()); + assertEquals(Event.NULL_SOURCE_TARGET, re.getSource()); + assertEquals(Event.NULL_SOURCE_TARGET, re.getTarget()); + + } + + @Test(expected=InvalidObjectException.class) + public void testUnknownEventTypeSerialization() throws IOException, ClassNotFoundException { + List l = new ArrayList(); + l.add("UNKNOWN"); + Object e = EventTypeShim.getEventTypeSerialization(l); + + objectOutputStream.writeObject(e); + turnToInput(); + EventType eType = (EventType) objectInputStream.readObject(); + } +}