From f068381a5eb6b60a4ec55b3bc73a0b6143dbd68d Mon Sep 17 00:00:00 2001 From: "tom.vaughan" Date: Wed, 29 Feb 2012 14:56:08 -0500 Subject: [PATCH] Resolving some problems I encountered on a fresh checkout with "./sbt test": * fixing deprecation warning by using "sys.exit()" instead of just "exit()" * fixing deprecation warning by using "extends App" instead of "extends Application" * fixing broken unit test by asserting the start of the input string has an indexOf > 0 --- scala_29/lift_blank/src/test/scala/LiftConsole.scala | 2 +- scala_29/lift_blank/src/test/scala/RunWebApp.scala | 2 +- .../lift_blank/src/test/scala/code/snippet/HelloWorldTest.scala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scala_29/lift_blank/src/test/scala/LiftConsole.scala b/scala_29/lift_blank/src/test/scala/LiftConsole.scala index 139cecd..724bb59 100644 --- a/scala_29/lift_blank/src/test/scala/LiftConsole.scala +++ b/scala_29/lift_blank/src/test/scala/LiftConsole.scala @@ -10,6 +10,6 @@ object LiftConsole { // Now run the MainGenericRunner to get your repl MainGenericRunner.main(args) // After the repl exits, then exit the scala script - exit(0) + sys.exit(0) } } diff --git a/scala_29/lift_blank/src/test/scala/RunWebApp.scala b/scala_29/lift_blank/src/test/scala/RunWebApp.scala index bedf9f5..5bc88d3 100644 --- a/scala_29/lift_blank/src/test/scala/RunWebApp.scala +++ b/scala_29/lift_blank/src/test/scala/RunWebApp.scala @@ -3,7 +3,7 @@ import org.mortbay.jetty.Server import org.mortbay.jetty.webapp.WebAppContext import org.mortbay.jetty.nio._ -object RunWebApp extends Application { +object RunWebApp extends App { val server = new Server val scc = new SelectChannelConnector scc.setPort(8080) diff --git a/scala_29/lift_blank/src/test/scala/code/snippet/HelloWorldTest.scala b/scala_29/lift_blank/src/test/scala/code/snippet/HelloWorldTest.scala index 28af398..af16387 100644 --- a/scala_29/lift_blank/src/test/scala/code/snippet/HelloWorldTest.scala +++ b/scala_29/lift_blank/src/test/scala/code/snippet/HelloWorldTest.scala @@ -37,7 +37,7 @@ object HelloWorldTestSpecs extends Specification { val str = hello.howdy(Welcome to your Lift app at Time goes here).toString str.indexOf(stableTime.toString) must be >= 0 - str.indexOf("Hello at") must be >= 0 + str.indexOf("Welcome to") must be >= 0 } } }