tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: Add unit tests for hpdelim. 

OpenBSD-Regress-ID: be97b85c19895e6a1ce13c639765a3b48fd95018
This commit is contained in:
dtucker@openbsd.org 2022-02-04 07:53:44 +00:00 committed by Damien Miller
parent 9699151b03
commit a29af853cf
4 changed files with 156 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.in
View File

@ -656,7 +656,8 @@ UNITTESTS_TEST_MISC_OBJS=\
regress/unittests/misc/test_expand.o \
regress/unittests/misc/test_convtime.o \
regress/unittests/misc/test_argv.o \
regress/unittests/misc/test_strdelim.o
regress/unittests/misc/test_strdelim.o \
regress/unittests/misc/test_hpdelim.o
regress/unittests/misc/test_misc$(EXEEXT): \
${UNITTESTS_TEST_MISC_OBJS} \

3
regress/unittests/misc/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.7 2021/05/21 03:48:07 djm Exp $
# $OpenBSD: Makefile,v 1.8 2022/02/04 07:53:44 dtucker Exp $
PROG=test_misc
SRCS=tests.c
@ -7,6 +7,7 @@ SRCS+= test_expand.c
SRCS+= test_parse.c
SRCS+= test_argv.c
SRCS+= test_strdelim.c
SRCS+= test_hpdelim.c
# From usr.bin/ssh/Makefile.inc
SRCS+= sshbuf.c

149
regress/unittests/misc/test_hpdelim.c Normal file
View File

@ -0,0 +1,149 @@
/* $OpenBSD: test_hpdelim.c,v 1.1 2022/02/04 07:53:44 dtucker Exp $ */
/*
* Regress test for misc hpdelim() and co
*
* Placed in the public domain.
*/
#include "includes.h"
#include <sys/types.h>
#include <stdio.h>
#ifdef HAVE_STDINT_H
#include <stdint.h>
#endif
#include <stdlib.h>
#include <string.h>
#include "test_helper.h"
#include "log.h"
#include "misc.h"
#include "xmalloc.h"
void test_hpdelim(void);
void
test_hpdelim(void)
{
char *orig, *str, *cp, *port;
#define START_STRING(x) orig = str = xstrdup(x)
#define DONE_STRING() free(orig)
TEST_START("hpdelim host only");
START_STRING("host");
cp = hpdelim(&str);
ASSERT_STRING_EQ(cp, "host");
ASSERT_PTR_EQ(str, NULL);
DONE_STRING();
TEST_DONE();
TEST_START("hpdelim host:port");
START_STRING("host:1234");
cp = hpdelim(&str);
ASSERT_STRING_EQ(cp, "host");
ASSERT_PTR_NE(str, NULL);
port = hpdelim(&str);
ASSERT_STRING_EQ(port, "1234");
ASSERT_PTR_EQ(str, NULL);
DONE_STRING();
TEST_DONE();
TEST_START("hpdelim [host]:port");
START_STRING("[::1]:1234");
cp = hpdelim(&str);
ASSERT_STRING_EQ(cp, "[::1]");
ASSERT_PTR_NE(str, NULL);
port = hpdelim(&str);
ASSERT_STRING_EQ(port, "1234");
ASSERT_PTR_EQ(str, NULL);
DONE_STRING();
TEST_DONE();
TEST_START("hpdelim missing ] error");
START_STRING("[::1:1234");
cp = hpdelim(&str);
ASSERT_PTR_EQ(cp, NULL);
DONE_STRING();
TEST_DONE();
}
/* $OpenBSD: test_hpdelim.c,v 1.2 2022/02/06 22:58:33 dtucker Exp $ */
/*
* Regress test for misc hpdelim() and co
*
* Placed in the public domain.
*/
#include <sys/types.h>
#include <stdio.h>
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#include "test_helper.h"
#include "log.h"
#include "misc.h"
#include "xmalloc.h"
void test_hpdelim(void);
void
test_hpdelim(void)
{
char *orig, *str, *cp, *port;
#define START_STRING(x) orig = str = xstrdup(x)
#define DONE_STRING() free(orig)
TEST_START("hpdelim host only");
START_STRING("host");
cp = hpdelim(&str);
ASSERT_STRING_EQ(cp, "host");
ASSERT_PTR_EQ(str, NULL);
DONE_STRING();
TEST_DONE();
TEST_START("hpdelim :port");
START_STRING(":1234");
cp = hpdelim(&str);
ASSERT_STRING_EQ(cp, "");
ASSERT_PTR_NE(str, NULL);
port = hpdelim(&str);
ASSERT_STRING_EQ(port, "1234");
ASSERT_PTR_EQ(str, NULL);
DONE_STRING();
TEST_DONE();
TEST_START("hpdelim host:port");
START_STRING("host:1234");
cp = hpdelim(&str);
ASSERT_STRING_EQ(cp, "host");
ASSERT_PTR_NE(str, NULL);
port = hpdelim(&str);
ASSERT_STRING_EQ(port, "1234");
ASSERT_PTR_EQ(str, NULL);
DONE_STRING();
TEST_DONE();
TEST_START("hpdelim [host]:port");
START_STRING("[::1]:1234");
cp = hpdelim(&str);
ASSERT_STRING_EQ(cp, "[::1]");
ASSERT_PTR_NE(str, NULL);
port = hpdelim(&str);
ASSERT_STRING_EQ(port, "1234");
ASSERT_PTR_EQ(str, NULL);
DONE_STRING();
TEST_DONE();
TEST_START("hpdelim missing ] error");
START_STRING("[::1:1234");
cp = hpdelim(&str);
ASSERT_PTR_EQ(cp, NULL);
DONE_STRING();
TEST_DONE();
}

4
regress/unittests/misc/tests.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: tests.c,v 1.8 2021/12/14 21:25:27 deraadt Exp $ */
/* $OpenBSD: tests.c,v 1.9 2022/02/04 07:53:44 dtucker Exp $ */
/*
* Regress test for misc helper functions.
*
@ -25,6 +25,7 @@ void test_convtime(void);
void test_expand(void);
void test_argv(void);
void test_strdelim(void);
void test_hpdelim(void);
void
tests(void)
@ -34,4 +35,5 @@ tests(void)
test_expand();
test_argv();
test_strdelim();
test_hpdelim();
}