You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directmemory.apache.org by no...@apache.org on 2012/11/02 20:49:40 UTC
svn commit: r1405128 [2/2] - in
/directmemory/lightning/trunk/lightning-core/src:
main/java/org/apache/directmemory/lightning/
main/java/org/apache/directmemory/lightning/io/
test/java/org/apache/directmemory/lightning/
test/java/org/apache/directmemor...
Modified: directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/ListMarshallerTestCase.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/ListMarshallerTestCase.java?rev=1405128&r1=1405127&r2=1405128&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/ListMarshallerTestCase.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/ListMarshallerTestCase.java Fri Nov 2 19:49:39 2012
@@ -32,6 +32,8 @@ import org.apache.directmemory.lightning
import org.apache.directmemory.lightning.Serializer;
import org.apache.directmemory.lightning.base.AbstractSerializerDefinition;
import org.apache.directmemory.lightning.internal.util.DebugLogger;
+import org.apache.directmemory.lightning.io.InputStreamSource;
+import org.apache.directmemory.lightning.io.OutputStreamTarget;
import org.apache.directmemory.lightning.metadata.Attribute;
import org.junit.Test;
@@ -65,10 +67,12 @@ public class ListMarshallerTestCase
value.setList( list );
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- serializer.serialize( value, baos );
+ OutputStreamTarget target = new OutputStreamTarget( baos );
+ serializer.serialize( value, target );
ByteArrayInputStream bais = new ByteArrayInputStream( baos.toByteArray() );
- Object result = serializer.deserialize( bais );
+ InputStreamSource source = new InputStreamSource( bais );
+ Object result = serializer.deserialize( source );
assertNotNull( result );
assertEquals( value, result );
@@ -100,10 +104,12 @@ public class ListMarshallerTestCase
value.setList( list );
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- serializer.serialize( value, baos );
+ OutputStreamTarget target = new OutputStreamTarget( baos );
+ serializer.serialize( value, target );
ByteArrayInputStream bais = new ByteArrayInputStream( baos.toByteArray() );
- Object result = serializer.deserialize( bais );
+ InputStreamSource source = new InputStreamSource( bais );
+ Object result = serializer.deserialize( source );
assertNotNull( result );
assertEquals( value, result );
@@ -146,10 +152,12 @@ public class ListMarshallerTestCase
value.setList( list );
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- serializer.serialize( value, baos );
+ OutputStreamTarget target = new OutputStreamTarget( baos );
+ serializer.serialize( value, target );
ByteArrayInputStream bais = new ByteArrayInputStream( baos.toByteArray() );
- Object result = serializer.deserialize( bais );
+ InputStreamSource source = new InputStreamSource( bais );
+ Object result = serializer.deserialize( source );
assertNotNull( result );
assertEquals( value, result );
Modified: directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/LongMarshallerTestCase.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/LongMarshallerTestCase.java?rev=1405128&r1=1405127&r2=1405128&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/LongMarshallerTestCase.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/LongMarshallerTestCase.java Fri Nov 2 19:49:39 2012
@@ -29,6 +29,8 @@ import org.apache.directmemory.lightning
import org.apache.directmemory.lightning.Serializer;
import org.apache.directmemory.lightning.base.AbstractSerializerDefinition;
import org.apache.directmemory.lightning.internal.util.DebugLogger;
+import org.apache.directmemory.lightning.io.InputStreamSource;
+import org.apache.directmemory.lightning.io.OutputStreamTarget;
import org.apache.directmemory.lightning.metadata.Attribute;
import org.junit.Test;
@@ -56,10 +58,12 @@ public class LongMarshallerTestCase
value.setValue2( Long.MAX_VALUE );
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- serializer.serialize( value, baos );
+ OutputStreamTarget target = new OutputStreamTarget( baos );
+ serializer.serialize( value, target );
ByteArrayInputStream bais = new ByteArrayInputStream( baos.toByteArray() );
- Object result = serializer.deserialize( bais );
+ InputStreamSource source = new InputStreamSource( bais );
+ Object result = serializer.deserialize( source );
assertNotNull( result );
assertEquals( value, result );
@@ -69,10 +73,12 @@ public class LongMarshallerTestCase
value.setValue2( 20 );
baos = new ByteArrayOutputStream();
- serializer.serialize( value, baos );
+ target = new OutputStreamTarget( baos );
+ serializer.serialize( value, target );
bais = new ByteArrayInputStream( baos.toByteArray() );
- result = serializer.deserialize( bais );
+ source = new InputStreamSource( bais );
+ result = serializer.deserialize( source );
assertNotNull( result );
assertEquals( value, result );
@@ -100,10 +106,12 @@ public class LongMarshallerTestCase
value.setValue3( 34L );
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- serializer.serialize( value, baos );
+ OutputStreamTarget target = new OutputStreamTarget( baos );
+ serializer.serialize( value, target );
ByteArrayInputStream bais = new ByteArrayInputStream( baos.toByteArray() );
- Object result = serializer.deserialize( bais );
+ InputStreamSource source = new InputStreamSource( bais );
+ Object result = serializer.deserialize( source );
assertNotNull( result );
assertEquals( value, result );
@@ -114,10 +122,12 @@ public class LongMarshallerTestCase
value.setValue3( null );
baos = new ByteArrayOutputStream();
- serializer.serialize( value, baos );
+ target = new OutputStreamTarget( baos );
+ serializer.serialize( value, target );
bais = new ByteArrayInputStream( baos.toByteArray() );
- result = serializer.deserialize( bais );
+ source = new InputStreamSource( bais );
+ result = serializer.deserialize( source );
assertNotNull( result );
assertEquals( value, result );
@@ -128,10 +138,12 @@ public class LongMarshallerTestCase
value.setValue3( Long.MAX_VALUE );
baos = new ByteArrayOutputStream();
- serializer.serialize( value, baos );
+ target = new OutputStreamTarget( baos );
+ serializer.serialize( value, target );
bais = new ByteArrayInputStream( baos.toByteArray() );
- result = serializer.deserialize( bais );
+ source = new InputStreamSource( bais );
+ result = serializer.deserialize( source );
assertNotNull( result );
assertEquals( value, result );
Modified: directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/MapMarshallerTestCase.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/MapMarshallerTestCase.java?rev=1405128&r1=1405127&r2=1405128&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/MapMarshallerTestCase.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/MapMarshallerTestCase.java Fri Nov 2 19:49:39 2012
@@ -34,8 +34,9 @@ import org.apache.directmemory.lightning
import org.apache.directmemory.lightning.Serializer;
import org.apache.directmemory.lightning.base.AbstractSerializerDefinition;
import org.apache.directmemory.lightning.internal.util.DebugLogger;
+import org.apache.directmemory.lightning.io.InputStreamSource;
+import org.apache.directmemory.lightning.io.OutputStreamTarget;
import org.apache.directmemory.lightning.metadata.Attribute;
-import org.junit.Ignore;
import org.junit.Test;
public class MapMarshallerTestCase
@@ -68,10 +69,12 @@ public class MapMarshallerTestCase
value.setMap( map );
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- serializer.serialize( value, baos );
+ OutputStreamTarget target = new OutputStreamTarget( baos );
+ serializer.serialize( value, target );
ByteArrayInputStream bais = new ByteArrayInputStream( baos.toByteArray() );
- Object result = serializer.deserialize( bais );
+ InputStreamSource source = new InputStreamSource( bais );
+ Object result = serializer.deserialize( source );
assertNotNull( result );
assertEquals( value, result );
@@ -102,10 +105,12 @@ public class MapMarshallerTestCase
value.setMap( map );
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- serializer.serialize( value, baos );
+ OutputStreamTarget target = new OutputStreamTarget( baos );
+ serializer.serialize( value, target );
ByteArrayInputStream bais = new ByteArrayInputStream( baos.toByteArray() );
- Object result = serializer.deserialize( bais );
+ InputStreamSource source = new InputStreamSource( bais );
+ Object result = serializer.deserialize( source );
assertNotNull( result );
assertEquals( value, result );
@@ -148,10 +153,12 @@ public class MapMarshallerTestCase
value.setSet( set );
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- serializer.serialize( value, baos );
+ OutputStreamTarget target = new OutputStreamTarget( baos );
+ serializer.serialize( value, target );
ByteArrayInputStream bais = new ByteArrayInputStream( baos.toByteArray() );
- Object result = serializer.deserialize( bais );
+ InputStreamSource source = new InputStreamSource( bais );
+ Object result = serializer.deserialize( source );
assertNotNull( result );
assertEquals( value, result );
Modified: directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/SetMarshallerTestCase.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/SetMarshallerTestCase.java?rev=1405128&r1=1405127&r2=1405128&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/SetMarshallerTestCase.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/SetMarshallerTestCase.java Fri Nov 2 19:49:39 2012
@@ -32,8 +32,9 @@ import org.apache.directmemory.lightning
import org.apache.directmemory.lightning.Serializer;
import org.apache.directmemory.lightning.base.AbstractSerializerDefinition;
import org.apache.directmemory.lightning.internal.util.DebugLogger;
+import org.apache.directmemory.lightning.io.InputStreamSource;
+import org.apache.directmemory.lightning.io.OutputStreamTarget;
import org.apache.directmemory.lightning.metadata.Attribute;
-import org.junit.Ignore;
import org.junit.Test;
public class SetMarshallerTestCase
@@ -66,10 +67,12 @@ public class SetMarshallerTestCase
value.setSet( set );
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- serializer.serialize( value, baos );
+ OutputStreamTarget target = new OutputStreamTarget( baos );
+ serializer.serialize( value, target );
ByteArrayInputStream bais = new ByteArrayInputStream( baos.toByteArray() );
- Object result = serializer.deserialize( bais );
+ InputStreamSource source = new InputStreamSource( bais );
+ Object result = serializer.deserialize( source );
assertNotNull( result );
assertEquals( value, result );
@@ -101,10 +104,12 @@ public class SetMarshallerTestCase
value.setSet( set );
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- serializer.serialize( value, baos );
+ OutputStreamTarget target = new OutputStreamTarget( baos );
+ serializer.serialize( value, target );
ByteArrayInputStream bais = new ByteArrayInputStream( baos.toByteArray() );
- Object result = serializer.deserialize( bais );
+ InputStreamSource source = new InputStreamSource( bais );
+ Object result = serializer.deserialize( source );
assertNotNull( result );
assertEquals( value, result );
@@ -147,10 +152,12 @@ public class SetMarshallerTestCase
value.setSet( set );
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- serializer.serialize( value, baos );
+ OutputStreamTarget target = new OutputStreamTarget( baos );
+ serializer.serialize( value, target );
ByteArrayInputStream bais = new ByteArrayInputStream( baos.toByteArray() );
- Object result = serializer.deserialize( bais );
+ InputStreamSource source = new InputStreamSource( bais );
+ Object result = serializer.deserialize( source );
assertNotNull( result );
assertEquals( value, result );
Modified: directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/ShortMarshallerTestCase.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/ShortMarshallerTestCase.java?rev=1405128&r1=1405127&r2=1405128&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/ShortMarshallerTestCase.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/marshaller/ShortMarshallerTestCase.java Fri Nov 2 19:49:39 2012
@@ -29,6 +29,8 @@ import org.apache.directmemory.lightning
import org.apache.directmemory.lightning.Serializer;
import org.apache.directmemory.lightning.base.AbstractSerializerDefinition;
import org.apache.directmemory.lightning.internal.util.DebugLogger;
+import org.apache.directmemory.lightning.io.InputStreamSource;
+import org.apache.directmemory.lightning.io.OutputStreamTarget;
import org.apache.directmemory.lightning.metadata.Attribute;
import org.junit.Test;
@@ -56,10 +58,12 @@ public class ShortMarshallerTestCase
value.setValue2( Short.MAX_VALUE );
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- serializer.serialize( value, baos );
+ OutputStreamTarget target = new OutputStreamTarget( baos );
+ serializer.serialize( value, target );
ByteArrayInputStream bais = new ByteArrayInputStream( baos.toByteArray() );
- Object result = serializer.deserialize( bais );
+ InputStreamSource source = new InputStreamSource( bais );
+ Object result = serializer.deserialize( source );
assertNotNull( result );
assertEquals( value, result );
@@ -69,10 +73,12 @@ public class ShortMarshallerTestCase
value.setValue2( (short) 20 );
baos = new ByteArrayOutputStream();
- serializer.serialize( value, baos );
+ target = new OutputStreamTarget( baos );
+ serializer.serialize( value, target );
bais = new ByteArrayInputStream( baos.toByteArray() );
- result = serializer.deserialize( bais );
+ source = new InputStreamSource( bais );
+ result = serializer.deserialize( source );
assertNotNull( result );
assertEquals( value, result );
@@ -100,10 +106,12 @@ public class ShortMarshallerTestCase
value.setValue3( (short) 34 );
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- serializer.serialize( value, baos );
+ OutputStreamTarget target = new OutputStreamTarget( baos );
+ serializer.serialize( value, target );
ByteArrayInputStream bais = new ByteArrayInputStream( baos.toByteArray() );
- Object result = serializer.deserialize( bais );
+ InputStreamSource source = new InputStreamSource( bais );
+ Object result = serializer.deserialize( source );
assertNotNull( result );
assertEquals( value, result );
@@ -114,10 +122,12 @@ public class ShortMarshallerTestCase
value.setValue3( null );
baos = new ByteArrayOutputStream();
- serializer.serialize( value, baos );
+ target = new OutputStreamTarget( baos );
+ serializer.serialize( value, target );
bais = new ByteArrayInputStream( baos.toByteArray() );
- result = serializer.deserialize( bais );
+ source = new InputStreamSource( bais );
+ result = serializer.deserialize( source );
assertNotNull( result );
assertEquals( value, result );
@@ -128,10 +138,12 @@ public class ShortMarshallerTestCase
value.setValue3( Short.MAX_VALUE );
baos = new ByteArrayOutputStream();
- serializer.serialize( value, baos );
+ target = new OutputStreamTarget( baos );
+ serializer.serialize( value, target );
bais = new ByteArrayInputStream( baos.toByteArray() );
- result = serializer.deserialize( bais );
+ source = new InputStreamSource( bais );
+ result = serializer.deserialize( source );
assertNotNull( result );
assertEquals( value, result );