Updated ecf's to the latest version.

jvelilla · jvelilla · commit 38a59b92cae6 · 2018-12-07T11:54:59.000-03:00
Clean code and updated agents to the new style.
diff --git a/examples/examples.ecf b/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"/>
diff --git a/selenium-safe.ecf b/selenium-safe.ecf
@@ -1,9 +1,9 @@
 <?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"/>
diff --git a/src/converter/se_build_value_json_converter.e b/src/converter/se_build_value_json_converter.e
@@ -25,7 +25,6 @@ feature -- Access
 feature -- Conversion
 
 	from_json (a_json: detachable JSON_VALUE; ctx: JSON_DESERIALIZER_CONTEXT; a_type: detachable TYPE [detachable ANY]): detachable like object
-	--from_json (j: like to_json): detachable like object
 		do
 			if attached {JSON_OBJECT} a_json as j then
 				create Result.make_empty
@@ -42,7 +41,6 @@ feature -- Conversion
 		end
 
 	to_json (obj: detachable ANY; ctx: JSON_SERIALIZER_CONTEXT): JSON_VALUE
-	--to_json (o: like object): JSON_OBJECT
 		local
 			jo: JSON_OBJECT
 		do
@@ -65,8 +63,6 @@ feature -- Conversion
 
 feature {NONE} -- Implementation
 
-
-
 	version_key: JSON_STRING
 		once
 			create Result.make_from_string ("version")
diff --git a/src/converter/se_capabilities_json_converter.e b/src/converter/se_capabilities_json_converter.e
@@ -27,7 +27,6 @@ feature -- Access
 feature -- Conversion
 
 	from_json (a_json: detachable JSON_VALUE; ctx: JSON_DESERIALIZER_CONTEXT; a_type: detachable TYPE [detachable ANY]): detachable like object
-	--from_json (j: like to_json): detachable like object
 		do
 			create Result.make
 			if attached {JSON_OBJECT} a_json as j then
@@ -78,12 +77,9 @@ feature -- Conversion
 	--			end
 
 			end
-
-
 		end
 
 	to_json (obj: detachable ANY; ctx: JSON_SERIALIZER_CONTEXT): JSON_VALUE
-	--to_json (o: like object): JSON_OBJECT
 		local
 			jo: JSON_OBJECT
 		do
@@ -115,8 +111,6 @@ feature -- Conversion
 			else
 				create {JSON_NULL} Result
 			end
-
-
 		end
 
 feature {NONE} -- Implementation
diff --git a/src/converter/se_cookie_json_converter.e b/src/converter/se_cookie_json_converter.e
@@ -25,7 +25,6 @@ feature -- Access
 feature -- Conversion
 
 	from_json (a_json: detachable JSON_VALUE; ctx: JSON_DESERIALIZER_CONTEXT; a_type: detachable TYPE [detachable ANY]): detachable like object
-	-- from_json (j: like to_json): detachable like object
 		do
 			create Result
 			if attached {JSON_OBJECT} a_json as j then
@@ -53,7 +52,6 @@ feature -- Conversion
 		end
 
 	to_json (obj: detachable ANY; ctx: JSON_SERIALIZER_CONTEXT): JSON_VALUE
-	--to_json (o: like object): JSON_OBJECT
 		local
 			jo: JSON_OBJECT
 		do
@@ -81,8 +79,6 @@ feature -- Conversion
 
 feature {NONE} -- Implementation
 
-
-
 	name_key: JSON_STRING
 		once
 			create Result.make_from_string ("name")
diff --git a/src/converter/se_java_value_json_converter.e b/src/converter/se_java_value_json_converter.e
@@ -5,7 +5,9 @@ note
 
 class
 	SE_JAVA_VALUE_JSON_CONVERTER
+
 inherit
+
 	SE_JSON_CONVERTER
 
 create
@@ -25,7 +27,6 @@ feature -- Access
 feature -- Conversion
 
 	from_json (a_json: detachable JSON_VALUE; ctx: JSON_DESERIALIZER_CONTEXT; a_type: detachable TYPE [detachable ANY]): detachable like object
-	--from_json (j: like to_json): detachable like object
 		do
 			create Result.make_empty
 			if attached {JSON_OBJECT} a_json as j then
@@ -36,7 +37,6 @@ feature -- Conversion
 		end
 
 	to_json (obj: detachable ANY; ctx: JSON_SERIALIZER_CONTEXT): JSON_VALUE
-	--to_json (o: like object): JSON_OBJECT
 		local
 			jo: JSON_OBJECT
 		do
@@ -53,8 +53,6 @@ feature -- Conversion
 
 feature {NONE} -- Implementation
 
-
-
 	version_key: JSON_STRING
 		once
 			create Result.make_from_string ("version")
diff --git a/src/converter/se_json_converter.e b/src/converter/se_json_converter.e
@@ -7,7 +7,6 @@ deferred class
 	SE_JSON_CONVERTER
 
 inherit
