]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test: shorten code a bit 20985/head
authorYu Watanabe <watanabe.yu+github@gmail.com>
Mon, 11 Oct 2021 18:04:06 +0000 (03:04 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Mon, 11 Oct 2021 18:31:54 +0000 (03:31 +0900)
src/busctl/test-busctl-introspect.c

index 862a92a0e2996bee4b1af0cd0ee89358745bfa32..216a9a3c3bdc94a844161a2a9e207c10d679226b 100644 (file)
@@ -354,48 +354,10 @@ static void test_introspect_on_path(void) {
         assert_se(strv_extend(&expected, "/org/freedesktop/LogControl1") >= 0);
         assert_se(strv_extend(&expected, "/org/freedesktop/network1") >= 0);
         assert_se(strv_extend(&expected, "/org/freedesktop/network1/network") >= 0);
-        assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/0") >= 0);
-        assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/0/hoge") >= 0);
-        assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/1") >= 0);
-        assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/1/hoge") >= 0);
-        assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/2") >= 0);
-        assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/2/hoge") >= 0);
-        assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/3") >= 0);
-        assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/3/hoge") >= 0);
-        assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/4") >= 0);
-        assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/4/hoge") >= 0);
-        assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/5") >= 0);
-        assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/5/hoge") >= 0);
-        assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/6") >= 0);
-        assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/6/hoge") >= 0);
-        assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/7") >= 0);
-        assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/7/hoge") >= 0);
-        assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/8") >= 0);
-        assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/8/hoge") >= 0);
-        assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/9") >= 0);
-        assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/9/hoge") >= 0);
-        assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/10") >= 0);
-        assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/10/hoge") >= 0);
-        assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/11") >= 0);
-        assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/11/hoge") >= 0);
-        assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/12") >= 0);
-        assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/12/hoge") >= 0);
-        assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/13") >= 0);
-        assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/13/hoge") >= 0);
-        assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/14") >= 0);
-        assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/14/hoge") >= 0);
-        assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/15") >= 0);
-        assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/15/hoge") >= 0);
-        assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/16") >= 0);
-        assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/16/hoge") >= 0);
-        assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/17") >= 0);
-        assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/17/hoge") >= 0);
-        assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/18") >= 0);
-        assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/18/hoge") >= 0);
-        assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/19") >= 0);
-        assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/19/hoge") >= 0);
-        assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/20") >= 0);
-        assert_se(strv_extend(&expected, "/org/freedesktop/network1/network/20/hoge") >= 0);
+        for (unsigned i = 0; i <= 20; i++) {
+                assert_se(strv_extendf(&expected, "/org/freedesktop/network1/network/%u", i) >= 0);
+                assert_se(strv_extendf(&expected, "/org/freedesktop/network1/network/%u/hoge", i) >= 0);
+        }
 
         strv_sort(expected);
         assert_se(strv_equal(l, expected));