[libvirt] [PATCH v4 3/3] vsh: Added tests
Michal Privoznik
mprivozn at redhat.com
Thu Aug 23 13:19:41 UTC 2018
On 08/22/2018 07:42 PM, Simon Kobyda wrote:
> For now, there are 9 test cases
> - testVshTableNew: Creating table with empty header
> - testVshTableHeader: Printing table with/without header
> - testVshTableRowAppend: Appending row with various number of cells.
> Only row with same number of cells as in header is accepted.
> - testUnicode: Printing table with unicode characters.
> Checking correct alignment.
> - testUnicodeArabic: test opposite (right to left) writing
> - testUnicodeZeroWidthChar
> - testUnicodeCombiningChar
> - testUnicodeNonPrintableChar,
> - testNTables: Create and print varios types of tables - one column,
> one row table, table without content, standart table...
>
> Signed-off-by: Simon Kobyda <skobyda at redhat.com>
> ---
> tests/Makefile.am | 8 +
> tests/vshtabletest.c | 393 +++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 401 insertions(+)
> create mode 100644 tests/vshtabletest.c
>
> diff --git a/tests/Makefile.am b/tests/Makefile.am
> index 21a6c823d9..136fe16f71 100644
> --- a/tests/Makefile.am
> +++ b/tests/Makefile.am
> @@ -206,6 +206,7 @@ test_programs = virshtest sockettest \
> virhostdevtest \
> virnetdevtest \
> virtypedparamtest \
> + vshtabletest \
> $(NULL)
>
> test_libraries = libshunload.la \
> @@ -938,6 +939,13 @@ metadatatest_SOURCES = \
> testutils.c testutils.h
> metadatatest_LDADD = $(LDADDS) $(LIBXML_LIBS)
>
> +vshtabletest_SOURCES = \
> + vshtabletest.c \
> + testutils.c testutils.h
> +vshtabletest_LDADD = \
> + $(LDADDS) \
> + ../tools/libvirt_shell.la
> +
> virshtest_SOURCES = \
> virshtest.c \
> testutils.c testutils.h
> diff --git a/tests/vshtabletest.c b/tests/vshtabletest.c
> new file mode 100644
> index 0000000000..48553057d4
> --- /dev/null
> +++ b/tests/vshtabletest.c
> @@ -0,0 +1,393 @@
> +/*
> + * Copyright (C) 2018 Red Hat, Inc.
> + *
> + * This library is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Lesser General Public
> + * License as published by the Free Software Foundation; either
> + * version 2.1 of the License, or (at your option) any later version.
> + *
> + * This library is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + * Lesser General Public License for more details.
> + *
> + * You should have received a copy of the GNU Lesser General Public
> + * License along with this library. If not, see
> + * <http://www.gnu.org/licenses/>.
> + */
> +
> +#include <config.h>
> +
> +#include <stdlib.h>
> +#include <stdio.h>
> +#include <locale.h>
> +
> +#include "internal.h"
> +#include "testutils.h"
> +#include "viralloc.h"
> +#include "../tools/vsh-table.h"
> +
> +static int
> +testVshTableNew(const void *opaque ATTRIBUTE_UNUSED)
> +{
> + if (vshTableNew(NULL)) {
> + fprintf(stderr, "expected failure when passing null to vshTableNew\n");
> + return -1;
> + }
> +
> + return 0;
> +}
> +
> +static int
> +testVshTableHeader(const void *opaque ATTRIBUTE_UNUSED)
> +{
> + int ret = 0;
> + char *act = NULL;
> + const char *exp =
> +" 1 fedora28 running \n"
> +" 2 rhel7.5 running \n";
> + const char *exp2 =
> +" Id Name State \n"
> +"--------------------------\n"
> +" 1 fedora28 running \n"
> +" 2 rhel7.5 running \n";
> +
> + vshTablePtr table = vshTableNew("Id", "Name", "State",
> + NULL); //to ask about return
> + if (!table)
> + goto cleanup;
> +
> + vshTableRowAppend(table, "1", "fedora28", "running", NULL);
> + vshTableRowAppend(table, "2", "rhel7.5", "running",
> + NULL);
> +
> + act = vshTablePrintToString(table, false);
> + if (virTestCompareToString(exp, act) < 0)
> + ret = -1;
> +
> + VIR_FREE(act);
> + act = vshTablePrintToString(table, true);
> + if (virTestCompareToString(exp2, act) < 0)
> + ret = -1;
> +
> + cleanup:
> + VIR_FREE(act);
> + vshTableFree(table);
> + return ret;
> +}
> +
> +static int
> +testVshTableRowAppend(const void *opaque ATTRIBUTE_UNUSED)
> +{
> + int ret = 0;
> +
> + vshTablePtr table = vshTableNew("Id", "Name", NULL);
> + if (!table)
> + goto cleanup;
> +
> + if (vshTableRowAppend(table, NULL) >= 0) {
> + fprintf(stderr, "Appending NULL shouldn't work\n");
> + ret = -1;
> + }
> +
> + if (vshTableRowAppend(table, "2", NULL) >= 0) {
> + fprintf(stderr, "Appending less items than in header\n");
> + ret = -1;
> + }
> +
> + if (vshTableRowAppend(table, "2", "rhel7.5", "running",
> + NULL) >= 0) {
> + fprintf(stderr, "Appending more items than in header\n");
> + ret = -1;
> + }
> +
> + if (vshTableRowAppend(table, "2", "rhel7.5", NULL) < 0) {
> + fprintf(stderr, "Appending same number of items as in header"
> + " should not return NULL\n");
> + ret = -1;
> + }
> +
> + cleanup:
> + vshTableFree(table);
> + return ret;
> +}
> +
> +static int
> +testUnicode(const void *opaque ATTRIBUTE_UNUSED)
> +{
> +
> + int ret = 0;
> + char *act = NULL;
> +
> + char *locale = setlocale(LC_CTYPE, NULL);
> + if (!setlocale(LC_CTYPE, "en_US.UTF-8"))
> + return EXIT_AM_SKIP;
Instead of these setlocale() called from each individual test, move it
at the beginning of mymain().
ACK if you do that.
Michal
More information about the libvir-list
mailing list