summaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2013-09-18 12:12:04 -0400
committerDave Reisner <dreisner@archlinux.org>2013-09-19 11:50:34 -0400
commit8f6ce71fe79d897b67157d92869db87ee2042af6 (patch)
tree30055a64faf4d6b3aeb0ba84979627a4a23c16b3 /src/test
parent7991ac34ab08421415b907e42775c5539a4a5bbb (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.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/test-device-nodes.c55
-rw-r--r--src/test/test-utf8.c28
2 files changed, 56 insertions, 27 deletions
diff --git a/src/test/test-device-nodes.c b/src/test/test-device-nodes.c
new file mode 100644
index 0000000000..2f3dedb90f
--- /dev/null
+++ b/src/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/src/test/test-utf8.c b/src/test/test-utf8.c
index 26cc37bd6e..b5a833e9e4 100644
--- a/src/test/test-utf8.c
+++ b/src/test/test-utf8.c
@@ -19,34 +19,9 @@
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 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_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_is_printable(void) {
assert_se(utf8_is_printable("ascii is valid\tunicode", 22));
assert_se(utf8_is_printable("\342\204\242", 3));
@@ -55,14 +30,13 @@ static void test_utf8_is_printable(void) {
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("\342\204\242"));
assert_se(!utf8_is_valid("\341\204"));
}
int main(int argc, char *argv[]) {
test_utf8_is_valid();
test_utf8_is_printable();
- test_udev_encode_string();
return 0;
}