Updated eJSON to use Eiffel 6.8 version.

Basically the changes are:

Replace ? by detachable
indexing by note
removing `is' from features, and in some places replaced by =
In the ecf now we need to include every gobo library, because the gobo.ecf, exclude libraries that are needed.
TODO: the test-suite is not void-safety.
This commit is contained in:
jvelilla
2011-07-07 12:03:25 +00:00
parent 94c5c90eaa
commit f4c472cb9f
26 changed files with 1009 additions and 929 deletions

View File

@@ -1,374 +1,395 @@
note
description: "[
Eiffel tests that can be executed by testing tool.
]"
author: "EiffelStudio test wizard"
date: "$Date$"
revision: "$Revision$"
testing: "type/manual"
class
TEST_JSON_SUITE
inherit
EQA_TEST_SET
redefine
on_prepare
end
feature {NONE} -- Events
on_prepare
-- <Precursor>
do
create file_reader
end
feature -- Tests Pass
test_json_pass1 is
--
do
json_file:=file_reader.read_json_from (test_dir + "pass1.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("pass1.json",parse_json.is_parsed = True)
end
test_json_pass2 is
--
do
json_file:=file_reader.read_json_from (test_dir +"pass2.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("pass2.json",parse_json.is_parsed = True)
end
test_json_pass3 is
--
do
json_file:=file_reader.read_json_from (test_dir +"pass3.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("pass3.json",parse_json.is_parsed = True)
end
feature -- Tests Failures
test_json_fail1 is
--
do
json_file:=file_reader.read_json_from (test_dir +"fail1.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail1.json",parse_json.is_parsed = False)
end
test_json_fail2 is
--
do
json_file:=file_reader.read_json_from (test_dir +"fail2.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail2.json",parse_json.is_parsed = False)
end
test_json_fail3 is
--
do
json_file:=file_reader.read_json_from (test_dir +"fail3.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail3.json",parse_json.is_parsed = False)
end
test_json_fail4 is
--
do
json_file:=file_reader.read_json_from (test_dir +"fail4.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail4.json",parse_json.is_parsed = False)
end
test_json_fail5 is
--
do
json_file:=file_reader.read_json_from (test_dir +"fail5.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail5.json",parse_json.is_parsed = False)
end
test_json_fail6 is
--
do
json_file:=file_reader.read_json_from (test_dir +"fail6.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail6.json",parse_json.is_parsed = False )
end
test_json_fail7 is
--
do
json_file:=file_reader.read_json_from (test_dir +"fail7.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail7.json",parse_json.is_parsed = False)
end
test_json_fail8 is
--
do
json_file:=file_reader.read_json_from (test_dir +"fail8.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail8.json",parse_json.is_parsed = False )
end
test_json_fail9 is
--
do
json_file:=file_reader.read_json_from (test_dir +"fail9.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail9.json",parse_json.is_parsed = False)
end
test_json_fail10 is
--
do
json_file:=file_reader.read_json_from (test_dir +"fail10.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail10.json",parse_json.is_parsed = False)
end
test_json_fail11 is
--
do
json_file:=file_reader.read_json_from (test_dir +"fail11.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail11.json",parse_json.is_parsed = False)
end
test_json_fail12 is
--
do
json_file:=file_reader.read_json_from (test_dir +"fail12.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail12.json",parse_json.is_parsed = False)
end
test_json_fail13 is
--
do
json_file:=file_reader.read_json_from (test_dir +"fail13.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail13.json",parse_json.is_parsed = False)
end
test_json_fail14 is
--
do
json_file:=file_reader.read_json_from (test_dir +"fail14.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail14.json",parse_json.is_parsed = False)
end
test_json_fail15 is
--
do
json_file:=file_reader.read_json_from (test_dir +"fail15.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail15.json",parse_json.is_parsed = False)
end
test_json_fail16 is
--
do
json_file:=file_reader.read_json_from (test_dir +"fail16.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail16.json",parse_json.is_parsed = False)
end
test_json_fail17 is
--
do
json_file:=file_reader.read_json_from (test_dir +"fail17.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail17.json",parse_json.is_parsed = False)
end
test_json_fail18 is
--
do
json_file:=file_reader.read_json_from (test_dir +"fail18.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail18.json",parse_json.is_parsed = True)
end
test_json_fail19 is
--
do
json_file:=file_reader.read_json_from (test_dir +"fail19.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail19.json",parse_json.is_parsed = False)
end
test_json_fail20 is
--
do
json_file:=file_reader.read_json_from (test_dir +"fail20.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail20.json",parse_json.is_parsed = False)
end
test_json_fail21 is
--
do
json_file:=file_reader.read_json_from (test_dir +"fail21.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail21.json",parse_json.is_parsed = False)
end
test_json_fail22 is
--
do
json_file:=file_reader.read_json_from (test_dir +"fail22.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail22.json",parse_json.is_parsed = False)
end
test_json_fail23 is
--
do
json_file:=file_reader.read_json_from (test_dir +"fail23.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail23.json",parse_json.is_parsed = False)
end
test_json_fail24 is
--
do
json_file:=file_reader.read_json_from (test_dir +"fail24.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail24.json",parse_json.is_parsed = False)
end
test_json_fail25 is
--
do
json_file:=file_reader.read_json_from (test_dir +"fail25.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail25.json",parse_json.is_parsed = False)
end
test_json_fail26 is
--
do
json_file:=file_reader.read_json_from (test_dir +"fail26.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail26.json",parse_json.is_parsed = False)
end
test_json_fail27 is
--
do
json_file:=file_reader.read_json_from (test_dir +"fail27.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail27.json",parse_json.is_parsed = False)
end
test_json_fail28 is
--
do
json_file:=file_reader.read_json_from (test_dir +"fail28.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail28.json",parse_json.is_parsed = False)
end
test_json_fail29 is
--
do
json_file:=file_reader.read_json_from (test_dir +"fail29.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail29.json",parse_json.is_parsed = False )
end
test_json_fail30 is
--
do
json_file:=file_reader.read_json_from (test_dir +"fail30.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail30.json",parse_json.is_parsed = False)
end
test_json_fail31 is
--
do
json_file:=file_reader.read_json_from (test_dir +"fail31.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail31.json",parse_json.is_parsed = False)
end
test_json_fail32 is
--
do
json_file:=file_reader.read_json_from (test_dir +"fail32.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail32.json",parse_json.is_parsed = False)
end
test_json_fail33 is
--
do
json_file:=file_reader.read_json_from (test_dir +"fail33.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail33.json",parse_json.is_parsed = False)
end
feature -- JSON_FROM_FILE
json_file:STRING
parse_json:JSON_PARSER
json_object:JSON_OBJECT
file_reader:JSON_FILE_READER
json_value : JSON_VALUE
test_dir : STRING is "/home/jvelilla/work/project/Eiffel/ejson_dev/trunk/test/autotest/test_suite/"
end
note
description: "[
Eiffel tests that can be executed by testing tool.
]"
author: "EiffelStudio test wizard"
date: "$Date$"
revision: "$Revision$"
testing: "type/manual"
class
TEST_JSON_SUITE
inherit
EQA_TEST_SET
redefine
on_prepare
end
feature {NONE} -- Events
on_prepare
-- <Precursor>
do
create file_reader
end
feature -- Tests Pass
test_json_pass1
--
do
json_file:=file_reader.read_json_from (test_dir + "pass1.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("pass1.json",parse_json.is_parsed = True)
end
test_json_pass2
--
do
json_file:=file_reader.read_json_from (test_dir +"pass2.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("pass2.json",parse_json.is_parsed = True)
end
test_json_pass3
--
do
json_file:=file_reader.read_json_from (test_dir +"pass3.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("pass3.json",parse_json.is_parsed = True)
end
feature -- Tests Failures
test_json_fail1
--
do
json_file:=file_reader.read_json_from (test_dir +"fail1.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail1.json",parse_json.is_parsed = False)
end
test_json_fail2
--
do
json_file:=file_reader.read_json_from (test_dir +"fail2.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail2.json",parse_json.is_parsed = False)
end
test_json_fail3
--
do
json_file:=file_reader.read_json_from (test_dir +"fail3.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail3.json",parse_json.is_parsed = False)
end
test_json_fail4
--
do
json_file:=file_reader.read_json_from (test_dir +"fail4.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail4.json",parse_json.is_parsed = False)
end
test_json_fail5
--
do
json_file:=file_reader.read_json_from (test_dir +"fail5.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail5.json",parse_json.is_parsed = False)
end
test_json_fail6
--
do
json_file:=file_reader.read_json_from (test_dir +"fail6.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail6.json",parse_json.is_parsed = False )
end
test_json_fail7
--
do
json_file:=file_reader.read_json_from (test_dir +"fail7.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail7.json",parse_json.is_parsed = False)
end
test_json_fail8
--
do
json_file:=file_reader.read_json_from (test_dir +"fail8.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail8.json",parse_json.is_parsed = False )
end
test_json_fail9
--
do
json_file:=file_reader.read_json_from (test_dir +"fail9.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail9.json",parse_json.is_parsed = False)
end
test_json_fail10
--
do
json_file:=file_reader.read_json_from (test_dir +"fail10.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail10.json",parse_json.is_parsed = False)
end
test_json_fail11
--
do
json_file:=file_reader.read_json_from (test_dir +"fail11.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail11.json",parse_json.is_parsed = False)
end
test_json_fail12
--
do
json_file:=file_reader.read_json_from (test_dir +"fail12.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail12.json",parse_json.is_parsed = False)
end
test_json_fail13
--
do
json_file:=file_reader.read_json_from (test_dir +"fail13.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail13.json",parse_json.is_parsed = False)
end
test_json_fail14
--
do
json_file:=file_reader.read_json_from (test_dir +"fail14.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail14.json",parse_json.is_parsed = False)
end
test_json_fail15
--
do
json_file:=file_reader.read_json_from (test_dir +"fail15.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail15.json",parse_json.is_parsed = False)
end
test_json_fail16
--
do
json_file:=file_reader.read_json_from (test_dir +"fail16.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail16.json",parse_json.is_parsed = False)
end
test_json_fail17
--
do
json_file:=file_reader.read_json_from (test_dir +"fail17.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail17.json",parse_json.is_parsed = False)
end
test_json_fail18
--
do
json_file:=file_reader.read_json_from (test_dir +"fail18.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail18.json",parse_json.is_parsed = True)
end
test_json_fail19
--
do
json_file:=file_reader.read_json_from (test_dir +"fail19.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail19.json",parse_json.is_parsed = False)
end
test_json_fail20
--
do
json_file:=file_reader.read_json_from (test_dir +"fail20.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail20.json",parse_json.is_parsed = False)
end
test_json_fail21
--
do
json_file:=file_reader.read_json_from (test_dir +"fail21.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail21.json",parse_json.is_parsed = False)
end
test_json_fail22
--
do
json_file:=file_reader.read_json_from (test_dir +"fail22.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail22.json",parse_json.is_parsed = False)
end
test_json_fail23
--
do
json_file:=file_reader.read_json_from (test_dir +"fail23.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail23.json",parse_json.is_parsed = False)
end
test_json_fail24
--
do
json_file:=file_reader.read_json_from (test_dir +"fail24.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail24.json",parse_json.is_parsed = False)
end
test_json_fail25
--
do
json_file:=file_reader.read_json_from (test_dir +"fail25.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail25.json",parse_json.is_parsed = False)
end
test_json_fail26
--
do
json_file:=file_reader.read_json_from (test_dir +"fail26.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail26.json",parse_json.is_parsed = False)
end
test_json_fail27
--
do
json_file:=file_reader.read_json_from (test_dir +"fail27.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail27.json",parse_json.is_parsed = False)
end
test_json_fail28
--
do
json_file:=file_reader.read_json_from (test_dir +"fail28.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail28.json",parse_json.is_parsed = False)
end
test_json_fail29
--
do
json_file:=file_reader.read_json_from (test_dir +"fail29.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail29.json",parse_json.is_parsed = False )
end
test_json_fail30
--
do
json_file:=file_reader.read_json_from (test_dir +"fail30.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail30.json",parse_json.is_parsed = False)
end
test_json_fail31
--
do
json_file:=file_reader.read_json_from (test_dir +"fail31.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail31.json",parse_json.is_parsed = False)
end
test_json_fail32
--
do
json_file:=file_reader.read_json_from (test_dir +"fail32.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail32.json",parse_json.is_parsed = False)
end
test_json_fail33
--
do
json_file:=file_reader.read_json_from (test_dir +"fail33.json")
create parse_json.make_parser (json_file)
json_value := parse_json.parse_json
assert ("fail33.json",parse_json.is_parsed = False)
end
feature -- JSON_FROM_FILE
json_file : STRING
parse_json : JSON_PARSER
json_object : JSON_OBJECT
file_reader : JSON_FILE_READER
json_value : JSON_VALUE
test_dir : STRING
local
i: INTEGER
do
Result := (create {EXECUTION_ENVIRONMENT}).current_working_directory
Result.append_character ((create {OPERATING_ENVIRONMENT}).directory_separator)
-- The should looks like
-- ..json\test\autotest\test_suite\EIFGENs\test_suite\Testing\execution\TEST_JSON_SUITE.test_json_fail1\..\..\..\..\..\fail1.json
from
i := 5
until
i = 0
loop
Result.append_character ('.')
Result.append_character ('.')
Result.append_character ((create {OPERATING_ENVIRONMENT}).directory_separator)
i := i - 1
end
-- Result := "/home/jvelilla/work/project/Eiffel/ejson_dev/trunk/test/autotest/test_suite/"
end
invariant
file_reader /= Void
end

View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-8-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-8-0 http://www.eiffel.com/developers/xml/configuration-1-8-0.xsd" name="test_suite" uuid="EA141B17-6A21-4781-8B5F-E9939BAE968A">
<target name="test_suite">
<root cluster="test_suite" class="APPLICATION" feature="make"/>
<option warning="true" void_safety="all" syntax="standard">
<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
</option>
<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
<library name="json" location="..\..\..\library\json-safe.ecf"/>
<library name="testing" location="$ISE_LIBRARY\library\testing\testing-safe.ecf"/>
<cluster name="test_suite" location=".\" recursive="true">
<file_rule>
<exclude>/EIFGENs$</exclude>
<exclude>/CVS$</exclude>
<exclude>/.svn$</exclude>
</file_rule>
</cluster>
</target>
</system>

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-5-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-5-0 http://www.eiffel.com/developers/xml/configuration-1-5-0.xsd" name="test_suite" uuid="EA141B17-6A21-4781-8B5F-E9939BAE968A">
<target name="test_suite">
<root class="APPLICATION" feature="make"/>
<root cluster="test_suite" class="APPLICATION" feature="make"/>
<option warning="true">
<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
</option>