Skip to content

Commit c0a98fa

Browse files
hyperupcallhyperupcall
committed
test: Uncomment commented tests and fix e2e
1 parent f5c43d5 commit c0a98fa

File tree

2 files changed

+54
-47
lines changed

2 files changed

+54
-47
lines changed

‎tests/e2e.bats

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ load './util/init.sh'
1111
run bobject "$subcmd" 'OBJECT' '.zulu.yankee' 'invalid'
1212

1313
assert_failure
14-
assert_line -p "Incorrect arguments for subcommand '$subcmd'"
14+
assert_line -p "Expected '3' arguments, but received '4'"
1515
done
1616
}
1717

@@ -24,7 +24,8 @@ load './util/init.sh'
2424
run bobject "$subcmd" 'invalid'
2525

2626
assert_failure
27-
assert_line -p "Incorrect arguments for subcommand '$subcmd'"
27+
assert_failure
28+
assert_line -p "Expected '3' arguments, but received '2'"
2829
done
2930
}
3031

‎tests/set-string.bats

Lines changed: 51 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -80,64 +80,70 @@ load './util/init.sh'
8080
assert [ "$REPLY" = 'phi' ]
8181
}
8282

83-
# @test "correctly sets string in subobject" {
84-
# declare -A SUB_SUB_OBJECT=()
85-
# declare -A SUB_OBJECT=([pi]=$'\x1C\x1Dtype=object;&SUB_SUB_OBJECT')
86-
# declare -A OBJECT=([omicron]=$'\x1C\x1Dtype=object;&SUB_OBJECT')
87-
88-
# bash_object.traverse-set --pass-by-ref string 'OBJECT' '.omicron.pi.rho' 'sigma'
89-
# bash_object.traverse-get string 'OBJECT' '.omicron.pi.rho'
90-
# assert [ "$REPLY" = 'sigma' ]
91-
# }
83+
@test "correctly sets string in subobject" {
84+
declare -A SUB_SUB_OBJECT=()
85+
declare -A SUB_OBJECT=([pi]=$'\x1C\x1Dtype=object;&SUB_SUB_OBJECT')
86+
declare -A OBJECT=([omicron]=$'\x1C\x1Dtype=object;&SUB_OBJECT')
87+
str='sigma'
88+
89+
bash_object.traverse-set --pass-by-ref string 'OBJECT' '.omicron.pi.rho' str
90+
bash_object.traverse-get string 'OBJECT' '.omicron.pi.rho'
91+
assert [ "$REPLY" = 'sigma' ]
92+
}
9293

93-
# @test "correctly sets string in subobject 2" {
94-
# declare -A obj=()
94+
@test "correctly sets string in subobject 2" {
95+
declare -A obj=()
96+
str='sigma'
9597

96-
# bash_object.traverse-set --pass-by-ref object 'OBJECT' '.omicron' obj
97-
# bash_object.traverse-set --pass-by-ref object 'OBJECT' '.omicron.pi' obj
98+
bash_object.traverse-set --pass-by-ref object 'OBJECT' '.omicron' obj
99+
bash_object.traverse-set --pass-by-ref object 'OBJECT' '.omicron.pi' obj
98100

99-
# bash_object.traverse-set --pass-by-ref string 'OBJECT' '.omicron.pi.rho' 'sigma'
100-
# bash_object.traverse-get string 'OBJECT' '.omicron.pi.rho'
101-
# assert [ "$REPLY" = 'sigma' ]
102-
# }
101+
bash_object.traverse-set --pass-by-ref string 'OBJECT' '.omicron.pi.rho' str
102+
bash_object.traverse-get string 'OBJECT' '.omicron.pi.rho'
103+
assert [ "$REPLY" = 'sigma' ]
104+
}
103105

