From 4f9533c7722fa07511a94d005227961f4a4dec23 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Thu, 18 May 2006 17:29:21 +0000 Subject: Imported GNU Classpath 0.90 Imported GNU Classpath 0.90 * scripts/makemake.tcl: LocaleData.java moved to gnu/java/locale. * sources.am: Regenerated. * gcj/javaprims.h: Regenerated. * Makefile.in: Regenerated. * gcj/Makefile.in: Regenerated. * include/Makefile.in: Regenerated. * testsuite/Makefile.in: Regenerated. * gnu/java/lang/VMInstrumentationImpl.java: New override. * gnu/java/net/local/LocalSocketImpl.java: Likewise. * gnu/classpath/jdwp/VMMethod.java: Likewise. * gnu/classpath/jdwp/VMVirtualMachine.java: Update to latest interface. * java/lang/Thread.java: Add UncaughtExceptionHandler. * java/lang/reflect/Method.java: Implements GenericDeclaration and isSynthetic(), * java/lang/reflect/Field.java: Likewise. * java/lang/reflect/Constructor.java * java/lang/Class.java: Implements Type, GenericDeclaration, getSimpleName() and getEnclosing*() methods. * java/lang/Class.h: Add new public methods. * java/lang/Math.java: Add signum(), ulp() and log10(). * java/lang/natMath.cc (log10): New function. * java/security/VMSecureRandom.java: New override. * java/util/logging/Logger.java: Updated to latest classpath version. * java/util/logging/LogManager.java: New override. From-SVN: r113887 --- .../test/java.io/ObjectOutputStreamTest.java | 157 --------------------- 1 file changed, 157 deletions(-) delete mode 100644 libjava/classpath/test/java.io/ObjectOutputStreamTest.java (limited to 'libjava/classpath/test/java.io/ObjectOutputStreamTest.java') diff --git a/libjava/classpath/test/java.io/ObjectOutputStreamTest.java b/libjava/classpath/test/java.io/ObjectOutputStreamTest.java deleted file mode 100644 index 62f60dc..0000000 --- a/libjava/classpath/test/java.io/ObjectOutputStreamTest.java +++ /dev/null @@ -1,157 +0,0 @@ -/************************************************************************* -/* ObjectOutputStreamTest.java -- Tests ObjectOutputStream class -/* -/* Copyright (c) 1998 by Free Software Foundation, Inc. -/* -/* This program is free software; you can redistribute it and/or modify -/* it under the terms of the GNU General Public License as published -/* by the Free Software Foundation, version 2. (see COPYING) -/* -/* This program 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 for more details. -/* -/* You should have received a copy of the GNU General Public License -/* along with this program; if not, write to the Free Software Foundation -/* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -/*************************************************************************/ - -import java.io.ByteArrayOutputStream; -import java.io.Externalizable; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectInputStream; -import java.io.ObjectOutput; -import java.io.ObjectOutputStream; -import java.io.ObjectStreamException; -import java.io.Serializable; - -public class ObjectOutputStreamTest extends Test -{ - public static void testSerial( Object obj, String filename ) - { - if( writeMode ) - { - try - { - ObjectOutputStream oos = - new ObjectOutputStream( new FileOutputStream( filename ) ); - oos.writeObject( obj ); - oos.close(); - } - catch( ObjectStreamException e ) - {} - catch( IOException ioe ) - { - ioe.printStackTrace(); - } - } - else - { - ByteArrayOutputStream bytes = new ByteArrayOutputStream(); - - try - { - ObjectOutputStream oos = new ObjectOutputStream( bytes ); - oos.writeObject( obj ); - oos.close(); - } - catch( ObjectStreamException e ) - {} - catch( IOException ioe ) - { - fail(); - return; - } - - byte[] jcl_bytes = bytes.toByteArray(); - int data; - - FileInputStream jdk_file; - try - { - jdk_file = new FileInputStream( filename ); - - for( int i=0; i < jcl_bytes.length; i++ ) - { - data = jdk_file.read(); - - if( data == -1 ) - { - fail(); - return; - } - - if( (byte)data != jcl_bytes[i] ) - { - fail(); - return; - } - } - - if( jdk_file.read() != -1 ) - { - fail(); - return; - } - } - catch( IOException e ) - { - error(); - return; - } - - pass(); - } - } - - - public static void main( String[] args ) - { - writeMode = (args.length != 0); - - testSerial( new OOSNotSerial(), "notserial.data" ); - System.out.println( "Non-serializable class" ); - - testSerial( new OOSBadField( 1, 2, new OOSNotSerial() ), - "notserialfield.data" ); - System.out.println( "Object with non-serializable field" ); - - testSerial( new OOSCallDefault( 1, 3.14, "test" ), - "calldefault.data" ); - System.out.println( "Object calling defaultWriteObject()" ); - - testSerial( new OOSNoCallDefault( 17, "no\ndefault", false ), - "nocalldefault.data" ); - System.out.println( "Object not calling defaultWriteObject()" ); - - testSerial( new OOSExtern( -1, "", true ), "external.data" ); - System.out.println( "Externalizable class" ); - - testSerial( new HairyGraph(), "graph.data" ); - System.out.println( "Graph of objects with circular references" ); - } - - - public static boolean writeMode; -} - - -class OOSNotSerial {} - -class OOSBadField implements Serializable -{ - int x; - int y; - OOSNotSerial o; - - OOSBadField( int X, int Y, OOSNotSerial O ) - { - x = X; - y = Y; - o = O; - } -} -- cgit v1.1