1 files changed, 23 insertions, 23 deletions

diff --git a/src/unit/myriad.unit b/src/unit/myriad.unit
index 24d3116..f7bea97 100644
--- a/src/unit/myriad.unit
+++ b/src/unit/myriad.unit
@@ -109,7 +109,7 @@ suite Myriad
         File fMyriad = tempFile( sFileName );
         Myriad m( fMyriad, 32 );
 
-        MyriadStream ms = m.openStream( m.createStream() );
+        MyriadStream ms = m.create( Myriad::ReadWrite );
         ms.setSize( 150 );
         ms.setPos( 145 );
         char stuff[10];
@@ -163,7 +163,7 @@ suite Myriad
         if( iSize < 8 || iSize > 1024 )
             throw ExceptionBase("Read bad data, %d", iSize );
         char *buf = new char[iSize-8];
-        if( s.read( buf, iSize-8 ) < (size_t)iSize-8 )
+        if( s.read( buf, iSize-8 ) < (Bu::size)iSize-8 )
         {
             delete[] buf;
             throw ExceptionBase("Block failed verify (insuffient block data).");
@@ -197,13 +197,12 @@ suite Myriad
         String sFileName("myriad-XXXXXXX");
 
         File fMyriad = tempFile( sFileName );
-        Myriad m( fMyriad );
-        m.initialize( 64 );
+        Myriad m( fMyriad, 64 );
 
         Array<int> aStreams;
         for( int j = 0; j < 5; j++ )
         {
-            aStreams.append( m.createStream() );
+            aStreams.append( m.create( Bu::Myriad::Read ).getId() );
         }
 
         srandom( 512 );
@@ -213,7 +212,7 @@ suite Myriad
             switch( random()%5 )
             {
                 case 0:
-                    aStreams.append( m.createStream() );
+                    aStreams.append( m.create( Bu::Myriad::Read ).getId() );
                     break;
 
                 case 1:
@@ -221,10 +220,10 @@ suite Myriad
                     {
                         int iStream = random()%aStreams.getSize();
                         {
-                            MyriadStream ms = m.openStream( aStreams[iStream] );
+                            MyriadStream ms = m.open( aStreams[iStream],  Myriad::Read );
                             verifyStream( ms );
                         }
-                        m.deleteStream( aStreams[iStream] );
+                        m.erase( aStreams[iStream] );
                         Array<int>::iterator i = aStreams.begin();
                         for( int k = 0; k < iStream; k++ )
                             i++;
@@ -235,11 +234,13 @@ suite Myriad
                 default:
                     if( aStreams.getSize() == 0 )
                     {
-                        aStreams.append( m.createStream() );
+                        aStreams.append(
+                            m.create( Bu::Myriad::Read ).getId()
+                            );
                     }
                     {
                         int iStream = random()%aStreams.getSize();
-                        MyriadStream ms = m.openStream( aStreams[iStream] );
+                        MyriadStream ms = m.open( aStreams[iStream], Myriad::ReadWrite );
                         addBlock( ms );
                         verifyStream( ms );
                     }
@@ -249,7 +250,7 @@ suite Myriad
 
         for( Array<int>::iterator i = aStreams.begin(); i; i++ )
         {
-            MyriadStream ms = m.openStream( *i );
+            MyriadStream ms = m.open( *i, Myriad::Read );
             verifyStream( ms );
         }
     }
@@ -259,14 +260,13 @@ suite Myriad
         String sFileName("myriad-XXXXXXX");
 
         File fMyriad = tempFile( sFileName );
-        Myriad m( fMyriad );
-        m.initialize( 128 );
+        Myriad m( fMyriad, 128 );
 
         Array<int> aStream;
 
         for( int j = 0; j < 5; j++ )
         {
-            aStream.append( m.createStream() );
+            aStream.append( m.create( Bu::Myriad::Read ).getId() );
         }
         
         srandom( 1024 );
@@ -276,7 +276,7 @@ suite Myriad
         {
             for( Array<int>::iterator i = aStream.begin(); i; i++ )
             {
-                MyriadStream ms = m.openStream( *i );
+                MyriadStream ms = m.open( *i, Myriad::ReadWrite );
                 addBlock( ms, false );
                 ms.setSize( ms.tell() );
                 unitTest( ms.read( &b, 1 ) == 0 );
@@ -301,7 +301,7 @@ suite Myriad
 
             for( int j = 0; j < 5; j++ )
             {
-                aStream.append( m.createStream() );
+                aStream.append( m.create( Bu::Myriad::Read ).getId() );
                 incProgress();
             }
         }
@@ -315,7 +315,7 @@ suite Myriad
             Myriad m( fMyriad );
             for( Array<int>::iterator i = aStream.begin(); i; i++ )
             {
-                MyriadStream ms = m.openStream( *i );
+                MyriadStream ms = m.open( *i, Myriad::ReadWrite );
                 addBlock( ms, false );
                 ms.setSize( ms.tell() );
                 unitTest( ms.read( &b, 1 ) == 0 );
@@ -342,17 +342,17 @@ suite Myriad
 
             for( int j = 0; j < 15; j++ )
             {
-                int iStream = m.createStream();
+                MyriadStream ms = m.create( Myriad::Write );
+                int iStream = ms.getId();
                 aStream.append( iStream );
                 VerifyObject vo( random()%1024 );
                 {
-                    MyriadStream ms = m.openStream( iStream );
                     Archive ar( ms, Archive::save );
                     ar << vo;
                     unitTest( ms.tell() == vo.getBytesWritten() );
                     ms.setSize( ms.tell() );
                 }
-                unitTest( m.getStreamSize( iStream ) == vo.getBytesWritten() );
+                unitTest( m.getSize( iStream ) == vo.getBytesWritten() );
                 incProgress();
             }
         }
@@ -365,18 +365,18 @@ suite Myriad
             {
                 VerifyObject vo( random()%1024 );
                 {
-                    MyriadStream ms = m.openStream( *i );
+                    MyriadStream ms = m.open( *i, Myriad::Read );
                     Archive ar( ms, Archive::load );
                     ar >> vo;
                 }
                 {
-                    MyriadStream ms = m.openStream( *i );
+                    MyriadStream ms = m.open( *i, Myriad::WriteNew );
                     Archive ar( ms, Archive::save );
                     ar << vo;
                     unitTest( ms.tell() == vo.getBytesWritten() );
                     ms.setSize( ms.tell() );
                 }
-                unitTest( m.getStreamSize( *i ) == vo.getBytesWritten() );
+                unitTest( m.getSize( *i ) == vo.getBytesWritten() );
                 incProgress();
             }
         }