Reintegrate test code with library code

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>

4 files changed, 0 insertions, 255 deletions

diff --git a/tests/libio/Makemodule.am b/tests/libio/Makemodule.am
deleted file mode 100644
index e031973..0000000
--- a/tests/libio/Makemodule.am
+++ /dev/null
@@ -1,12 +0,0 @@
-test_get_line_SOURCES = tests/libio/get_line.c
-test_get_line_LDADD = libio.a libcompat.a
-test_get_line_CPPFLAGS = $(AM_CPPFLAGS)
-test_get_line_CPPFLAGS += -DTESTFILE=$(top_srcdir)/tests/libio/get_line.txt
-
-test_sparse_fb_SOURCES = tests/libio/sparse_fb.c
-test_sparse_fb_LDADD = libio.a libutil.a libcompat.a
-
-check_PROGRAMS += test_get_line test_sparse_fb
-TESTS += test_get_line test_sparse_fb
-
-EXTRA_DIST += $(top_srcdir)/tests/libio/get_line.txt
diff --git a/tests/libio/get_line.c b/tests/libio/get_line.c
deleted file mode 100644
index 2d0f9b7..0000000
--- a/tests/libio/get_line.c
+++ /dev/null
@@ -1,166 +0,0 @@
-/* SPDX-License-Identifier: GPL-3.0-or-later */
-/*
- * get_line.c
- *
- * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
- */
-#include "config.h"
-
-#include "io/file.h"
-#include "util/test.h"
-
-typedef struct {
-	size_t line_num;
-	const char *str;
-} line_t;
-
-static void run_test_case(const line_t *lines, size_t count,
-			  int flags)
-{
-	size_t i, line_num, old_line_num;
-	istream_t *fp;
-	char *line;
-	int ret;
-
-	fp = istream_open_file(STRVALUE(TESTFILE));
-	TEST_NOT_NULL(fp);
-
-	line_num = 1;
-	line = NULL;
-
-	for (i = 0; i < count; ++i) {
-		old_line_num = line_num;
-		ret = istream_get_line(fp, &line, &line_num, flags);
-
-		TEST_ASSERT(line_num >= old_line_num);
-		TEST_EQUAL_I(ret, 0);
-		TEST_NOT_NULL(line);
-
-		TEST_EQUAL_UI(line_num, lines[i].line_num);
-		TEST_STR_EQUAL(line, lines[i].str);
-
-		free(line);
-		line = NULL;
-		line_num += 1;
-	}
-
-	ret = istream_get_line(fp, &line, &line_num, flags);
-	TEST_ASSERT(ret > 0);
-
-	sqfs_drop(fp);
-}
-
-static const line_t lines_raw[] = {
-	{ 1, "" },
-	{ 2, "The quick" },
-	{ 3, "  " },
-	{ 4, "  brown fox  " },
-	{ 5, "" },
-	{ 6, "jumps over" },
-	{ 7, "the" },
-	{ 8, "lazy" },
-	{ 9, "" },
-	{ 10, "dog" },
-	{ 11, "" },
-};
-
-static const line_t lines_ltrim[] = {
-	{ 1, "" },
-	{ 2, "The quick" },
-	{ 3, "" },
-	{ 4, "brown fox  " },
-	{ 5, "" },
-	{ 6, "jumps over" },
-	{ 7, "the" },
-	{ 8, "lazy" },
-	{ 9, "" },
-	{ 10, "dog" },
-	{ 11, "" },
-};
-
-static const line_t lines_rtrim[] = {
-	{ 1, "" },
-	{ 2, "The quick" },
-	{ 3, "" },
-	{ 4, "  brown fox" },
-	{ 5, "" },
-	{ 6, "jumps over" },
-	{ 7, "the" },
-	{ 8, "lazy" },
-	{ 9, "" },
-	{ 10, "dog" },
-	{ 11, "" },
-};
-
-static const line_t lines_trim[] = {
-	{ 1, "" },
-	{ 2, "The quick" },
-	{ 3, "" },
-	{ 4, "brown fox" },
-	{ 5, "" },
-	{ 6, "jumps over" },
-	{ 7, "the" },
-	{ 8, "lazy" },
-	{ 9, "" },
-	{ 10, "dog" },
-	{ 11, "" },
-};
-
-static const line_t lines_no_empty[] = {
-	{ 2, "The quick" },
-	{ 3, "  " },
-	{ 4, "  brown fox  " },
-	{ 6, "jumps over" },
-	{ 7, "the" },
-	{ 8, "lazy" },
-	{ 10, "dog" },
-};
-
-static const line_t lines_no_empty_ltrim[] = {
-	{ 2, "The quick" },
-	{ 4, "brown fox  " },
-	{ 6, "jumps over" },
-	{ 7, "the" },
-	{ 8, "lazy" },
-	{ 10, "dog" },
-};
-
-static const line_t lines_no_empty_rtrim[] = {
-	{ 2, "The quick" },
-	{ 4, "  brown fox" },
-	{ 6, "jumps over" },
-	{ 7, "the" },
-	{ 8, "lazy" },
-	{ 10, "dog" },
-};
-
-static const line_t lines_no_empty_trim[] = {
-	{ 2, "The quick" },
-	{ 4, "brown fox" },
-	{ 6, "jumps over" },
-	{ 7, "the" },
-	{ 8, "lazy" },
-	{ 10, "dog" },
-};
-
-int main(int argc, char **argv)
-{
-	(void)argc; (void)argv;
-
-	run_test_case(lines_raw, 11, 0);
-	run_test_case(lines_ltrim, 11, ISTREAM_LINE_LTRIM);
-	run_test_case(lines_rtrim, 11, ISTREAM_LINE_RTRIM);
-	run_test_case(lines_trim, 11,
-		      ISTREAM_LINE_LTRIM | ISTREAM_LINE_RTRIM);
-
-	run_test_case(lines_no_empty, 7, ISTREAM_LINE_SKIP_EMPTY);
-	run_test_case(lines_no_empty_ltrim, 6,
-		      ISTREAM_LINE_SKIP_EMPTY | ISTREAM_LINE_LTRIM);
-	run_test_case(lines_no_empty_rtrim, 6,
-		      ISTREAM_LINE_SKIP_EMPTY | ISTREAM_LINE_RTRIM);
-	run_test_case(lines_no_empty_trim, 6,
-		      ISTREAM_LINE_SKIP_EMPTY | ISTREAM_LINE_LTRIM |
-		      ISTREAM_LINE_RTRIM);
-
-	return EXIT_SUCCESS;
-}
diff --git a/tests/libio/get_line.txt b/tests/libio/get_line.txt
deleted file mode 100644
index a1994f0..0000000
--- a/tests/libio/get_line.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-

