Hib Eris : msi/tests: Test type for INTEGER, SHORT, LONG columns.

[Alexandre Julliard]

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

Author: Hib Eris <Hib(a)hiberis.nl>
Date:   Sat Apr 25 21:35:55 2009 +0200

msi/tests: Test type for INTEGER, SHORT, LONG columns.

---

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

diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c
index ec9443b..2d38274 100644
--- a/dlls/msi/tests/db.c
+++ b/dlls/msi/tests/db.c
@@ -1128,7 +1128,13 @@ static void test_viewgetcolumninfo(void)
 
     r = run_query( hdb, 0,
             "CREATE TABLE `Properties` "
-            "( `Property` CHAR(255), `Value` CHAR(1), `Intvalue` INT PRIMARY KEY `Property`)" );
+            "( `Property` CHAR(255), "
+	    "  `Value` CHAR(1), "
+	    "  `Intvalue` INT, "
+	    "  `Integervalue` INTEGER, "
+	    "  `Shortvalue` SHORT, "
+	    "  `Longvalue` LONG "
+	    "  PRIMARY KEY `Property`)" );
     ok( r == ERROR_SUCCESS , "Failed to create table\n" );
 
     /* check the column types */
@@ -1138,6 +1144,9 @@ static void test_viewgetcolumninfo(void)
     ok( check_record( rec, 1, "S255"), "wrong record type\n");
     ok( check_record( rec, 2, "S1"), "wrong record type\n");
     ok( check_record( rec, 3, "I2"), "wrong record type\n");
+    ok( check_record( rec, 4, "I2"), "wrong record type\n");
+    ok( check_record( rec, 5, "I2"), "wrong record type\n");
+    ok( check_record( rec, 6, "I4"), "wrong record type\n");
 
     MsiCloseHandle( rec );
 
@@ -1145,6 +1154,9 @@ static void test_viewgetcolumninfo(void)
     ok( 0x3dff == get_columns_table_type(hdb, "Properties", 1 ), "_columns table wrong\n");
     ok( 0x1d01 == get_columns_table_type(hdb, "Properties", 2 ), "_columns table wrong\n");
     ok( 0x1502 == get_columns_table_type(hdb, "Properties", 3 ), "_columns table wrong\n");
+    ok( 0x1502 == get_columns_table_type(hdb, "Properties", 4 ), "_columns table wrong\n");
+    todo_wine ok( 0x1502 == get_columns_table_type(hdb, "Properties", 5 ), "_columns table wrong\n");
+    ok( 0x1104 == get_columns_table_type(hdb, "Properties", 6 ), "_columns table wrong\n");
 
     /* now try the names */
     rec = get_column_info( hdb, "select * from `Properties`", MSICOLINFO_NAMES );
@@ -1153,6 +1165,9 @@ static void test_viewgetcolumninfo(void)
     ok( check_record( rec, 1, "Property"), "wrong record type\n");
     ok( check_record( rec, 2, "Value"), "wrong record type\n");
     ok( check_record( rec, 3, "Intvalue"), "wrong record type\n");
+    ok( check_record( rec, 4, "Integervalue"), "wrong record type\n");
+    ok( check_record( rec, 5, "Shortvalue"), "wrong record type\n");
+    ok( check_record( rec, 6, "Longvalue"), "wrong record type\n");
 
     MsiCloseHandle( rec );