From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonatan Schlag To: development@lists.ipfire.org Subject: [PATCH v2 08/18] test: Add functions test_that_array_is_defined Date: Sun, 16 Jun 2024 18:02:35 +0200 Message-ID: <20240616160245.18865-9-jonatan.schlag@ipfire.org> In-Reply-To: <20240616160245.18865-1-jonatan.schlag@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4998508317267766224==" List-Id: --===============4998508317267766224== 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 | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/tests/lib.sh b/tests/lib.sh index 4110ed2d8..32481b6a5 100644 --- a/tests/lib.sh +++ b/tests/lib.sh @@ -34,11 +34,8 @@ var_has_value() { [[ "${!1}" =3D=3D "${2}" ]] } =20 -test_value_in_array() { - local -n array=3D"${1}" +test_that_array_is_defined() { local arrayname=3D"${1}" - local key=3D"${2}" - local value=3D"${3}" =20 # `declare -p` print out how the variable with the name $arrayname was decl= ared # If the array was not declared as indexed or associative array we fail. We= cannot check for a value in an array if=20 @@ -46,7 +43,19 @@ test_value_in_array() { 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_value_in_array() { + local -n array=3D"${1}" + local arrayname=3D"${1}" + local key=3D"${2}" + local value=3D"${3}" + + test_that_array_is_defined "${arrayname}" || return 1 =20 # If key is not defined we return _ # If the key is defined we return nothing --=20 2.39.2 --===============4998508317267766224==--