[weld-commits] Weld SVN: r5848 - core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization.

[weld-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2010-02-16 14:09:55 -0500 (Tue, 16 Feb 2010)
New Revision: 5848

Modified:
   core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/LoggerConsumer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/SerializationTest.java
Log:
fix test to work incontainer

Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/LoggerConsumer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/LoggerConsumer.java	2010-02-16 15:34:37 UTC (rev 5847)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/LoggerConsumer.java	2010-02-16 19:09:55 UTC (rev 5848)
@@ -16,5 +16,10 @@
    {
       
    }
+   
+   public Logger getLog()
+   {
+      return log;
+   }
 
 }

Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/SerializationTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/SerializationTest.java	2010-02-16 15:34:37 UTC (rev 5847)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/serialization/SerializationTest.java	2010-02-16 19:09:55 UTC (rev 5848)
@@ -16,6 +16,8 @@
  */
 package org.jboss.weld.tests.serialization;
 
+import java.io.Serializable;
+
 import javax.enterprise.inject.IllegalProductException;
 
 import org.jboss.testharness.impl.packaging.Artifact;
@@ -44,9 +46,20 @@
       assert deserializedCMgr.getConversationInstance().get() != null;
    }
    
-   @Test(description="http://lists.jboss.org/pipermail/weld-dev/2010-February/002265.html", expectedExceptions=IllegalProductException.class)
+   @Test(description="http://lists.jboss.org/pipermail/weld-dev/2010-February/002265.html")
    public void testNonSerializableProductInjectedIntoSessionScopedBean()
    {
-      getReference(LoggerConsumer.class).ping();
+      try
+      {
+         getReference(LoggerConsumer.class).ping();
+      }
+      catch (Exception e) 
+      {
+         // If Logger isn't serializable, we get here 
+         assert e instanceof IllegalProductException;
+         return;
+      }
+      // If Logger is serializable we get here
+      assert getReference(LoggerConsumer.class).getLog() instanceof Serializable;
    }
 }