[openejb-scm] openejb/modules/core/src/test/org/openejb/client JNDIRequestTest.java

[dblevins]

dblevins    2004/09/25 14:12:56

  Modified:    modules/core/src/test/org/openejb/client
                        JNDIRequestTest.java
  Log:

  Cleaned up the test code
  
  Revision  Changes    Path
  1.2       +16 -22    
openejb/modules/core/src/test/org/openejb/client/JNDIRequestTest.java
  
  Index: JNDIRequestTest.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/test/org/openejb/client/JNDIRequestTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JNDIRequestTest.java      25 Sep 2004 01:29:54 -0000      1.1
  +++ JNDIRequestTest.java      25 Sep 2004 18:12:56 -0000      1.2
  @@ -44,10 +44,7 @@
    */
   package org.openejb.client;
   
  -import java.io.ByteArrayInputStream;
  -import java.io.ByteArrayOutputStream;
  -import java.io.ObjectInputStream;
  -import java.io.ObjectOutputStream;
  +import java.io.*;
   
   import junit.framework.TestCase;
   
  @@ -56,41 +53,38 @@
   
       public void testExternalize() throws Exception {
           JNDIRequest expected = new 
JNDIRequest(RequestMethods.JNDI_LOOKUP,"this/is/a/jndi/name");
  +        JNDIRequest actual = new JNDIRequest();
   
  -        ByteArrayOutputStream baos = new ByteArrayOutputStream();
  -        ObjectOutputStream out = new ObjectOutputStream(baos);
  +        externalize(expected, actual);
   
  -        expected.writeExternal(out);
  -        out.close();
  +        assertEquals("Request method not the 
same",expected.getRequestMethod(),actual.getRequestMethod());
  +        assertEquals("ClientModuleID not the 
same",expected.getClientModuleID(),actual.getClientModuleID());
  +        assertEquals("JNDI Name not the 
same",expected.getRequestString(),actual.getRequestString());
  +    }
   
  -        ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
  -        ObjectInputStream in = new ObjectInputStream(bais);
   
  +    public void testExternalize2() throws Exception {
  +        JNDIRequest expected = new 
JNDIRequest(RequestMethods.JNDI_LOOKUP,"foobar","this/is/a/jndi/name");
           JNDIRequest actual = new JNDIRequest();
  -        actual.readExternal(in);
  +
  +        externalize(expected, actual);
   
           assertEquals("Request method not the 
same",expected.getRequestMethod(),actual.getRequestMethod());
           assertEquals("ClientModuleID not the 
same",expected.getClientModuleID(),actual.getClientModuleID());
           assertEquals("JNDI Name not the 
same",expected.getRequestString(),actual.getRequestString());
       }
  -    
  -    public void testExternalize2() throws Exception {
  -        JNDIRequest expected = new 
JNDIRequest(RequestMethods.JNDI_LOOKUP,"foobar","this/is/a/jndi/name");
   
  +
  +    private void externalize(Externalizable original, Externalizable copy) throws 
IOException, ClassNotFoundException {
           ByteArrayOutputStream baos = new ByteArrayOutputStream();
           ObjectOutputStream out = new ObjectOutputStream(baos);
   
  -        expected.writeExternal(out);
  +        original.writeExternal(out);
           out.close();
   
           ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
           ObjectInputStream in = new ObjectInputStream(bais);
   
  -        JNDIRequest actual = new JNDIRequest();
  -        actual.readExternal(in);
  -
  -        assertEquals("Request method not the 
same",expected.getRequestMethod(),actual.getRequestMethod());
  -        assertEquals("ClientModuleID not the 
same",expected.getClientModuleID(),actual.getClientModuleID());
  -        assertEquals("JNDI Name not the 
same",expected.getRequestString(),actual.getRequestString());
  +        copy.readExternal(in);
       }
   }