test: Fix failing test suite (again)

Author: hyperupcall

pkg/lib/traverse-get.sh

@@ -61,7 +61,7 @@ bash_object.traverse-get() {
 				local -n current_object="$current_object_name"
 
 				if ((i+1 < ${#REPLIES[@]})); then
-					# TODO: test these internal invalid errors
+					# TODO: test these internal invalid errors (error when type=array references object, etc.)
 					# Do nothing (assuming the type is correct), we have already set 'current_object'
 					# for the next iteration
 					:

tests/get-array.bats

@@ -51,11 +51,13 @@ load './util/init.sh'
 	declare -A OBJECT=([my_key]=$'\x1C\x1Dtype=array;&SUB_ARRAY')
 
 	bash_object.traverse-get array OBJECT '.my_key'
-
 	assert [ ${#REPLY[@]} -eq 3 ]
 	assert [ "${REPLY[0]}" = omicron ]
 	assert [ "${REPLY[1]}" = pi ]
 	assert [ "${REPLY[2]}" = rho ]
+
+	bash_object.traverse-get string OBJECT '.["my_key"].[2]'
+	assert [ "$REPLY" = rho ]
 }
 
 @test "correctly gets array in subobject" {
@@ -64,11 +66,13 @@ load './util/init.sh'
 	declare -A OBJECT=([my_key]=$'\x1C\x1Dtype=object;&SUB_OBJECT')
 
 	bash_object.traverse-get array OBJECT '.my_key.subkey'
-
 	assert [ ${#REPLY[@]} -eq 3 ]
 	assert [ "${REPLY[0]}" = pi ]
 	assert [ "${REPLY[1]}" = rho ]
 	assert [ "${REPLY[2]}" = sigma ]
+
+	bash_object.traverse-get string OBJECT '.["my_key"].["subkey"].[2]'
+	assert [ "$REPLY" = sigma ]
 }
 
 @test "correctly gets array in subarray" {
@@ -77,14 +81,12 @@ load './util/init.sh'
 	declare -A OBJECT=([my_key]=$'\x1C\x1Dtype=array;&SUB_ARRAY')
 
 	bash_object.traverse-get array OBJECT '.["my_key"].[2]'
-
 	assert [ ${#REPLY[@]} -eq 3 ]
 	assert [ "${REPLY[0]}" = omicron ]
 	assert [ "${REPLY[1]}" = pi ]
 	assert [ "${REPLY[2]}" = rho ]
 
 
-	bash_object.traverse-get array OBJECT '.["my_key"].[2].[0]'
-
+	bash_object.traverse-get string OBJECT '.["my_key"].[2].[0]'
 	assert [ "$REPLY" = omicron ]
 }

tests/get-object.bats

@@ -46,22 +46,38 @@ load './util/init.sh'
 	assert_line -p 'Queried for object, but found array'
 }
 
-# { "stars": { "cool": "Wolf 359" } }
-@test "properly gets 4" {
+@test "correctly gets object" {
 	declare -A inner_object=([cool]='Wolf 359')
 	declare -A OBJ=([stars]=$'\x1C\x1Dtype=object;&inner_object')
 
 	bash_object.traverse-get object 'OBJ' '.stars'
 	assert [ "${REPLY[cool]}" = 'Wolf 359' ]
+
+	bash_object.traverse-get string 'OBJ' '.stars.cool'
+	assert [ "$REPLY" = 'Wolf 359' ]
 }
 
-# { "stars": { "cool": "Wolf 359" } }
-@test "properly gets 5" {
-	declare -a inner_array=('Alpha Centauri A' 'Proxima Centauri')
-	declare -A OBJ=([nearby]=$'\x1C\x1Dtype=object;&inner_array')
 
-	bash_object.traverse-get object 'OBJ' '.nearby'
-	assert [ "${#REPLY[@]}" -eq 2 ]
-	assert [ "${REPLY[0]}" = 'Alpha Centauri A' ]
-	assert [ "${REPLY[1]}" = 'Proxima Centauri' ]
+@test "correctly gets object in subobject" {
+	declare -A SUB_SUB_OBJECT=([omicron]='pi')
+	declare -A SUB_OBJECT=([delta]=$'\x1C\x1Dtype=object;&SUB_SUB_OBJECT')
+	declare -A OBJ=([gamma]=$'\x1C\x1Dtype=object;&SUB_OBJECT')
+
+	bash_object.traverse-get object 'OBJ' '.gamma.delta'
+	assert [ "${REPLY[omicron]}" = pi ]
+
+	bash_object.traverse-get string 'OBJ' '.gamma.delta.omicron'
+	assert [ "$REPLY" = pi ]
+}
+
+@test "correctly gets object in subarray" {
+	declare -A SUB_SUB_OBJECT=([pi]='rho')
+	declare -a SUB_ARRAY=('foo' 'bar' $'\x1C\x1Dtype=object;&SUB_SUB_OBJECT')
+	declare -A OBJ=([omicron]=$'\x1C\x1Dtype=array;&SUB_ARRAY')
+
+	bash_object.traverse-get object 'OBJ' '.["omicron"].[2]'
+	assert [ "${REPLY[pi]}" = rho ]
+
+	bash_object.traverse-get string 'OBJ' '.["omicron"].[2].["pi"]'
+	assert [ "$REPLY" = rho ]
 }

tests/get-string.bats

@@ -48,38 +48,43 @@ load './util/init.sh'
 	assert_line -p 'Queried for string, but found array'
 }
 
-@test "properly gets string in root" {
+@test "correctly gets object at root" {
 	declare -A OBJECT=([my_key]='my_value')
 
 	bash_object.traverse-get string OBJECT '.my_key'
 	assert [ "$REPLY" = 'my_value' ]
 }
 
-@test "properly gets string in nested object" {
+@test "correctly gets object" {
 	declare -A EPSILON_OBJECT=([my_key]='my_value2')
 	declare -A OBJECT=([epsilon]=$'\x1C\x1Dtype=object;&EPSILON_OBJECT')
 
 	bash_object.traverse-get string OBJECT '.epsilon.my_key'
 	assert [ "$REPLY" = 'my_value2' ]
 }
 
-# { "stars": { "cool": "Wolf 359" } }
-@test "properly gets string in nested object 2" {
-	declare -A inner_object=([cool]='Wolf 359')
-	declare -A OBJ=([stars]=$'\x1C\x1Dtype=object;&inner_object')
+@test "correctly gets object in subobject" {
+	declare -A obj_bravo=([charlie]=delta)
+	declare -A obj_alfa=([bravo]=$'\x1C\x1Dtype=object;&obj_bravo')
+	declare -A OBJ=([alfa]=$'\x1C\x1Dtype=object;&obj_alfa')
 
-	bash_object.traverse-get string 'OBJ' '.stars.cool'
-	assert [ "$REPLY" = 'Wolf 359' ]
+	bash_object.traverse-get object 'OBJ' '.alfa.bravo'
+	assert [ "${REPLY[charlie]}" = 'delta' ]
+
+	bash_object.traverse-get string 'OBJ' '.alfa.bravo.charlie'
+	assert [ "$REPLY" = 'delta' ]
 }
 
-# # { "alfa": { "bravo": { "charlie": { "delta": { "echo": "final_value" } } } } }
-@test "properly gets string in nested object 3" {
+@test "correctly gets object in subobject highly nested" {
 	declare -A obj_delta=([echo]="final_value")
 	declare -A obj_charlie=([delta]=$'\x1C\x1Dtype=object;&obj_delta')
 	declare -A obj_bravo=([charlie]=$'\x1C\x1Dtype=object;&obj_charlie')
 	declare -A obj_alfa=([bravo]=$'\x1C\x1Dtype=object;&obj_bravo')
 	declare -A OBJ=([alfa]=$'\x1C\x1Dtype=object;&obj_alfa')
 
+	bash_object.traverse-get object 'OBJ' '.alfa.bravo.charlie.delta'
+	assert [ "${REPLY[echo]}" = 'final_value' ]
+
 	bash_object.traverse-get string 'OBJ' '.alfa.bravo.charlie.delta.echo'
 	assert [ "$REPLY" = 'final_value' ]
 }