From 306b80c1cf9ab490a83b36d3e7cf07e09f9e5d68 Mon Sep 17 00:00:00 2001
From: Mike Buland <eichlan@xagasoft.com>
Date: Sat, 15 May 2010 07:44:10 +0000
Subject: 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.
---
 src/unit/queuebuf.unit | 148 ++++++++++++++++++++++++-------------------------
 1 file changed, 74 insertions(+), 74 deletions(-)

(limited to 'src/unit/queuebuf.unit')

diff --git a/src/unit/queuebuf.unit b/src/unit/queuebuf.unit
index 9ae7d36..29ba858 100644
--- a/src/unit/queuebuf.unit
+++ b/src/unit/queuebuf.unit
@@ -14,91 +14,91 @@
 
 #define RNDCHR ((char)(((double)random()/(double)RAND_MAX)*256.0))
 
-{=Init}
-
-{%testBasic01}
+suite QueueBuf
 {
-	Bu::QueueBuf qb;
-	unitTest( qb.write("ab", 2 ) == 2 );
-	unitTest( qb.write("cde", 3 ) == 3 );
-	unitTest( qb.write("FG", 2 ) == 2 );
+	test testBasic01
+	{
+		Bu::QueueBuf qb;
+		unitTest( qb.write("ab", 2 ) == 2 );
+		unitTest( qb.write("cde", 3 ) == 3 );
+		unitTest( qb.write("FG", 2 ) == 2 );
 
-	char buf[8];
-	buf[7] = '\0';
-	unitTest( qb.read( buf, 7 ) == 7 );
-	unitTest( !strncmp( buf, "abcdeFG", 7 ) );
-	unitTest( qb.read( buf, 7 ) == 0 );
-}
+		char buf[8];
+		buf[7] = '\0';
+		unitTest( qb.read( buf, 7 ) == 7 );
+		unitTest( !strncmp( buf, "abcdeFG", 7 ) );
+		unitTest( qb.read( buf, 7 ) == 0 );
+	}
 
-void QBUF_RANDSTR( Bu::FString &fill, unsigned int iSize )
-{
-	char c;
-	for( unsigned int i=0; i<iSize; ++i )
+	void QBUF_RANDSTR( Bu::FString &fill, unsigned int iSize )
 	{
-		c = RNDCHR;
-		fill.append(&c,1);
+		char c;
+		for( unsigned int i=0; i<iSize; ++i )
+		{
+			c = RNDCHR;
+			fill.append(&c,1);
+		}
 	}
-}
 
-{%testAmounts}
-{
-	srandom(time(NULL));
-	Bu::QueueBuf qb;
-	Bu::FString sTmp;
-	char buf[4096];
-
-	for( int i=0; i<200; ++i )
+	test testAmounts
 	{
-		unsigned int iAmt = (int)RNDCHR+128;
-		sTmp.clear();
-		QBUF_RANDSTR( sTmp, iAmt );
-		unitTest( qb.write( sTmp.getStr(), sTmp.getSize() ) == 
-			(uint32_t)sTmp.getSize() );
-		size_t iRead = qb.read( buf, 4096 );
-		unitTest( iRead == iAmt );
-	}
-}
+		srandom(time(NULL));
+		Bu::QueueBuf qb;
+		Bu::FString sTmp;
+		char buf[4096];
 
-void QBUF_HEXOUT( const char *s, int iSize )
-{
-	for( int i=0; i<iSize; ++i )
-		printf("%02x",(int)(uint8_t)s[i]);
-}
+		for( int i=0; i<200; ++i )
+		{
+			unsigned int iAmt = (int)RNDCHR+128;
+			sTmp.clear();
+			QBUF_RANDSTR( sTmp, iAmt );
+			unitTest( qb.write( sTmp.getStr(), sTmp.getSize() ) == 
+				(uint32_t)sTmp.getSize() );
+			size_t iRead = qb.read( buf, 4096 );
+			unitTest( iRead == iAmt );
+		}
+	}
 
-void QBUF_HASH( Bu::FString &fill, const char *s, int iSize )
-{
-	Bu::Md5 hash;
-	hash.reset();
-	hash.addData( s, iSize );
-	const Bu::FString &sTmp = hash.getResult();
-	fill.append( sTmp.getStr(), 16 );
-}
+	void QBUF_HEXOUT( const char *s, int iSize )
+	{
+		for( int i=0; i<iSize; ++i )
+			printf("%02x",(int)(uint8_t)s[i]);
+	}
 
-{%testRandomData}
-{
-	srandom(time(NULL));
-	Bu::QueueBuf qb;
-	Bu::FString sTmp;
-	Bu::FString sTmp2;
-	char buf[4096];
+	void QBUF_HASH( Bu::FString &fill, const char *s, int iSize )
+	{
+		Bu::Md5 hash;
+		hash.reset();
+		hash.addData( s, iSize );
+		const Bu::FString &sTmp = hash.getResult();
+		fill.append( sTmp.getStr(), 16 );
+	}
 
-	for( int i=0; i<200; ++i )
+	test testRandomData
 	{
-		uint32_t iAmt = (uint32_t)RNDCHR+128;
-		sTmp.clear();
-		sTmp.append( (const char *)&iAmt, 4 );
-		QBUF_RANDSTR( sTmp, iAmt );
-		sTmp2.clear();
-		QBUF_HASH( sTmp2, sTmp.getStr()+4, iAmt );
-		sTmp.append( sTmp2 );
-		unitTest( qb.write( sTmp.getStr(), sTmp.getSize() ) == 
-			(uint32_t)sTmp.getSize() );
-		size_t iRead = qb.read( buf, 4096 );
-		uint32_t iGotSize = *((uint32_t *)buf);
-		unitTest( iRead == iGotSize+4+16 );
-		sTmp2.clear();
-		QBUF_HASH( sTmp2, buf+4, iGotSize );
-		unitTest( !strncmp(sTmp2.getStr(),buf+4+iGotSize,16) );
+		srandom(time(NULL));
+		Bu::QueueBuf qb;
+		Bu::FString sTmp;
+		Bu::FString sTmp2;
+		char buf[4096];
+
+		for( int i=0; i<200; ++i )
+		{
+			uint32_t iAmt = (uint32_t)RNDCHR+128;
+			sTmp.clear();
+			sTmp.append( (const char *)&iAmt, 4 );
+			QBUF_RANDSTR( sTmp, iAmt );
+			sTmp2.clear();
+			QBUF_HASH( sTmp2, sTmp.getStr()+4, iAmt );
+			sTmp.append( sTmp2 );
+			unitTest( qb.write( sTmp.getStr(), sTmp.getSize() ) == 
+				(uint32_t)sTmp.getSize() );
+			size_t iRead = qb.read( buf, 4096 );
+			uint32_t iGotSize = *((uint32_t *)buf);
+			unitTest( iRead == iGotSize+4+16 );
+			sTmp2.clear();
+			QBUF_HASH( sTmp2, buf+4, iGotSize );
+			unitTest( !strncmp(sTmp2.getStr(),buf+4+iGotSize,16) );
+		}
 	}
 }
-
-- 
cgit v1.2.3