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

[do-not-reply at jboss.org]

Author: areshetnyak
Date: 2009-10-15 10:31:25 -0400 (Thu, 15 Oct 2009)
New Revision: 283

Modified:
   jcr/trunk/component/core/src/test/java/org/exoplatform/services/jcr/impl/value/TestTransientValueDataSpooling.java
Log:
JCR-1227 : has been fixed test TestTransientValueDataSpooling.

Modified: jcr/trunk/component/core/src/test/java/org/exoplatform/services/jcr/impl/value/TestTransientValueDataSpooling.java
===================================================================
--- jcr/trunk/component/core/src/test/java/org/exoplatform/services/jcr/impl/value/TestTransientValueDataSpooling.java	2009-10-15 13:45:07 UTC (rev 282)
+++ jcr/trunk/component/core/src/test/java/org/exoplatform/services/jcr/impl/value/TestTransientValueDataSpooling.java	2009-10-15 14:31:25 UTC (rev 283)
@@ -18,6 +18,16 @@
  */
 package org.exoplatform.services.jcr.impl.value;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FilenameFilter;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import javax.jcr.Node;
+
 import org.exoplatform.services.jcr.BaseStandaloneTest;
 import org.exoplatform.services.jcr.config.WorkspaceEntry;
 import org.exoplatform.services.jcr.core.WorkspaceContainerFacade;
@@ -30,13 +40,6 @@
 import org.exoplatform.services.jcr.impl.dataflow.serialization.ObjectWriterImpl;
 import org.exoplatform.services.jcr.impl.dataflow.serialization.TransactionChangesLogWriter;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FilenameFilter;
-
-import javax.jcr.Node;
-
 /**
  * Created by The eXo Platform SAS.
  * 
@@ -94,27 +97,27 @@
    {
       File tmpFile = createBLOBTempFile(250);
 
-      int countBefore = tmpdir.list(new FilenameFilter()
+      String[] countBefore = tmpdir.list(new FilenameFilter()
       {
          public boolean accept(File dir, String name)
          {
             return name.startsWith("jcrvd");
          }
-      }).length;
+      });
 
       NodeImpl node = (NodeImpl)root.addNode("testNode");
       node.setProperty("testProp", new FileInputStream(tmpFile));
       root.save();
 
-      int countAfter = tmpdir.list(new FilenameFilter()
+      String[] countAfter = tmpdir.list(new FilenameFilter()
       {
          public boolean accept(File dir, String name)
          {
             return name.startsWith("jcrvd");
          }
-      }).length;
+      });
 
-      assertEquals(countBefore + (haveValueStorage ? 0 : 1), countAfter);
+      assertFalse(isSpooling(countBefore, countAfter));
    }
 
    /**
@@ -127,28 +130,28 @@
    {
       File tmpFile = createBLOBTempFile(250);
 
-      int countBefore = tmpdir.list(new FilenameFilter()
+      String[] countBefore = tmpdir.list(new FilenameFilter()
       {
          public boolean accept(File dir, String name)
          {
             return name.startsWith("jcrvd");
          }
-      }).length;
+      });
 
       Node node = root.addNode("testNode");
       node.setProperty("testProp", new FileInputStream(tmpFile));
       node.getProperty("testProp").getStream().close();
       root.save();
 
-      int countAfter = tmpdir.list(new FilenameFilter()
+      String[] countAfter = tmpdir.list(new FilenameFilter()
       {
          public boolean accept(File dir, String name)
          {
             return name.startsWith("jcrvd");
          }
-      }).length;
+      });
 
-      assertEquals(countBefore + (haveValueStorage ? 0 : 1), countAfter);
+      assertFalse(isSpooling(countBefore, countAfter));
    }
 
    public void _testSerialization() throws Exception
@@ -180,4 +183,24 @@
    {
       cLog = (TransactionChangesLog)itemStates;
    }
+   
+   private boolean isSpooling(String[] before, String[] after) {
+    int newFilecount = 0;
+    
+    List<String> lBefore = new ArrayList<String>();
+    for (String sBefore : before)
+      lBefore.add(sBefore);
+    
+    for (String sAfter : after) {
+      if (!lBefore.contains(sAfter)) {
+        if (haveValueStorage && newFilecount == 0 || newFilecount == 0)
+          newFilecount++;
+        else
+          return true;
+      }
+        
+    }
+    
+    return false;
+   }
 }