Skip to content

Commit 7533e18

Browse files
hyperupcallhyperupcall
committed
test: Refactor to use 'bobject-set' in tests rather than internal
function Justification in directly preceeding commit
1 parent 78c06c2 commit 7533e18

7 files changed

+64
-70
lines changed

‎tests/get-errors-invalid-dereferenced-vobj-type.bats

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/usr/bin/env bats
22

33
# @brief Ensures errors are thrown when the type of vobject does not match up with the actual object that it references
4+
# TODO
45

56
load './util/init.sh'
67

‎tests/set-array.bats

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ load './util/init.sh'
66
declare -a arr=(omicron pi rho)
77
declare -A OBJECT=()
88

9-
bash_object.traverse-set --pass-by-ref array 'OBJECT' '.arr' arr
9+
bobject set-array --pass-by-ref 'OBJECT' '.arr' arr
1010

1111
bobject get-array 'OBJECT' '.arr'
1212
assert [ ${#REPLY[@]} -eq 3 ]

‎tests/set-errors-invalid-vobj-type.bats

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ load './util/init.sh'
1212
declare -A OBJECT=([my_key]=$'\x1C\x1Dtype=array;&SUB_ARRAY')
1313
declare -A obj=([upsilon]=phi)
1414

15-
run bash_object.traverse-set --pass-by-ref object OBJECT '.my_key' obj
15+
run bobject set-object --pass-by-ref OBJECT '.my_key' obj
1616

1717
assert_failure
1818
assert_line -p "ERROR_ARGUMENTS_INCORRECT_TYPE"
@@ -25,7 +25,7 @@ load './util/init.sh'
2525
declare -A OBJECT=([my_key]=$'\x1C\x1Dtype=array;&SUB_OBJECT')
2626
declare -A obj=([upsilon]=phi)
2727

28-
run bash_object.traverse-set --pass-by-ref object OBJECT '.my_key.nested' obj
28+
run bobject set-object --pass-by-ref OBJECT '.my_key.nested' obj
2929

3030
assert_failure
3131
assert_line -p "ERROR_ARGUMENTS_INCORRECT_TYPE"
@@ -38,7 +38,7 @@ load './util/init.sh'
3838
declare -A OBJECT=([my_key]=$'\x1C\x1Dtype=array;&SUB_ARRAY')
3939
declare -A obj=([upsilon]=phi)
4040

41-
run bash_object.traverse-set --pass-by-ref object OBJECT '.["my_key"].[2]' obj
41+
run bobject set-object --pass-by-ref OBJECT '.["my_key"].[2]' obj
4242

4343
assert_failure
4444
assert_line -p "ERROR_ARGUMENTS_INCORRECT_TYPE"
@@ -49,7 +49,7 @@ load './util/init.sh'
4949
declare -A OBJECT=([my_key]='string_value2')
5050
declare -A obj=([upsilon]=phi)
5151

52-
run bash_object.traverse-set --pass-by-ref object OBJECT '.my_key' obj
52+
run bobject set-object --pass-by-ref OBJECT '.my_key' obj
5353

5454
assert_failure
5555
assert_line -p "ERROR_ARGUMENTS_INCORRECT_TYPE"
@@ -61,7 +61,7 @@ load './util/init.sh'
6161
declare -A OBJECT=([my_key]=$'\x1C\x1Dtype=object;&SUB_OBJECT')
6262
declare -A obj=([upsilon]=phi)
6363

64-
run bash_object.traverse-set --pass-by-ref object OBJECT '.my_key.nested' obj
64+
run bobject set-object --pass-by-ref OBJECT '.my_key.nested' obj
6565

6666
assert_failure
6767
assert_line -p "ERROR_ARGUMENTS_INCORRECT_TYPE"
@@ -73,7 +73,7 @@ load './util/init.sh'
7373
declare -A OBJECT=([my_key]=$'\x1C\x1Dtype=array;&SUB_ARRAY')
7474
declare -A obj=([upsilon]=phi)
7575

76-
run bash_object.traverse-set --pass-by-ref object OBJECT '.["my_key"].[2]' obj
76+
run bobject set-object --pass-by-ref OBJECT '.["my_key"].[2]' obj
7777

7878
assert_failure
7979
assert_line -p "ERROR_ARGUMENTS_INCORRECT_TYPE"
@@ -86,7 +86,7 @@ load './util/init.sh'
8686
declare -A OBJECT=([my_key]=$'\x1C\x1Dtype=object;&SUB_OBJECT')
8787
declare -a arr=(upsilon phi chi psi)
8888

89-
run bash_object.traverse-set --pass-by-ref array OBJECT '.my_key' arr
89+
run bobject set-array --pass-by-ref OBJECT '.my_key' arr
9090

9191
assert_failure
9292
assert_line -p "ERROR_ARGUMENTS_INCORRECT_TYPE"
@@ -99,7 +99,7 @@ load './util/init.sh'
9999
declare -A OBJECT=([my_key]=$'\x1C\x1Dtype=object;&SUB_OBJECT')
100100
declare -a arr=(upsilon phi chi psi)
101101

102-
run bash_object.traverse-set --pass-by-ref array OBJECT '.my_key.nested' arr
102+
run bobject set-array --pass-by-ref OBJECT '.my_key.nested' arr
103103

104104
assert_failure
105105
assert_line -p "ERROR_ARGUMENTS_INCORRECT_TYPE"
@@ -112,7 +112,7 @@ load './util/init.sh'
112112
declare -A OBJECT=([my_key]=$'\x1C\x1Dtype=array;&SUB_ARRAY')
113113
declare -a arr=(upsilon phi chi psi)
114114

115-
run bash_object.traverse-set --pass-by-ref array OBJECT '.["my_key"].[2]' arr
115+
run bobject set-array --pass-by-ref OBJECT '.["my_key"].[2]' arr
116116

117117
assert_failure
118118
assert_line -p "ERROR_ARGUMENTS_INCORRECT_TYPE"
@@ -123,7 +123,7 @@ load './util/init.sh'
123123
declare -A OBJECT=([my_key]='string_value2')
124124
declare -a arr=(upsilon phi chi psi)
125125

126-
run bash_object.traverse-set --pass-by-ref array OBJECT '.my_key' arr
126+
run bobject set-array --pass-by-ref OBJECT '.my_key' arr
127127

128128
assert_failure
129129
assert_line -p "ERROR_ARGUMENTS_INCORRECT_TYPE"
@@ -135,7 +135,7 @@ load './util/init.sh'
135135
declare -A OBJECT=([my_key]=$'\x1C\x1Dtype=object;&SUB_OBJECT')
136136
declare -a arr=(upsilon phi chi psi)
137137

138-
run bash_object.traverse-set --pass-by-ref array OBJECT '.my_key.nested' arr
138+
run bobject set-array --pass-by-ref OBJECT '.my_key.nested' arr
139139

140140
assert_failure
141141
assert_line -p "ERROR_ARGUMENTS_INCORRECT_TYPE"
@@ -147,7 +147,7 @@ load './util/init.sh'
147147
declare -A OBJECT=([my_key]=$'\x1C\x1Dtype=array;&SUB_ARRAY')
148148
declare -a arr=(upsilon phi chi psi)
149149

150-
run bash_object.traverse-set --pass-by-ref array OBJECT '.["my_key"].[2]' arr
150+
run bobject set-array --pass-by-ref OBJECT '.["my_key"].[2]' arr
151151

152152
assert_failure
153153
assert_line -p "ERROR_ARGUMENTS_INCORRECT_TYPE"
@@ -160,7 +160,7 @@ load './util/init.sh'
160160
declare -A OBJECT=([my_key]=$'\x1C\x1Dtype=array;&SUB_ARRAY')
161161
str='psi-omega'
162162

163-
run bash_object.traverse-set --pass-by-ref string OBJECT '.my_key' str
163+
run bobject set-string --pass-by-ref OBJECT '.my_key' str
164164

165165
assert_failure
166166
assert_line -p "ERROR_ARGUMENTS_INCORRECT_TYPE"
@@ -173,7 +173,7 @@ load './util/init.sh'
173173
declare -A OBJECT=([my_key]=$'\x1C\x1Dtype=array;&SUB_OBJECT')
174174
str='psi-omega'
175175

176-
run bash_object.traverse-set --pass-by-ref string OBJECT '.my_key.nested' str
176+
run bobject set-string --pass-by-ref OBJECT '.my_key.nested' str
177177

178178
assert_failure
179179
assert_line -p "ERROR_ARGUMENTS_INCORRECT_TYPE"
@@ -186,7 +186,7 @@ load './util/init.sh'
186186
declare -A OBJECT=([my_key]=$'\x1C\x1Dtype=array;&SUB_ARRAY')
187187
str='psi-omega'
188188

189-
run bash_object.traverse-set --pass-by-ref string OBJECT '.["my_key"].[2]' str
189+
run bobject set-string --pass-by-ref OBJECT '.["my_key"].[2]' str
190190

191191
assert_failure
192192
assert_line -p "ERROR_ARGUMENTS_INCORRECT_TYPE"
@@ -198,7 +198,7 @@ load './util/init.sh'
198198
declare -A OBJECT=([my_key]=$'\x1C\x1Dtype=object;&SUB_OBJECT')
199199
str='psi-omega'
200200

201-
run bash_object.traverse-set --pass-by-ref string OBJECT '.my_key' str
201+
run bobject set-string --pass-by-ref OBJECT '.my_key' str
202202

203203
assert_failure
204204
assert_line -p "ERROR_ARGUMENTS_INCORRECT_TYPE"
@@ -211,7 +211,7 @@ load './util/init.sh'
211211
declare -A OBJECT=([my_key]=$'\x1C\x1Dtype=object;&SUB_OBJECT')
212212
str='psi-omega'
213213

214-
run bash_object.traverse-set --pass-by-ref string OBJECT '.my_key.nested' str
214+
run bobject set-string --pass-by-ref OBJECT '.my_key.nested' str
215215

216216
assert_failure
217217
assert_line -p "ERROR_ARGUMENTS_INCORRECT_TYPE"
@@ -224,7 +224,7 @@ load './util/init.sh'
224224
declare -A OBJECT=([my_key]=$'\x1C\x1Dtype=array;&SUB_ARRAY')
225225
str='psi-omega'
226226

227-
run bash_object.traverse-set --pass-by-ref string OBJECT '.["my_key"].[2]' str
227+
run bobject set-string --pass-by-ref OBJECT '.["my_key"].[2]' str
228228

229229
assert_failure
230230
assert_line -p "ERROR_ARGUMENTS_INCORRECT_TYPE"

0 commit comments

Comments
 (0)