From 5b38155e7f3ee4d4ac5bdb1e8bde1607cd9becfd Mon Sep 17 00:00:00 2001
From: Jay McCarthy <jay@racket-lang.org>
Date: Mon, 17 May 2010 11:04:20 -0500
Subject: [PATCH] Using raw response file in test

---
 .../web-server/dispatchers/dispatch-servlets-test.rkt     | 8 ++++++++
 .../servlets/examples/{response.rkt => response.rktd}     | 2 +-
 collects/web-server/servlet-env.rkt                       | 2 +-
 collects/web-server/web-server-unit.rkt                   | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)
 rename collects/web-server/default-web-root/htdocs/servlets/examples/{response.rkt => response.rktd} (67%)

diff --git a/collects/tests/web-server/dispatchers/dispatch-servlets-test.rkt b/collects/tests/web-server/dispatchers/dispatch-servlets-test.rkt
index 949019e14d..e7e9ec2490 100644
--- a/collects/tests/web-server/dispatchers/dispatch-servlets-test.rkt
+++ b/collects/tests/web-server/dispatchers/dispatch-servlets-test.rkt
@@ -2,6 +2,7 @@
 (require racunit
          mzlib/etc
          mzlib/list
+         xml
          web-server/http
          web-server/private/cache-table
          web-server/private/web-server-structs
@@ -53,6 +54,13 @@
                         [t0 (simple-xpath* '(p) (call d url0 empty))])
                    t0)
                  "Hello, Web!")
+    (test-equal? "response.rktd - loading"
+                 (parameterize ([xexpr-drop-empty-attributes #t])
+                   (let* ([d (mkd (build-path example-servlets "response.rktd"))])
+                     (call d url0 empty)))
+                 `(html (head (title "Hello"))
+                        (body ([bgcolor "white"])
+                              (p "Hello"))))
     (test-add-two-numbers mkd "add.rkt - send/suspend"
                           (build-path example-servlets "add.rkt"))
     (test-add-two-numbers mkd "add-v2.rkt - send/suspend, version 2"
diff --git a/collects/web-server/default-web-root/htdocs/servlets/examples/response.rkt b/collects/web-server/default-web-root/htdocs/servlets/examples/response.rktd
similarity index 67%
rename from collects/web-server/default-web-root/htdocs/servlets/examples/response.rkt
rename to collects/web-server/default-web-root/htdocs/servlets/examples/response.rktd
index 107fec9673..df7278c20d 100644
--- a/collects/web-server/default-web-root/htdocs/servlets/examples/response.rkt
+++ b/collects/web-server/default-web-root/htdocs/servlets/examples/response.rktd
@@ -1,3 +1,3 @@
 `(html (head (title "Hello"))
        (body ([bgcolor "white"])
-             (p #f "Hello")))
+             (p "Hello")))
diff --git a/collects/web-server/servlet-env.rkt b/collects/web-server/servlet-env.rkt
index ad42593d6a..09ebe138ef 100644
--- a/collects/web-server/servlet-env.rkt
+++ b/collects/web-server/servlet-env.rkt
@@ -152,7 +152,7 @@
      (let-values ([(clear-cache! url->servlet)
                    (servlets:make-cached-url->servlet
                     (fsmap:filter-url->path
-                     #rx"\\.(ss|scm|rkt)$"
+                     #rx"\\.(ss|scm|rkt|rktd)$"
                      (fsmap:make-url->valid-path
                       (fsmap:make-url->path servlets-root)))
                     (make-default-path->servlet
diff --git a/collects/web-server/web-server-unit.rkt b/collects/web-server/web-server-unit.rkt
index d65f8e1426..e575f15a2a 100644
--- a/collects/web-server/web-server-unit.rkt
+++ b/collects/web-server/web-server-unit.rkt
@@ -79,7 +79,7 @@
      (let-values ([(clear-cache! url->servlet)
                    (servlets:make-cached-url->servlet
                     (fsmap:filter-url->path
-                     #rx"\\.(ss|scm|rkt)$"
+                     #rx"\\.(ss|scm|rkt|rktd)$"
                      (fsmap:make-url->valid-path
                       (fsmap:make-url->path (paths-servlet (host-paths host-info)))))
                     (make-default-path->servlet