Ref #872, #873, #817

- More cleanup and class/sus names consistencies
- Remove deprecation warnings
- Remove junit references, import cleanups

core/util/src/test/scala/net/liftweb/util/CombParserHelpersSpec.scala

@@ -83,8 +83,7 @@ object CombParserHelpersSpec extends Specification("CombParserHelpers Specificat
       val number: String => Boolean =
         (s: String) => {
           aNumber(s) match {
-            case Success(x, y) => 
-              s.toInt == x
+            case Success(x, y) => s.toInt == x
             case _ => true
           }
         }

persistence/mapper/src/test/scala/net/liftweb/mapper/DBProviders.scala

@@ -25,7 +25,7 @@ import util._
 
 
 object DbProviders {
-  def asList = PostgreSqlProvider :: MySqlProvider :: DerbyProvider :: H2Provider :: H2MemoryProvider :: Nil
+  def asList = PostgreSqlProvider :: MySqlProvider :: DerbyProvider :: H2FileProvider :: H2MemoryProvider :: Nil
   // Uncomment to run tests faster, but only against H2 def asList =  H2MemoryProvider :: Nil
 
 
@@ -132,7 +132,7 @@ object DbProviders {
     override def required_? = true
   }
 
-  object H2Provider extends Provider with FileDbSetup {
+  object H2FileProvider extends Provider with FileDbSetup {
     def name = "H2"
     def filePath = "target/tests_h2_lift"
     def vendor = new Vendor("org.h2.Driver") {

persistence/mapper/src/test/scala/net/liftweb/mapper/MapperSpec.scala

@@ -32,7 +32,7 @@ import http.provider.HTTPRequest
 /**
  * Systems under specification for Mapper.
  */
-object MapperSpecs extends Specification("Mapper Specification") {
+object MapperSpec extends Specification("Mapper Specification") {
 
   val doLog = false
 
@@ -98,19 +98,28 @@ object MapperSpecs extends Specification("Mapper Specification") {
     Schemifier.schemify(true, if (doLog) Schemifier.infoF _ else ignoreLogger _, DbProviders.SnakeConnectionIdentifier, SampleModelSnake, SampleTagSnake)
   }
 
+/*
   doBeforeSpec {
     providers.foreach(provider => {
       try {provider.setupDB} catch { case e if !provider.required_? => skip("Provider %s not available: %s".format(provider, e)) }
         Thread.sleep(50)  // Yuck! FIXME
 //        println("Setup done for =>>> " + provider)
     })
   }
+*/
 
   providers.foreach(provider => {
 
     ("Mapper for " + provider.name) should {
 
-      doBefore { cleanup() }
+      doBefore {
+        (try {
+          provider.setupDB
+          cleanup
+        } catch {
+          case e if !provider.required_? => skip("Provider %s not available: %s".format(provider, e))
+        }) must not(throwAnException[Exception]).orSkipExample
+      }
       setSequential()
 
       "schemify" in {

persistence/mongodb-record/src/test/scala/net/liftweb/mongodb/record/CustomSerializersSpec.scala

@@ -29,7 +29,6 @@ import java.util.{Calendar, Date}
 
 import org.bson.types.ObjectId
 import org.specs.Specification
-import org.specs.runner.JUnit4
 
 import net.liftweb.record.field._
 

persistence/mongodb-record/src/test/scala/net/liftweb/mongodb/record/MongoFieldSpecs.scala

@@ -34,7 +34,6 @@ import scala.xml.Text
 
 import org.bson.types.ObjectId
 import org.specs.Specification
-import org.specs.runner.JUnit4
 
 import net.liftweb.record._
 

persistence/mongodb-record/src/test/scala/net/liftweb/mongodb/record/MongoRecordExamplesSpec.scala

@@ -29,7 +29,6 @@ import net.liftweb.record.field._
 import net.liftweb.util.TimeHelpers._
 
 import org.specs.Specification
-import org.specs.runner.JUnit4
 
 import com.mongodb._
 import org.bson.types.ObjectId

persistence/mongodb-record/src/test/scala/net/liftweb/mongodb/record/MongoRecordSpec.scala

@@ -28,7 +28,6 @@ import java.util.regex.Pattern
 
 import org.bson.types.ObjectId
 import org.specs.Specification
-import org.specs.runner.JUnit4
 
 import net.liftweb.record.field.Countries
 

persistence/mongodb-record/src/test/scala/net/liftweb/mongodb/record/field/EnumFieldSpec.scala

@@ -21,7 +21,6 @@ package field
 
 import org.bson.types.ObjectId
 import org.specs.Specification
-import org.specs.runner.JUnit4
 
 import net.liftweb.common._
 import net.liftweb.json.ext.EnumSerializer

persistence/mongodb-record/src/test/scala/net/liftweb/mongodb/record/field/EnumNameFieldSpec.scala

@@ -21,7 +21,6 @@ package field
 
 import org.bson.types.ObjectId
 import org.specs.Specification
-import org.specs.runner.JUnit4
 
 import net.liftweb.common._
 import net.liftweb.json.ext.EnumNameSerializer

persistence/squeryl-record/src/test/scala/net/liftweb/squerylrecord/Fixtures.scala

@@ -37,8 +37,8 @@ import java.util.Calendar
 
 object DBHelper {
   def initSquerylRecordWithInMemoryDB() {
-    SquerylRecord.initWithSquerylSession { 
-      val session = Session.create(DriverManager.getConnection("jdbc:h2:mem:testSquerylRecordDB;DB_CLOSE_DELAY=-1", "sa", ""), new H2Adapter)
+    SquerylRecord.initWithSquerylSession {
+      val session = Session.create(DriverManager.getConnection("jdbc:h2:mem:testSquerylRecordDB;DB_CLOSE_DELAY=-1"), new H2Adapter)
       //session.setLogger(statement => println(statement))
       session
     }
@@ -50,14 +50,14 @@ object DBHelper {
    */
   def createSchema() {
     inTransaction {
-    	try {
-	      //MySchema.printDdl
-	      MySchema.dropAndCreate
-	      MySchema.createTestData
-    	} catch {
-    		case e => e.printStackTrace()
-    		  throw e;
-    	}
+      try {
+        //MySchema.printDdl
+        MySchema.dropAndCreate
+        MySchema.createTestData
+      } catch {
+        case e => e.printStackTrace()
+          throw e;
+      }
     }
   }
 }
@@ -145,13 +145,13 @@ object Employee extends Employee with MetaRecord[Employee]
  * Test record: One or more employees can have a room (one-to-many-relation).
  */
 class Room private() extends Record[Room] with KeyedRecord[Long] {
-	override def meta = Room
-	
-	override val idField = new LongField(this)
-	
-	val name = new StringField(this, 50)
-	
-	lazy val employees = MySchema.roomAssignments.right(this)
+  override def meta = Room
+
+  override val idField = new LongField(this)
+
+  val name = new StringField(this, 50)
+
+  lazy val employees = MySchema.roomAssignments.right(this)
 }
 
 object Room extends Room with MetaRecord[Room]
@@ -179,9 +179,9 @@ object MySchema extends Schema {
     oneToManyRelation(companies, employees).via((c, e) => c.id === e.companyId)
 
   val roomAssignments = manyToManyRelation(employees, rooms).
-  	via[RoomAssignment]((employee, room, roomAssignment) => 
-  		(roomAssignment.employeeId === employee.idField, roomAssignment.roomId === room.idField))
-    
+    via[RoomAssignment]((employee, room, roomAssignment) =>
+      (roomAssignment.employeeId === employee.idField, roomAssignment.roomId === room.idField))
+
   on(employees)(e =>
     declare(e.companyId defineAs (indexed("idx_employee_companyId")),
       e.email defineAs indexed("idx_employee_email")))

persistence/squeryl-record/src/test/scala/net/liftweb/squerylrecord/SquerylRecordSpec.scala

@@ -17,8 +17,7 @@ package squerylrecord
 import org.specs.Specification
 import record.{BaseField, Record}
 import RecordTypeMode._
-import MySchema.{TestData => td}
-import MySchema.{companies, employees, rooms, roomAssignments}
+import MySchema.{TestData => td, _}
 
 
 /**
@@ -55,7 +54,7 @@ object SquerylRecordSpec extends Specification("SquerylRecord Specification") {
       transaction {
         val orderedCompanies = from(companies)(c =>
           select(c) orderBy (c.name))
-        val ids = orderedCompanies.map(c => c.id)
+        val ids = orderedCompanies.map(_.id)
         ids must containInOrder(
           td.allCompanies.sortBy(_.name.is).map(_.id))
       }
@@ -263,7 +262,7 @@ object SquerylRecordSpec extends Specification("SquerylRecord Specification") {
     def check(fieldExtractor: (T) => BaseField) {
       val f1 = fieldExtractor(r1)
       val f2 = fieldExtractor(r2)
-      f1.is must_== f2.is
+      f1.get must_== f2.get
       f1.name must_== f2.name
     }
 

project/build/LiftFrameworkProject.scala

@@ -59,8 +59,8 @@ class LiftFrameworkProject(info: ProjectInfo) extends ParentProject(info) with L
   lazy val framework_doc = project(".", "lift-framework-doc", new DefaultProject(_) with LiftDefaultDocProject)
 
 
-  private def coreProject = frameworkProject("core") _
-  private def webProject = frameworkProject("web") _
+  private def coreProject        = frameworkProject("core") _
+  private def webProject         = frameworkProject("web") _
   private def persistenceProject = frameworkProject("persistence") _
 
   private def frameworkProject(base: String)(path: String, libs: ModuleID*)(deps: Project*) =
@@ -85,12 +85,12 @@ class LiftFrameworkProject(info: ProjectInfo) extends ParentProject(info) with L
   // ------------
   class FrameworkProject(info: ProjectInfo, libs: ModuleID*) extends DefaultProject(info) with LiftDefaultProject {
 
-    override def libraryDependencies = super.libraryDependencies ++ libs ++ Seq(TestScope.junit)
+    override def libraryDependencies = super.libraryDependencies ++ libs
 
     // FIXME: Build fails with -Xcheckinit -Xwarninit
     override def compileOptions = super.compileOptions.toList -- compileOptions("-Xcheckinit", "-Xwarninit").toList
 
-    // System property hack for derby.log, webapptests
+    // System properties necessary during test
     override def testAction =
       super.testAction dependsOn
       task {
@@ -101,10 +101,9 @@ class LiftFrameworkProject(info: ProjectInfo) extends ParentProject(info) with L
 
     // FIXME: breaks with SBT
     override def testOptions =
-      // TestFilter((name: String) => name.startsWith("net.liftweb.mapper")) ::
       ExcludeTests(
         // Web tests
-        "net.liftweb.webapptest.OneShot" :: "net.liftweb.webapptest.ToHeadUsages" :: "net.liftweb.http.SnippetSpec" :: Nil) ::
+        "net.liftweb.http.SnippetSpec" :: Nil) ::
       super.testOptions.toList
   }
 

web/testkit/src/test/scala/net/liftweb/http/testing/MockHttpRequestSpec.scala

@@ -126,5 +126,3 @@ object MockHttpRequestSpec extends Specification("MockHttpRequest Specification"
 
   }
 }
-
-

web/webkit/src/test/scala/net/liftweb/builtin/snippet/MsgSpec.scala

@@ -17,17 +17,17 @@
 package net.liftweb
 package builtin.snippet
 
-import common._
-import http.{LiftRules,LiftSession,S}
+import xml._
+import org.specs.Specification
 
-import org.specs._
-import runner._
-import Sugar._
+import common._
+import http._
 
-import scala.xml.{Null,Text,UnprefixedAttribute,XML}
 
-class MsgSpecTest extends Runner(MsgSpec) with JUnit with Console
-object MsgSpec extends Specification {
+/**
+ * System under specification for Msg.
+ */
+object MsgSpec extends Specification("Msg Specification") {
   def withSession[T](f: => T) : T =
     S.initIfUninitted(new LiftSession("test", "", Empty))(f)
 

web/webkit/src/test/scala/net/liftweb/builtin/snippet/MsgsSpec.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 WorldWide Conferencing, LLC
+ * Copyright 2010-2011 WorldWide Conferencing, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,19 +14,21 @@
  * limitations under the License.
  */
 
-package net.liftweb {
-package builtin.snippet {
+package net.liftweb
+package builtin.snippet
 
-import _root_.org.specs._
-import _root_.org.specs.runner._
-import _root_.org.specs.Sugar._
-import _root_.net.liftweb.http.{LiftRules,LiftSession,S}
-import _root_.net.liftweb.common._
+import xml.XML
+import org.specs.Specification
 
-import _root_.scala.xml.XML
+import common._
+import http._
+
+
+/**
+ * System under specification for Msgs.
+ */
+object MsgsSpec extends Specification("Msgs Specification") {
 
-class MsgsSpecTest extends Runner(MsgsSpec) with JUnit with Console
-object MsgsSpec extends Specification {
   def withSession[T](f: => T) : T =
     S.initIfUninitted(new LiftSession("test", "", Empty))(f)
 
@@ -69,5 +71,3 @@ object MsgsSpec extends Specification {
     }
   }
 }
-
-}} // Close nested packages

web/webkit/src/test/scala/net/liftweb/http/BindingsSpec.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 WorldWide Conferencing, LLC
+ * Copyright 2010-2011 WorldWide Conferencing, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,20 +14,22 @@
  * limitations under the License.
  */
 
-package net.liftweb {
-package http {
+package net.liftweb
+package http
 
-import _root_.net.liftweb.util.Helpers._
-import _root_.org.specs._
-import _root_.org.specs.runner._
-import _root_.org.specs.Sugar._
-import scala.xml.NodeSeq
-import scala.xml.Text
-import _root_.net.liftweb.common._
+import xml.{NodeSeq, Text}
+import org.specs.Specification
+
+import common._
+import util.Helpers._
 import Bindings._
 
-class BindingsSpecTest extends Runner(BindingsSpec) with JUnit with Console
-object BindingsSpec extends Specification {
+
+/**
+ * System under specification for Bindings.
+ */
+object BindingsSpec extends Specification("Bindings Bindings") {
+
   case class MyClass(str: String, i: Int, other: MyOtherClass)
   case class MyOtherClass(foo: String)
 
@@ -106,5 +108,3 @@ object BindingsSpec extends Specification {
   }
 }
 }
-
-}}