[MMBASE CVS] tests/bridge/org/mmbase/bridge ProcessorTest.java

[Michiel Meeuwissen]

Update of /var/cvs/tests/bridge/org/mmbase/bridge
In directory james.mmbase.org:/tmp/cvs-serv13662/bridge/org/mmbase/bridge

Modified Files:
        ProcessorTest.java 
Log Message:
count commit tests cannot be done by rmmci


See also: http://cvs.mmbase.org/viewcvs/tests/bridge/org/mmbase/bridge


Index: ProcessorTest.java
===================================================================
RCS file: /var/cvs/tests/bridge/org/mmbase/bridge/ProcessorTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- ProcessorTest.java  25 Nov 2008 16:02:37 -0000      1.3
+++ ProcessorTest.java  2 Dec 2008 08:06:28 -0000       1.4
@@ -22,7 +22,7 @@
 /**
  *
  * @author Michiel Meeuwissen
- * @version $Id: ProcessorTest.java,v 1.3 2008/11/25 16:02:37 michiel Exp $
+ * @version $Id: ProcessorTest.java,v 1.4 2008/12/02 08:06:28 michiel Exp $
  * @since MMBase-1.9.1
   */
 public class ProcessorTest extends BridgeTest {
@@ -32,7 +32,6 @@
         super(name);
     }
 
-    /*
     protected Node testCommitProcessorIsChanged1(Cloud c) {
         NodeManager nm = c.getNodeManager("mustbechanged");
         Node n = nm.createNode();
@@ -107,13 +106,15 @@
         org.mmbase.cache.CacheManager.getInstance().readConfiguration();
     }
 
-    */
+
     protected int testCommitCount(Cloud c) {
         NodeManager nm = c.getNodeManager("datatypes");
         int ccbefore = CountCommitProcessor.count;
         Node n = nm.createNode();
         n.commit();
+        if 
(c.getCloudContext().getUri().equals(ContextProvider.DEFAULT_CLOUD_CONTEXT_NAME))
 {
         assertEquals(ccbefore + 1, CountCommitProcessor.count);
+        }
         return n.getNumber();
     }
 
@@ -126,9 +127,11 @@
         Transaction t = getCloud().getTransaction("commitcount");
         testCommitCount(t);
         t.commit();
+        if 
(getCloudContext().getUri().equals(ContextProvider.DEFAULT_CLOUD_CONTEXT_NAME)) 
{
         // there is no point in calling a commit processor twice
         assertEquals(ccbefore + 1, CountCommitProcessor.count);
     }
+    }
     static int nn = 0;
     public void testCommitCountTransaction2() {
         Transaction t = getCloud().getTransaction("commitcount2");
@@ -139,28 +142,33 @@
         t.commit(); // but only the transaction.
 
         nn = n.getNumber();
-
+        if 
(getCloudContext().getUri().equals(ContextProvider.DEFAULT_CLOUD_CONTEXT_NAME)) 
{
         // commit processor must have been called.
         assertEquals(ccbefore + 1, CountCommitProcessor.count);
     }
+    }
 
     protected void testCommitCountOnChange(Cloud c, int nn) {
         int ccbefore = CountCommitProcessor.count;
         int changedbefore = CountCommitProcessor.changed;
         Node n = c.getNode(nn);
         n.commit();
+        if 
(getCloudContext().getUri().equals(ContextProvider.DEFAULT_CLOUD_CONTEXT_NAME)) 
{
         assertEquals(ccbefore + 1, CountCommitProcessor.count);
         assertEquals(changedbefore, CountCommitProcessor.changed);
     }
+    }
     protected void testCommitCountOnChange2(Cloud c, int nn) {
         int ccbefore = CountCommitProcessor.count;
         int changedbefore = CountCommitProcessor.changed;
         Node n = c.getNode(nn);
         n.setStringValue("string", "foobar");
         n.commit();
+        if 
(getCloudContext().getUri().equals(ContextProvider.DEFAULT_CLOUD_CONTEXT_NAME)) 
{
         assertEquals(ccbefore + 1, CountCommitProcessor.count);
         assertEquals(changedbefore + 1, CountCommitProcessor.changed);
     }
+    }
 
     public void testCommitCountOnChange() {
         testCommitCountOnChange(getCloud(), nn);
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs