diff -r cf3757c60c8f -r 0125e4089f88 test/logging_tests.c --- a/test/logging_tests.c Wed Feb 06 14:31:44 2013 +0100 +++ b/test/logging_tests.c Wed Feb 06 14:35:15 2013 +0100 @@ -8,20 +8,23 @@ char buffer[100]; FILE *stream = tmpfile(); - UcxLogger *logger = ucx_logger_new(stream, UCX_LOGGER_INFO); + UcxLogger *logger = ucx_logger_new(stream, + UCX_LOGGER_INFO, UCX_LOGGER_SOURCE | UCX_LOGGER_LEVEL); UCX_TEST_BEGIN - ucx_logger_info(logger, ST("[INFO:] allright\n")); - ucx_logger_trace(logger, ST("[TRACE:] dont log this!\n")); - ucx_logger_error(logger, ST("[ERROR:] error!\n")); + ucx_logger_info(logger, ST("allright")); + ucx_logger_trace(logger, ST("dont log this!")); + ucx_logger_error(logger, ST("error!")); fseek(stream, 0, SEEK_SET); int r = fread(buffer, 1, 100, stream); - - UCX_TEST_ASSERT(r == 33 && strncmp(buffer, - "[INFO:] allright\n[ERROR:] error!\n", 33) == 0, "incorrect logs"); + + size_t expected_length = 73; + UCX_TEST_ASSERT(r == expected_length && strncmp(buffer, + "[INFO] logging_tests.c:15 - allright\n" + "[ERROR] logging_tests.c:17 - error!\n", expected_length) == 0, "incorrect logs"); UCX_TEST_END - free(logger); + ucx_logger_free(logger); fclose(stream); }