Mike McCormack : msi: Add some more tests for MsiOpenDatabase.

Alexandre Julliard julliard at wine.codeweavers.com
Tue Sep 12 07:30:19 CDT 2006


Module: wine
Branch: master
Commit: e1757fcad2503e0113034bc25eca0f9f601f777c
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=e1757fcad2503e0113034bc25eca0f9f601f777c

Author: Mike McCormack <mike at codeweavers.com>
Date:   Tue Sep 12 15:28:43 2006 +0900

msi: Add some more tests for MsiOpenDatabase.

---

 dlls/msi/tests/db.c |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 53 insertions(+), 1 deletions(-)

diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c
index 3635f59..f46190a 100644
--- a/dlls/msi/tests/db.c
+++ b/dlls/msi/tests/db.c
@@ -35,7 +35,7 @@ #endif
 
 static void test_msidatabase(void)
 {
-    MSIHANDLE hdb = 0;
+    MSIHANDLE hdb = 0, hdb2 = 0;
     UINT res;
 
     DeleteFile(msifile);
@@ -47,9 +47,61 @@ static void test_msidatabase(void)
     res = MsiDatabaseCommit( hdb );
     ok( res == ERROR_SUCCESS , "Failed to commit database\n" );
 
+    ok( INVALID_FILE_ATTRIBUTES != GetFileAttributes( msifile ), "database should exist\n");
+
+    res = MsiCloseHandle( hdb );
+    ok( res == ERROR_SUCCESS , "Failed to close database\n" );
+    todo_wine {
+    res = MsiOpenDatabase( msifile, msifile2, &hdb2 );
+    ok( res == ERROR_SUCCESS , "Failed to close database\n" );
+
+    ok( INVALID_FILE_ATTRIBUTES != GetFileAttributes( msifile2 ), "database should exist\n");
+
+    res = MsiDatabaseCommit( hdb2 );
+    ok( res == ERROR_SUCCESS , "Failed to commit database\n" );
+    }
+    res = MsiCloseHandle( hdb2 );
+    ok( res == ERROR_SUCCESS , "Failed to close database\n" );
+
+    res = MsiOpenDatabase( msifile, MSIDBOPEN_READONLY, &hdb );
+    ok( res == ERROR_SUCCESS , "Failed to open database\n" );
+
     res = MsiCloseHandle( hdb );
     ok( res == ERROR_SUCCESS , "Failed to close database\n" );
 
+    res = MsiOpenDatabase( msifile, MSIDBOPEN_DIRECT, &hdb );
+    ok( res == ERROR_SUCCESS , "Failed to open database\n" );
+
+    res = MsiCloseHandle( hdb );
+    ok( res == ERROR_SUCCESS , "Failed to close database\n" );
+
+    res = MsiOpenDatabase( msifile, MSIDBOPEN_TRANSACT, &hdb );
+    ok( res == ERROR_SUCCESS , "Failed to open database\n" );
+
+    res = MsiCloseHandle( hdb );
+    ok( res == ERROR_SUCCESS , "Failed to close database\n" );
+    todo_wine {
+    ok( INVALID_FILE_ATTRIBUTES != GetFileAttributes( msifile2 ), "database should exist\n");
+
+    /* MSIDBOPEN_CREATE deletes the database if MsiCommitDatabase isn't called */
+    res = MsiOpenDatabase( msifile, MSIDBOPEN_CREATE, &hdb );
+    ok( res == ERROR_SUCCESS , "Failed to open database\n" );
+
+    res = MsiCloseHandle( hdb );
+    ok( res == ERROR_SUCCESS , "Failed to close database\n" );
+
+    res = MsiOpenDatabase( msifile, MSIDBOPEN_CREATE, &hdb );
+    ok( res == ERROR_SUCCESS , "Failed to open database\n" );
+
+    res = MsiDatabaseCommit( hdb );
+    ok( res == ERROR_SUCCESS , "Failed to commit database\n" );
+
+    res = MsiCloseHandle( hdb );
+    ok( res == ERROR_SUCCESS , "Failed to close database\n" );
+
+    res = DeleteFile( msifile2 );
+    ok( res == TRUE, "Failed to delete database\n" );
+    }
     res = DeleteFile( msifile );
     ok( res == TRUE, "Failed to delete database\n" );
 }




More information about the wine-cvs mailing list