luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-09 19:06:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

tests: Merge iochannel-test into io-channel tests in glib directory

Browse Source 
We’re trying to eliminate the legacy `tests/` directory. This commit
moves the code from `tests/iochannel-test.c` into
`glib/tests/io-channel.c` and ports it to the latest GLib test coding
standards:
 * Change `g_assert()` to `g_assert_*()`
 * Print verbose messages with `g_test_message()`
 * Rename some variables to conform to modern conventions
 * Use `GTest`

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>

Helps: #1434
This commit is contained in:
Philip Withnall 2022-02-17 21:42:35 +00:00
parent d286ea0c57
commit 5b7383c544
5 changed files with 142 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

141
glib/tests/io-channel.c
View File

@ -1,5 +1,13 @@
/* GLib testing framework examples and tests
*
* Copyright © 2001 Hidetoshi Tajima
* Copyright © 2001 Ron Steinke
* Copyright © 2001 Owen Taylor
* Copyright © 2002 Manish Singh
* Copyright © 2011 Sjoerd Simons
* Copyright © 2012 Simon McVittie
* Copyright © 2013 Stef Walter
* Copyright © 2005, 2006, 2008, 2012, 2013 Matthias Clasen
* Copyright © 2020 Endless Mobile, Inc.
*
* This library is free software; you can redistribute it and/or
@ -21,6 +29,138 @@
#include <glib.h>
#include <glib/gstdio.h>
static void
test_small_writes (void)
{
GIOChannel *io;
GIOStatus status = G_IO_STATUS_ERROR;
guint bytes_remaining;
gchar tmp;
GError *local_error = NULL;
io = g_io_channel_new_file ("iochannel-test-outfile", "w", &local_error);
g_assert_no_error (local_error);
g_io_channel_set_encoding (io, NULL, NULL);
g_io_channel_set_buffer_size (io, 1022);
bytes_remaining = 2 * g_io_channel_get_buffer_size (io);
tmp = 0;
while (bytes_remaining)
{
status = g_io_channel_write_chars (io, &tmp, 1, NULL, NULL);
if (status == G_IO_STATUS_ERROR)
break;
if (status == G_IO_STATUS_NORMAL)
bytes_remaining--;
}
g_assert_cmpint (status, ==, G_IO_STATUS_NORMAL);
g_io_channel_unref (io);
}
static void
test_read_write (void)
{
GIOChannel *gio_r, *gio_w ;
GError *local_error = NULL;
GString *buffer;
char *filename;
gint rlength = 0;
glong wlength = 0;
gsize length_out;
const gchar *encoding = "EUC-JP";
GIOStatus status;
const gsize buffer_size_bytes = 1024;
filename = g_test_build_filename (G_TEST_DIST, "iochannel-test-infile", NULL);
setbuf (stdout, NULL); /* For debugging */
gio_r = g_io_channel_new_file (filename, "r", &local_error);
g_assert_no_error (local_error);
gio_w = g_io_channel_new_file ("iochannel-test-outfile", "w", &local_error);
g_assert_no_error (local_error);
g_io_channel_set_encoding (gio_r, encoding, &local_error);
g_assert_no_error (local_error);
g_io_channel_set_buffer_size (gio_r, buffer_size_bytes);
status = g_io_channel_set_flags (gio_r, G_IO_FLAG_NONBLOCK, &local_error);
if (status == G_IO_STATUS_ERROR)
{
/* Errors should not happen */
g_assert_no_error (local_error);
g_clear_error (&local_error);
}
buffer = g_string_sized_new (buffer_size_bytes);
while (TRUE)
{
do
status = g_io_channel_read_line_string (gio_r, buffer, NULL, &local_error);
while (status == G_IO_STATUS_AGAIN);
if (status != G_IO_STATUS_NORMAL)
break;
rlength += buffer->len;
do
status = g_io_channel_write_chars (gio_w, buffer->str, buffer->len,
&length_out, &local_error);
while (status == G_IO_STATUS_AGAIN);
if (status != G_IO_STATUS_NORMAL)
break;
wlength += length_out;
/* Ensure the whole line was written */
g_assert_cmpuint (length_out, ==, buffer->len);
g_test_message ("%s", buffer->str);
g_string_truncate (buffer, 0);
}
switch (status)
{
case G_IO_STATUS_EOF:
break;
case G_IO_STATUS_ERROR:
/* Errors should not happen */
g_assert_no_error (local_error);
g_clear_error (&local_error);
break;
default:
g_assert_not_reached ();
break;
}
do
status = g_io_channel_flush (gio_w, &local_error);
while (status == G_IO_STATUS_AGAIN);
if (status == G_IO_STATUS_ERROR)
{
/* Errors should not happen */
g_assert_no_error (local_error);
g_clear_error (&local_error);
}
g_test_message ("read %d bytes, wrote %ld bytes", rlength, wlength);
g_io_channel_unref (gio_r);
g_io_channel_unref (gio_w);
test_small_writes ();
g_free (filename);
g_string_free (buffer, TRUE);
}
static void
test_read_line_embedded_nuls (void)
{
@ -75,6 +215,7 @@ main (int argc,
{
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/io-channel/read-write", test_read_write);
g_test_add_func ("/io-channel/read-line/embedded-nuls", test_read_line_embedded_nuls);
return g_test_run ();

0
tests/iochannel-test-infile → glib/tests/iochannel-test-infile
View File

1
glib/tests/meson.build
View File

@ -190,6 +190,7 @@ if installed_tests_enabled
'echo-script',
'echo-script.bat',
'empty',
'iochannel-test-infile',
'keyfile.c',
'keyfiletest.ini',
'pages.ini',

172
tests/iochannel-test.c
View File

@ -1,172 +0,0 @@
#undef G_DISABLE_ASSERT
#undef G_LOG_DOMAIN
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <glib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#define BUFFER_SIZE 1024
static void
test_small_writes (void)
{
GIOChannel *io;
GIOStatus status = G_IO_STATUS_ERROR;
guint cnt;
gchar tmp;
GError *error = NULL;
io = g_io_channel_new_file ("iochannel-test-outfile", "w", &error);
if (error)
{
g_warning ("Unable to open file %s: %s",
"iochannel-test-outfile",
error->message);
g_clear_error (&error);
exit (1);
}
g_io_channel_set_encoding (io, NULL, NULL);
g_io_channel_set_buffer_size (io, 1022);
cnt = 2 * g_io_channel_get_buffer_size (io);
tmp = 0;
while (cnt)
{
status = g_io_channel_write_chars (io, &tmp, 1, NULL, NULL);
if (status == G_IO_STATUS_ERROR)
break;
if (status == G_IO_STATUS_NORMAL)
cnt--;
}
g_assert (status == G_IO_STATUS_NORMAL);
g_io_channel_unref (io);
}
gint main (gint argc, gchar * argv[])
{
GIOChannel *gio_r, *gio_w ;
GError *gerr = NULL;
GString *buffer;
char *filename;
gint rlength = 0;
glong wlength = 0;
gsize length_out;
const gchar encoding[] = "EUC-JP";
GIOStatus status;
g_test_init (&argc, &argv, NULL);
filename = g_test_build_filename (G_TEST_DIST, "iochannel-test-infile", NULL);
setbuf (stdout, NULL); /* For debugging */
gio_r = g_io_channel_new_file (filename, "r", &gerr);
if (gerr)
{
g_warning ("Unable to open file %s: %s", filename, gerr->message);
g_clear_error (&gerr);
return 1;
}
gio_w = g_io_channel_new_file ("iochannel-test-outfile", "w", &gerr);
if (gerr)
{
g_warning ("Unable to open file %s: %s", "iochannel-test-outfile", gerr->message);
g_clear_error (&gerr);
return 1;
}
g_io_channel_set_encoding (gio_r, encoding, &gerr);
if (gerr)
{
g_warning ("%s", gerr->message);
/* Keep going if this is just a case of iconv not supporting EUC-JP, see bug 428048 */
if (gerr->code != G_CONVERT_ERROR_NO_CONVERSION)
return 1;
g_clear_error (&gerr);
}
g_io_channel_set_buffer_size (gio_r, BUFFER_SIZE);
status = g_io_channel_set_flags (gio_r, G_IO_FLAG_NONBLOCK, &gerr);
if (status == G_IO_STATUS_ERROR)
{
g_warning ("%s", gerr->message);
g_clear_error (&gerr);
}
buffer = g_string_sized_new (BUFFER_SIZE);
while (TRUE)
{
do
status = g_io_channel_read_line_string (gio_r, buffer, NULL, &gerr);
while (status == G_IO_STATUS_AGAIN);
if (status != G_IO_STATUS_NORMAL)
break;
rlength += buffer->len;
do
status = g_io_channel_write_chars (gio_w, buffer->str, buffer->len,
&length_out, &gerr);
while (status == G_IO_STATUS_AGAIN);
if (status != G_IO_STATUS_NORMAL)
break;
wlength += length_out;
if (length_out < buffer->len)
g_warning ("Only wrote part of the line.");
#ifdef VERBOSE
g_print ("%s", buffer->str);
#endif
g_string_truncate (buffer, 0);
}
switch (status)
{
case G_IO_STATUS_EOF:
break;
case G_IO_STATUS_ERROR:
g_warning ("%s", gerr->message);
g_clear_error (&gerr);
break;
default:
g_warning ("Abnormal exit from write loop.");
break;
}
do
status = g_io_channel_flush (gio_w, &gerr);
while (status == G_IO_STATUS_AGAIN);
if (status == G_IO_STATUS_ERROR)
{
g_warning ("%s", gerr->message);
g_clear_error (&gerr);
}
#ifdef VERBOSE
g_print ("read %d bytes, wrote %ld bytes\n", rlength, wlength);
#endif
g_io_channel_unref(gio_r);
g_io_channel_unref(gio_w);
test_small_writes ();
g_free (filename);
g_string_free (buffer, TRUE);
return 0;
}

2
tests/meson.build
View File

@ -58,7 +58,6 @@ test_extra_programs = {
if host_machine.system() != 'windows'
tests += {
'timeloop' : {},
'iochannel-test' : {},
}
else
test_extra_programs += {
@ -68,7 +67,6 @@ endif
if installed_tests_enabled
install_data(
'iochannel-test-infile',
'utf8.txt',
install_dir : installed_tests_execdir,
)