MarinaTest: use expectNorthFifoExactly()

diff --git a/marina/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java b/marina/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
index 06035b9..f26bf5a 100644 (file)
--- a/marina/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
+++ b/marina/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
@@ -1102,12 +1102,10 @@ public class MarinaTest {
                 new Instruction.Set(dock,Predicate.IgnoreFlagD,SetDest.InnerLoopCounter,1),
                 SEND_DATA,
             });
-        dataItems = marina.data.drainMany(1);
-        fatal(dataItems.size()!=0, "Expected exactly no data items to emerge but got at least: "+dataItems.size());
-        marina.instrIn.fill(new Instruction.Tail(dock));
 
-        BitVector bv = marina.data.drain();
-        fatal(bv==null, "Expected at least one data item to emerge but got none");
+        expectNorthFifoExactly(0);
+        marina.instrIn.fill(new Instruction.Tail(dock));
+        expectNorthFifoAtLeast(1);
 
         adjustIndent(-2);
         prln("End testHeadWaitsForTail");