---	JSON_CONVERTER
 	JSON_SERIALIZER
 	JSON_DESERIALIZER
 
diff --git a/src/converter/se_os_value_json_converter.e b/src/converter/se_os_value_json_converter.e
@@ -27,7 +27,6 @@ feature -- Access
 feature -- Conversion
 
 	from_json (a_json: detachable JSON_VALUE; ctx: JSON_DESERIALIZER_CONTEXT; a_type: detachable TYPE [detachable ANY]): detachable like object
-	--from_json (j: like to_json): detachable like object
 		do
 			create Result.make_empty
 			if attached {JSON_OBJECT} a_json as j then
@@ -44,7 +43,6 @@ feature -- Conversion
 		end
 
 	to_json (obj: detachable ANY; ctx: JSON_SERIALIZER_CONTEXT): JSON_VALUE
-	-- to_json (o: like object): JSON_OBJECT
 		local
 			jo: JSON_OBJECT
 		do
diff --git a/src/converter/se_response_json_converter.e b/src/converter/se_response_json_converter.e
@@ -5,7 +5,9 @@ note
 
 class
 	SE_RESPONSE_JSON_CONVERTER
+
 inherit
+
 	SE_JSON_CONVERTER
 
 create
@@ -25,7 +27,6 @@ feature -- Access
 feature -- Conversion
 
 	from_json (a_json: detachable JSON_VALUE; ctx: JSON_DESERIALIZER_CONTEXT; a_type: detachable TYPE [detachable ANY]): detachable like object
-	--from_json (j: like to_json): detachable like object
 		do
 			create Result.make_empty
 			if attached {JSON_OBJECT} a_json as j then
@@ -42,7 +43,6 @@ feature -- Conversion
 		end
 
 	to_json (obj: detachable ANY; ctx: JSON_SERIALIZER_CONTEXT): JSON_VALUE
-	--to_json (o: like object): JSON_OBJECT
 		local
 			jo: JSON_OBJECT
 		do
diff --git a/src/converter/se_status_json_converter.e b/src/converter/se_status_json_converter.e
@@ -7,6 +7,7 @@ class
 	SE_STATUS_JSON_CONVERTER
 
 inherit
+
 	SE_JSON_CONVERTER
 
 create
@@ -26,7 +27,6 @@ feature -- Access
 feature -- Conversion
 
 	from_json (a_json: detachable JSON_VALUE; ctx: JSON_DESERIALIZER_CONTEXT; a_type: detachable TYPE [detachable ANY]): detachable like object
-	-- from_json (j: like to_json): detachable like object
 		do
 			if attached {JSON_OBJECT} a_json as j then
 				create Result
@@ -52,7 +52,6 @@ feature -- Conversion
 		end
 
 	to_json (obj: detachable ANY; ctx: JSON_SERIALIZER_CONTEXT): JSON_VALUE
-	--to_json (o: like object): JSON_OBJECT
 		local
 			jo: JSON_OBJECT
 		do
diff --git a/src/converter/se_status_value_json_converter.e b/src/converter/se_status_value_json_converter.e
@@ -5,7 +5,9 @@ note
 
 class
 	SE_STATUS_VALUE_JSON_CONVERTER
+
 inherit
+
 	SE_JSON_CONVERTER
 
 create
@@ -25,7 +27,6 @@ feature -- Access
 feature -- Conversion
 
 	from_json (a_json: detachable JSON_VALUE; ctx: JSON_DESERIALIZER_CONTEXT; a_type: detachable TYPE [detachable ANY]): detachable like object
-	--from_json (j: like to_json): detachable like object
 		do
 			if attached {JSON_OBJECT} a_json as j then
 				create Result.make_empty
@@ -42,7 +43,6 @@ feature -- Conversion
 		end
 
 	to_json (obj: detachable ANY; ctx: JSON_SERIALIZER_CONTEXT): JSON_VALUE
-	--to_json (o: like object): JSON_OBJECT
 		local
 			jo: JSON_OBJECT
 		do
@@ -65,8 +65,6 @@ feature -- Conversion
 
 feature {NONE} -- Implementation
 
-
-
 	os_key: JSON_STRING
 		once
 			create Result.make_from_string ("os")
diff --git a/src/converter/se_timeout_type_json_converter.e b/src/converter/se_timeout_type_json_converter.e
@@ -5,7 +5,9 @@ note
 
 class
 	SE_TIMEOUT_TYPE_JSON_CONVERTER
+
 inherit
+
 	SE_JSON_CONVERTER
 
 create
@@ -25,7 +27,6 @@ feature -- Access
 feature -- Conversion
 
 	from_json (a_json: detachable JSON_VALUE; ctx: JSON_DESERIALIZER_CONTEXT; a_type: detachable TYPE [detachable ANY]): detachable like object
-	--from_json (j: like to_json): detachable like object
 		do
 			if attached {JSON_OBJECT} a_json as j then
 				create Result.make_empty