104-
# @test "correctly sets 2 strings in subobject" {
105-
# declare -A SUB_SUB_OBJECT=()
106-
# declare -A SUB_OBJECT=([pi]=$'\x1C\x1Dtype=object;&SUB_SUB_OBJECT')
107-
# declare -A OBJECT=([omicron]=$'\x1C\x1Dtype=object;&SUB_OBJECT')
106+
@test "correctly sets 2 strings in subobject" {
107+
declare -A SUB_SUB_OBJECT=()
108+
declare -A SUB_OBJECT=([pi]=$'\x1C\x1Dtype=object;&SUB_SUB_OBJECT')
109+
declare -A OBJECT=([omicron]=$'\x1C\x1Dtype=object;&SUB_OBJECT')
110+
str1='sigma'
111+
str2='upsilon'
108112

109-
# bash_object.traverse-set --pass-by-ref string 'OBJECT' '.omicron.pi.rho' 'sigma'
110-
# bash_object.traverse-set --pass-by-ref string 'OBJECT' '.omicron.pi.tau' 'upsilon'
113+
bash_object.traverse-set --pass-by-ref string 'OBJECT' '.omicron.pi.rho' str1
114+
bash_object.traverse-set --pass-by-ref string 'OBJECT' '.omicron.pi.tau' str2
111115

112-
# bash_object.traverse-get string 'OBJECT' '.omicron.pi.rho'
113-
# assert [ "$REPLY" = 'sigma' ]
116+
bash_object.traverse-get string 'OBJECT' '.omicron.pi.rho'
117+
assert [ "$REPLY" = 'sigma' ]
114118

115-
# bash_object.traverse-get string 'OBJECT' '.omicron.pi.tau'
116-
# assert [ "$REPLY" = 'upsilon' ]
119+
bash_object.traverse-get string 'OBJECT' '.omicron.pi.tau'
120+
assert [ "$REPLY" = 'upsilon' ]
117121

118-
# bash_object.traverse-get object 'OBJECT' '.omicron.pi'
122+
bash_object.traverse-get object 'OBJECT' '.omicron.pi'
119123

120-
# assert [ "${REPLY[rho]}" = 'sigma' ]
121-
# assert [ "${REPLY[tau]}" = 'upsilon' ]
122-
# }
124+
assert [ "${REPLY[rho]}" = 'sigma' ]
125+
assert [ "${REPLY[tau]}" = 'upsilon' ]
126+
}
123127

124-
# @test "correctly sets 2 strings in subobject 2" {
125-
# declare -A obj=()
128+
@test "correctly sets 2 strings in subobject 2" {
129+
declare -A obj=()
130+
str1='sigma'
131+
str2='upsilon'
126132

127-
# bash_object.traverse-set --pass-by-ref object 'OBJECT' '.omicron' obj
128-
# bash_object.traverse-set --pass-by-ref object 'OBJECT' '.omicron.pi' obj
133+
bash_object.traverse-set --pass-by-ref object 'OBJECT' '.omicron' obj
134+
bash_object.traverse-set --pass-by-ref object 'OBJECT' '.omicron.pi' obj
129135

130-
# bash_object.traverse-set --pass-by-ref string 'OBJECT' '.omicron.pi.rho' 'sigma'
131-
# bash_object.traverse-set --pass-by-ref string 'OBJECT' '.omicron.pi.tau' 'upsilon'
136+
bash_object.traverse-set --pass-by-ref string 'OBJECT' '.omicron.pi.rho' str1
137+
bash_object.traverse-set --pass-by-ref string 'OBJECT' '.omicron.pi.tau' str2
132138

133-
# bash_object.traverse-get string 'OBJECT' '.omicron.pi.rho'
134-
# assert [ "$REPLY" = 'sigma' ]
139+
bash_object.traverse-get string 'OBJECT' '.omicron.pi.rho'
140+
assert [ "$REPLY" = 'sigma' ]
135141

136-
# bash_object.traverse-get string 'OBJECT' '.omicron.pi.tau'
137-
# assert [ "$REPLY" = 'upsilon' ]
142+
bash_object.traverse-get string 'OBJECT' '.omicron.pi.tau'
143+
assert [ "$REPLY" = 'upsilon' ]
138144

139-
# bash_object.traverse-get object 'OBJECT' '.omicron.pi'
145+
bash_object.traverse-get object 'OBJECT' '.omicron.pi'
140146

141-
# assert [ "${REPLY[rho]}" = 'sigma' ]
142-
# assert [ "${REPLY[tau]}" = 'upsilon' ]
143-
# }
147+
assert [ "${REPLY[rho]}" = 'sigma' ]
148+
assert [ "${REPLY[tau]}" = 'upsilon' ]
149+
}

0 commit comments

Comments
 (0)