You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2010/03/09 01:36:45 UTC
svn commit: r920595 - in /myfaces/trinidad/trunk/trinidad-api/src:
main/java/org/apache/myfaces/trinidad/util/ComponentReference.java
test/java/org/apache/myfaces/trinidad/util/ComponentReferenceTest.java
Author: matzew
Date: Tue Mar 9 00:36:44 2010
New Revision: 920595
URL: http://svn.apache.org/viewvc?rev=920595&view=rev
Log:
updated CompRef test and (temporary) change writeReplace to be protected...
Modified:
myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/ComponentReference.java
myfaces/trinidad/trunk/trinidad-api/src/test/java/org/apache/myfaces/trinidad/util/ComponentReferenceTest.java
Modified: myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/ComponentReference.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/ComponentReference.java?rev=920595&r1=920594&r2=920595&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/ComponentReference.java (original)
+++ myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/ComponentReference.java Tue Mar 9 00:36:44 2010
@@ -20,6 +20,7 @@
import java.io.InvalidObjectException;
import java.io.ObjectInputStream;
+import java.io.ObjectStreamException;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
@@ -407,7 +408,7 @@
return _createScopedId(scopedIdLength, scopedIdList, componentId);
}
- private Object writeReplace()
+ protected Object writeReplace() throws ObjectStreamException
{
// Only use the proxy when Serializing
return new SerializationProxy(getScopedId());
@@ -575,7 +576,7 @@
private final String _componentId;
private final String _scopedId;
- private static final long serialVersionUID = 0L;
+ private static final long serialVersionUID = 1L;
}
/**
@@ -647,7 +648,7 @@
private transient volatile String _componentId;
private volatile String _scopedId;
- private static final long serialVersionUID = 0L;
+ private static final long serialVersionUID = 1L;
}
/**
@@ -667,7 +668,7 @@
private final String _scopedId;
- private static final long serialVersionUID = 0L;
+ private static final long serialVersionUID = 1L;
}
private transient volatile List<Object> _componentPath;
@@ -675,5 +676,5 @@
private static final String _FINISH_INITIALIZATION_LIST_KEY = ComponentReference.class.getName() +
"#FINISH_INITIALIZATION";
- private static final long serialVersionUID = -6803949269368863899L;
+ private static final long serialVersionUID = -6803949693688638969L;
}
\ No newline at end of file
Modified: myfaces/trinidad/trunk/trinidad-api/src/test/java/org/apache/myfaces/trinidad/util/ComponentReferenceTest.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-api/src/test/java/org/apache/myfaces/trinidad/util/ComponentReferenceTest.java?rev=920595&r1=920594&r2=920595&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-api/src/test/java/org/apache/myfaces/trinidad/util/ComponentReferenceTest.java (original)
+++ myfaces/trinidad/trunk/trinidad-api/src/test/java/org/apache/myfaces/trinidad/util/ComponentReferenceTest.java Tue Mar 9 00:36:44 2010
@@ -18,9 +18,9 @@
*/
package org.apache.myfaces.trinidad.util;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
@@ -74,7 +74,7 @@
}
@SuppressWarnings("unchecked")
- public void testFailoverOnCustomFacet()
+ public void testFailoverOnCustomFacet() throws IOException, ClassNotFoundException
{
UIViewRoot root = facesContext.getViewRoot();
root.setId("root");
@@ -108,36 +108,26 @@
// find it again!
assertEquals(input, uiRef.getComponent());
- // fake the failover
- try
- {
- FileOutputStream fos = new FileOutputStream("trinidad.failover");
- ObjectOutputStream oos = new ObjectOutputStream(fos);
+ // fake the failover
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ObjectOutputStream oos = new ObjectOutputStream(baos);
- oos.writeObject(uiRef);
+ oos.writeObject(uiRef);
- FileInputStream fis = new FileInputStream("trinidad.failover");
- ObjectInputStream ois = new ObjectInputStream(fis);
+ ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+ ObjectInputStream ois = new ObjectInputStream(bais);
- uiRef = (ComponentReference<UIInput>) ois.readObject();
+ uiRef = (ComponentReference<UIInput>) ois.readObject();
- referencedComp = uiRef.getComponent();
- assertEquals(input, referencedComp);
+ referencedComp = uiRef.getComponent();
+ assertEquals(input, referencedComp);
- // clean up...
- File failoverFile = new File("trinidad.failover");
- failoverFile.delete();
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
}
@SuppressWarnings("unchecked")
- public void testFailover()
+ public void testFailover() throws IOException, ClassNotFoundException
{
UIViewRoot root = facesContext.getViewRoot();
root.setId("root");
@@ -154,30 +144,19 @@
assertEquals(input1, referencedComp);
// fake the failover
- try
- {
- FileOutputStream fos = new FileOutputStream("trinidad.failover");
- ObjectOutputStream oos = new ObjectOutputStream(fos);
-
- oos.writeObject(uiRef);
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ObjectOutputStream oos = new ObjectOutputStream(baos);
- FileInputStream fis = new FileInputStream("trinidad.failover");
- ObjectInputStream ois = new ObjectInputStream(fis);
+ oos.writeObject(uiRef);
+ oos.flush();
- uiRef = (ComponentReference<UIInput>) ois.readObject();
+ ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+ ObjectInputStream ois = new ObjectInputStream(bais);
- referencedComp = uiRef.getComponent();
- assertEquals(input1, referencedComp);
+ uiRef = (ComponentReference<UIInput>) ois.readObject();
- // clean up...
- File failoverFile = new File("trinidad.failover");
- failoverFile.delete();
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
-
+ referencedComp = uiRef.getComponent();
+ assertEquals(input1, referencedComp);
}
public void testEmptyViewRootOnGetComponent()