4 files changed, 58 insertions, 9 deletions

diff --git a/src/tests/bigmyriad.cpp b/src/tests/bigmyriad.cpp
index 9af301c..73a3315 100644
--- a/src/tests/bigmyriad.cpp
+++ b/src/tests/bigmyriad.cpp
@@ -5,16 +5,17 @@
 int main()
 {
     Bu::File f("big.myr", Bu::File::Read|Bu::File::Write|Bu::File::Create );
-    Bu::Myriad m( f, 2048 );
+    Bu::Myriad m( f, 512, 12 );
 
-    char *buf = new char[1024*1024*10];
-    memset( buf, 0, 1024*1024*10 );
+#define SSIZE (1024*8) // 1024*1024*10
+    char *buf = new char[SSIZE];
 
-    for( int j = 0; j < 250; j++ )
+    for( int j = 0; j < 25; j++ )
     {
-        m.openStream( m.createStream() ).write( buf, 1024*1024*10 );
-//      m.sync();
-        printf("\r%03d%%", (j+1)*100/250 );
+        memset( buf, j, SSIZE );
+        m.create( Bu::Myriad::Write ).write( buf, SSIZE );
+//        m.sync();
+        printf("\r%03d%%", (j+1)*100/25 );
         fflush( stdout );
     }
 
diff --git a/src/tests/cachedel.cpp b/src/tests/cachedel.cpp
index 817757c..f4cb1b5 100644
--- a/src/tests/cachedel.cpp
+++ b/src/tests/cachedel.cpp
@@ -21,6 +21,12 @@ public:
 
     virtual ~Something()
     {
+        //Bu::println("Deleting %1").arg( this->toString() );
+    }
+
+    void sayHi()
+    {
+        Bu::println("Hello %1").arg( toString() );
     }
 
     virtual Bu::Uuid getKey() const
@@ -39,7 +45,7 @@ public:
         changed();
     }
 
-    virtual Bu::String toString() const=0;
+    virtual Bu::String toString() const=0;// { return Bu::String("ERROR"); };
 
 private:
     Bu::Uuid uId;
@@ -60,6 +66,11 @@ public:
         iNumber( iNumber )
     {
     }
+
+    virtual ~SubSomethingA()
+    {
+        Bu::println("Deleting-A %1").arg( this->toString() );
+    }
     
     virtual Bu::String toString() const
     {
@@ -84,6 +95,10 @@ public:
         sString( sString )
     {
     }
+
+    virtual ~SubSomethingB()
+    {
+    }
     
     virtual Bu::String toString() const
     {
@@ -187,6 +202,11 @@ int main( int, char *[] )
     Bu::MemBuf mbStore;
     SomethingCache c( mbStore );
 
+    {
+        SubSomethingA a("Test", 1);
+        a.sayHi();
+    }
+
     SomethingPtr ptr;
     if( time(NULL)%2 )
         ptr = c.insert( new SubSomethingA("Hello", 55) ).cast<Something>();
@@ -205,8 +225,13 @@ int main( int, char *[] )
 
     SomethingPtr p2 = c.insert( new SubSomethingA("new test", 123) ).cast<Something>();
     id = p2.getKey();
+    Bu::println("p2 %1: %2").arg( id ).arg( c.has( id ) );
     p2.unbind();
+    Bu::println("p2 %1: %2").arg( id ).arg( c.has( id ) );
     c.erase( id );
+    Bu::println("p2 %1: %2").arg( id ).arg( c.has( id ) );
+
+    Bu::println("Program listing over, leaving main scope.");
 
     return 0;
 }
diff --git a/src/tests/myriad.cpp b/src/tests/myriad.cpp
new file mode 100644
index 0000000..ee4eac4
--- /dev/null
+++ b/src/tests/myriad.cpp
@@ -0,0 +1,23 @@
+#include <bu/myriad.h>
+#include <bu/myriadstream.h>
+#include <bu/string.h>
+#include <bu/sio.h>
+#include <bu/file.h>
+
+int main( int , char *[] )
+{
+    Bu::File fMyriad("test.myr", Bu::File::WriteNew|Bu::File::Read );
+    Bu::Myriad m( fMyriad, 32 );
+
+    Bu::MyriadStream ms = m.create( Bu::Myriad::ReadWrite );
+    ms.setSize( 150 );
+    ms.setPos( 145 );
+    char stuff[10];
+    int32_t iRead = ms.read( stuff, 10 );
+
+    Bu::println("Tried to read 10, expect 5, got %1").arg( iRead );
+
+
+    return 0;
+}
+
diff --git a/src/tests/myriadfs.cpp b/src/tests/myriadfs.cpp
index 1266e4b..29ac3d9 100644
--- a/src/tests/myriadfs.cpp
+++ b/src/tests/myriadfs.cpp
@@ -9,7 +9,7 @@ using namespace Bu;
 int main()
 {
 //  Bu::MemBuf mb;
-    Bu::File mb("store.myr", File::Read|File::Write|File::Create );
+    Bu::File mb("store.mfs", File::Read|File::Write|File::Create );
     Bu::MyriadFs mfs( mb, 512 );
 
     sio << "Creating dirs..." << sio.nl;