[OpenWrt-Devel] [PATCH v2 07/16] tests: add more test coverage for `uci show' command.

Yousong Zhou yszhou4tech at gmail.com
Tue Dec 16 02:00:09 EST 2014


Signed-off-by: Yousong Zhou <yszhou4tech at gmail.com>
---
 test/references/show_parsing_multiline.data        |   20 +++++++++++++
 .../show_parsing_multiline_option.result           |   12 ++++++++
 .../show_parsing_multiline_package.result          |   18 ++++++++++++
 .../show_parsing_multiline_section.result          |   16 ++++++++++
 test/tests.d/050_show                              |   31 ++++++++++++++++++++
 5 files changed, 97 insertions(+)
 create mode 100644 test/references/show_parsing_multiline.data
 create mode 100644 test/references/show_parsing_multiline_option.result
 create mode 100644 test/references/show_parsing_multiline_package.result
 create mode 100644 test/references/show_parsing_multiline_section.result

diff --git a/test/references/show_parsing_multiline.data b/test/references/show_parsing_multiline.data
new file mode 100644
index 0000000..670e809
--- /dev/null
+++ b/test/references/show_parsing_multiline.data
@@ -0,0 +1,20 @@
+config main
+        option version  1.4.1
+
+config sockd 'instance0'
+        option enabled  1
+        list internal_network   vpn
+        list external_network   wan
+
+        option extra_config '
+		user.unprivileged: nobody
+		client pass {
+			from: 0.0.0.0/0 to: 0.0.0.0/0
+			session.max: 64
+			log: error
+		}
+
+		socks pass {
+			from: 0.0.0.0/0 to: 0.0.0.0/0
+			log: connect
+		} '
diff --git a/test/references/show_parsing_multiline_option.result b/test/references/show_parsing_multiline_option.result
new file mode 100644
index 0000000..6f7aacf
--- /dev/null
+++ b/test/references/show_parsing_multiline_option.result
@@ -0,0 +1,12 @@
+sockd.instance0.extra_config='
+		user.unprivileged: nobody
+		client pass {
+			from: 0.0.0.0/0 to: 0.0.0.0/0
+			session.max: 64
+			log: error
+		}
+
+		socks pass {
+			from: 0.0.0.0/0 to: 0.0.0.0/0
+			log: connect
+		} '
diff --git a/test/references/show_parsing_multiline_package.result b/test/references/show_parsing_multiline_package.result
new file mode 100644
index 0000000..218082d
--- /dev/null
+++ b/test/references/show_parsing_multiline_package.result
@@ -0,0 +1,18 @@
+sockd. at main[0]=main
+sockd. at main[0].version='1.4.1'
+sockd.instance0=sockd
+sockd.instance0.enabled='1'
+sockd.instance0.internal_network='vpn'
+sockd.instance0.external_network='wan'
+sockd.instance0.extra_config='
+		user.unprivileged: nobody
+		client pass {
+			from: 0.0.0.0/0 to: 0.0.0.0/0
+			session.max: 64
+			log: error
+		}
+
+		socks pass {
+			from: 0.0.0.0/0 to: 0.0.0.0/0
+			log: connect
+		} '
diff --git a/test/references/show_parsing_multiline_section.result b/test/references/show_parsing_multiline_section.result
new file mode 100644
index 0000000..0506ac3
--- /dev/null
+++ b/test/references/show_parsing_multiline_section.result
@@ -0,0 +1,16 @@
+sockd.instance0=sockd
+sockd.instance0.enabled='1'
+sockd.instance0.internal_network='vpn'
+sockd.instance0.external_network='wan'
+sockd.instance0.extra_config='
+		user.unprivileged: nobody
+		client pass {
+			from: 0.0.0.0/0 to: 0.0.0.0/0
+			session.max: 64
+			log: error
+		}
+
+		socks pass {
+			from: 0.0.0.0/0 to: 0.0.0.0/0
+			log: connect
+		} '
diff --git a/test/tests.d/050_show b/test/tests.d/050_show
index 7d7e160..ce0eafc 100644
--- a/test/tests.d/050_show
+++ b/test/tests.d/050_show
@@ -9,3 +9,34 @@ test_get_parsing()
 	assertFailWithNoReturn "${UCI_Q} show test.section.opt.val.qsdf.qsd"
 	assertFailWithNoReturn "${UCI_Q} show test.section.opt.valqsqsd"
 }
+
+prepare_get_parsing_multiline() {
+	cp ${REF_DIR}/show_parsing_multiline.data ${CONFIG_DIR}/sockd
+}
+
+test_get_parsing_multiline_package()
+{
+	prepare_get_parsing_multiline
+
+	value=$(${UCI_Q} show sockd)
+	value_ref=$(cat ${REF_DIR}/show_parsing_multiline_package.result)
+	assertEquals "$value_ref" "$value"
+}
+
+test_get_parsing_multiline_section()
+{
+	prepare_get_parsing_multiline
+
+	value=$(${UCI_Q} show sockd.instance0)
+	value_ref=$(cat ${REF_DIR}/show_parsing_multiline_section.result)
+	assertEquals "$value_ref" "$value"
+}
+
+test_get_parsing_multiline_option()
+{
+	prepare_get_parsing_multiline
+
+	value=$(${UCI_Q} show sockd.instance0.extra_config)
+	value_ref=$(cat ${REF_DIR}/show_parsing_multiline_option.result)
+	assertEquals "$value_ref" "$value"
+}
-- 
1.7.10.4
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel



More information about the openwrt-devel mailing list