From 5d5a90c4e108fc3d3339b1622362ab6a8d05fb8a Mon Sep 17 00:00:00 2001
From: Jay McCarthy <jay@racket-lang.org>
Date: Tue, 12 Jun 2007 05:49:09 +0000
Subject: [PATCH] Figuring out where to run servlet tests

svn: r6585
---
 collects/web-server/tests/all-web-server-tests.ss      |  2 --
 .../tests/dispatchers/dispatch-servlets-test.ss        | 10 +++++-----
 collects/web-server/tests/servlet-test.ss              |  9 ---------
 collects/web-server/tests/servlet/all-servlet-tests.ss |  6 ++----
 collects/web-server/tests/servlet/web-test.ss          |  8 --------
 5 files changed, 7 insertions(+), 28 deletions(-)
 delete mode 100644 collects/web-server/tests/servlet-test.ss
 delete mode 100644 collects/web-server/tests/servlet/web-test.ss

diff --git a/collects/web-server/tests/all-web-server-tests.ss b/collects/web-server/tests/all-web-server-tests.ss
index 6af29437ea..5e6da58110 100644
--- a/collects/web-server/tests/all-web-server-tests.ss
+++ b/collects/web-server/tests/all-web-server-tests.ss
@@ -7,7 +7,6 @@
            "managers/all-managers-tests.ss"
            "private/all-private-tests.ss"
            "servlet/all-servlet-tests.ss"
-           "servlet-test.ss"
            "servlet-env-test.ss")
   (provide all-web-server-tests)
   
@@ -21,5 +20,4 @@
      all-managers-tests
      all-private-tests
      all-servlet-tests
-     servlet-tests
      servlet-env-tests)))
\ No newline at end of file
diff --git a/collects/web-server/tests/dispatchers/dispatch-servlets-test.ss b/collects/web-server/tests/dispatchers/dispatch-servlets-test.ss
index b13766e653..c2f883e7a0 100644
--- a/collects/web-server/tests/dispatchers/dispatch-servlets-test.ss
+++ b/collects/web-server/tests/dispatchers/dispatch-servlets-test.ss
@@ -3,15 +3,11 @@
            (only (planet "ssax.ss" ("lizorkin" "ssax.plt" 1 3))
                  ssax:xml->sxml)
            (planet "sxml.ss" ("lizorkin" "sxml.plt" 1 4))
-           (lib "file.ss")
            (lib "etc.ss")
            (lib "url.ss" "net")
            (lib "list.ss")
-           (lib "xml.ss" "xml")
            (lib "pretty.ss")
            (lib "request-structs.ss" "web-server" "private")
-           (lib "util.ss" "web-server" "private")
-           (lib "dispatch.ss" "web-server" "dispatchers")
            (lib "cache-table.ss" "web-server" "private")
            (lib "web-server-structs.ss" "web-server" "private")
            (lib "namespace.ss" "web-server" "configuration")
@@ -44,7 +40,6 @@
   (define test-servlets (build-path (collection-path "web-server") "tests" "servlets"))
   (define example-servlets (build-path (collection-path "web-server") "default-web-root" "servlets" "examples/"))
   
-  ; XXX
   (define dispatch-servlets-tests
     (test-suite
      "Servlets"
@@ -91,4 +86,9 @@
                           url0
                           (build-list 7 (lambda (i) i))))))
      
+     (test-suite
+      "servlet/web.ss"
+      ; XXX
+      )
+     
      )))
\ No newline at end of file
diff --git a/collects/web-server/tests/servlet-test.ss b/collects/web-server/tests/servlet-test.ss
deleted file mode 100644
index 5e9f02983e..0000000000
--- a/collects/web-server/tests/servlet-test.ss
+++ /dev/null
@@ -1,9 +0,0 @@
-(module servlet-test mzscheme
-  (require (planet "test.ss" ("schematics" "schemeunit.plt" 2))
-           (lib "servlet.ss" "web-server"))
-  (provide servlet-tests)
-  
-  ; XXX
-  (define servlet-tests
-    (test-suite
-     "Servlets")))
\ No newline at end of file
diff --git a/collects/web-server/tests/servlet/all-servlet-tests.ss b/collects/web-server/tests/servlet/all-servlet-tests.ss
index 1e8261e312..edcb6b6aaa 100644
--- a/collects/web-server/tests/servlet/all-servlet-tests.ss
+++ b/collects/web-server/tests/servlet/all-servlet-tests.ss
@@ -3,8 +3,7 @@
            "bindings-test.ss"
            "servlet-url-test.ss"
            "basic-auth-test.ss"
-           "helpers-test.ss"
-           "web-test.ss")
+           "helpers-test.ss")
   (provide all-servlet-tests)
   
   (define all-servlet-tests
@@ -13,5 +12,4 @@
      bindings-tests
      servlet-url-tests
      basic-auth-tests
-     helpers-tests
-     web-tests)))
\ No newline at end of file
+     helpers-tests)))
\ No newline at end of file
diff --git a/collects/web-server/tests/servlet/web-test.ss b/collects/web-server/tests/servlet/web-test.ss
deleted file mode 100644
index 1b9a885066..0000000000
--- a/collects/web-server/tests/servlet/web-test.ss
+++ /dev/null
@@ -1,8 +0,0 @@
-(module web-test mzscheme
-  (require (planet "test.ss" ("schematics" "schemeunit.plt" 2)))
-  (provide web-tests)
-  
-  ; XXX
-  (define web-tests
-    (test-suite
-     "Web")))
\ No newline at end of file