Delete empty unit tests files, remove 1- and 1+, reorder IN: lines in a lot of places...

[factor.git] / basis / http / client / client-tests.factor

diff --git a/basis/http/client/client-tests.factor b/basis/http/client/client-tests.factor
old mode 100755 (executable)
new mode 100644 (file)
index 28a6051..7a7fcff
--- a/basis/http/client/client-tests.factor
+++ b/basis/http/client/client-tests.factor
@@ -1,5 +1,7 @@
 USING: http.client http.client.private http tools.test
-tuple-syntax namespaces urls ;
+namespaces urls ;
+IN: http.client.tests
+
 [ "localhost" f ] [ "localhost" parse-host ] unit-test
 [ "localhost" 8888 ] [ "localhost:8888" parse-host ] unit-test
 
@@ -9,12 +11,13 @@ tuple-syntax namespaces urls ;
 [ "www.arc.com" ] [ "http://www.arc.com////" download-name ] unit-test
 
 [
-    TUPLE{ request
-        url: TUPLE{ url protocol: "http" host: "www.apple.com" port: 80 path: "/index.html" }
-        method: "GET"
-        version: "1.1"
-        cookies: V{ }
-        header: H{ { "connection" "close" } { "user-agent" "Factor http.client" } }
+    T{ request
+        { url T{ url { protocol "http" } { host "www.apple.com" } { port 80 } { path "/index.html" } } }
+        { method "GET" }
+        { version "1.1" }
+        { cookies V{ } }
+        { header H{ { "connection" "close" } { "user-agent" "Factor http.client" } } }
+        { redirects 10 }
     }
 ] [
     "http://www.apple.com/index.html"
@@ -22,12 +25,13 @@ tuple-syntax namespaces urls ;
 ] unit-test
 
 [
-    TUPLE{ request
-        url: TUPLE{ url protocol: "https" host: "www.amazon.com" port: 443 path: "/index.html" }
-        method: "GET"
-        version: "1.1"
-        cookies: V{ }
-        header: H{ { "connection" "close" } { "user-agent" "Factor http.client" } }
+    T{ request
+        { url T{ url { protocol "https" } { host "www.amazon.com" } { port 443 } { path "/index.html" } } }
+        { method "GET" }
+        { version "1.1" }
+        { cookies V{ } }
+        { header H{ { "connection" "close" } { "user-agent" "Factor http.client" } } }
+        { redirects 10 }
     }
 ] [
     "https://www.amazon.com/index.html"