[jboss-cvs] JBossCache/tests/functional/org/jboss/cache/marshall ...

[Manik Surtani]

  User: msurtani
  Date: 06/11/02 04:44:38

  Modified:    tests/functional/org/jboss/cache/marshall 
                        JBossSerializationTest.java
  Log:
  Object stream factory enhancements
  
  Revision  Changes    Path
  1.6       +119 -114  JBossCache/tests/functional/org/jboss/cache/marshall/JBossSerializationTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: JBossSerializationTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/marshall/JBossSerializationTest.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- JBossSerializationTest.java	12 May 2006 00:01:47 -0000	1.5
  +++ JBossSerializationTest.java	2 Nov 2006 09:44:38 -0000	1.6
  @@ -25,24 +25,26 @@
   	
   	// you can change these variables to change behavior of this testsuite, for debug purposes:
   	
  -	public static boolean SAVE_FILE=false;
  -	public static boolean USE_STRING=false;
  +   public static boolean SAVE_FILE = false;
  +   public static boolean USE_STRING = false;
   	
   	static class DummyObject implements java.io.Serializable 
   	{
   		private static final long serialVersionUID = -1374365296408936578L;
   		String stringName;
  +
   		public DummyObject()
   		{
   			stringName = "Hello world, blah blah blah." + (new Random().nextInt());
   		}
  +
   		public boolean equals(Object obj)
   		{
  -			return stringName.equals(((DummyObject)obj).stringName);
  +         return stringName.equals(((DummyObject) obj).stringName);
   		}
   	}
   	
  -	private static void saveBytes(File fileName,byte[] bytes) throws Exception
  +   private static void saveBytes(File fileName, byte[] bytes) throws Exception
   	{
   		if (SAVE_FILE)
   		{
  @@ -56,6 +58,7 @@
       {
   
           assertTrue("JBoss Serialization should be enabled by default", ObjectSerializationFactory.useJBossSerialization);
  +      assertEquals("Should be using the JBossObjectStreamFactory", JBossObjectStreamFactory.class, ObjectSerializationFactory.factory.getClass());
           Object dummyObject = null;
           
           if (USE_STRING)
  @@ -68,6 +71,7 @@
           }
   
           ObjectSerializationFactory.useJBossSerialization = false;
  +      ObjectSerializationFactory.factory = new JavaObjectStreamFactory();
           assertTrue("Should be false", !ObjectSerializationFactory.useJBossSerialization);
   
           
  @@ -75,56 +79,57 @@
   
           long start = 0;
           
  -        for (int i=0;i<50000;i++)
  +      for (int i = 0; i < 50000; i++)
           {
           	out.reset();
  -        	if (i==1000)
  +         if (i == 1000)
           	{
  -        		start=System.currentTimeMillis();
  +            start = System.currentTimeMillis();
           	}
   	        ObjectOutputStream objectOut = ObjectSerializationFactory.createObjectOutputStream(out);
  -	        objectOut.writeObject( dummyObject );
  +         objectOut.writeObject(dummyObject);
   	        objectOut.close();
   	        
   	        ObjectInputStream objectInput = ObjectSerializationFactory.createObjectInputStream(out.toByteArray());
   	        Object newObject = objectInput.readObject();
   	        
  -	        assertEquals(dummyObject,newObject);
  -	        assertNotSame(dummyObject,newObject);
  +         assertEquals(dummyObject, newObject);
  +         assertNotSame(dummyObject, newObject);
           }
           
   
           long javaSerializationTime = System.currentTimeMillis() - start;
           int javaSerializationSize = out.toByteArray().length;
           
  -        saveBytes(new File("/tmp/fileJava.bin"),out.toByteArray());
  +      saveBytes(new File("/tmp/fileJava.bin"), out.toByteArray());
           
           ObjectSerializationFactory.useJBossSerialization = true;
  +      ObjectSerializationFactory.factory = new JBossObjectStreamFactory();
           assertTrue("Should be false", ObjectSerializationFactory.useJBossSerialization);
   
  -        start=0;
  -        for (int i=0;i<50000;i++)
  +      start = 0;
  +      for (int i = 0; i < 50000; i++)
           {
           	out.reset();
  -        	if (i==1000)
  +         if (i == 1000)
           	{
  -        		start=System.currentTimeMillis();
  +            start = System.currentTimeMillis();
           	}
   	        ObjectOutputStream objectOut = ObjectSerializationFactory.createObjectOutputStream(out);
  -	        objectOut.writeObject( dummyObject );
  +         objectOut.writeObject(dummyObject);
   	        objectOut.close();
   	        
   	        ObjectInputStream objectInput = ObjectSerializationFactory.createObjectInputStream(out.toByteArray());
   	        Object newObject = objectInput.readObject();
   	        
  -	        assertEquals(dummyObject,newObject);
  -	        assertNotSame(dummyObject,newObject);
  +         assertEquals(dummyObject, newObject);
  +         assertNotSame(dummyObject, newObject);
           }
           long jbossSerializationTime = System.currentTimeMillis() - start;
           int jbossSerializationSize = out.toByteArray().length;
           
           System.out.println("FinishJBoss:" + System.currentTimeMillis());
  -        saveBytes(new File("/tmp/fileJBoss.bin"),out.toByteArray());
  +      saveBytes(new File("/tmp/fileJBoss.bin"), out.toByteArray());
           
           System.out.println("JBossSerialization Time:" + jbossSerializationTime);
           System.out.println("JavaSerialization Time:" + javaSerializationTime);