[exo-jcr-commits] exo-jcr SVN: r2407 - jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization.

[do-not-reply at jboss.org]

Author: areshetnyak
Date: 2010-05-18 08:29:14 -0400 (Tue, 18 May 2010)
New Revision: 2407

Modified:
   jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/TestJCRSerializationEditData.java
   jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/TestPropsDeserialization.java
Log:
EXOJCR-497 : Tests was adapted to CASable storage.

Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/TestJCRSerializationEditData.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/TestJCRSerializationEditData.java	2010-05-18 11:25:19 UTC (rev 2406)
+++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/TestJCRSerializationEditData.java	2010-05-18 12:29:14 UTC (rev 2407)
@@ -50,22 +50,39 @@
       contentNode.setProperty("jcr:mimeType", "plain/text");
       contentNode.setProperty("jcr:lastModified", session.getValueFactory().createValue(Calendar.getInstance()));
       session.save();
+      
+      // check 1
+      List<TransactionChangesLog> srcLog = pl.pushChanges();
 
+      File jcrfile = super.serializeLogs(srcLog);
+
+      List<TransactionChangesLog> destLog = super.deSerializeLogs(jcrfile);
+
+      assertEquals(srcLog.size(), destLog.size());
+
+      for (int i = 0; i < srcLog.size(); i++)
+         checkIterator(srcLog.get(i).getAllStates().iterator(), destLog.get(i).getAllStates().iterator());
+      
+      // edit 1
+      pl = new TesterItemsPersistenceListener(this.session);
       String newData = "____________simple_data_2____________";
-
       session.getRootNode().getNode("cms3").getNode("test").getNode("nnn").getNode("jcr:content").setProperty(
          "jcr:data", newData);
       session.save();
 
-      List<TransactionChangesLog> srcLog = pl.pushChanges();
+      // check 1
+      srcLog = pl.pushChanges();
 
-      File jcrfile = super.serializeLogs(srcLog);
+      jcrfile = super.serializeLogs(srcLog);
 
-      List<TransactionChangesLog> destLog = super.deSerializeLogs(jcrfile);
+      destLog = super.deSerializeLogs(jcrfile);
 
       assertEquals(srcLog.size(), destLog.size());
 
       for (int i = 0; i < srcLog.size(); i++)
          checkIterator(srcLog.get(i).getAllStates().iterator(), destLog.get(i).getAllStates().iterator());
+      
+
+      
    }
 }

Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/TestPropsDeserialization.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/TestPropsDeserialization.java	2010-05-18 11:25:19 UTC (rev 2406)
+++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/TestPropsDeserialization.java	2010-05-18 12:29:14 UTC (rev 2407)
@@ -54,9 +54,7 @@
 
       session.save();
 
-      contentNode.setProperty("jcr:data", new FileInputStream(content2));
-      session.save();
-
+      // check 1
       List<TransactionChangesLog> logs = pl.pushChanges();
 
       File jcrfile = super.serializeLogs(logs);
@@ -67,6 +65,23 @@
 
       for (int i = 0; i < logs.size(); i++)
          checkIterator(logs.get(i).getAllStates().iterator(), destLog.get(i).getAllStates().iterator());
+      
+      // set value
+      pl = new TesterItemsPersistenceListener(this.session);
+      contentNode.setProperty("jcr:data", new FileInputStream(content2));
+      session.save();
+      
+      // check 2
+      logs = pl.pushChanges();
+
+      jcrfile = super.serializeLogs(logs);
+
+      destLog = super.deSerializeLogs(jcrfile);
+
+      assertEquals(logs.size(), destLog.size());
+
+      for (int i = 0; i < logs.size(); i++)
+         checkIterator(logs.get(i).getAllStates().iterator(), destLog.get(i).getAllStates().iterator());
    }
 
 }