tests: add test coverage for uci export with -P option.

[project/uci.git] / test / tests.d / 090_cli_options

diff --git a/test/tests.d/090_cli_options b/test/tests.d/090_cli_options
index 52052a3..55920a2 100644 (file)
--- a/test/tests.d/090_cli_options
+++ b/test/tests.d/090_cli_options
@@ -1,6 +1,7 @@
 test_add_delta() {
        local new_savedir="$TMP_DIR/new_savedir"
        local config_delta="$CONFIG_DIR/delta"
 test_add_delta() {
        local new_savedir="$TMP_DIR/new_savedir"
        local config_delta="$CONFIG_DIR/delta"

+       local cmdoutput

 
        # add normal changes
        touch "$config_delta"
 
        # add normal changes
        touch "$config_delta"


@@ -16,11 +17,18 @@ test_add_delta() {
        assertEquals "delta.sec0='sectype'
 delta.sec0.li0+='0'" "$($UCI changes)"
 
        assertEquals "delta.sec0='sectype'
 delta.sec0.li0+='0'" "$($UCI changes)"
 

-       # check combined changes.  order matters here.
+       # check combined changes.  Order matters here.
+       cmdoutput="$($UCI -P "$new_savedir" changes)"
+       assertTrue "$?"

        assertEquals "delta.sec0='sectype'
        assertEquals "delta.sec0='sectype'

-delta.sec0.li0+='1'
+delta.sec0.li0+='0'

 delta.sec0='sectype'
 delta.sec0='sectype'

-delta.sec0.li0+='0'" "$($UCI -P "$new_savedir" changes)"
+delta.sec0.li0+='1'" "$cmdoutput"
+
+       # check combined export.  Order matters here.
+       cmdoutput="$($UCI -P "$new_savedir" export)"
+       assertTrue "$?"
+       assertEquals "$(cat $REF_DIR/cli.options.delta.export.result)" "$cmdoutput"

 
        # check CLI_FLAG_NOCOMMIT with -P option.
        $UCI -P "$new_savedir" commit
 
        # check CLI_FLAG_NOCOMMIT with -P option.
        $UCI -P "$new_savedir" commit


@@ -30,7 +38,7 @@ delta.sec0.li0+='0'" "$($UCI -P "$new_savedir" changes)"
        # check normal commit.
        $UCI -p "$new_savedir" commit
        assertTrue "$?"
        # check normal commit.
        $UCI -p "$new_savedir" commit
        assertTrue "$?"

-       assertSameFile "$REF_DIR/options.delta.result" "$config_delta"
+       assertSameFile "$REF_DIR/cli.options.delta.commit.result" "$config_delta"

 
        rm -rf "$new_savedir"
        rm -f "$config_delta"
 
        rm -rf "$new_savedir"
        rm -f "$config_delta"