Merge branch 'master' into es17.01

library/network/http_client/tests/test_libcurl_with_web.e

@@ -34,6 +34,11 @@ feature -- Tests
 			test_post_with_form_data
 		end
 
+	libcurl_test_post_with_uncommon_form_data
+		do
+			test_post_with_uncommon_form_data
+		end
+
 	libcurl_test_post_with_file
 		do
 			test_post_with_file

library/network/http_client/tests/test_net_with_web.e

@@ -34,6 +34,11 @@ feature -- Tests
 			test_post_with_form_data
 		end
 
+	net_test_post_with_uncommon_form_data
+		do
+			test_post_with_uncommon_form_data
+		end
+
 	net_test_post_with_file
 		do
 			test_post_with_file
@@ -69,4 +74,9 @@ feature -- Tests
 			test_post_with_file_using_chunked_transfer_encoding
 		end
 
+	net_test_get_with_query_parameters
+		do
+			test_get_with_query_parameters
+		end
+
 end

library/network/http_client/tests/test_with_web_i.e

@@ -1,4 +1,4 @@
-note
+note
 	description: "[
 		Eiffel tests that can be executed by testing tool.
 	]"
@@ -21,7 +21,10 @@ feature -- Initialization
 	on_prepare
 		do
 			Precursor
-			global_requestbin_path := new_requestbin_path
+			global_requestbin_path := "/s0jkhhs0"
+			if global_requestbin_path = Void then
+				global_requestbin_path := new_requestbin_path
+			end
 		end
 
 feature -- Factory
@@ -49,6 +52,9 @@ feature -- Requestbin
 					i := l_content.substring_index ("%"name%":", 1)
 					if i > 0 then
 						j := l_content.index_of (',', i + 1)
+						if j = 0 then
+							j := l_content.index_of ('}', i + 1)
+						end
 						if j > 0 then
 							Result := l_content.substring (i + 7, j - 1)
 							Result.adjust
@@ -61,6 +67,7 @@ feature -- Requestbin
 							if not Result.starts_with ("/") then
 								Result.prepend_character ('/')
 							end
+							print ("new_requestbin_path => http://requestb.in" + Result + "?inspect%N")
 						end
 					end
 				end
@@ -108,8 +115,55 @@ feature -- Factory
 					-- check requestbin to ensure the form parameters are correctly received
 				sess := new_session ("http://requestb.in")
 				create l_ctx.make
-				l_ctx.form_parameters.extend ("First Value", "First Key")
-				l_ctx.form_parameters.extend ("Second Value", "Second Key")
+				l_ctx.add_form_parameter ("First Key", "First Value")
+				l_ctx.add_form_parameter ("Second Key", "Second Value")
+				l_ctx.add_form_parameter ("unicode", {STRING_32} "Hello / 你好 !")
+				l_ctx.add_form_parameter ({STRING_32} "Field 你好 !", "How are you?")
+				create h.make_empty
+				if
+					attached sess.post (requestbin_path, l_ctx, "") as res and then
+					attached res.headers as hds
+				then
+					across
+						hds as c
+					loop
+						h.append (c.item.name + ": " + c.item.value + "%R%N")
+					end
+				end
+				print (h)
+			else
+				assert ("Has requestbin path", False)
+			end
+		end
+
+	test_post_with_uncommon_form_data
+		local
+			sess: HTTP_CLIENT_SESSION
+			h: STRING_8
+			l_ctx: HTTP_CLIENT_REQUEST_CONTEXT
+		do
+			if attached global_requestbin_path as requestbin_path then
+
+					-- POST REQUEST WITH FORM DATA
+					-- check requestbin to ensure the form parameters are correctly received
+				sess := new_session ("http://requestb.in")
+				create l_ctx.make
+
+				l_ctx.add_form_parameter ("title", "Eiffel World!") -- space and !
+				l_ctx.add_form_parameter ("path", "foo/bar") -- slash
+				l_ctx.add_form_parameter ("unreserved", ":!@[]{}()*") -- ...
+				l_ctx.add_form_parameter ("reserved", "+=?&_#_") -- ...
+				l_ctx.add_form_parameter ("a=b", "a=b") -- equal sign
+				l_ctx.add_form_parameter ("test", "!$&'()*") --
+				l_ctx.add_form_parameter ("lst[a][b]", "[123][456]") -- brackets
+				l_ctx.add_form_parameter ("pos{1,2}", "loc{a,b}") -- curly brackets
+				l_ctx.add_form_parameter ("?foo", "?bar") -- question mark
+				l_ctx.add_form_parameter ("?", "?") -- question mark
+				l_ctx.add_form_parameter ("&bar", "&bar") -- ampersand
+				l_ctx.add_form_parameter ("&", "&") -- ampersand
+
+				assert ("form data well generated", l_ctx.form_parameters_to_x_www_form_url_encoded_string.same_string ("title=Eiffel+World!&path=foo%%2Fbar&unreserved=%%3A!%%40%%5B%%5D%%7B%%7D()*&reserved=%%2B%%3D%%3F%%26_%%23_&a%%3Db=a%%3Db&test=!%%24%%26'()*&lst%%5Ba%%5D%%5Bb%%5D=%%5B123%%5D%%5B456%%5D&pos%%7B1%%2C2%%7D=loc%%7Ba%%2Cb%%7D&%%3Ffoo=%%3Fbar&%%3F=%%3F&%%26bar=%%26bar&%%26=%%26"))
+
 				create h.make_empty
 				if
 					attached sess.post (requestbin_path, l_ctx, "") as res and then
