backup/EWF
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Converted the autotest test suite to void-safety

Browse Source 
+ cosmetics
This commit is contained in:
jfiat
2011-07-07 14:39:06 +00:00
parent 591cfb6cfa
commit 28a699e5f2
3 changed files with 310 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/kernel/scanner/json_parser.e
View File

@@ -65,7 +65,7 @@ feature -- Commands
-- Parse JSON data `representation' -- Parse JSON data `representation'
-- start ::= object | array -- start ::= object | array
do do
if is_valid_start_symbol then if is_valid_start_symbol then
Result := parse Result := parse
if extra_elements then if extra_elements then
is_parsed := False is_parsed := False

497
test/autotest/test_suite/test_json_suite.e
View File

@@ -24,351 +24,468 @@ feature {NONE} -- Events
create file_reader create file_reader
end end
feature -- Tests Pass feature -- Tests Pass
test_json_pass1 test_json_pass1
-- --
do local
json_file:=file_reader.read_json_from (test_dir + "pass1.json") parse_json: like new_json_parser
create parse_json.make_parser (json_file) do
if attached json_file_from ("pass1.json") as json_file then
parse_json := new_json_parser (json_file)
json_value := parse_json.parse_json json_value := parse_json.parse_json
assert ("pass1.json",parse_json.is_parsed = True) assert ("pass1.json",parse_json.is_parsed = True)
end end
end
test_json_pass2 test_json_pass2
-- --
do local
json_file:=file_reader.read_json_from (test_dir +"pass2.json") parse_json: like new_json_parser
create parse_json.make_parser (json_file) do
if attached json_file_from ("pass2.json") as json_file then
parse_json := new_json_parser (json_file)
json_value := parse_json.parse_json json_value := parse_json.parse_json
assert ("pass2.json",parse_json.is_parsed = True) assert ("pass2.json",parse_json.is_parsed = True)
end end
end
test_json_pass3 test_json_pass3
-- --
do local
json_file:=file_reader.read_json_from (test_dir +"pass3.json") parse_json: like new_json_parser
create parse_json.make_parser (json_file) do
if attached json_file_from ("pass3.json") as json_file then
parse_json := new_json_parser (json_file)
json_value := parse_json.parse_json json_value := parse_json.parse_json
assert ("pass3.json",parse_json.is_parsed = True) assert ("pass3.json",parse_json.is_parsed = True)
end end
end
feature -- Tests Failures feature -- Tests Failures
test_json_fail1 test_json_fail1
-- --
do local
json_file:=file_reader.read_json_from (test_dir +"fail1.json") parse_json: like new_json_parser
create parse_json.make_parser (json_file) do
if attached json_file_from ("fail1.json") as json_file then
parse_json := new_json_parser (json_file)
json_value := parse_json.parse_json json_value := parse_json.parse_json
assert ("fail1.json",parse_json.is_parsed = False) assert ("fail1.json",parse_json.is_parsed = False)
end end
end
test_json_fail2 test_json_fail2
-- --
do local
json_file:=file_reader.read_json_from (test_dir +"fail2.json") parse_json: like new_json_parser
create parse_json.make_parser (json_file) do
if attached json_file_from ("fail2.json") as json_file then
parse_json := new_json_parser (json_file)
json_value := parse_json.parse_json json_value := parse_json.parse_json
assert ("fail2.json",parse_json.is_parsed = False) assert ("fail2.json",parse_json.is_parsed = False)
end end
end
test_json_fail3 test_json_fail3
-- --
do local
json_file:=file_reader.read_json_from (test_dir +"fail3.json") parse_json: like new_json_parser
create parse_json.make_parser (json_file) do
if attached json_file_from ("fail3.json") as json_file then
parse_json := new_json_parser (json_file)
json_value := parse_json.parse_json json_value := parse_json.parse_json
assert ("fail3.json",parse_json.is_parsed = False) assert ("fail3.json",parse_json.is_parsed = False)
end end
end
test_json_fail4 test_json_fail4
-- --
do local
json_file:=file_reader.read_json_from (test_dir +"fail4.json") parse_json: like new_json_parser
create parse_json.make_parser (json_file) do
if attached json_file_from ("fail4.json") as json_file then
parse_json := new_json_parser (json_file)
json_value := parse_json.parse_json json_value := parse_json.parse_json
assert ("fail4.json",parse_json.is_parsed = False) assert ("fail4.json",parse_json.is_parsed = False)
end end
end
test_json_fail5 test_json_fail5
-- --
do local
json_file:=file_reader.read_json_from (test_dir +"fail5.json") parse_json: like new_json_parser
create parse_json.make_parser (json_file) do
if attached json_file_from ("fail5.json") as json_file then
parse_json := new_json_parser (json_file)
json_value := parse_json.parse_json json_value := parse_json.parse_json
assert ("fail5.json",parse_json.is_parsed = False) assert ("fail5.json",parse_json.is_parsed = False)
end end
end
test_json_fail6 test_json_fail6
-- --
do local
json_file:=file_reader.read_json_from (test_dir +"fail6.json") parse_json: like new_json_parser
create parse_json.make_parser (json_file) do
if attached json_file_from ("fail6.json") as json_file then
parse_json := new_json_parser (json_file)
json_value := parse_json.parse_json json_value := parse_json.parse_json
assert ("fail6.json",parse_json.is_parsed = False ) assert ("fail6.json",parse_json.is_parsed = False )
end end
end
test_json_fail7 test_json_fail7
-- --
do local
json_file:=file_reader.read_json_from (test_dir +"fail7.json") parse_json: like new_json_parser
create parse_json.make_parser (json_file) do
if attached json_file_from ("fail7.json") as json_file then
parse_json := new_json_parser (json_file)
json_value := parse_json.parse_json json_value := parse_json.parse_json
assert ("fail7.json",parse_json.is_parsed = False) assert ("fail7.json",parse_json.is_parsed = False)
end end
end
test_json_fail8 test_json_fail8
-- --
do local
json_file:=file_reader.read_json_from (test_dir +"fail8.json") parse_json: like new_json_parser
create parse_json.make_parser (json_file) do
if attached json_file_from ("fail8.json") as json_file then
parse_json := new_json_parser (json_file)
json_value := parse_json.parse_json json_value := parse_json.parse_json
assert ("fail8.json",parse_json.is_parsed = False ) assert ("fail8.json",parse_json.is_parsed = False )
end end
end
test_json_fail9 test_json_fail9
-- --
do local
json_file:=file_reader.read_json_from (test_dir +"fail9.json") parse_json: like new_json_parser
create parse_json.make_parser (json_file) do
if attached json_file_from ("fail9.json") as json_file then
parse_json := new_json_parser (json_file)
json_value := parse_json.parse_json json_value := parse_json.parse_json
assert ("fail9.json",parse_json.is_parsed = False) assert ("fail9.json",parse_json.is_parsed = False)
end end
end
test_json_fail10 test_json_fail10
-- --
do local
json_file:=file_reader.read_json_from (test_dir +"fail10.json") parse_json: like new_json_parser
create parse_json.make_parser (json_file) do
if attached json_file_from ("fail10.json") as json_file then
parse_json := new_json_parser (json_file)
json_value := parse_json.parse_json json_value := parse_json.parse_json
assert ("fail10.json",parse_json.is_parsed = False) assert ("fail10.json",parse_json.is_parsed = False)
end end
end
test_json_fail11 test_json_fail11
-- --
do local
json_file:=file_reader.read_json_from (test_dir +"fail11.json") parse_json: like new_json_parser
create parse_json.make_parser (json_file) do
if attached json_file_from ("fail11.json") as json_file then
parse_json := new_json_parser (json_file)
json_value := parse_json.parse_json json_value := parse_json.parse_json
assert ("fail11.json",parse_json.is_parsed = False) assert ("fail11.json",parse_json.is_parsed = False)
end end
end
test_json_fail12 test_json_fail12
-- --
do local
json_file:=file_reader.read_json_from (test_dir +"fail12.json") parse_json: like new_json_parser
create parse_json.make_parser (json_file) do
if attached json_file_from ("fail12.json") as json_file then
parse_json := new_json_parser (json_file)
json_value := parse_json.parse_json json_value := parse_json.parse_json
assert ("fail12.json",parse_json.is_parsed = False) assert ("fail12.json",parse_json.is_parsed = False)
end end
end
test_json_fail13 test_json_fail13
-- --
do local
json_file:=file_reader.read_json_from (test_dir +"fail13.json") parse_json: like new_json_parser
create parse_json.make_parser (json_file) do
if attached json_file_from ("fail13.json") as json_file then
parse_json := new_json_parser (json_file)
json_value := parse_json.parse_json json_value := parse_json.parse_json
assert ("fail13.json",parse_json.is_parsed = False) assert ("fail13.json",parse_json.is_parsed = False)
end end
end
test_json_fail14 test_json_fail14
-- --
do local
json_file:=file_reader.read_json_from (test_dir +"fail14.json") parse_json: like new_json_parser
create parse_json.make_parser (json_file) do
if attached json_file_from ("fail14.json") as json_file then
parse_json := new_json_parser (json_file)
json_value := parse_json.parse_json json_value := parse_json.parse_json
assert ("fail14.json",parse_json.is_parsed = False) assert ("fail14.json",parse_json.is_parsed = False)
end end
end
test_json_fail15 test_json_fail15
-- --
do local
json_file:=file_reader.read_json_from (test_dir +"fail15.json") parse_json: like new_json_parser
create parse_json.make_parser (json_file) do
if attached json_file_from ("fail15.json") as json_file then
parse_json := new_json_parser (json_file)
json_value := parse_json.parse_json json_value := parse_json.parse_json
assert ("fail15.json",parse_json.is_parsed = False) assert ("fail15.json",parse_json.is_parsed = False)
end end
end
test_json_fail16 test_json_fail16
-- --
do local
json_file:=file_reader.read_json_from (test_dir +"fail16.json") parse_json: like new_json_parser
create parse_json.make_parser (json_file) do
if attached json_file_from ("fail16.json") as json_file then
parse_json := new_json_parser (json_file)
json_value := parse_json.parse_json json_value := parse_json.parse_json
assert ("fail16.json",parse_json.is_parsed = False) assert ("fail16.json",parse_json.is_parsed = False)
end end
end
test_json_fail17 test_json_fail17
-- --
do local
json_file:=file_reader.read_json_from (test_dir +"fail17.json") parse_json: like new_json_parser
create parse_json.make_parser (json_file) do
if attached json_file_from ("fail17.json") as json_file then
parse_json := new_json_parser (json_file)
json_value := parse_json.parse_json json_value := parse_json.parse_json
assert ("fail17.json",parse_json.is_parsed = False) assert ("fail17.json",parse_json.is_parsed = False)
end end
end
test_json_fail18 test_json_fail18
-- --
do local
json_file:=file_reader.read_json_from (test_dir +"fail18.json") parse_json: like new_json_parser
create parse_json.make_parser (json_file) do
if attached json_file_from ("fail18.json") as json_file then
parse_json := new_json_parser (json_file)
json_value := parse_json.parse_json json_value := parse_json.parse_json
assert ("fail18.json",parse_json.is_parsed = True) assert ("fail18.json",parse_json.is_parsed = True)
end end
end
test_json_fail19 test_json_fail19
-- --
do local
json_file:=file_reader.read_json_from (test_dir +"fail19.json") parse_json: like new_json_parser
create parse_json.make_parser (json_file) do
if attached json_file_from ("fail19.json") as json_file then
parse_json := new_json_parser (json_file)
json_value := parse_json.parse_json json_value := parse_json.parse_json
assert ("fail19.json",parse_json.is_parsed = False) assert ("fail19.json",parse_json.is_parsed = False)
end end
end
test_json_fail20 test_json_fail20
-- --
do local
json_file:=file_reader.read_json_from (test_dir +"fail20.json") parse_json: like new_json_parser
create parse_json.make_parser (json_file) do
if attached json_file_from ("fail20.json") as json_file then
parse_json := new_json_parser (json_file)
json_value := parse_json.parse_json json_value := parse_json.parse_json
assert ("fail20.json",parse_json.is_parsed = False) assert ("fail20.json",parse_json.is_parsed = False)
end end
end
test_json_fail21 test_json_fail21
-- --
do local
json_file:=file_reader.read_json_from (test_dir +"fail21.json") parse_json: like new_json_parser
create parse_json.make_parser (json_file) do
if attached json_file_from ("fail21.json") as json_file then
parse_json := new_json_parser (json_file)
json_value := parse_json.parse_json json_value := parse_json.parse_json
assert ("fail21.json",parse_json.is_parsed = False) assert ("fail21.json",parse_json.is_parsed = False)
end end
end
test_json_fail22 test_json_fail22
-- --
do local
json_file:=file_reader.read_json_from (test_dir +"fail22.json") parse_json: like new_json_parser
create parse_json.make_parser (json_file) do
if attached json_file_from ("fail22.json") as json_file then
parse_json := new_json_parser (json_file)
json_value := parse_json.parse_json json_value := parse_json.parse_json
assert ("fail22.json",parse_json.is_parsed = False) assert ("fail22.json",parse_json.is_parsed = False)
end end
end
test_json_fail23 test_json_fail23
-- --
do local
json_file:=file_reader.read_json_from (test_dir +"fail23.json") parse_json: like new_json_parser
create parse_json.make_parser (json_file) do
if attached json_file_from ("fail23.json") as json_file then
parse_json := new_json_parser (json_file)
json_value := parse_json.parse_json json_value := parse_json.parse_json
assert ("fail23.json",parse_json.is_parsed = False) assert ("fail23.json",parse_json.is_parsed = False)
end end
end
test_json_fail24 test_json_fail24
-- --
do local
json_file:=file_reader.read_json_from (test_dir +"fail24.json") parse_json: like new_json_parser
create parse_json.make_parser (json_file) do
if attached json_file_from ("fail24.json") as json_file then
parse_json := new_json_parser (json_file)
json_value := parse_json.parse_json json_value := parse_json.parse_json
assert ("fail24.json",parse_json.is_parsed = False) assert ("fail24.json",parse_json.is_parsed = False)
end end
end
test_json_fail25 test_json_fail25
-- --
do local
json_file:=file_reader.read_json_from (test_dir +"fail25.json") parse_json: like new_json_parser
create parse_json.make_parser (json_file) do
if attached json_file_from ("fail25.json") as json_file then
parse_json := new_json_parser (json_file)
json_value := parse_json.parse_json json_value := parse_json.parse_json
assert ("fail25.json",parse_json.is_parsed = False) assert ("fail25.json",parse_json.is_parsed = False)
end end
end
test_json_fail26 test_json_fail26
-- --
do local
json_file:=file_reader.read_json_from (test_dir +"fail26.json") parse_json: like new_json_parser
create parse_json.make_parser (json_file) do
if attached json_file_from ("fail26.json") as json_file then
parse_json := new_json_parser (json_file)
json_value := parse_json.parse_json json_value := parse_json.parse_json
assert ("fail26.json",parse_json.is_parsed = False) assert ("fail26.json",parse_json.is_parsed = False)
end end
end
test_json_fail27 test_json_fail27
-- --
do local
json_file:=file_reader.read_json_from (test_dir +"fail27.json") parse_json: like new_json_parser
create parse_json.make_parser (json_file) do
if attached json_file_from ("fail27.json") as json_file then
parse_json := new_json_parser (json_file)
json_value := parse_json.parse_json json_value := parse_json.parse_json
assert ("fail27.json",parse_json.is_parsed = False) assert ("fail27.json",parse_json.is_parsed = False)
end end
end
test_json_fail28 test_json_fail28
-- --
do local
json_file:=file_reader.read_json_from (test_dir +"fail28.json") parse_json: like new_json_parser
create parse_json.make_parser (json_file) do
if attached json_file_from ("fail28.json") as json_file then
parse_json := new_json_parser (json_file)
json_value := parse_json.parse_json json_value := parse_json.parse_json
assert ("fail28.json",parse_json.is_parsed = False) assert ("fail28.json",parse_json.is_parsed = False)
end end
end
test_json_fail29 test_json_fail29
-- --
do local
json_file:=file_reader.read_json_from (test_dir +"fail29.json") parse_json: like new_json_parser
create parse_json.make_parser (json_file) do
if attached json_file_from ("fail29.json") as json_file then
parse_json := new_json_parser (json_file)
json_value := parse_json.parse_json json_value := parse_json.parse_json
assert ("fail29.json",parse_json.is_parsed = False ) assert ("fail29.json",parse_json.is_parsed = False )
end end
end
test_json_fail30 test_json_fail30
-- --
do local
json_file:=file_reader.read_json_from (test_dir +"fail30.json") parse_json: like new_json_parser
create parse_json.make_parser (json_file) do
if attached json_file_from ("fail30.json") as json_file then
parse_json := new_json_parser (json_file)
json_value := parse_json.parse_json json_value := parse_json.parse_json
assert ("fail30.json",parse_json.is_parsed = False) assert ("fail30.json",parse_json.is_parsed = False)
end end
end
test_json_fail31 test_json_fail31
-- --
do local
json_file:=file_reader.read_json_from (test_dir +"fail31.json") parse_json: like new_json_parser
create parse_json.make_parser (json_file) do
if attached json_file_from ("fail31.json") as json_file then
parse_json := new_json_parser (json_file)
json_value := parse_json.parse_json json_value := parse_json.parse_json
assert ("fail31.json",parse_json.is_parsed = False) assert ("fail31.json",parse_json.is_parsed = False)
end end
end
test_json_fail32 test_json_fail32
-- --
do local
json_file:=file_reader.read_json_from (test_dir +"fail32.json") parse_json: like new_json_parser
create parse_json.make_parser (json_file) do
if attached json_file_from ("fail32.json") as json_file then
parse_json := new_json_parser (json_file)
json_value := parse_json.parse_json json_value := parse_json.parse_json
assert ("fail32.json",parse_json.is_parsed = False) assert ("fail32.json",parse_json.is_parsed = False)
end end
end
test_json_fail33 test_json_fail33
-- --
do local
json_file:=file_reader.read_json_from (test_dir +"fail33.json") parse_json: like new_json_parser
create parse_json.make_parser (json_file) do
if attached json_file_from ("fail33.json") as json_file then
parse_json := new_json_parser (json_file)
json_value := parse_json.parse_json json_value := parse_json.parse_json
assert ("fail33.json",parse_json.is_parsed = False) assert ("fail33.json",parse_json.is_parsed = False)
end end
end
feature -- JSON_FROM_FILE feature -- JSON_FROM_FILE
json_file : STRING file_reader: JSON_FILE_READER
parse_json : JSON_PARSER
json_object : JSON_OBJECT json_value: detachable JSON_VALUE
file_reader : JSON_FILE_READER
json_value : JSON_VALUE json_file_from (fn: STRING): detachable STRING
test_dir : STRING do
Result := file_reader.read_json_from (test_dir + fn)
assert ("File contains json data", Result /= Void)
end
new_json_parser (a_string: STRING): JSON_PARSER
do
create Result.make_parser (a_string)
end
test_dir: STRING
local local
i: INTEGER i: INTEGER
do do
@@ -388,8 +505,10 @@ feature -- JSON_FROM_FILE
end end
-- Result := "/home/jvelilla/work/project/Eiffel/ejson_dev/trunk/test/autotest/test_suite/" -- Result := "/home/jvelilla/work/project/Eiffel/ejson_dev/trunk/test/autotest/test_suite/"
end end
invariant
file_reader /= Void invariant
file_reader /= Void
end end

2
test/autotest/test_suite/test_suite-safe.ecf
View File

@@ -7,7 +7,7 @@
<exclude>/CVS$</exclude> <exclude>/CVS$</exclude>
<exclude>/.svn$</exclude> <exclude>/.svn$</exclude>
</file_rule> </file_rule>
<option warning="true" void_safety="all" syntax="standard"> <option warning="true" is_attached_by_default="true" void_safety="all" syntax="standard">
<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/> <assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
</option> </option>
<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/> <library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>