mkunit.sh was a little dumb, it didn't handle a number of things correctly.

I've written a new program that basically does the same thing, only it's much
more clever, and does many more of the translations and conversions better,
including the #line directives.  Also, I dropped nids, we don't need it anymore.

But now I'm ready to write some serious tests for myriad.

1 files changed, 31 insertions, 30 deletions

diff --git a/src/unit/membuf.unit b/src/unit/membuf.unit
index 883b7f8..1da3b90 100644
--- a/src/unit/membuf.unit
+++ b/src/unit/membuf.unit
@@ -8,38 +8,39 @@
 
 #include "bu/membuf.h"
 
-{=Init}
-
-{%testWriteRead01}
+suite MemBuf
 {
-        Bu::MemBuf mb;
-        unitTest( mb.write("ab", 2 ) == 2 );
-        unitTest( mb.write("cde", 3 ) == 3 );
-        unitTest( mb.write("FG", 2 ) == 2 );
+        test testWriteRead01
+        {
+                Bu::MemBuf mb;
+                unitTest( mb.write("ab", 2 ) == 2 );
+                unitTest( mb.write("cde", 3 ) == 3 );
+                unitTest( mb.write("FG", 2 ) == 2 );
 
-        mb.setPos( 0 );
+                mb.setPos( 0 );
 
-        char buf[8];
-        buf[7] = '\0';
-        unitTest( mb.read( buf, 7 ) == 7 );
-        unitTest( !strncmp( buf, "abcdeFG", 7 ) );
-        unitTest( mb.read( buf, 7 ) == 0 );
-        mb.seek( -3 );
-        unitTest( mb.read( buf, 7 ) == 3 );
-        unitTest( !strncmp( buf, "eFG", 3 ) );
-}
+                char buf[8];
+                buf[7] = '\0';
+                unitTest( mb.read( buf, 7 ) == 7 );
+                unitTest( !strncmp( buf, "abcdeFG", 7 ) );
+                unitTest( mb.read( buf, 7 ) == 0 );
+                mb.seek( -3 );
+                unitTest( mb.read( buf, 7 ) == 3 );
+                unitTest( !strncmp( buf, "eFG", 3 ) );
+        }
 
-{%testOverwrite1}
-{
-        Bu::MemBuf mb;
-        unitTest( mb.write("0123456789") == 10 );
-        mb.setPos( 4 );
-        unitTest( mb.write("-5-") == 3 );
-        mb.setPos( 9 );
-        mb.write("Hey!!!");
-        unitTest( mb.tell() == 15 );
-        char buf[50];
-        mb.setPos( 0 );
-        buf[mb.read( buf, 50 )] = '\0';
-        unitTest( !strcmp( buf, "0123-5-78Hey!!!" ) );
+        test testOverwrite1
+        {
+                Bu::MemBuf mb;
+                unitTest( mb.write("0123456789") == 10 );
+                mb.setPos( 4 );
+                unitTest( mb.write("-5-") == 3 );
+                mb.setPos( 9 );
+                mb.write("Hey!!!");
+                unitTest( mb.tell() == 15 );
+                char buf[50];
+                mb.setPos( 0 );
+                buf[mb.read( buf, 50 )] = '\0';
+                unitTest( !strcmp( buf, "0123-5-78Hey!!!" ) );
+        }
 }