| Revision | 75a79bc8c9e70a433c9133d824d18890795c4358 (tree) |
|---|---|
| Time | 2014-02-06 20:24:34 |
| Author | iga <tosiki.iga@nift...> |
| Commiter | iga |
Kaizen test.
main/bumsg.fnc (diff)
test/bumsgTest.sh (diff)| @@ -57,9 +57,11 @@ LOGGER="/usr/bin/logger -t $0 -i" | ||
| 57 | 57 | # @param $7 argument 6 |
| 58 | 58 | # @param $8 argument 7 |
| 59 | 59 | # @param $9 argument 8 |
| 60 | +# @param ${10} argument 9 | |
| 61 | +# @param ${11} argument 10 | |
| 60 | 62 | logmsg() { |
| 61 | 63 | local msgid="$1" |
| 62 | - local strmsg="`getmsg \"$1\" \"$2\" \"$3\" \"$4\" \"$5\" \"$6\" \"$7\" \"$8\" \"$9\"`" | |
| 64 | + local strmsg="`getmsg \"$1\" \"$2\" \"$3\" \"$4\" \"$5\" \"$6\" \"$7\" \"$8\" \"$9\" \"${10}\" \"${11}\"`" | |
| 63 | 65 | |
| 64 | 66 | ismsgEnvSysout "${msgid}" |
| 65 | 67 | local issysout=$? |
| @@ -93,6 +95,8 @@ logmsg() { | ||
| 93 | 95 | # @param $7 argument 6 |
| 94 | 96 | # @param $8 argument 7 |
| 95 | 97 | # @param $9 argument 8 |
| 98 | +# @param ${10} argument 9 | |
| 99 | +# @param ${11} argument 10 | |
| 96 | 100 | # @echo message text |
| 97 | 101 | getmsg() { |
| 98 | 102 | local msgid="$1" |
| @@ -104,6 +108,8 @@ getmsg() { | ||
| 104 | 108 | local arg6="$7" |
| 105 | 109 | local arg7="$8" |
| 106 | 110 | local arg8="$9" |
| 111 | + local arg9="${10}" | |
| 112 | + local arg10="${11}" | |
| 107 | 113 | local msgtextkey="`getmsgIdEnvKey ${msgid}`" |
| 108 | 114 | local msgtextkeyString="`getmsgEnvValue ${msgtextkey}`" |
| 109 | 115 | local printfString="" |
| @@ -133,8 +139,12 @@ getmsg() { | ||
| 133 | 139 | outMessage="`printf \"${printfString}\" \"${arg1}\" \"${arg2}\" \"${arg3}\" \"${arg4}\" \"${arg5}\" \"${arg6}\"`" |
| 134 | 140 | elif [ ${#arg8} = 0 ]; then |
| 135 | 141 | outMessage="`printf \"${printfString}\" \"${arg1}\" \"${arg2}\" \"${arg3}\" \"${arg4}\" \"${arg5}\" \"${arg6}\" \"${arg7}\"`" |
| 136 | - else | |
| 142 | + elif [ ${#arg9} = 0 ]; then | |
| 137 | 143 | outMessage="`printf \"${printfString}\" \"${arg1}\" \"${arg2}\" \"${arg3}\" \"${arg4}\" \"${arg5}\" \"${arg6}\" \"${arg7}\" \"${arg8}\"`" |
| 144 | + elif [ ${#arg10} = 0 ]; then | |
| 145 | + outMessage="`printf \"${printfString}\" \"${arg1}\" \"${arg2}\" \"${arg3}\" \"${arg4}\" \"${arg5}\" \"${arg6}\" \"${arg7}\" \"${arg8}\" \"${arg9}\"`" | |
| 146 | + else | |
| 147 | + outMessage="`printf \"${printfString}\" \"${arg1}\" \"${arg2}\" \"${arg3}\" \"${arg4}\" \"${arg5}\" \"${arg6}\" \"${arg7}\" \"${arg8}\" \"${arg9}\" \"${arg10}\"`" | |
| 138 | 148 | fi |
| 139 | 149 | |
| 140 | 150 | echo "${outMessage}" |
| @@ -265,4 +275,4 @@ ismsgEnvEmbedid() { | ||
| 265 | 275 | "2" ) return 1 ;; |
| 266 | 276 | * ) return 1 ;; |
| 267 | 277 | esac |
| 268 | -} | |
| \ No newline at end of file | ||
| 278 | +} |
| @@ -22,6 +22,10 @@ MSG_M001_embedid=true | ||
| 22 | 22 | |
| 23 | 23 | # Test for 9 parameters |
| 24 | 24 | MSG_M002='[%s][%s][%s][%s][%s][%s][%s][%s][%s]' |
| 25 | + | |
| 26 | +# Test for 10 parameters | |
| 27 | +MSG_M003='[%s][%s][%s][%s][%s][%s][%s][%s][%s][%s]' | |
| 28 | + | |
| 25 | 29 | # Inplace message area: end |
| 26 | 30 | ############################################################################## |
| 27 | 31 |
| @@ -33,6 +37,9 @@ assertEquals '[bumsgTest.sh#getmsg]basic message printf.' '[M001]Hello [Bash] wo | ||
| 33 | 37 | result=`getmsg 'M002' '1' '2' '3' '4' '5' '6' '7' '8' '9'` |
| 34 | 38 | assertEquals '[bumsgTest.sh#getmsg]Test for 9 parameters' '[1][2][3][4][5][6][7][8][9]' "${result}" |
| 35 | 39 | |
| 40 | +result=`getmsg 'M003' '1' '2' '3' '4' '5' '6' '7' '8' '9' '10'` | |
| 41 | +assertEquals '[bumsgTest.sh#getmsg]Test for 10 parameters' '[1][2][3][4][5][6][7][8][9][10]' "${result}" | |
| 42 | + | |
| 36 | 43 | ######################################## |
| 37 | 44 | # Test for getmsgIdEnvKey |
| 38 | 45 | result=`getmsgIdEnvKey 'M001'` |
Fork