@@ -39,7 +40,6 @@ feature -- Conversion
 		end
 
 	to_json (obj: detachable ANY; ctx: JSON_SERIALIZER_CONTEXT): JSON_VALUE
-	--to_json (o: like object): JSON_OBJECT
 		local
 			jo: JSON_OBJECT
 		do
@@ -57,7 +57,6 @@ feature -- Conversion
 
 feature {NONE} -- Implementation
 
-
 	type_key: JSON_STRING
 		once
 			create Result.make_from_string ("type")
diff --git a/src/helpers/json_helper.e b/src/helpers/json_helper.e
@@ -126,21 +126,6 @@ feature -- Access
 			Result.register (create {SE_TIMEOUT_TYPE_JSON_CONVERTER}.make, {SE_TIMEOUT_TYPE})
 		end
 
-
---	initialize_converters (j: like json)
---			-- Initialize json converters
---		do
---			j.add_converter (create {SE_STATUS_JSON_CONVERTER}.make)
---			j.add_converter (create {SE_BUILD_VALUE_JSON_CONVERTER}.make)
---			j.add_converter (create {SE_JAVA_VALUE_JSON_CONVERTER}.make)
---			j.add_converter (create {SE_OS_VALUE_JSON_CONVERTER}.make)
---			j.add_converter (create {SE_STATUS_VALUE_JSON_CONVERTER}.make)
---			j.add_converter (create {SE_CAPABILITIES_JSON_CONVERTER}.make)
---			j.add_converter (create {SE_RESPONSE_JSON_CONVERTER}.make)
---			j.add_converter (create {SE_TIMEOUT_TYPE_JSON_CONVERTER}.make)
---			j.add_converter (create {SE_COOKIE_JSON_CONVERTER}.make)
---		end
-
 	to_json_value (a_obj: detachable ANY): JSON_VALUE
 			-- Convert an object `a_obj' to JSON_VALUE representation.
 		local
diff --git a/src/interaction/se_send_keys_action.e b/src/interaction/se_send_keys_action.e
@@ -29,7 +29,6 @@ feature {NONE} -- Implementation
 			keys_set: keys = a_keys
 		end
 
-
 	make_with_location (a_keyboard: SE_KEYBOARD; a_mouse: SE_MOUSE; a_coordinate: SE_COORDINATES; a_keys: ARRAY[STRING_32])
 		do
 			set_keyboard (a_keyboard)
diff --git a/src/protocol/se_json_wire_protocol.e b/src/protocol/se_json_wire_protocol.e
@@ -60,10 +60,8 @@ feature -- Commands
 			if commnad_executor.is_available then
 				response := commnad_executor.status
 				check_response (response)
-				if not has_error then
-					if attached response.json_response as l_response then
-						Result := json_to_se_status (l_response)
-					end
+				if not has_error and then attached response.json_response as l_response then
+					Result := json_to_se_status (l_response)
 				end
 			end
 		end
@@ -91,10 +89,8 @@ feature -- Commands
 				if attached to_json (capabilities) as l_json then
 					response := commnad_executor.new_session (desired_capabilities (l_json.representation))
 					check_response (response)
-					if not has_error then
-						if attached response.json_response as r_value then
-							Result := new_session (r_value, "session")
-						end
+					if not has_error and then attached response.json_response as r_value then
+						Result := new_session (r_value, "session")
 					end
 				end
 			end
diff --git a/src/se_button.e b/src/se_button.e
@@ -74,20 +74,20 @@ feature -- Query
 	is_left : BOOLEAN
 			-- is the current value left?
 		do
-			Result := (value = left_value)
+			Result := value = left_value
 		end
 
 	is_middle  : BOOLEAN
 		-- is the current value middle?
 		do
-			Result := (value = middle_value)
+			Result := value = middle_value
 		end
 
 
 	is_right  : BOOLEAN
 		-- is the current value right?
 		do
-			Result := (value = right_value)
+			Result := value = right_value
 		end
 
 
diff --git a/src/se_session.e b/src/se_session.e
@@ -8,11 +8,17 @@ class
 
 create
 	make
+
 feature -- Initializaton
+
 	make (a_session_id : STRING_32; a_capabilities: SE_CAPABILITIES)
+			-- Create a session with session `a_session_id' and capabilities `a_capabilities'.
 		do
 			session_id := a_session_id
 			capabilities := a_capabilities
+		ensure
+			session_set: session_id = a_session_id
+			capatiblites_set: capabilities = a_capabilities
 		end
 
 feature -- Access
diff --git a/src/web_driver.e b/src/web_driver.e
diff --git a/src/web_driver_proxy.e b/src/web_driver_proxy.e
diff --git a/src/web_driver_wait.e b/src/web_driver_wait.e
diff --git a/test/test-safe.ecf b/test/test-safe.ecf
diff --git a/test/test_json_wire_protocol.e b/test/test_json_wire_protocol.e
