Merge pull request #1 from jvelilla/WD_Eiffel_112018

Updated Eiffel Web Driver to use JSON_SERIALIZER and JSON_DESERIALIZE…

Author: jvelilla

examples/example_1.e

@@ -22,12 +22,12 @@ feature -- Access
 				if attached l_session as l_s then
 
 					-- navigate to www.google.com
-					web_driver.navigate_to_url (l_s.session_id, "http://www.google.com/")
+					web_driver.navigate_to_url (l_s.session_id, "https://www.google.com/")
 
 					-- Find the text input element by its name
 					if attached {WEB_ELEMENT} web_driver.search_element (l_s.session_id, (create {SE_BY}).name ("q")) as l_element then
 						-- search something
-						web_driver.send_event(l_s.session_id, l_element.element,<<"Eiffel Room">>)
+						web_driver.send_event(l_s.session_id, l_element.element,<<"Eiffel.org">>)
 
 						-- Submit Form
 						web_driver.element_submit (l_s.session_id, l_element.element)

examples/example_double_click.e

@@ -40,7 +40,7 @@ feature -- Test
 			web_driver.start_session_chrome
 
 				-- Go to Page under test
-			web_driver.to_url ("http://dl.dropbox.com/u/55228056/DoubleClickDemo.html")
+			web_driver.to_url ("http://cookbook.seleniumacademy.com/DoubleClickDemo.html")
 			create wait.make (web_driver,100)
 
 				-- Create a new instance of actions
@@ -49,16 +49,16 @@ feature -- Test
 				-- Find links
 			if attached {WEB_ELEMENT} web_driver.find_element ((create {SE_BY}).id("message")) as l_element  then
 
-				if attached l_element.get_css_value ("color")  as l_value then
+				if attached l_element.get_css_value ("background-color")  as l_value then
 --					check
---					 Expected_blue: l_value.same_string ("rgb(0, 0, 255)")
+--					 Expected_blue: l_value.same_string ("%"rgb(0, 0, 255,1)"%")
 --					end
 				end
 				actions.double_click (l_element).execute
 
-				if attached l_element.get_css_value ("background")  as l_value then
+				if attached l_element.get_css_value ("background-color")  as l_value then
 --					check
---					 Expected_yellow: l_value.same_string ("rgb(255, 255, 0)")
+--					 Expected_yellow: l_value.same_string ("%"rgb(255, 255, 0,1)"%")
 --					end
 				end
 			end

examples/example_dragging_arround.e

@@ -22,7 +22,7 @@ feature  {NONE} -- Initialization
 
 	default_create
 		do
---			test_dragging_around
+			test_dragging_around
 			test_draggable
 		end
 

examples/examples.ecf

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

selenium-safe.ecf

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-10-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-10-0 http://www.eiffel.com/developers/xml/configuration-1-10-0.xsd" name="selenium" uuid="F76D19F7-509C-47B1-B2EA-46FCB05F9893" library_target="selenium">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-18-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-18-0 http://www.eiffel.com/developers/xml/configuration-1-18-0.xsd" name="selenium" uuid="F76D19F7-509C-47B1-B2EA-46FCB05F9893" library_target="selenium">
 	<target name="selenium">
 		<root all_classes="true"/>
-		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="standard">
-			<assertions precondition="true" postcondition="true" check="true" invariant="true" supplier_precondition="true"/>
+		<option warning="true">
+			<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="encoding" location="$ISE_LIBRARY\library\encoding\encoding-safe.ecf"/>
-		<library name="http_client" location="$EIFFEL_LIBRARY\EWF\library\network\http_client\http_client-safe.ecf"/>
-		<library name="json" location="$EIFFEL_LIBRARY\EWF\contrib\library\text\parser\json\library\json-safe.ecf"/>
+		<library name="http_client" location="$ISE_LIBRARY\contrib\library\network\http_client\http_client.ecf"/>
+		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json.ecf" readonly="false"/>
 		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
 		<cluster name="src" location=".\src\" recursive="true">
 			<file_rule>

src/converter/se_build_value_json_converter.e

@@ -1,6 +1,5 @@
 note
 	description: "Summary description for {SE_BUILD_VALUE_JSON_CONVERTER}."
-	author: ""
 	date: "$Date$"
 	revision: "$Revision$"
 
@@ -25,48 +24,58 @@ feature -- Access
 
 feature -- Conversion
 
-	from_json (j: like to_json): detachable like object
+	from_json (a_json: detachable JSON_VALUE; ctx: JSON_DESERIALIZER_CONTEXT; a_type: detachable TYPE [detachable ANY]): detachable like object
 		do
-			create Result.make_empty
-			if attached {STRING_32} json_to_object (j.item (version_key),Void) as l_item then
-				Result.set_version(l_item)
+			if attached {JSON_OBJECT} a_json as j then
+				create Result.make_empty
+				if attached {JSON_STRING} j.item (version_key) as l_item then
+					Result.set_version (l_item.unescaped_string_32)
+				end
+				if attached {JSON_STRING} j.item (revision_key) as l_item then
+					Result.set_revision (l_item.unescaped_string_32)
+				end
+				if attached {JSON_STRING} j.item (time_key) as l_item then
+					Result.set_time (l_item.unescaped_string_32)
+				end
 			end
-			if attached {STRING_32} json_to_object (j.item (revision_key), Void) as l_item then
-				Result.set_revision(l_item)
-			end
-			if attached {STRING_32} json_to_object (j.item (time_key),Void) as l_item then
-				Result.set_time(l_item)
-			end
-
-
-
 		end
 
-	to_json (o: like object): JSON_OBJECT
+	to_json (obj: detachable ANY; ctx: JSON_SERIALIZER_CONTEXT): JSON_VALUE
+		local
+			jo: JSON_OBJECT
 		do
-			create Result.make
-			Result.put (json.value (o.version), version_key)
-			Result.put (json.value (o.revision), revision_key)
-			Result.put (json.value (o.time), time_key)
+			if attached {SE_BUILD_VALUE} obj as o then
+				create jo.make_with_capacity (3)
+				if attached o.version as l_version then
+					jo.put_string (l_version, version_key)
+				end
+				if attached o.revision as l_revision then
+					jo.put_string (l_revision, revision_key)
+				end
+				if attached o.time as l_time then
+					jo.put_string (l_time, time_key)
+				end
+				Result := jo
+			else
+				create {JSON_NULL} Result
+			end
 		end
 
 feature {NONE} -- Implementation
 
-
-
 	version_key: JSON_STRING
 		once
-			create Result.make_json ("version")
+			create Result.make_from_string ("version")
 		end
 
 	time_key: JSON_STRING
 		once
-			create Result.make_json ("time")
+			create Result.make_from_string ("time")
 		end
 
 	revision_key: JSON_STRING
 		once
-			create Result.make_json ("revision")
+			create Result.make_from_string ("revision")
 		end
 
 end