(no commit message)

[utils] / wicket / joe / src / test / java / org / wamblee / wicket / inject / InjectionBehaviorTest.java

diff --git a/wicket/joe/src/test/java/org/wamblee/wicket/inject/InjectionBehaviorTest.java b/wicket/joe/src/test/java/org/wamblee/wicket/inject/InjectionBehaviorTest.java
index 4a2fef21c8df962e8aa7ffdf738073244aa93bbf..d54de1ce4265af9f344611e97fc58df40d7e08b0 100644 (file)
--- a/wicket/joe/src/test/java/org/wamblee/wicket/inject/InjectionBehaviorTest.java
+++ b/wicket/joe/src/test/java/org/wamblee/wicket/inject/InjectionBehaviorTest.java
@@ -24,6 +24,7 @@ import org.apache.wicket.Component;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.wamblee.general.ObjectSerializationUtils;
 import org.wamblee.inject.Injector;
 import org.wamblee.inject.InjectorBuilder;
 import org.wamblee.inject.InjectorFactory;
@@ -32,9 +33,9 @@ import static org.mockito.Mockito.*;
 
 public class InjectionBehaviorTest {
 
-    Component component;
-    Injector injector;
-    InjectorFactory injectorFactory;
+    private Component component;
+    private Injector injector;
+    private InjectorFactory injectorFactory;
 
     @Before
     public void setUp() {
@@ -53,26 +54,22 @@ public class InjectionBehaviorTest {
     @Test
     public void testNoInjectionInitially() {
         InjectionBehavior behavior = new InjectionBehavior();
-        behavior.beforeRender(component); 
+        behavior.beforeRender(component);
         verifyNoMoreInteractions(injector);
     }
-    
+
     @Test
-    public void testInjectOnlyOnceAfterDeserialisation() throws Exception { 
+    public void testInjectOnlyOnceAfterDeserialisation() throws Exception {
         InjectionBehavior behavior = new InjectionBehavior();
-        
-        ByteArrayOutputStream bos = new ByteArrayOutputStream(); 
-        ObjectOutputStream os = new ObjectOutputStream(bos); 
-        os.writeObject(behavior);
-        os.flush();
-        ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
-        ObjectInputStream ois = new ObjectInputStream(bis); 
-        behavior = (InjectionBehavior)ois.readObject();
-        
-        behavior.beforeRender(component); 
+
+        behavior = ObjectSerializationUtils.deserialize(
+            ObjectSerializationUtils.serialize(behavior),
+            InjectionBehavior.class);
+
+        behavior.beforeRender(component);
         verify(injector).inject(same(component));
         reset(injector);
-        behavior.beforeRender(component); 
+        behavior.beforeRender(component);
         verifyNoMoreInteractions(injector);
 
     }