summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2014-01-09 14:02:56 -0500
committerAnthony G. Basile <blueness@gentoo.org>2014-01-09 14:02:56 -0500
commit855ce449eba82c417c005d17aa680aba2048ed8d (patch)
tree9c9c5c9cdd30ed2dfbbdef820118124e891b6662 /test
parent7ed87c74dfb81761cbcefc10cd4f79394a1d36a3 (diff)
device-nodes: move device node specific code to own file
In the process, rename udev_encode_string which is poorly named for what it does. It deals specifically with encoding names that udev creates and has its own rules: utf8 is valid but some ascii is not (e.g. path separators), and everything else is simply escaped. Rename it to encode_devnode_name. Adopted for eudev: Anthony G. Basile <blueness@gentoo.org> Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'test')
-rw-r--r--test/Makefile.am12
-rw-r--r--test/test-device-nodes.c55
-rw-r--r--test/test-utf8.c46
3 files changed, 86 insertions, 27 deletions
diff --git a/test/Makefile.am b/test/Makefile.am
index a9c28c9316..f12ee20f04 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -9,7 +9,8 @@ AM_CPPFLAGS = \
noinst_PROGRAMS = \
test-libudev \
test-udev \
- test_utf8
+ test-utf8 \
+ test-device_nodes
test_libudev_SOURCES = \
test-libudev.c
@@ -40,6 +41,15 @@ test_utf8_CFLAGS = \
test_utf8_LDADD = \
$(top_builddir)/src/libudev/libudev-private.la
+test_device_nodes_SOURCES = \
+ test-device-nodes.c
+
+test_device_nodes_CFLAGS = \
+ $(AM_CFLAGS)
+
+test_device_nodes_LDADD = \
+ $(top_builddir)/src/libudev/libudev-private.la
+
if HAVE_LIBKMOD
test_udev_LDADD += $(KMOD_LIBS)
endif
diff --git a/test/test-device-nodes.c b/test/test-device-nodes.c
new file mode 100644
index 0000000000..2f3dedb90f
--- /dev/null
+++ b/test/test-device-nodes.c
@@ -0,0 +1,55 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
+ This file is part of systemd.
+
+ Copyright 2013 Dave Reisner
+
+ systemd 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.
+
+ systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include <sys/types.h>
+
+#include "device-nodes.h"
+#include "util.h"
+
+/* helpers for test_encode_devnode_name */
+static char *do_encode_string(const char *in) {
+ size_t out_len = strlen(in) * 4;
+ char *out = malloc(out_len);
+
+ assert_se(out);
+ assert_se(encode_devnode_name(in, out, out_len) >= 0);
+ puts(out);
+
+ return out;
+}
+
+static bool expect_encoded_as(const char *in, const char *expected) {
+ _cleanup_free_ char *encoded = do_encode_string(in);
+ return streq(encoded, expected);
+}
+
+static void test_encode_devnode_name(void) {
+ assert_se(expect_encoded_as("systemd sucks", "systemd\\x20sucks"));
+ assert_se(expect_encoded_as("pinkiepie", "pinkiepie"));
+ assert_se(expect_encoded_as("valíd\\ųtf8", "valíd\\x5cųtf8"));
+ assert_se(expect_encoded_as("s/ash/ng", "s\\x2fash\\x2fng"));
+}
+
+int main(int argc, char *argv[]) {
+ test_encode_devnode_name();
+
+ return 0;
+}
diff --git a/test/test-utf8.c b/test/test-utf8.c
index d2b9771f4b..bd8ca86834 100644
--- a/test/test-utf8.c
+++ b/test/test-utf8.c
@@ -19,41 +19,35 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-
#include "utf8.h"
#include "util.h"
-/* helpers for test_udev_encode_string */
-static char *do_encode_string(const char *in) {
- size_t out_len = strlen(in) * 4;
- char *out = malloc(out_len);
-
- assert_se(out);
- assert_se(udev_encode_string(in, out, out_len) >= 0);
- puts(out);
-
- return out;
+static void test_utf8_is_printable(void) {
+ assert_se(utf8_is_printable("ascii is valid\tunicode", 22));
+ assert_se(utf8_is_printable("\342\204\242", 3));
+ assert_se(!utf8_is_printable("\341\204", 2));
+ assert_se(utf8_is_printable("ąę", 4));
}
-static bool expect_encoded_as(const char *in, const char *expected) {
- _cleanup_free_ char *encoded = do_encode_string(in);
- return streq(encoded, expected);
+static void test_ascii_is_valid(void) {
+ assert_se(ascii_is_valid("alsdjf\t\vbarr\nba z"));
+ assert_se(!ascii_is_valid("\342\204\242"));
+ assert_se(!ascii_is_valid("\341\204"));
}
-static void test_udev_encode_string(void) {
- assert_se(expect_encoded_as("systemd sucks", "systemd\\x20sucks"));
- assert_se(expect_encoded_as("pinkiepie", "pinkiepie"));
- assert_se(expect_encoded_as("valíd\\ųtf8", "valíd\\x5cųtf8"));
- assert_se(expect_encoded_as("s/ash/ng", "s\\x2fash\\x2fng"));
-}
+static void test_utf8_encoded_valid_unichar(void) {
+ assert_se(utf8_encoded_valid_unichar("\342\204\242") == 3);
+ assert_se(utf8_encoded_valid_unichar("\302\256") == 2);
+ assert_se(utf8_encoded_valid_unichar("a") == 1);
+ assert_se(utf8_encoded_valid_unichar("\341\204") < 0);
+ assert_se(utf8_encoded_valid_unichar("\341\204\341\204") < 0);
-static void test_utf8_is_valid(void) {
- assert_se(utf8_is_valid("ascii is valid unicode"));
- assert_se(utf8_is_valid("\341\204\242"));
- assert_se(!utf8_is_valid("\341\204"));
}
int main(int argc, char *argv[]) {
- test_utf8_is_valid();
- test_udev_encode_string();
+ test_utf8_is_printable();
+ test_ascii_is_valid();
+ test_utf8_encoded_valid_unichar();
+
+ return 0;
}