-The quick

-  

-  brown fox  

-

-jumps over

-the

-lazy

-

-dog

-

diff --git a/tests/libio/sparse_fb.c b/tests/libio/sparse_fb.c
deleted file mode 100644
index fa4b840..0000000
--- a/tests/libio/sparse_fb.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/* SPDX-License-Identifier: GPL-3.0-or-later */
-/*
- * get_line.c
- *
- * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
- */
-#include "config.h"
-
-#include "io/ostream.h"
-#include "util/test.h"
-#include "util/util.h"
-
-static ostream_t dummy;
-static size_t total = 0;
-
-static int dummy_append(ostream_t *strm, const void *data, size_t size)
-{
-	bool bret;
-
-	TEST_ASSERT(strm == &dummy);
-	TEST_NOT_NULL(data);
-	TEST_ASSERT(size > 0);
-
-	bret = is_memory_zero(data, size);
-	TEST_ASSERT(bret);
-
-	bret = SZ_ADD_OV(total, size, &total);
-	TEST_ASSERT(!bret);
-	return 0;
-}
-
-static int dummy_flush(ostream_t *strm)
-{
-	TEST_ASSERT(strm == &dummy);
-	return 0;
-}
-
-static ostream_t dummy = {
-	{
-		1,
-		NULL,
-		NULL,
-	},
-	dummy_append,
-	NULL,
-	dummy_flush,
-	NULL,
-};
-
-int main(int argc, char **argv)
-{
-	size_t ref;
-	int ret;
-	(void)argc; (void)argv;
-
-	ref = 131072 + 1337;
-
-	ret = ostream_append_sparse(&dummy, ref);
-	TEST_EQUAL_I(ret, 0);
-
-	ret = ostream_flush(&dummy);
-	TEST_EQUAL_I(ret, 0);
-
-	TEST_EQUAL_UI(ref, total);
-	return EXIT_SUCCESS;
-}