Reformat

[factor.git] / basis / smtp / smtp-tests.factor

diff --git a/basis/smtp/smtp-tests.factor b/basis/smtp/smtp-tests.factor
index 8a9107b905ff5a65cd85005fb17a3e531bd2d7ed..a00ebea05ac1ca387da513ccedbcc6b449136c73 100644 (file)
--- a/basis/smtp/smtp-tests.factor
+++ b/basis/smtp/smtp-tests.factor
@@ -1,45 +1,53 @@
-USING: smtp tools.test io.streams.string io.sockets
-io.sockets.secure threads smtp.server kernel sequences
-namespaces logging accessors assocs sorting smtp.private
-concurrency.promises system ;
+USING: accessors assocs calendar combinators concurrency.promises
+continuations fry io.sockets io.sockets.secure io.streams.string
+kernel namespaces sequences smtp smtp.private smtp.server
+sorting system tools.test ;
 IN: smtp.tests
 
-\ send-email must-infer
+: with-test-smtp-config ( quot -- )
+    [
+        <promise> "p" set
+        "p" get mock-smtp-server
+
+        default-smtp-config
+            "localhost" "p" get 5 seconds ?promise-timeout <inet> >>server
+            no-auth >>auth
+            os unix? [ t >>tls? ] when
+        \ smtp-config
+    ] dip with-variable ; inline
 
 { 0 0 } [ [ ] with-smtp-connection ] must-infer-as
 
 [ "hello\nworld" validate-address ] must-fail
 
-[ "slava@factorcode.org" ]
+{ "slava@factorcode.org" }
 [ "slava@factorcode.org" validate-address ] unit-test
 
-[ { "hello" "." "world" } validate-message ] must-fail
-
-[ "aGVsbG8Kd29ybGQ=\r\n.\r\n" ] [
-    "hello\nworld" [ send-body ] with-string-writer
+{ "aGVsbG8Kd29ybGQ=\r\n.\r\n" } [
+    T{ email { body "hello\nworld" } } [ send-body ] with-string-writer
 ] unit-test
 
 [ { "500 syntax error" } <response> check-response ]
 [ smtp-error? ] must-fail-with
 
-[ ] [ { "220 success" } <response> check-response ] unit-test
+{ } [ { "220 success" } <response> check-response ] unit-test
 
-[ T{ response f 220 { "220 success" } } ] [
+{ T{ response f 220 { "220 success" } } } [
     "220 success" [ receive-response ] with-string-reader
 ] unit-test
 
-[
+{
     T{ response f 220 {
         "220-a multiline response"
         "250-another line"
         "220 the end"
     } }
-] [
+} [
     "220-a multiline response\r\n250-another line\r\n220 the end"
     [ receive-response ] with-string-reader
 ] unit-test
 
-[ ] [
+{ } [
     "220-a multiline response\r\n250-another line\r\n220 the end"
     [ get-ok ] with-string-reader
 ] unit-test
@@ -48,10 +56,10 @@ IN: smtp.tests
     "Subject:\r\nsecurity hole" validate-header
 ] must-fail
 
-[
+{
     {
         { "Content-Transfer-Encoding" "base64" }
-        { "Content-Type" "Text/plain; charset=utf-8" }
+        { "Content-Type" "text/plain; charset=UTF-8" }
         { "From" "Doug <erg@factorcode.org>" }
         { "MIME-Version" "1.0" }
         { "Subject" "Factor rules" }
@@ -59,41 +67,41 @@ IN: smtp.tests
     }
     { "slava@factorcode.org" "dharmatech@factorcode.org" }
     "erg@factorcode.org"
-] [
-    <email>
-        "Factor rules" >>subject
-        {
-            "Slava <slava@factorcode.org>"
-            "Ed <dharmatech@factorcode.org>"
-        } >>to
-        "Doug <erg@factorcode.org>" >>from
+} [
     [
-        email>headers sort-keys [
-            drop { "Date" "Message-Id" } member? not
-        ] assoc-filter
-    ]
-    [ to>> [ extract-email ] map ]
-    [ from>> extract-email ] tri
-] unit-test
-
-<promise> "p" set
-
-[ ] [ "p" get mock-smtp-server ] unit-test
-
-[ ] [
-    <secure-config> f >>verify [
-        "localhost" "p" get ?promise <inet> smtp-server set
-        no-auth smtp-auth set
-        os unix? [ smtp-tls? on ] when
-
         <email>
-            "Hi guys\nBye guys" >>body
             "Factor rules" >>subject
             {
                 "Slava <slava@factorcode.org>"
                 "Ed <dharmatech@factorcode.org>"
             } >>to
             "Doug <erg@factorcode.org>" >>from
-        send-email
+        {
+            [
+                email>headers sort-keys [
+                    { "Date" "Message-Id" } member? not
+                ] filter-keys
+            ]
+            [ to>> [ extract-email ] map ]
+            [ from>> extract-email ]
+            ! To get the smtp server to clean up itself
+            [ '[ _ send-email ] ignore-errors ]
+        } cleave
+    ] with-test-smtp-config
+] unit-test
+
+{ } [
+    <secure-config> f >>verify [
+        [
+            <email>
+                "Hi guys\nBye guys" >>body
+                "Factor rules" >>subject
+                {
+                    "Slava <slava@factorcode.org>"
+                    "Ed <dharmatech@factorcode.org>"
+                } >>to
+                "Doug <erg@factorcode.org>" >>from
+            send-email
+        ] with-test-smtp-config
     ] with-secure-context
 ] unit-test