more testing

[disorder] / lib / test.c

diff --git a/lib/test.c b/lib/test.c
index 5454fd327b3d589c10d301f4bff053b4b8298e27..50280546fa9d306d5a91ea6afd7d496593c06bf2 100644 (file)
--- a/lib/test.c
+++ b/lib/test.c
@@ -34,8 +34,10 @@
 #include <signal.h>
 #include <sys/wait.h>
 #include <stddef.h>
+#include <sys/socket.h>
+#include <netdb.h>
+#include <netinet/in.h>
 
-#include "utf8.h"
 #include "mem.h"
 #include "log.h"
 #include "vector.h"
@@ -57,6 +59,8 @@
 #include "printf.h"
 #include "basen.h"
 #include "split.h"
+#include "configuration.h"
+#include "addr.h"
 
 static int tests, errors;
 static int fail_first;
@@ -883,12 +887,17 @@ static void test_cache(void) {
 static void test_filepart(void) {
   fprintf(stderr, "test_filepart\n");
   check_string(d_dirname("/"), "/");
+  check_string(d_dirname("////"), "/");
   check_string(d_dirname("/spong"), "/");
+  check_string(d_dirname("////spong"), "/");
   check_string(d_dirname("/foo/bar"), "/foo");
+  check_string(d_dirname("////foo/////bar"), "////foo");
   check_string(d_dirname("./bar"), ".");
+  check_string(d_dirname(".//bar"), ".");
   check_string(d_dirname("."), ".");
   check_string(d_dirname(".."), ".");
   check_string(d_dirname("../blat"), "..");
+  check_string(d_dirname("..//blat"), "..");
   check_string(d_dirname("wibble"), ".");
   check_string(extension("foo.c"), ".c");
   check_string(extension(".c"), ".c");
@@ -896,6 +905,11 @@ static void test_filepart(void) {
   check_string(extension("foo"), "");
   check_string(extension("./foo"), "");
   check_string(extension("./foo.c"), ".c");
+  check_string(strip_extension("foo.c"), "foo");
+  check_string(strip_extension("foo.mp3"), "foo");
+  check_string(strip_extension("foo.---"), "foo.---");
+  check_string(strip_extension("foo.---xyz"), "foo.---xyz");
+  check_string(strip_extension("foo.bar/wibble.spong"), "foo.bar/wibble");
 }
 
 static void test_selection(void) {
@@ -1045,6 +1059,8 @@ static void test_printf(void) {
   intmax_t m;
   ssize_t ssz;
   ptrdiff_t p;
+  char *cp;
+  char buffer[16];
   
   fprintf(stderr, "test_printf\n");
   check_string(do_printf("%d", 999), "999");
@@ -1122,6 +1138,21 @@ static void test_printf(void) {
   check_string(do_printf("wibble"), "wibble");
   insist(do_printf("%") == 0);
   insist(do_printf("%=") == 0);
+  i = byte_asprintf(&cp, "xyzzy %d", 999);
+  insist(i == 9);
+  check_string(cp, "xyzzy 999");
+  i = byte_snprintf(buffer, sizeof buffer, "xyzzy %d", 999);
+  insist(i == 9);
+  check_string(buffer, "xyzzy 999");
+  i = byte_snprintf(buffer, sizeof buffer, "%*d", 32, 99);
+  insist(i == 32);
+  check_string(buffer, "               ");
+  {
+    /* bizarre workaround for compiler checking of format strings */
+    char f[] = "xyzzy %";
+    i = byte_asprintf(&cp, f);
+    insist(i == -1);
+  }
 }
 
 static void test_basen(void) {
@@ -1252,6 +1283,55 @@ static void test_hash(void) {
   check_integer(hash_count(h), 0);
 }
 
+static void test_addr(void) {
+  struct stringlist a;
+  const char *s[2];
+  struct addrinfo *ai;
+  char *name;
+  const struct sockaddr_in *sin;
+
+  static const struct addrinfo pref = {
+    AI_PASSIVE,
+    PF_INET,
+    SOCK_STREAM,
+    0,
+    0,
+    0,
+    0,
+    0
+  };
+
+  a.n = 1;
+  a.s = (char **)s;
+  s[0] = "smtp";
+  ai = get_address(&a, &pref, &name);
+  insist(ai != 0);
+  check_integer(ai->ai_family, PF_INET);
+  check_integer(ai->ai_socktype, SOCK_STREAM);
+  check_integer(ai->ai_protocol, IPPROTO_TCP);
+  check_integer(ai->ai_addrlen, sizeof(struct sockaddr_in));
+  sin = (const struct sockaddr_in *)ai->ai_addr;
+  check_integer(sin->sin_family, AF_INET);
+  check_integer(sin->sin_addr.s_addr, 0);
+  check_integer(ntohs(sin->sin_port), 25);
+  check_string(name, "host * service smtp");
+
+  a.n = 2;
+  s[0] = "localhost";
+  s[1] = "nntp";
+  ai = get_address(&a, &pref, &name);
+  insist(ai != 0);
+  check_integer(ai->ai_family, PF_INET);
+  check_integer(ai->ai_socktype, SOCK_STREAM);
+  check_integer(ai->ai_protocol, IPPROTO_TCP);
+  check_integer(ai->ai_addrlen, sizeof(struct sockaddr_in));
+  sin = (const struct sockaddr_in *)ai->ai_addr;
+  check_integer(sin->sin_family, AF_INET);
+  check_integer(ntohl(sin->sin_addr.s_addr), 0x7F000001);
+  check_integer(ntohs(sin->sin_port), 119);
+  check_string(name, "host localhost service nntp");
+}
+
 int main(void) {
   mem_init();
   fail_first = !!getenv("FAIL_FIRST");
@@ -1265,6 +1345,7 @@ int main(void) {
   insist('a' == 0x61);
   insist('z' == 0x7A);
   /* addr.c */
+  test_addr();
   /* asprintf.c */
   /* authhash.c */
   /* basen.c */