From 5e6416550f23daff9e622445123b17d2b5d53a8e Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sun, 26 Aug 2018 18:18:02 +0200 Subject: Add tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- Makefile | 4 ++ difftimespec.c | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++- difftimeval.c | 123 ++++++++++++++++++++++++++++++++++++++++++++++++++++- doubletotimespec.c | 13 ++++++ doubletotimeval.c | 13 ++++++ 5 files changed, 269 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 22ac562..048d690 100644 --- a/Makefile +++ b/Makefile @@ -61,6 +61,10 @@ OBJ =\ TESTS =\ asprintf.test\ + difftimespec.test\ + difftimeval.test\ + doubletotimespec.test\ + doubletotimeval.test\ isutf8.test\ memdup.test\ memends.test\ diff --git a/difftimespec.c b/difftimespec.c index 383dced..07f46c9 100644 --- a/difftimespec.c +++ b/difftimespec.c @@ -1,9 +1,10 @@ /* See LICENSE file for copyright and license details. */ #include "libsimple.h" +#ifndef TEST int -libsimple_difftimespec(struct timespec *diff, const struct timespec *minuend, const struct timespec *subtrahend) /* TODO test */ +libsimple_difftimespec(struct timespec *diff, const struct timespec *minuend, const struct timespec *subtrahend) { long int ns = minuend->tv_nsec - subtrahend->tv_nsec; time_t s; @@ -48,3 +49,119 @@ libsimple_difftimespec(struct timespec *diff, const struct timespec *minuend, co diff->tv_nsec = ns; return ret; } + + +#else +#include "test.h" + +int +main(void) +{ + struct timespec r, a, b; + + a.tv_sec = 0, a.tv_nsec = 0L; + b.tv_sec = 0, b.tv_nsec = 0L; + assert(!libsimple_difftimespec(&r, &a, &b)); + assert(r.tv_sec == 0); + assert(r.tv_nsec == 0L); + + a.tv_sec = 10, a.tv_nsec = 0L; + b.tv_sec = 0, b.tv_nsec = 0L; + assert(!libsimple_difftimespec(&r, &a, &b)); + assert(r.tv_sec == 10); + assert(r.tv_nsec == 0L); + + a.tv_sec = 10, a.tv_nsec = 100L; + b.tv_sec = 0, b.tv_nsec = 0L; + assert(!libsimple_difftimespec(&r, &a, &b)); + assert(r.tv_sec == 10); + assert(r.tv_nsec == 100L); + + a.tv_sec = 10, a.tv_nsec = 100L; + b.tv_sec = 1, b.tv_nsec = 0L; + assert(!libsimple_difftimespec(&r, &a, &b)); + assert(r.tv_sec == 9); + assert(r.tv_nsec == 100L); + + a.tv_sec = 10, a.tv_nsec = 100L; + b.tv_sec = 0, b.tv_nsec = 1L; + assert(!libsimple_difftimespec(&r, &a, &b)); + assert(r.tv_sec == 10); + assert(r.tv_nsec == 99L); + + a.tv_sec = -10, a.tv_nsec = 100L; + b.tv_sec = 0, b.tv_nsec = 0L; + assert(!libsimple_difftimespec(&r, &a, &b)); + assert(r.tv_sec == -10); + assert(r.tv_nsec == 100L); + + a.tv_sec = 10, a.tv_nsec = 1L; + b.tv_sec = 1, b.tv_nsec = 100L; + assert(!libsimple_difftimespec(&r, &a, &b)); + assert(r.tv_sec == 8); + assert(r.tv_nsec == 1000000001L - 100L); + + a.tv_sec = 10, a.tv_nsec = 0L; + b.tv_sec = 20, b.tv_nsec = 0L; + assert(!libsimple_difftimespec(&r, &a, &b)); + assert(r.tv_sec == -10); + assert(r.tv_nsec == 0L); + + a.tv_sec = 10, a.tv_nsec = 10L; + b.tv_sec = 20, b.tv_nsec = 0L; + assert(!libsimple_difftimespec(&r, &a, &b)); + assert(r.tv_sec == -10); + assert(r.tv_nsec == 10L); + + a.tv_sec = 10, a.tv_nsec = 10L; + b.tv_sec = 20, b.tv_nsec = 20L; + assert(!libsimple_difftimespec(&r, &a, &b)); + assert(r.tv_sec == -10 - 1); + assert(r.tv_nsec == 1000000010L - 20L); + + a.tv_sec = 10, a.tv_nsec = 10L; + b.tv_sec = -20, b.tv_nsec = 0L; + assert(!libsimple_difftimespec(&r, &a, &b)); + assert(r.tv_sec == 30); + assert(r.tv_nsec == 10L); + + a.tv_sec = 0, a.tv_nsec = 10L; + b.tv_sec = 0, b.tv_nsec = 0L; + assert(!libsimple_difftimespec(&r, &a, &b)); + assert(r.tv_sec == 0); + assert(r.tv_nsec == 10L); + + a.tv_sec = 0, a.tv_nsec = 0L; + b.tv_sec = 0, b.tv_nsec = 10L; + assert(!libsimple_difftimespec(&r, &a, &b)); + assert(r.tv_sec == -1); + assert(r.tv_nsec == 1000000000L - 10L); + + a.tv_sec = TIME_MIN, a.tv_nsec = 0L; + b.tv_sec = 0, b.tv_nsec = 0L; + assert(!libsimple_difftimespec(&r, &a, &b)); + assert(r.tv_sec == TIME_MIN); + assert(r.tv_nsec == 0L); + + a.tv_sec = TIME_MIN, a.tv_nsec = 0L; + b.tv_sec = 0, b.tv_nsec = 1L; + assert(libsimple_difftimespec(&r, &a, &b) == -1 && errno == ERANGE); + assert(r.tv_sec == TIME_MIN); + assert(r.tv_nsec == 0L); + + a.tv_sec = TIME_MIN, a.tv_nsec = 0L; + b.tv_sec = -1, b.tv_nsec = 1L; + assert(!libsimple_difftimespec(&r, &a, &b)); + assert(r.tv_sec == TIME_MIN); + assert(r.tv_nsec == 999999999L); + + a.tv_sec = TIME_MAX, a.tv_nsec = 0L; + b.tv_sec = -1, b.tv_nsec = 0L; + assert(libsimple_difftimespec(&r, &a, &b) == -1 && errno == ERANGE); + assert(r.tv_sec == TIME_MAX); + assert(r.tv_nsec == 999999999L); + + return 0; +} + +#endif diff --git a/difftimeval.c b/difftimeval.c index 9ba06c5..0cd8cda 100644 --- a/difftimeval.c +++ b/difftimeval.c @@ -1,9 +1,10 @@ /* See LICENSE file for copyright and license details. */ #include "libsimple.h" +#ifndef TEST int -libsimple_difftimeval(struct timeval *diff, const struct timeval *minuend, const struct timeval *subtrahend) /* TODO test */ +libsimple_difftimeval(struct timeval *diff, const struct timeval *minuend, const struct timeval *subtrahend) { struct timespec a, b, d; int r; @@ -12,5 +13,123 @@ libsimple_difftimeval(struct timeval *diff, const struct timeval *minuend, const r = libsimple_difftimespec(&d, &a, &b); if (r && errno != ERANGE) return r; - return r | libsimple_timespec2timeval(diff, &d); + if (libsimple_timespec2timeval(diff, &d) && r) + errno = ERANGE; + return r; } + + +#else +#include "test.h" + +int +main(void) +{ + struct timeval r, a, b; + + a.tv_sec = 0, a.tv_usec = 0L; + b.tv_sec = 0, b.tv_usec = 0L; + assert(!libsimple_difftimeval(&r, &a, &b)); + assert(r.tv_sec == 0); + assert(r.tv_usec == 0L); + + a.tv_sec = 10, a.tv_usec = 0L; + b.tv_sec = 0, b.tv_usec = 0L; + assert(!libsimple_difftimeval(&r, &a, &b)); + assert(r.tv_sec == 10); + assert(r.tv_usec == 0L); + + a.tv_sec = 10, a.tv_usec = 100L; + b.tv_sec = 0, b.tv_usec = 0L; + assert(!libsimple_difftimeval(&r, &a, &b)); + assert(r.tv_sec == 10); + assert(r.tv_usec == 100L); + + a.tv_sec = 10, a.tv_usec = 100L; + b.tv_sec = 1, b.tv_usec = 0L; + assert(!libsimple_difftimeval(&r, &a, &b)); + assert(r.tv_sec == 9); + assert(r.tv_usec == 100L); + + a.tv_sec = 10, a.tv_usec = 100L; + b.tv_sec = 0, b.tv_usec = 1L; + assert(!libsimple_difftimeval(&r, &a, &b)); + assert(r.tv_sec == 10); + assert(r.tv_usec == 99L); + + a.tv_sec = -10, a.tv_usec = 100L; + b.tv_sec = 0, b.tv_usec = 0L; + assert(!libsimple_difftimeval(&r, &a, &b)); + assert(r.tv_sec == -10); + assert(r.tv_usec == 100L); + + a.tv_sec = 10, a.tv_usec = 1L; + b.tv_sec = 1, b.tv_usec = 100L; + assert(!libsimple_difftimeval(&r, &a, &b)); + assert(r.tv_sec == 8); + assert(r.tv_usec == 1000001L - 100L); + + a.tv_sec = 10, a.tv_usec = 0L; + b.tv_sec = 20, b.tv_usec = 0L; + assert(!libsimple_difftimeval(&r, &a, &b)); + assert(r.tv_sec == -10); + assert(r.tv_usec == 0L); + + a.tv_sec = 10, a.tv_usec = 10L; + b.tv_sec = 20, b.tv_usec = 0L; + assert(!libsimple_difftimeval(&r, &a, &b)); + assert(r.tv_sec == -10); + assert(r.tv_usec == 10L); + + a.tv_sec = 10, a.tv_usec = 10L; + b.tv_sec = 20, b.tv_usec = 20L; + assert(!libsimple_difftimeval(&r, &a, &b)); + assert(r.tv_sec == -10 - 1); + assert(r.tv_usec == 1000010L - 20L); + + a.tv_sec = 10, a.tv_usec = 10L; + b.tv_sec = -20, b.tv_usec = 0L; + assert(!libsimple_difftimeval(&r, &a, &b)); + assert(r.tv_sec == 30); + assert(r.tv_usec == 10L); + + a.tv_sec = 0, a.tv_usec = 10L; + b.tv_sec = 0, b.tv_usec = 0L; + assert(!libsimple_difftimeval(&r, &a, &b)); + assert(r.tv_sec == 0); + assert(r.tv_usec == 10L); + + a.tv_sec = 0, a.tv_usec = 0L; + b.tv_sec = 0, b.tv_usec = 10L; + assert(!libsimple_difftimeval(&r, &a, &b)); + assert(r.tv_sec == -1); + assert(r.tv_usec == 1000000L - 10L); + + a.tv_sec = TIME_MIN, a.tv_usec = 0L; + b.tv_sec = 0, b.tv_usec = 0L; + assert(!libsimple_difftimeval(&r, &a, &b)); + assert(r.tv_sec == TIME_MIN); + assert(r.tv_usec == 0L); + + a.tv_sec = TIME_MIN, a.tv_usec = 0L; + b.tv_sec = 0, b.tv_usec = 1L; + assert(libsimple_difftimeval(&r, &a, &b) == -1 && errno == ERANGE); + assert(r.tv_sec == TIME_MIN); + assert(r.tv_usec == 0L); + + a.tv_sec = TIME_MIN, a.tv_usec = 0L; + b.tv_sec = -1, b.tv_usec = 1L; + assert(!libsimple_difftimeval(&r, &a, &b)); + assert(r.tv_sec == TIME_MIN); + assert(r.tv_usec == 999999L); + + a.tv_sec = TIME_MAX, a.tv_usec = 0L; + b.tv_sec = -1, b.tv_usec = 0L; + assert(libsimple_difftimeval(&r, &a, &b) == -1 && errno == ERANGE); + assert(r.tv_sec == TIME_MAX); + assert(r.tv_usec == 999999L); + + return 0; +} + +#endif diff --git a/doubletotimespec.c b/doubletotimespec.c index a71d662..a104b37 100644 --- a/doubletotimespec.c +++ b/doubletotimespec.c @@ -1,5 +1,6 @@ /* See LICENSE file for copyright and license details. */ #include "libsimple.h" +#ifndef TEST void @@ -30,3 +31,15 @@ libsimple_doubletotimespec(struct timespec *ts, double d) ts->tv_nsec += 1000000000L; } } + + +#else +#include "test.h" + +int +main(void) +{ + return 0; /* Tested in libsimple.c */ +} + +#endif diff --git a/doubletotimeval.c b/doubletotimeval.c index 5396897..03bacec 100644 --- a/doubletotimeval.c +++ b/doubletotimeval.c @@ -1,5 +1,6 @@ /* See LICENSE file for copyright and license details. */ #include "libsimple.h" +#ifndef TEST void @@ -30,3 +31,15 @@ libsimple_doubletotimeval(struct timeval *tv, double d) tv->tv_usec += 1000000L; } } + + +#else +#include "test.h" + +int +main(void) +{ + return 0; /* Tested in libsimple.c */ +} + +#endif -- cgit v1.2.3-70-g09d2