diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-11 11:06:48 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-11 11:06:48 +0100 |
| commit | 4a33d8ff9f1e0593bd49922cd46aa3e6a7aa1273 (patch) | |
| tree | aa850a84a8406f497bb020169038f6f732febd61 /tests | |
| parent | 52387b9a15aa1209b1582c53f26a2c558e79cc75 (diff) | |
| parent | 0ffc9bc6e55b5e42766e68fb6cc087f6cbead6e0 (diff) | |
| download | msitools-4a33d8ff9f1e0593bd49922cd46aa3e6a7aa1273.tar.gz msitools-4a33d8ff9f1e0593bd49922cd46aa3e6a7aa1273.tar.xz msitools-4a33d8ff9f1e0593bd49922cd46aa3e6a7aa1273.zip | |
Merge branch 'pre-gsf'
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/testdatabase.c | 2 | ||||
| -rw-r--r-- | tests/testrecord.c | 9 | ||||
| -rw-r--r-- | tests/testsuite.at | 6 |
3 files changed, 6 insertions, 11 deletions
diff --git a/tests/testdatabase.c b/tests/testdatabase.c index 543b307..0a89013 100644 --- a/tests/testdatabase.c +++ b/tests/testdatabase.c @@ -357,7 +357,7 @@ static void test_msiinsert(void) ok(r == 3, "record count wrong\n"); r = libmsi_record_is_null(hrec, 0); - ok(r == false, "field 0 not null\n"); + ok(r == true, "Expected true, got %d\n", r); r = libmsi_record_get_integer(hrec, 1); ok(r == 1, "field 1 contents wrong\n"); diff --git a/tests/testrecord.c b/tests/testrecord.c index df0a63b..d3d896e 100644 --- a/tests/testrecord.c +++ b/tests/testrecord.c @@ -77,10 +77,6 @@ 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_new(-1); - ok(h==0, "created record with -1 elements\n"); - 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"); r = libmsi_record_get_field_size(0,0); @@ -581,10 +577,9 @@ static void test_fieldzero(void) ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r); r = libmsi_record_get_integer(rec, 0); - ok(r != MSI_NULL_INTEGER && r != 0, "Expected non-NULL value, got %d\n", r); - + ok(r == MSI_NULL_INTEGER, "Expected NULL value, got %d\n", r); r = libmsi_record_is_null(rec, 0); - ok(r == false, "Expected false, got %d\n", r); + ok(r == true, "Expected true, got %d\n", r); r = libmsi_unref(hview); ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_unref failed\n"); diff --git a/tests/testsuite.at b/tests/testsuite.at index e222d62..eb6dcec 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -53,21 +53,21 @@ AT_BANNER([libmsi tests]) AT_SETUP([testdatabase]) AT_KEYWORDS([testdatabase]) AT_SKIP_IF([! test -f $abs_builddir/tests/testdatabase$EXEEXT]) -AT_CHECK([tests/testdatabase$EXEEXT], [ignore], [stdout], [ignore]) +AT_CHECK([$abs_builddir/tests/testdatabase$EXEEXT], [ignore], [stdout], [ignore]) AT_CHECK([grep ^FAIL stdout], [1], [], []) AT_CLEANUP AT_SETUP([testrecord]) AT_KEYWORDS([testrecord]) AT_SKIP_IF([! test -f $abs_builddir/tests/testrecord$EXEEXT]) -AT_CHECK([tests/testrecord$EXEEXT], [ignore], [stdout], [ignore]) +AT_CHECK([$abs_builddir/tests/testrecord$EXEEXT], [ignore], [stdout], [ignore]) AT_CHECK([grep ^FAIL stdout], [1], [], []) AT_CLEANUP AT_SETUP([testsuminfo]) AT_KEYWORDS([testsuminfo]) AT_SKIP_IF([! test -f $abs_builddir/tests/testsuminfo$EXEEXT]) -AT_CHECK([tests/testsuminfo$EXEEXT], [ignore], [stdout], [ignore]) +AT_CHECK([$abs_builddir/tests/testsuminfo$EXEEXT], [ignore], [stdout], [ignore]) AT_CHECK([grep ^FAIL stdout], [1], [], []) AT_CLEANUP |