[jboss-cvs] JBossRemoting/src/tests/org/jboss/test/remoting/transport/socket/raw ...

[Ron Sigal]

  User: rsigal  
  Date: 06/11/02 13:54:22

  Modified:    src/tests/org/jboss/test/remoting/transport/socket/raw  Tag:
                        remoting_2_x RawTestClient.java
  Log:
  JBREM-623:  Conforms to socket wrappers' use of socket streams instead of object streams.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +17 -23    JBossRemoting/src/tests/org/jboss/test/remoting/transport/socket/raw/RawTestClient.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: RawTestClient.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/tests/org/jboss/test/remoting/transport/socket/raw/RawTestClient.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -b -r1.1 -r1.1.2.1
  --- RawTestClient.java	26 Sep 2006 02:27:52 -0000	1.1
  +++ RawTestClient.java	2 Nov 2006 18:54:22 -0000	1.1.2.1
  @@ -5,8 +5,10 @@
   import java.io.BufferedInputStream;
   import java.io.BufferedOutputStream;
   import java.io.IOException;
  +import java.io.InputStream;
   import java.io.ObjectInputStream;
   import java.io.ObjectOutputStream;
  +import java.io.OutputStream;
   import java.net.Socket;
   
   /**
  @@ -22,6 +24,8 @@
   
      private Socket socket = null;
   
  +   private OutputStream out;
  +   private InputStream in;
      private ObjectOutputStream oos;
      private ObjectInputStream objInputStream;
   
  @@ -37,35 +41,30 @@
            {
               getSocket();
   
  -            oos.writeObject("This is the request");
  -
  -            //oos.flush();
  +            // Write version.
  +            out.write(1);
  +            out.flush();
   
  -            oos.reset();
  -            // to make sure stream gets reset
  -            // Stupid ObjectInputStream holds object graph
  -            // can only be set by the client/server sending a TC_RESET
  -            oos.writeObject(Boolean.TRUE);
  +            // Write invocation.
  +            oos = new ObjectOutputStream(out);
  +            oos.writeObject("This is the request");
               oos.flush();
  -            oos.reset();
  -
   
  +            // Get response.
  +            objInputStream = new ObjectInputStream(in);
               Object obj = objInputStream.readObject();
  -
  -            objInputStream.readObject(); // for stupid ObjectInputStream reset
  -
               System.out.println("response: " + obj);
  -
               assertEquals(RawTestServer.RESPONSE, obj);
  -
            }
            catch(IOException e)
            {
               e.printStackTrace();
  +            fail();
            }
            catch(ClassNotFoundException e)
            {
               e.printStackTrace();
  +            fail();
            }
   
      }
  @@ -80,13 +79,8 @@
               socket.setTcpNoDelay(enableTcpNoDelay);
   //            socket.setSoTimeout(timeout);
   
  -            BufferedOutputStream out = new BufferedOutputStream(socket.getOutputStream());
  -//         out.flush();
  -            BufferedInputStream in = new BufferedInputStream(socket.getInputStream());
  -
  -            oos = new ObjectOutputStream(out);
  -            objInputStream = new ObjectInputStream(in);
  -
  +            out = new BufferedOutputStream(socket.getOutputStream());
  +            in = new BufferedInputStream(socket.getInputStream());
            }
            catch(IOException e)
            {