From ee45c024334a7874f56af215103aea22dd874a1a Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Tue, 31 May 2011 21:48:22 +0200 Subject: [PATCH] example: Fix build warnings of product_database_test. --- src/example/product_database.c | 4 +++- src/example/product_database_test.c | 10 +++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/example/product_database.c b/src/example/product_database.c index 1f03cd0..3fb9641 100644 --- a/src/example/product_database.c +++ b/src/example/product_database.c @@ -15,8 +15,10 @@ */ #include +DatabaseConnection* connect_to_product_database(void); + // Connect to the database containing customer information. -DatabaseConnection* connect_to_product_database() { +DatabaseConnection* connect_to_product_database(void) { return connect_to_database("products.abcd.org", 322); } diff --git a/src/example/product_database_test.c b/src/example/product_database_test.c index e198516..571d51a 100644 --- a/src/example/product_database_test.c +++ b/src/example/product_database_test.c @@ -19,7 +19,7 @@ #include #include -extern DatabaseConnection* connect_to_product_database(); +extern DatabaseConnection* connect_to_product_database(void); /* Mock connect to database function. * NOTE: This mock function is very general could be shared between tests @@ -31,7 +31,7 @@ DatabaseConnection* connect_to_database(const char * const url, return (DatabaseConnection*)((unsigned)mock()); } -void test_connect_to_product_database(void **state) { +static void test_connect_to_product_database(void **state) { expect_string(connect_to_database, url, "products.abcd.org"); expect_value(connect_to_database, port, 322); will_return(connect_to_database, 0xDA7ABA53); @@ -40,7 +40,7 @@ void test_connect_to_product_database(void **state) { /* This test will fail since the expected URL is different to the URL that is * passed to connect_to_database() by connect_to_product_database(). */ -void test_connect_to_product_database_bad_url(void **state) { +static void test_connect_to_product_database_bad_url(void **state) { expect_string(connect_to_database, url, "products.abcd.com"); expect_value(connect_to_database, port, 322); will_return(connect_to_database, 0xDA7ABA53); @@ -50,13 +50,13 @@ void test_connect_to_product_database_bad_url(void **state) { /* This test will fail since the mock connect_to_database() will attempt to * retrieve a value for the parameter port which isn't specified by this * test function. */ -void test_connect_to_product_database_missing_parameter(void **state) { +static void test_connect_to_product_database_missing_parameter(void **state) { expect_string(connect_to_database, url, "products.abcd.org"); will_return(connect_to_database, 0xDA7ABA53); assert_int_equal((int)connect_to_product_database(), 0xDA7ABA53); } -int main(int argc, char* argv[]) { +int main(void) { const UnitTest tests[] = { unit_test(test_connect_to_product_database), unit_test(test_connect_to_product_database_bad_url), -- 2.7.4