[jboss-cvs] JBossAS SVN: r66131 - in projects/microcontainer/trunk: managed/src/main/org/jboss/managed/plugins and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2007-10-15 13:03:56 -0400 (Mon, 15 Oct 2007)
New Revision: 66131

Modified:
   projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/test/DeployerManagedDeploymentUnitTestCase.java
   projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/ManagedPropertyImpl.java
   projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/WritethroughManagedPropertyImpl.java
Log:
Fixed the tests (to be actually used :-)).
Fixed WritethroughManagedProperty - missing target managed object.

Modified: projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/test/DeployerManagedDeploymentUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/test/DeployerManagedDeploymentUnitTestCase.java	2007-10-15 17:01:32 UTC (rev 66130)
+++ projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/test/DeployerManagedDeploymentUnitTestCase.java	2007-10-15 17:03:56 UTC (rev 66131)
@@ -21,18 +21,13 @@
 */
 package org.jboss.test.deployers.managed.test;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.net.URL;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Map;
 import java.util.Set;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
-
 import org.jboss.deployers.client.spi.DeployerClient;
 import org.jboss.deployers.client.spi.Deployment;
 import org.jboss.deployers.spi.attachments.MutableAttachments;
@@ -72,7 +67,7 @@
    
    public static Test suite()
    {
-      return new TestSuite(DeployerManagedObjectUnitTestCase.class);
+      return new TestSuite(DeployerManagedDeploymentUnitTestCase.class);
    }
 
    public DeployerManagedDeploymentUnitTestCase(String name)
@@ -88,7 +83,7 @@
 
       Map<String, ManagedProperty> props = mo.getProperties();
       log.info("DSMetaData props: "+props);
-      assertEquals(3, props.size());
+      assertEquals(2, props.size());
    }
 
    public void testManagedDeployment()
@@ -167,13 +162,10 @@
       validateDeployment1(mo1, ps);
 
       // Validate that the ManagedDeployment is serializable
-      ByteArrayOutputStream baos = new ByteArrayOutputStream();
-      ObjectOutputStream oos = new ObjectOutputStream(baos);
-      oos.writeObject(mo1);
-      ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-      ObjectInputStream ois = new ObjectInputStream(bais);
-      ManagedDeployment mo1test = (ManagedDeployment) ois.readObject();
-      validateDeployment1(mo1test, ps);
+      assertInstanceOf(mo1, Serializable.class);
+      byte[] bytes = serialize((Serializable)mo1);
+      ManagedDeployment dmo1 = (ManagedDeployment)deserialize(bytes);
+      validateDeployment1(dmo1, ps);
    }
 
    protected void validateDeployment1(ManagedDeployment mo1, MockProfileService ps)

Modified: projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/ManagedPropertyImpl.java
===================================================================
--- projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/ManagedPropertyImpl.java	2007-10-15 17:01:32 UTC (rev 66130)
+++ projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/ManagedPropertyImpl.java	2007-10-15 17:03:56 UTC (rev 66131)
@@ -126,6 +126,7 @@
    {
       return targetManagedObject;
    }
+
    public void setTargetManagedObject(ManagedObject target)
    {
       this.targetManagedObject = target;

Modified: projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/WritethroughManagedPropertyImpl.java
===================================================================
--- projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/WritethroughManagedPropertyImpl.java	2007-10-15 17:01:32 UTC (rev 66130)
+++ projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/WritethroughManagedPropertyImpl.java	2007-10-15 17:03:56 UTC (rev 66131)
@@ -124,6 +124,8 @@
     */
    private Object writeReplace() throws ObjectStreamException
    {
-      return new ManagedPropertyImpl(getManagedObject(), getFields());
+      ManagedPropertyImpl managedProperty = new ManagedPropertyImpl(getManagedObject(), getFields());
+      managedProperty.setTargetManagedObject(getTargetManagedObject());
+      return managedProperty;
    }
 }