Code cleanup/organize imports.

framework/src/play/src/test/scala/play/api/libs/openid/OpenIDSpec.scala

@@ -7,8 +7,6 @@ import org.mockito._
 import play.api.mvc.Request
 import play.api.http.{ContentTypeOf, Writeable, HeaderNames}
 import play.api.libs.openid.Errors.{BAD_RESPONSE, AUTH_ERROR}
-import org.specs2.control.NoStackTraceFilter
-import play.api.libs.openid._
 import scala.Some
 
 object OpenIDSpec extends Specification with Mockito {

framework/src/play/src/test/scala/play/api/libs/openid/package.scala

@@ -2,17 +2,23 @@ package play.api.libs
 
 import java.net.URL
 import io.Source
+import play.api.libs.ws.WS.WSRequestHolder
+import play.api.libs.ws.Response
+import play.api.libs.concurrent.Promise
+import org.specs2.mock.Mockito
+import play.api.http.Status._
+import play.api.http.{ContentTypeOf, Writeable, HeaderNames}
 
 package object openid {
   type Params = Map[String, Seq[String]]
 
   implicit def stringToSeq(s: String): Seq[String] = Seq(s)
 
   trait RichUrl[A] {
-    def hostAndPath:String
+    def hostAndPath: String
   }
 
-  implicit def urlToRichUrl(url:URL) = new RichUrl[URL] {
+  implicit def urlToRichUrl(url: URL) = new RichUrl[URL] {
     def hostAndPath = new URL(url.getProtocol, url.getHost, url.getPort, url.getPath).toExternalForm
   }
 
@@ -35,4 +41,20 @@ package object openid {
     "openid.signed" -> defaultSigned,
     "openid.sig" -> "MWRsJZ/9AOMQt9gH6zTZIfIjk6g="
   )
+
+
+  class WSMock extends Mockito {
+    val request = mock[WSRequestHolder]
+    val response = mock[Response]
+
+    response.status returns OK
+    response.header(HeaderNames.CONTENT_TYPE) returns Some("text/html;charset=UTF-8")
+    response.body returns ""
+
+    request.get() returns Promise.pure(response)
+    request.post(anyString)(any[Writeable[String]], any[ContentTypeOf[String]]) returns Promise.pure(response)
+
+    def url(url: String): WSRequestHolder = request
+  }
+
 }