@@ -7,8 +7,8 @@ class StepProject(info: ProjectInfo) extends DefaultWebProject(info) override def useMavenConfigurations = true override def packageAction = packageTask(mainClasses +++ mainResources, outputPath, defaultJarName, packageOptions).dependsOn(compile) describedAs PackageDescription - val jetty = "org.mortbay.jetty" % "jetty" % "6.1.14" % "test->default" - val jettytester = "org.eclipse.jetty" % "jetty-servlet-tester" % "7.0.0.M1" % "test->default" + val jetty = "org.mortbay.jetty" % "jetty" % "7.0.0pre3" % "test->default" + val jettytester = "org.mortbay.jetty" % "jetty-servlet-tester" % "7.0.0pre3" % "test->default" val scalatest = "org.scala-tools.testing" % "scalatest" % "0.9.5" % "test->default" val servlet = "javax.servlet" % "servlet-api" % "2.5" % "provided->default" } project/build/src/StepProject.scala @@ -51,7 +51,7 @@ abstract class Step extends HttpServlet { before()_ response.setContentType(contentType) paramsMap.withValue(args ++ realParams){ - response.getWriter.println(route.action()) + response.getWriter.print(route.action()) } true } src/main/scala/Step.scala @@ -1,9 +1,79 @@ package com.thinkminimo.step -import org.scalatest._ -class StepSuite extends FunSuite with PrivateMethodTester { - test("true should equal true") { - val t = true - assert(t == true) +import javax.servlet.http._ +import org.mortbay.jetty.testing.HttpTester +import org.mortbay.jetty.testing.ServletTester +import org.scalatest.FunSuite + +class TestServlet extends Step { + get("/") { + "root" + } + + get("/this/:test/should/:pass") { + params(":test")+params(":pass") + } + + get("/xml/:must/:val") { + <h1>{ params(":must")+params(":val") }</h1> + } + + get("/number") { + 42 + } + + post("/post/test") { + params("posted_value") + } + + post("/post/:test/val") { + params("posted_value")+params(":test") + } +} + +class StepSuite extends FunSuite { + + val tester = new ServletTester() + val response = new HttpTester() + val request = new HttpTester() + request.setVersion("HTTP/1.0") + tester.addServlet(classOf[TestServlet], "/*") + tester.start() + + test("GET / should return 'root'") { + request.setMethod("GET") + request.setURI("/") + response.parse(tester.getResponses(request.generate())) + assert(response.getContent === "root") + } + + test("GET /this/will/should/work should return 'willwork'") { + request.setMethod("GET") + request.setURI("/this/will/should/work") + response.parse(tester.getResponses(request.generate())) + assert(response.getContent === "willwork") + } + + test("GET /xml/really/works should return '<h1>reallyworks</h1>'") { + request.setMethod("GET") + request.setURI("/xml/really/works") + response.parse(tester.getResponses(request.generate())) + assert(response.getContent === "<h1>reallyworks</h1>") + } + + test("GET /number should return '42'") { + request.setMethod("GET") + request.setURI("/number") + response.parse(tester.getResponses(request.generate())) + assert(response.getContent === "42") + } + + test("POST /post/test with posted_value=yes should return 'yes'") { + request.setMethod("POST") + request.setURI("/post/test") + request.addHeader("Content-Type", "application/x-www-form-urlencoded") + request.setContent("posted_value=yes") + response.parse(tester.getResponses(request.generate())) + assert(response.getContent === "yes") } } src/test/scala/StepTest.scala 06e50ec95a9869eb9620af1992b332bfaa01b656 Alan Dipert alan@ubergibson.com http://github.com/riffraff/step/commit/79d944c1b64c94a2a060b5cfb97252e813b730d7 79d944c1b64c94a2a060b5cfb97252e813b730d7 2009-05-31T12:08:40-07:00 2009-05-31T12:08:40-07:00 tests, updated jetty release deps ad3f2ed5a3d2a2b9a339f2dac025f71b8546a6e4 Alan Dipert alan@ubergibson.com