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

[Manik Surtani]

  User: msurtani
  Date: 07/04/23 10:09:08

  Modified:    tests/perf/org/jboss/cache/marshall 
                        VersionAwareMarshallerPerfTest.java
  Log:
  Removed dependency on JBoss Serialization
  
  Revision  Changes    Path
  1.4       +9 -31     JBossCache/tests/perf/org/jboss/cache/marshall/VersionAwareMarshallerPerfTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: VersionAwareMarshallerPerfTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/perf/org/jboss/cache/marshall/VersionAwareMarshallerPerfTest.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- VersionAwareMarshallerPerfTest.java	27 Mar 2007 15:42:11 -0000	1.3
  +++ VersionAwareMarshallerPerfTest.java	23 Apr 2007 14:09:08 -0000	1.4
  @@ -45,7 +45,7 @@
   
      private enum Type
      {
  -      VAM_JBOSS_SERIALIZATION, VAM_JDK_SERIALIZATION, JDK_SERIALIZATION
  +      VAM_SERIALIZATION, JDK_SERIALIZATION
      }
   
      protected void setUp() throws Exception
  @@ -63,25 +63,17 @@
      {
         doStandardSerialization();
         tearDown();
  -      doVamJavaSerialization();
  -      tearDown();
  -      doVamJBossSerialization();
  +      doVamSerialization();
   
         // now for some assertions
         Result jdkSer = results.get(Type.JDK_SERIALIZATION);
  -      Result vamJdkSer = results.get(Type.VAM_JDK_SERIALIZATION);
  -      Result vamJBossSer = results.get(Type.VAM_JBOSS_SERIALIZATION);
  -
  -      assertTrue("JDK serialization should, on average, produce larger output than VAM streams", jdkSer.size > vamJBossSer.size);
  -      assertTrue("JDK serialization should, on average, produce larger output than VAM streams", jdkSer.size > vamJdkSer.size);
  +      Result vamSer = results.get(Type.VAM_SERIALIZATION);
   
  -      assertTrue("JDK serialization should, on average, be slower for writing", jdkSer.writeAverageTime > vamJBossSer.writeAverageTime);
  -      assertTrue("JDK serialization should, on average, be slower for writing", jdkSer.writeAverageTime > vamJdkSer.writeAverageTime);
  +      assertTrue("JDK serialization should, on average, produce larger output than VAM streams", jdkSer.size > vamSer.size);
   
  -      assertTrue("JDK serialization should, on average, be slower for reading", jdkSer.readAverageTime > vamJBossSer.readAverageTime);
  -      assertTrue("JDK serialization should, on average, be slower for reading", jdkSer.readAverageTime > vamJdkSer.readAverageTime);
  +      assertTrue("JDK serialization should, on average, be slower for writing", jdkSer.writeAverageTime > vamSer.writeAverageTime);
   
  -      // don't bother pitting JBoss Serialization against Java Serialization for now since this is pretty poor - we may be dropping JBoss Serialization.
  +      assertTrue("JDK serialization should, on average, be slower for reading", jdkSer.readAverageTime > vamSer.readAverageTime);
      }
   
      /**
  @@ -95,23 +87,10 @@
      /**
       * Run this manually if you need to just run this test specifically.
       */
  -   private void doVamJavaSerialization()
  +   private void doVamSerialization()
      {
  -      System.setProperty("serialization.jboss", "false");
         ObjectSerializationFactory.factory = new JavaObjectStreamFactory();
  -      ObjectSerializationFactory.useJBossSerialization = false;
  -      run(Type.VAM_JDK_SERIALIZATION);
  -   }
  -
  -   /**
  -    * Run this manually if you need to just run this test specifically.
  -    */
  -   private void doVamJBossSerialization() throws Exception
  -   {
  -      System.setProperty("serialization.jboss", "true");
  -      ObjectSerializationFactory.factory = (ObjectStreamFactory) Class.forName("org.jboss.cache.marshall.JBossObjectStreamFactory").newInstance();
  -      ObjectSerializationFactory.useJBossSerialization = true;
  -      run(Type.VAM_JBOSS_SERIALIZATION);
  +      run(Type.VAM_SERIALIZATION);
      }
   
      public void run(final Type t)
  @@ -151,8 +130,7 @@
                              if (j < IGNORE_LOOPS) read[j + id] = timeTaken;
                              if (id == 0 && j == 0) size = buffer.length;
                              break;
  -                        case VAM_JBOSS_SERIALIZATION:
  -                        case VAM_JDK_SERIALIZATION:
  +                        case VAM_SERIALIZATION:
                              VersionAwareMarshaller marshaller = new VersionAwareMarshaller(new RegionManager(), false, false, "2.0.0.GA");
   
                              start = System.currentTimeMillis();