From 93d0ceccdf49f97c00925c42ee68bcd08de27cf9 Mon Sep 17 00:00:00 2001
From: adam <adam@megacz.com>
Date: Tue, 28 Aug 2007 01:23:09 +0100
Subject: [PATCH] updates to tests

---
 tests/codebags/fun-with-codebags.fleet   |   14 ++++++++++
 tests/pump/token-on-last-iteration.fleet |    4 +--
 tests/requeue/requeue-expire.fleet       |    4 +--
 tests/requeue/requeueing-literal.fleet   |    8 +++---
 tests/requeue/test-kill-requeueing.fleet |   42 ++++++++++++++++++++++++++++++
 tests/requeue/test-requeue.fleet         |   12 ++++-----
 6 files changed, 70 insertions(+), 14 deletions(-)
 create mode 100644 tests/codebags/fun-with-codebags.fleet
 create mode 100644 tests/requeue/test-kill-requeueing.fleet

diff --git a/tests/codebags/fun-with-codebags.fleet b/tests/codebags/fun-with-codebags.fleet
new file mode 100644
index 0000000..4f82259
--- /dev/null
+++ b/tests/codebags/fun-with-codebags.fleet
@@ -0,0 +1,14 @@
+#expect 3
+
+#ship debug  : Debug
+#ship memory : Memory
+
+memory.inCBD: literal {
+    memory.inCBD: literal {
+        memory.inCBD: literal {
+            debug.in:
+              literal 3;
+              deliver;
+          }; deliver;
+      }; deliver;
+  }; deliver;
diff --git a/tests/pump/token-on-last-iteration.fleet b/tests/pump/token-on-last-iteration.fleet
index 44adb8f..eada980 100644
--- a/tests/pump/token-on-last-iteration.fleet
+++ b/tests/pump/token-on-last-iteration.fleet
@@ -11,8 +11,8 @@ fifo.in:
 
 fifo.out:
   clog;
-  (9) take, sendto debug.in;
-  (3) notifyLast debug.in;
+  take, sendto debug.in, requeue 9 times;
+  notifyLast debug.in, requeue 3 times;
   unclog;
 
 debug.in:
diff --git a/tests/requeue/requeue-expire.fleet b/tests/requeue/requeue-expire.fleet
index 68474fe..89a9ff3 100644
--- a/tests/requeue/requeue-expire.fleet
+++ b/tests/requeue/requeue-expire.fleet
@@ -11,8 +11,8 @@ fifo.out: [*] take, sendto debug.in;
 
 debug.in: 
   clog;
-  (2) take;
-  (3) deliver;
+  take, requeue 2 times;
+  deliver, requeue 3 times;
   unclog;
 
 
diff --git a/tests/requeue/requeueing-literal.fleet b/tests/requeue/requeueing-literal.fleet
index f154cab..3e20147 100644
--- a/tests/requeue/requeueing-literal.fleet
+++ b/tests/requeue/requeueing-literal.fleet
@@ -17,10 +17,10 @@ debug.in:
 
 fifo.out:
   clog;
-  (3) literal 5;
-  (3) sendto debug.in;
-  (3) take;
-  (3) sendto debug.in;
+  literal 5,       requeue 3 times;
+  sendto debug.in, requeue 3 times;
+  take,            requeue 3 times;
+  sendto debug.in, requeue 3 times;
   unclog;
 
 
diff --git a/tests/requeue/test-kill-requeueing.fleet b/tests/requeue/test-kill-requeueing.fleet
new file mode 100644
index 0000000..7a745db
--- /dev/null
+++ b/tests/requeue/test-kill-requeueing.fleet
@@ -0,0 +1,42 @@
+#expect 7
+#expect 7
+#expect 7
+#expect 7
+#expect 8
+
+#ship debug        : Debug
+#ship memory       : Memory
+#ship fifo         : Fifo
+
+debug.in: [*] take, deliver, notify fifo.in;
+
+fifo.out:
+  notify fifo.in;
+  [4] take, sendto debug.in;
+  notify memory.inCBD;
+  [*] take, sendto debug.in;
+
+fifo.in:
+  clog;
+  take,        requeue forever;
+  literal 7,   requeue forever;
+  deliver,     requeue forever;
+  unclog;
+
+memory.inCBD:
+  wait;
+  literal {
+    fifo.in:
+      kill 3;
+      literal 8;
+      deliver;
+      notify memory.inCBD;
+        fifo.in: literal 8; [*] wait, deliver;
+    memory.inCBD:
+      wait;
+      literal {
+      }; deliver;
+  }; deliver;
+
+
+
diff --git a/tests/requeue/test-requeue.fleet b/tests/requeue/test-requeue.fleet
index 08964cb..ec0e15f 100644
--- a/tests/requeue/test-requeue.fleet
+++ b/tests/requeue/test-requeue.fleet
@@ -58,18 +58,18 @@ f.out: take, sendto alu.in1;
        take, sendto alu.in2;
 
 alu.in1:   clog;
-           (*) take, deliver;
-           (*) deliver;
-           (*) dismiss;
-           (4) deliver;
+           take, deliver, requeue forever;
+           deliver,       requeue forever;
+           discard,       requeue forever;
+           deliver,       requeue 4 times ;
            unclog;
 alu.in2:   take;
            [*] deliver;
 alu.inOp:  literal Alu2.inOp[ADD];
            [*] deliver;
 alu.out:   clog;
-           (40) take, sendto alu.in1;
-           (50) sendto debug.in;
+           take, sendto alu.in1, requeue 40 times;
+           sendto debug.in, requeue 50 times;
            unclog;
 debug.in:  [*] take, deliver;
 
-- 
1.7.10.4