summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@gmail.com>2012-12-10 00:01:22 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2012-12-10 17:35:57 +0100
commit92243bbcde2f22b3ada7b665acc70382de369ddb (patch)
tree3cc1a64d9fedd71cfc8a82242649066ed33531f3 /tests
parent6b7407cb031cf245a4998d8c79009039ead38fc5 (diff)
downloadmsitools-92243bbcde2f22b3ada7b665acc70382de369ddb.tar.gz
msitools-92243bbcde2f22b3ada7b665acc70382de369ddb.tar.xz
msitools-92243bbcde2f22b3ada7b665acc70382de369ddb.zip
Rename libmsi_record_create() to libmsi_record_new()
Diffstat (limited to 'tests')
-rw-r--r--tests/testdatabase.c54
-rw-r--r--tests/testrecord.c16
2 files changed, 35 insertions, 35 deletions
diff --git a/tests/testdatabase.c b/tests/testdatabase.c
index 5e24374..7d20d49 100644
--- a/tests/testdatabase.c
+++ b/tests/testdatabase.c
@@ -406,7 +406,7 @@ static void test_msiinsert(void)
ok(r == LIBMSI_RESULT_BAD_QUERY_SYNTAX, "libmsi_database_open_query failed\n");
/* construct a record to insert */
- hrec = libmsi_record_create(4);
+ hrec = libmsi_record_new(4);
r = libmsi_record_set_int(hrec, 1, 2);
ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_record_set_int failed\n");
r = libmsi_record_set_string(hrec, 2, "Adam");
@@ -480,7 +480,7 @@ static unsigned try_insert_query( LibmsiDatabase *hdb, const char *szQuery )
LibmsiRecord *hrec = 0;
unsigned r;
- hrec = libmsi_record_create( 1 );
+ hrec = libmsi_record_new( 1 );
libmsi_record_set_string( hrec, 1, "Hello");
r = try_query_param( hdb, szQuery, hrec );
@@ -1208,7 +1208,7 @@ static void test_streamtable(void)
/* insert a file into the _Streams table */
create_file( "test.txt" );
- rec = libmsi_record_create( 2 );
+ rec = libmsi_record_new( 2 );
libmsi_record_set_string( rec, 1, "data" );
r = libmsi_record_load_stream( rec, 2, "test.txt" );
@@ -1231,7 +1231,7 @@ static void test_streamtable(void)
/* insert another one */
create_file( "test1.txt" );
- rec = libmsi_record_create( 2 );
+ rec = libmsi_record_new( 2 );
libmsi_record_set_string( rec, 1, "data1" );
r = libmsi_record_load_stream( rec, 2, "test1.txt" );
@@ -1305,7 +1305,7 @@ static void test_streamtable(void)
/* perform an update */
create_file( "test2.txt" );
- rec = libmsi_record_create( 1 );
+ rec = libmsi_record_new( 1 );
r = libmsi_record_load_stream( rec, 1, "test2.txt" );
ok( r == LIBMSI_RESULT_SUCCESS, "Failed to add stream data to the record: %d\n", r);
@@ -1389,7 +1389,7 @@ static void test_binary(void)
ok( r == LIBMSI_RESULT_SUCCESS, "Cannot create Binary table: %d\n", r );
create_file( "test.txt" );
- rec = libmsi_record_create( 1 );
+ rec = libmsi_record_new( 1 );
r = libmsi_record_load_stream( rec, 1, "test.txt" );
ok( r == LIBMSI_RESULT_SUCCESS, "Failed to add stream data to the record: %d\n", r);
unlink( "test.txt" );
@@ -1679,7 +1679,7 @@ static void test_where(void)
ok( r == LIBMSI_RESULT_NO_MORE_ITEMS, "query failed: %d\n", r );
libmsi_unref( rec );
- rec = libmsi_record_create(1);
+ rec = libmsi_record_new(1);
libmsi_record_set_string(rec, 1, "");
sql = "SELECT * FROM `Media` WHERE `DiskPrompt` = ?";
@@ -2170,7 +2170,7 @@ static void test_markers(void)
hdb = create_db();
ok( hdb, "failed to create db\n");
- rec = libmsi_record_create(3);
+ rec = libmsi_record_new(3);
libmsi_record_set_string(rec, 1, "Table");
libmsi_record_set_string(rec, 2, "Apples");
libmsi_record_set_string(rec, 3, "Oranges");
@@ -2182,7 +2182,7 @@ static void test_markers(void)
libmsi_unref(rec);
/* try table name as marker */
- rec = libmsi_record_create(1);
+ rec = libmsi_record_new(1);
libmsi_record_set_string(rec, 1, "Fable");
sql = "CREATE TABLE `?` ( `One` SHORT NOT NULL, `Two` CHAR(255) PRIMARY KEY `One`)";
r = run_query(hdb, rec, sql);
@@ -2209,7 +2209,7 @@ static void test_markers(void)
libmsi_unref(rec);
/* try column names as markers */
- rec = libmsi_record_create(2);
+ rec = libmsi_record_new(2);
libmsi_record_set_string(rec, 1, "One");
libmsi_record_set_string(rec, 2, "Two");
sql = "CREATE TABLE `Mable` ( `?` SHORT NOT NULL, `?` CHAR(255) PRIMARY KEY `One`)";
@@ -2218,7 +2218,7 @@ static void test_markers(void)
libmsi_unref(rec);
/* try names with backticks */
- rec = libmsi_record_create(3);
+ rec = libmsi_record_new(3);
libmsi_record_set_string(rec, 1, "One");
libmsi_record_set_string(rec, 2, "Two");
libmsi_record_set_string(rec, 3, "One");
@@ -2238,7 +2238,7 @@ static void test_markers(void)
libmsi_unref(rec);
/* try one long marker */
- rec = libmsi_record_create(1);
+ rec = libmsi_record_new(1);
libmsi_record_set_string(rec, 1, "`One` SHORT NOT NULL, `Two` CHAR(255) PRIMARY KEY `One`");
sql = "CREATE TABLE `Mable` ( ? )";
r = run_query(hdb, rec, sql);
@@ -2246,7 +2246,7 @@ static void test_markers(void)
libmsi_unref(rec);
/* try all names as markers */
- rec = libmsi_record_create(4);
+ rec = libmsi_record_new(4);
libmsi_record_set_string(rec, 1, "Mable");
libmsi_record_set_string(rec, 2, "One");
libmsi_record_set_string(rec, 3, "Two");
@@ -2265,7 +2265,7 @@ static void test_markers(void)
ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
/* try values as markers */
- rec = libmsi_record_create(2);
+ rec = libmsi_record_new(2);
libmsi_record_set_int(rec, 1, 4);
libmsi_record_set_string(rec, 2, "hi");
sql = "INSERT INTO `Table` ( `One`, `Two` ) VALUES ( ?, '?' )";
@@ -2274,7 +2274,7 @@ static void test_markers(void)
libmsi_unref(rec);
/* try column names and values as markers */
- rec = libmsi_record_create(4);
+ rec = libmsi_record_new(4);
libmsi_record_set_string(rec, 1, "One");
libmsi_record_set_string(rec, 2, "Two");
libmsi_record_set_int(rec, 3, 5);
@@ -2285,7 +2285,7 @@ static void test_markers(void)
libmsi_unref(rec);
/* try column names as markers */
- rec = libmsi_record_create(2);
+ rec = libmsi_record_new(2);
libmsi_record_set_string(rec, 1, "One");
libmsi_record_set_string(rec, 2, "Two");
sql = "INSERT INTO `Table` ( `?`, `?` ) VALUES ( 3, 'yellow' )";
@@ -2294,7 +2294,7 @@ static void test_markers(void)
libmsi_unref(rec);
/* try table name as a marker */
- rec = libmsi_record_create(1);
+ rec = libmsi_record_new(1);
libmsi_record_set_string(rec, 1, "Table");
sql = "INSERT INTO `?` ( `One`, `Two` ) VALUES ( 2, 'green' )";
r = run_query(hdb, rec, sql);
@@ -2302,7 +2302,7 @@ static void test_markers(void)
libmsi_unref(rec);
/* try table name and values as markers */
- rec = libmsi_record_create(3);
+ rec = libmsi_record_new(3);
libmsi_record_set_string(rec, 1, "Table");
libmsi_record_set_int(rec, 2, 10);
libmsi_record_set_string(rec, 3, "haha");
@@ -2312,7 +2312,7 @@ static void test_markers(void)
libmsi_unref(rec);
/* try all markers */
- rec = libmsi_record_create(5);
+ rec = libmsi_record_new(5);
libmsi_record_set_string(rec, 1, "Table");
libmsi_record_set_string(rec, 1, "One");
libmsi_record_set_string(rec, 1, "Two");
@@ -2324,7 +2324,7 @@ static void test_markers(void)
libmsi_unref(rec);
/* insert an integer as a string */
- rec = libmsi_record_create(2);
+ rec = libmsi_record_new(2);
libmsi_record_set_string(rec, 1, "11");
libmsi_record_set_string(rec, 2, "hi");
sql = "INSERT INTO `Table` ( `One`, `Two` ) VALUES ( ?, '?' )";
@@ -2333,7 +2333,7 @@ static void test_markers(void)
libmsi_unref(rec);
/* leave off the '' for the string */
- rec = libmsi_record_create(2);
+ rec = libmsi_record_new(2);
libmsi_record_set_int(rec, 1, 12);
libmsi_record_set_string(rec, 2, "hi");
sql = "INSERT INTO `Table` ( `One`, `Two` ) VALUES ( ?, ? )";
@@ -2620,7 +2620,7 @@ static void test_try_transform(void)
r = run_query(hdb, 0, sql);
ok(r == LIBMSI_RESULT_SUCCESS, "failed to add table\n");
- hrec = libmsi_record_create(2);
+ hrec = libmsi_record_new(2);
r = libmsi_record_set_int(hrec, 1, 2);
ok(r == LIBMSI_RESULT_SUCCESS, "failed to set integer\n");
@@ -4157,7 +4157,7 @@ static void test_update(void)
r = run_query(hdb, 0, sql);
ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
- rec = libmsi_record_create(2);
+ rec = libmsi_record_new(2);
libmsi_record_set_int(rec, 1, 8);
libmsi_record_set_string(rec, 2, "two");
@@ -4731,7 +4731,7 @@ static void test_select_markers(void)
"( `One`, `Two`, `Three` ) VALUES ( 'banana', 'three', 3 )");
ok(r == LIBMSI_RESULT_SUCCESS, "cannot add file to the Media table: %d\n", r);
- rec = libmsi_record_create(2);
+ rec = libmsi_record_new(2);
libmsi_record_set_string(rec, 1, "apple");
libmsi_record_set_string(rec, 2, "two");
@@ -4786,7 +4786,7 @@ static void test_select_markers(void)
libmsi_query_close(query);
libmsi_unref(query);
- rec = libmsi_record_create(2);
+ rec = libmsi_record_new(2);
libmsi_record_set_string(rec, 1, "one");
libmsi_record_set_int(rec, 2, 1);
@@ -6195,7 +6195,7 @@ static void test_storages_table(void)
create_storage("storage.bin");
- hrec = libmsi_record_create(2);
+ hrec = libmsi_record_new(2);
libmsi_record_set_string(hrec, 1, "stgname");
r = libmsi_record_load_stream(hrec, 2, "storage.bin");
@@ -7020,7 +7020,7 @@ static void test_dbmerge(void)
ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
create_file("binary.dat");
- hrec = libmsi_record_create(1);
+ hrec = libmsi_record_new(1);
libmsi_record_load_stream(hrec, 1, "binary.dat");
sql = "INSERT INTO `One` ( `A`, `B` ) VALUES ( 1, ? )";
diff --git a/tests/testrecord.c b/tests/testrecord.c
index f88f43d..07defc0 100644
--- a/tests/testrecord.c
+++ b/tests/testrecord.c
@@ -77,9 +77,9 @@ static void test_msirecord(void)
ok(r == LIBMSI_RESULT_INVALID_HANDLE, "libmsi_record_set_int returned wrong error\n");
r = libmsi_record_set_int(0,-1,0);
ok(r == LIBMSI_RESULT_INVALID_HANDLE, "libmsi_record_set_int returned wrong error\n");
- h = libmsi_record_create(-1);
+ h = libmsi_record_new(-1);
ok(h==0, "created record with -1 elements\n");
- h = libmsi_record_create(0x10000);
+ h = libmsi_record_new(0x10000);
ok(h==0, "created record with 0x10000 elements\n");
r = libmsi_record_clear_data(0);
ok(r == LIBMSI_RESULT_INVALID_HANDLE, "libmsi_record_clear_data returned wrong error\n");
@@ -88,7 +88,7 @@ static void test_msirecord(void)
/* check behaviour of a record with 0 elements */
- h = libmsi_record_create(0);
+ h = libmsi_record_new(0);
ok(h!=0, "couldn't create record with zero elements\n");
r = libmsi_record_get_field_count(h);
ok(r==0, "field count should be zero\n");
@@ -303,7 +303,7 @@ static void test_msirecord(void)
return;
/* streams can't be inserted in field 0 for some reason */
- h = libmsi_record_create(2);
+ h = libmsi_record_new(2);
ok(h, "couldn't create a two field record\n");
r = libmsi_record_load_stream(h, 0, filename);
ok(r == LIBMSI_RESULT_INVALID_PARAMETER, "added stream to field 0\n");
@@ -366,7 +366,7 @@ static void test_MsiRecordGetString(void)
unsigned sz;
unsigned r;
- rec = libmsi_record_create(2);
+ rec = libmsi_record_new(2);
ok(rec != 0, "Expected a valid handle\n");
sz = sizeof(buf);
@@ -390,7 +390,7 @@ static void test_MsiRecordGetString(void)
libmsi_unref(rec);
- rec = libmsi_record_create(1);
+ rec = libmsi_record_new(1);
ok(rec != 0, "Expected a valid handle\n");
r = libmsi_record_set_int(rec, 1, 5);
@@ -427,7 +427,7 @@ static void test_MsiRecordGetInteger(void)
int val;
unsigned r;
- rec = libmsi_record_create(1);
+ rec = libmsi_record_new(1);
ok(rec != 0, "Expected a valid handle\n");
r = libmsi_record_set_string(rec, 1, "5");
@@ -461,7 +461,7 @@ static void test_fieldzero(void)
unsigned sz;
unsigned r;
- rec = libmsi_record_create(1);
+ rec = libmsi_record_new(1);
ok(rec != 0, "Expected a valid handle\n");
r = libmsi_record_get_integer(rec, 0);