@@ -143,7 +197,7 @@ feature -- Factory
 				l_ctx.set_upload_filename ("test.txt")
 				create h.make_empty
 				if
-					attached sess.post (requestbin_path, l_ctx, "") as res and then
+					attached sess.post (requestbin_path, l_ctx, Void) as res and then
 					attached res.headers as hds
 				then
 					across
@@ -202,7 +256,7 @@ feature -- Factory
 					-- set filename to a local file
 				sess := new_session ("http://requestb.in")
 				create l_ctx.make
-				l_ctx.set_upload_data ("This is a test for http client.%N")
+				l_ctx.set_upload_data ("name=This is a test for http client.%N")
 				create h.make_empty
 				if
 					attached sess.put (requestbin_path, l_ctx, Void) as res and then
@@ -232,10 +286,12 @@ feature -- Factory
 					-- check requestbin to ensure the file and form parameters are correctly received
 					-- set filename to a local file
 				sess := new_session ("http://requestb.in")
+--				sess := new_session ("http://localhost:9090")
 				create l_ctx.make
-				l_ctx.set_upload_filename ("logo.jpg")
-				l_ctx.form_parameters.extend ("First Value", "First Key")
-				l_ctx.form_parameters.extend ("Second Value", "Second Key")
+--				l_ctx.set_upload_filename ("logo.jpg")
+				l_ctx.set_upload_filename ("test.txt")
+				l_ctx.add_form_parameter ("First", "Value")
+				l_ctx.add_form_parameter ("Second", "and last value")
 				create h.make_empty
 				if
 					attached sess.post (requestbin_path, l_ctx, Void) as res and then
@@ -297,6 +353,7 @@ feature -- Factory
 				sess := new_session ("http://google.com")
 				create h.make_empty
 				if attached sess.get ("/", Void) as res and then attached res.headers as hds then
+					assert("was redirected", res.redirections_count > 0)
 					across
 						hds as c
 					loop
@@ -328,6 +385,53 @@ feature -- Factory
 			end
 		end
 
+	test_get_with_query_parameters
+		local
+			sess: HTTP_CLIENT_SESSION
+			h: STRING_8
+			l_ctx: HTTP_CLIENT_REQUEST_CONTEXT
+			q: STRING
+		do
+			if attached global_requestbin_path as requestbin_path then
+
+					-- GET REQUEST WITH A FILE AND FORM DATA
+					-- check requestbin to ensure the file and form parameters are correctly received
+					-- set filename to a local file
+				sess := new_session ("http://requestb.in")
+				create l_ctx.make
+				l_ctx.add_query_parameter ("?", "?first&arg")
+				l_ctx.add_query_parameter ("title", "Eiffel World!")
+				l_ctx.add_query_parameter ("path", "foo/bar")
+				l_ctx.add_query_parameter ("reserved", "+=&?")
+				l_ctx.add_query_parameter ("unreserved", ":!@'()*")
+				l_ctx.add_query_parameter ("unsafe", "%"[]{}")
+				l_ctx.add_query_parameter ("test", "!$&'()*")
+				l_ctx.add_query_parameter ("a&b", "a&b")
+				l_ctx.add_query_parameter ("lst[a][b]", "[abc][123]")
+				l_ctx.add_query_parameter ("foo(a,b)", "bar(1,2)*pi")
+				create q.make_empty
+				l_ctx.append_query_parameters_to_url (q)
+				assert("query", q.same_string ("??=?first%%26arg&title=Eiffel+World!&path=foo/bar&reserved=%%2B=%%26?&unreserved=:!@'()*&unsafe=%%22%%5B%%5D%%7B%%7D&test=!$%%26'()*&a%%26b=a%%26b&lst%%5Ba%%5D%%5Bb%%5D=%%5Babc%%5D%%5B123%%5D&foo(a,b)=bar(1,2)*pi"))
+
+
+				create h.make_empty
+				if
+					attached sess.get (requestbin_path, l_ctx) as res and then
+					attached res.headers as hds
+				then
+					across
+						hds as c
+					loop
+						h.append (c.item.name + ": " + c.item.value + "%R%N")
+					end
+				end
+				print (h)
+			else
+				assert ("Has requestbin path", False)
+			end
+		end
+
+
 
 end