From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonatan Schlag To: development@lists.ipfire.org Subject: [PATCH 14/21] test: Add functions test_that_array_is_defined Date: Mon, 20 May 2024 11:06:04 +0200 Message-ID: <20240520090611.10406-15-jonatan.schlag@ipfire.org> In-Reply-To: <20240520090611.10406-1-jonatan.schlag@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1267071492320483420==" List-Id: --===============1267071492320483420== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable we need this check in multiple places so it makes sense to move this to a separate function. Signed-off-by: Jonatan Schlag --- tests/lib.sh | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/tests/lib.sh b/tests/lib.sh index 9ce0201b1..29f4e3b71 100644 --- a/tests/lib.sh +++ b/tests/lib.sh @@ -27,17 +27,25 @@ var_has_value() { [[ "${!1}" =3D=3D "${2}" ]] } =20 -test_that_key_in_arry_has_value() { - local -n array=3D"${1}" +test_that_array_is_defined() { local arrayname=3D"${1}" - local key=3D"${2}" - local value=3D"${3}" =20 if [[ ! "$(declare -p "${arrayname}")" =3D~ "declare -a" && ! "$(declare = -p "${arrayname}")" =3D~ "declare -A" ]]; then log_test_failed "The array '${1}' does not exists. The variable is not set= ." return 1 + else + log_test_succeded "The array '${1}' is defined." + return 0 fi +} + +test_that_key_in_arry_has_value() { + local -n array=3D"${1}" + local arrayname=3D"${1}" + local key=3D"${2}" + local value=3D"${3}" =20 + test_that_array_is_defined "${arrayname}" || return 1 =20 if [[ "${array["${key}"]+_}" =3D=3D "" ]]; then log_test_failed "The array does not contain the key '${key}', valid keys a= re: ${!array[*]}" --=20 2.39.2 --===============1267071492320483420==--