[infinispan-commits] Infinispan SVN: r249 - in trunk: core/src/test/java/org/infinispan/marshall and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2009-05-11 13:25:56 -0400 (Mon, 11 May 2009)
New Revision: 249

Modified:
   trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreTest.java
   trunk/core/src/test/java/org/infinispan/marshall/TestObjectStreamMarshaller.java
Log:
Marshalling improvements, removed unnecessary Serializable/Externalizable interfaces, reimplemented TestObjectStreamMarshaller to use XStream to bypass serialization requirements.

Modified: trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreTest.java
===================================================================
--- trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreTest.java	2009-05-11 17:16:41 UTC (rev 248)
+++ trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreTest.java	2009-05-11 17:25:56 UTC (rev 249)
@@ -51,7 +51,7 @@
 
       cacheStoreConfig.setKey2StringMapperClass(DefaultKey2StringMapper.class.getName());
       cacheStore = new JdbcMixedCacheStore();
-      cacheStore.init(cacheStoreConfig, null, new TestObjectStreamMarshaller());
+      cacheStore.init(cacheStoreConfig, null, new TestObjectStreamMarshaller(true));
       cacheStore.start();
    }
 
@@ -103,7 +103,6 @@
       assertRowCounts(0, 0);
    }
 
-   @Test(enabled = false, description = "Re-enable once proper semantics of how the 2 delegate stores multiplex over the stream is figured out.")
    public void testMixedFromAndToStream() throws Exception {
       cacheStore.store(InternalEntryFactory.create("String", "someValue"));
       cacheStore.store(InternalEntryFactory.create("String2", "someValue"));

Modified: trunk/core/src/test/java/org/infinispan/marshall/TestObjectStreamMarshaller.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/marshall/TestObjectStreamMarshaller.java	2009-05-11 17:16:41 UTC (rev 248)
+++ trunk/core/src/test/java/org/infinispan/marshall/TestObjectStreamMarshaller.java	2009-05-11 17:25:56 UTC (rev 249)
@@ -42,11 +42,11 @@
    public void objectToObjectStream(Object obj, ObjectOutput out) throws IOException {
       String xml = xs.toXML(obj);
       debug("Writing: \n" + xml);
-      out.writeUTF(xml);
+      out.writeObject(xml);
    }
 
    public Object objectFromObjectStream(ObjectInput in) throws IOException, ClassNotFoundException {
-      String xml = in.readUTF();
+      String xml = (String) in.readObject();
       debug("Reading: \n" + xml);
       return xs.fromXML(xml);
    }