INTEGRATION: CWS mav08 (1.2.10); FILE MERGED

2003/10/15 08:31:11 mav 1.2.10.1: #i21121# substorages must implement transacted mode

odk/examples/java/Storage/Test02.java

@@ -88,6 +88,7 @@ public class Test02 implements StorageTest {
                 return false;
 
             // dispose used storage to free resources
+            // the substorage dispose will be triggered by this call
             if ( !m_aTestHelper.disposeStorage( xTempStorage ) )
                 return false;
 

odk/examples/java/Storage/Test03.java

@@ -70,6 +70,9 @@ public class Test03 implements StorageTest {
                                                             ElementModes.ELEMENT_WRITE ) )
                 return false;
 
+            if ( !m_aTestHelper.commitStorage( xTempSubStorage ) )
+                return false;
+
             if ( !m_aTestHelper.disposeStorage( xTempSubStorage ) )
                 return false;
 

odk/examples/java/Storage/Test04.java

@@ -121,6 +121,14 @@ public class Test04 implements StorageTest {
             if ( !m_aTestHelper.copyElementTo( xTempStorage, "SubStorage1", xTempFileStorage ) )
                 return false;
 
+            // if storage is not commited before disposing all the changes will be lost
+            if ( !m_aTestHelper.commitStorage( xTempSubStorage2 ) )
+                return false;
+
+            // a storage must be disposed before moving/removing otherwise the access will be denied
+            if ( !m_aTestHelper.disposeStorage( xTempSubStorage2 ) )
+                return false;
+
             if ( !m_aTestHelper.moveElementTo( xTempStorage, "SubStorage2", xTempFileStorage ) )
                 return false;
 
@@ -212,6 +220,10 @@ public class Test04 implements StorageTest {
             if ( !m_aTestHelper.checkStream( xResSubStorage2, "SubStream2", "MediaType2", pBytes2 ) )
                 return false;
 
+            // the storage must be disposed before removing
+            if ( !m_aTestHelper.disposeStorage( xResSubStorage2 ) )
+                return false;
+
             // remove element and check that it was removed completelly
             if ( !m_aTestHelper.removeElement( xResStorage, "SubStorage2" ) )
                 return false;