Tue, 06 May 2014 14:35:29 +0200
logger: removed unnecessary boundary checks and limited string parts so they always respect buffer lengths
54 | 1 | /* |
103
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
2 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. |
54 | 3 | * |
103
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
4 | * Copyright 2013 Olaf Wintermann. All rights reserved. |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
5 | * |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
6 | * Redistribution and use in source and binary forms, with or without |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
7 | * modification, are permitted provided that the following conditions are met: |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
8 | * |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
9 | * 1. Redistributions of source code must retain the above copyright |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
10 | * notice, this list of conditions and the following disclaimer. |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
11 | * |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
12 | * 2. Redistributions in binary form must reproduce the above copyright |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
13 | * notice, this list of conditions and the following disclaimer in the |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
14 | * documentation and/or other materials provided with the distribution. |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
15 | * |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
16 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
17 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
18 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
19 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
20 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
26 | * POSSIBILITY OF SUCH DAMAGE. |
54 | 27 | */ |
28 | ||
29 | #include "logging_tests.h" | |
170 | 30 | #include <time.h> |
54 | 31 | |
170 | 32 | UCX_TEST(test_ucx_logger_new) { |
33 | ||
55
180bc6b18fec
fixed map tests + used tmpfiles in tests
Mike Becker <universe@uap-core.de>
parents:
54
diff
changeset
|
34 | FILE *stream = tmpfile(); |
80
0125e4089f88
Fixed map tests + added some formatting options to logger
Mike Becker <universe@uap-core.de>
parents:
75
diff
changeset
|
35 | UcxLogger *logger = ucx_logger_new(stream, |
0125e4089f88
Fixed map tests + added some formatting options to logger
Mike Becker <universe@uap-core.de>
parents:
75
diff
changeset
|
36 | UCX_LOGGER_INFO, UCX_LOGGER_SOURCE | UCX_LOGGER_LEVEL); |
54 | 37 | |
38 | UCX_TEST_BEGIN | |
170 | 39 | UCX_TEST_ASSERT(logger->stream == stream, "stream not set"); |
40 | UCX_TEST_ASSERT(logger->mask == (UCX_LOGGER_SOURCE | UCX_LOGGER_LEVEL), | |
41 | "mask not set"); | |
42 | UCX_TEST_ASSERT(logger->level == UCX_LOGGER_INFO, | |
43 | "level not set"); | |
44 | UCX_TEST_ASSERT(logger->writer == (write_func)fwrite, | |
45 | "writer not set to fwrite"); | |
46 | UCX_TEST_ASSERT(strcmp(logger->dateformat, "%F %T %z ") == 0, | |
47 | "date format not set to \"%F %T %z\""); | |
48 | ||
49 | UCX_TEST_ASSERT(logger->levels->count == 4, | |
50 | "incorrect number of registered log levels"); | |
51 | ||
52 | int level = UCX_LOGGER_ERROR; | |
53 | UCX_TEST_ASSERT(strcmp(ucx_map_int_get(logger->levels, level), | |
54 | "[ERROR]") == 0, "invalid error level"); | |
55 | level = UCX_LOGGER_WARN; | |
56 | UCX_TEST_ASSERT(strcmp(ucx_map_int_get(logger->levels, level), | |
57 | "[WARNING]") == 0, "invalid warning level"); | |
58 | level = UCX_LOGGER_INFO; | |
59 | UCX_TEST_ASSERT(strcmp(ucx_map_int_get(logger->levels, level), | |
60 | "[INFO]") == 0, "invalid info level"); | |
61 | level = UCX_LOGGER_TRACE; | |
62 | UCX_TEST_ASSERT(strcmp(ucx_map_int_get(logger->levels, level), | |
63 | "[TRACE]") == 0, "invalid trace level"); | |
64 | ||
65 | UCX_TEST_END | |
66 | ||
67 | fclose(stream); | |
68 | ucx_logger_free(logger); | |
69 | } | |
70 | ||
71 | UCX_TEST(test_ucx_logger_log) { | |
72 | char buffer[100]; | |
73 | ||
74 | FILE *stream = tmpfile(); | |
75 | ||
76 | UcxLogger *logger = ucx_logger_new(stream, | |
77 | UCX_LOGGER_INFO, UCX_LOGGER_SOURCE | UCX_LOGGER_LEVEL); | |
78 | logger->dateformat = "%F:"; | |
79 | ||
80 | UCX_TEST_BEGIN | |
81 | const uint line1 = __LINE__; ucx_logger_info(logger, "allright"); | |
82 | ||
81
86a23238d8a1
changed logger to behave more like printf + added possibility to specify write function
Mike Becker <universe@uap-core.de>
parents:
80
diff
changeset
|
83 | ucx_logger_trace(logger, "dont log this!"); |
170 | 84 | |
85 | logger->mask |= UCX_LOGGER_TIMESTAMP; | |
86 | time_t now = time(NULL); | |
87 | char timestr[13]; | |
88 | strftime(timestr, 12, "%F:", localtime(&now)); | |
89 | const uint line2 = __LINE__; ucx_logger_error(logger, "error %d!", 42); | |
90 | ||
54 | 91 | fseek(stream, 0, SEEK_SET); |
95 | 92 | size_t r = fread(buffer, 1, 100, stream); |
80
0125e4089f88
Fixed map tests + added some formatting options to logger
Mike Becker <universe@uap-core.de>
parents:
75
diff
changeset
|
93 | |
170 | 94 | const size_t expected_length = 87; |
95 | char expected[expected_length+1]; | |
96 | snprintf(expected, expected_length+1, | |
97 | "[INFO] logging_tests.c:%u - allright\n" | |
98 | "[ERROR] %slogging_tests.c:%u - error 42!\n", line1, timestr, line2); | |
99 | ||
100 | UCX_TEST_ASSERT(r == expected_length, "incorrect log length"); | |
101 | UCX_TEST_ASSERT(strncmp(buffer, expected, expected_length) == 0, | |
102 | "incorrect logs"); | |
54 | 103 | |
104 | UCX_TEST_END | |
105 | ||
80
0125e4089f88
Fixed map tests + added some formatting options to logger
Mike Becker <universe@uap-core.de>
parents:
75
diff
changeset
|
106 | ucx_logger_free(logger); |
54 | 107 | fclose(stream); |
108 | } |