failed connections to database test and bugfix

Narigo · Narigo · commit effe6d1b2dba · 2013-11-01T11:24:17.000+01:00
diff --git a/src/main/scala/io/vertx/asyncsql/database/pool/AsyncConnectionPool.scala b/src/main/scala/io/vertx/asyncsql/database/pool/AsyncConnectionPool.scala
@@ -39,6 +39,8 @@ trait AsyncConnectionPool[ConnType <: Connection] {
           giveBack(c)
           p.failure(ex)
       }
+    } recover {
+      case ex => p.failure(ex)
     }
     p.future
   }
diff --git a/src/test/scala/io/vertx/asyncsql/test/BaseVertxIntegrationTest.scala b/src/test/scala/io/vertx/asyncsql/test/BaseVertxIntegrationTest.scala
@@ -10,14 +10,18 @@ import org.vertx.testtools.VertxAssert.{ assertEquals, fail, testComplete }
 
 trait BaseVertxIntegrationTest { this: TestVerticle =>
   val address: String
+  type not[T] = T => Nothing
 
   protected def asyncTest[X](fn: => Future[X]): Future[Unit] = {
     fn recover {
       case x =>
         logger.error("async fail in test code!", x)
         fail("Something failed asynchronously: " + x.getClass() + x.getMessage())
-    } map { _ =>
-      testComplete
+    } map {
+      case f: Future[_] =>
+        logger.warn("test code most likely wrong! returns Future[Future[_]]")
+        testComplete
+      case _ => testComplete
     }
   }
 
diff --git a/src/test/scala/io/vertx/asyncsql/test/postgresql/BadlyConfiguredPostgreSqlTest.scala b/src/test/scala/io/vertx/asyncsql/test/postgresql/BadlyConfiguredPostgreSqlTest.scala
@@ -0,0 +1,22 @@
+package io.vertx.asyncsql.test.postgresql
+
+import org.junit.Test
+import org.vertx.scala.core.json._
+import org.vertx.testtools.VertxAssert._
+import io.vertx.asyncsql.test.{ BaseSqlTests, SqlTestVerticle }
+import scala.concurrent.Future
+
+class BadlyConfiguredPostgreSqlTest extends SqlTestVerticle {
+
+  val address = "campudus.asyncdb"
+  val config = Json.obj("address" -> address, "database" -> "nonexistent")
+
+  override def getConfig = config
+
+  @Test
+  def testNonExistentDatabase(): Unit = asyncTest {
+    expectError(raw("SELECT 0")) map { reply =>
+      assertTrue(reply.getString("message").contains("nonexistent"))
+    }
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,8 @@ trait AsyncConnectionPool[ConnType <: Connection] {`
`39`	`39`	`giveBack(c)`
`40`	`40`	`p.failure(ex)`
`41`	`41`	`}`
	`42`	`+ } recover {`
	`43`	`+ case ex => p.failure(ex)`
`42`	`44`	`}`
`43`	`45`	`p.future`
`44`	`46`	`}`