Going forward with the specs2 upgrade

Author: mauricio

db-async-common/src/main/scala/com/github/mauricio/async/db/util/FutureUtils.scala

@@ -22,7 +22,7 @@ import scala.language.postfixOps
 
 object FutureUtils {
 
- def await[T]( future : Future[T] ) : T = {
+ def awaitFuture[T]( future : Future[T] ) : T = {
  Await.result(future, 5 seconds )
  }
 

mysql-async/src/main/scala/com/github/mauricio/async/db/mysql/codec/MySQLConnectionHandler.scala

@@ -86,7 +86,7 @@ class MySQLConnectionHandler(
 
  override def channelRead0(ctx: ChannelHandlerContext, message: Object) {
 
- log.debug("Message received {}", message)
+ //log.debug("Message received {}", message)
 
  message match {
  case m: ServerMessage => {

mysql-async/src/main/scala/com/github/mauricio/async/db/mysql/codec/MySQLFrameDecoder.scala

@@ -77,8 +77,8 @@ class MySQLFrameDecoder(charset: Charset, connectionId : String) extends ByteToM
 
  // TODO: Remove once https://github.com/netty/netty/issues/1704 is fixed
  val slice = buffer.readSlice(size).order(ByteOrder.LITTLE_ENDIAN)
- val dump = MySQLHelper.dumpAsHex(slice)
- log.debug(s"[${messagesCount.get()}] Dump of message is - $messageType - $size isInQuery $isInQuery processingColumns $processingColumns processedColumns $processedColumns processingParams $processingParams processedParams $processedParams \n{}", dump)
+ //val dump = MySQLHelper.dumpAsHex(slice)
+ //log.debug(s"[${messagesCount.get()}] Dump of message is - $messageType - $size isInQuery $isInQuery processingColumns $processingColumns processedColumns $processedColumns processingParams $processingParams processedParams $processedParams \n{}", dump)
 
  slice.readByte()
 

mysql-async/src/main/scala/com/github/mauricio/async/db/mysql/codec/MySQLOneToOneEncoder.scala

@@ -69,7 +69,7 @@ class MySQLOneToOneEncoder(charset: Charset, charsetMapper: CharsetMapper) exten
  case _ => throw new EncoderNotAvailableException(message)
  }
 
- log.debug("Writing message {}", message)
+ //log.debug("Writing message {}", message)
 
  val result = encoder.encode(message)
 

mysql-async/src/main/scala/com/github/mauricio/async/db/mysql/decoder/PreparedStatementPrepareResponseDecoder.scala

@@ -27,8 +27,8 @@ class PreparedStatementPrepareResponseDecoder extends MessageDecoder {
 
  def decode(buffer: ByteBuf): ServerMessage = {
 
- val dump = MySQLHelper.dumpAsHex(buffer)
- log.debug("prepared statement response dump is \n{}", dump)
+ //val dump = MySQLHelper.dumpAsHex(buffer)
+ //log.debug("prepared statement response dump is \n{}", dump)
 
  val statementId = Array[Byte]( buffer.readByte(), buffer.readByte(), buffer.readByte(), buffer.readByte() )
  val columnsCount = buffer.readUnsignedShort()

mysql-async/src/test/scala/com/github/mauricio/async/db/mysql/ConnectionHelper.scala

@@ -16,7 +16,7 @@
 
 package com.github.mauricio.async.db.mysql
 
-import com.github.mauricio.async.db.util.FutureUtils.await
+import com.github.mauricio.async.db.util.FutureUtils.awaitFuture
 import com.github.mauricio.async.db._
 import com.github.mauricio.async.db.pool.{PoolConfiguration, ConnectionPool}
 import com.github.mauricio.async.db.mysql.pool.MySQLConnectionFactory
@@ -110,7 +110,7 @@ trait ConnectionHelper {
  try {
  fn(pool)
  } finally {
- await( pool.close )
+ awaitFuture( pool.close )
  }
 
  }
@@ -120,20 +120,20 @@ trait ConnectionHelper {
  val connection = new MySQLConnection(this.defaultConfiguration)
 
  try {
- await( connection.connect )
+ awaitFuture( connection.connect )
  fn(connection)
  } finally {
- await( connection.close )
+ awaitFuture( connection.close )
  }
 
  }
 
  def executeQuery( connection : Connection, query : String ) : QueryResult = {
- await( connection.sendQuery(query) )
+ awaitFuture( connection.sendQuery(query) )
  }
 
  def executePreparedStatement( connection : Connection, query : String, values : Any * ) : QueryResult = {
- await( connection.sendPreparedStatement(query, values) )
+ awaitFuture( connection.sendPreparedStatement(query, values) )
  }
 
 }

mysql-async/src/test/scala/com/github/mauricio/async/db/mysql/MySQLConnectionSpec.scala

@@ -17,7 +17,7 @@
 package com.github.mauricio.async.db.mysql
 
 import com.github.mauricio.async.db.Configuration
-import com.github.mauricio.async.db.util.FutureUtils.await
+import com.github.mauricio.async.db.util.FutureUtils.awaitFuture
 import org.specs2.mutable.Specification
 
 class MySQLConnectionSpec extends Specification {
@@ -60,29 +60,29 @@ class MySQLConnectionSpec extends Specification {
 
  withNonConnectedConnection {
  connection =>
- await(connection.connect) === connection
+ awaitFuture(connection.connect) === connection
  }(configuration)
 
  }
 
  "connect to a MySQL instance without password" in {
  withNonConnectedConnection({
  connection =>
- await(connection.connect) === connection
+ awaitFuture(connection.connect) === connection
  }) (rootConfiguration)
  }
 
  "connect to a MySQL instance without a database" in {
  withNonConnectedConnection({
  connection =>
- await(connection.connect) === connection
+ awaitFuture(connection.connect) === connection
  }) (configurationWithoutDatabase)
  }
 
  "connect to a MySQL instance without database with password" in {
  withNonConnectedConnection({
  connection =>
- await(connection.connect) === connection
+ awaitFuture(connection.connect) === connection
  }) (configurationWithPasswordWithoutDatabase)
  }
 
@@ -94,7 +94,7 @@ class MySQLConnectionSpec extends Specification {
  try {
  fn(connection)
  } finally {
- await(connection.close)
+ awaitFuture(connection.close)
  }
 
 

mysql-async/src/test/scala/com/github/mauricio/async/db/mysql/PreparedStatementsSpec.scala

@@ -21,8 +21,8 @@ import java.util.concurrent.TimeUnit
 import org.joda.time._
 import org.specs2.mutable.Specification
 import scala.concurrent.duration.Duration
-import com.github.mauricio.async.db.util.FutureUtils._
 import scala.Some
+import org.specs2.execute.Skipped
 
 class PreparedStatementsSpec extends Specification with ConnectionHelper {
 
@@ -271,7 +271,7 @@ class PreparedStatementsSpec extends Specification with ConnectionHelper {
  connection =>
 
  if ( connection.version < MySQLConnection.MicrosecondsVersion ) {
- pending(s"this version of MySQL (${connection.version}) does not support microseconds")
+ skipped(s"this version of MySQL (${connection.version}) does not support microseconds")
  } else {
  executeQuery(connection, create)
  executeQuery(connection, insert)

mysql-async/src/test/scala/com/github/mauricio/async/db/mysql/TransactionSpec.scala

@@ -2,7 +2,7 @@ package com.github.mauricio.async.db.mysql
 
 import org.specs2.mutable.Specification
 import com.github.mauricio.async.db.util.ExecutorServiceUtils._
-import com.github.mauricio.async.db.util.FutureUtils.await
+import com.github.mauricio.async.db.util.FutureUtils.awaitFuture
 
 class TransactionSpec extends Specification with ConnectionHelper {
 
@@ -21,7 +21,7 @@ class TransactionSpec extends Specification with ConnectionHelper {
  .flatMap( r => connection.sendPreparedStatement(this.insert))
  }
 
- await(future)
+ awaitFuture(future)
 
  val result = executePreparedStatement(connection, this.select).rows.get
  result.size === 2

mysql-async/src/test/scala/com/github/mauricio/async/db/mysql/pool/MySQLConnectionFactorySpec.scala

@@ -17,7 +17,7 @@
 package com.github.mauricio.async.db.mysql.pool
 
 import com.github.mauricio.async.db.mysql.{MySQLConnection, ConnectionHelper}
-import com.github.mauricio.async.db.util.FutureUtils.await
+import com.github.mauricio.async.db.util.FutureUtils.awaitFuture
 import org.specs2.mutable.Specification
 import scala.util._
 import com.github.mauricio.async.db.exceptions.ConnectionNotConnectedException
@@ -39,28 +39,27 @@ class MySQLConnectionFactorySpec extends Specification with ConnectionHelper {
  }
 
  try {
- factory.validate(connection) match {
- case Failure(e) => ok("connection sucessfully rejected")
- case Success(e) => failure("should not have come here")
+ if (factory.validate(connection).isSuccess) {
+ throw new IllegalStateException("should not have come here")
  }
  } finally {
- await(connection.close)
+ awaitFuture(connection.close)
  }
 
-
+ ok("connection successfully rejected")
  }
 
  "it should take a connection from the pool and the pool should not accept it back if it is broken" in {
  withPool {
  pool =>
- val connection = await(pool.take)
+ val connection = awaitFuture(pool.take)
 
  pool.inUse.size === 1
 
- await(connection.disconnect)
+ awaitFuture(connection.disconnect)
 
  try {
- await(pool.giveBack(connection))
+ awaitFuture(pool.giveBack(connection))
  } catch {
  case e: ConnectionNotConnectedException => {
  // all good
@@ -79,18 +78,18 @@ class MySQLConnectionFactorySpec extends Specification with ConnectionHelper {
  }
  }
 
- "fail validation if a connection is disconnected" in {
+"fail validation if a connection is disconnected" in {
 
-  val connection = factory.create
+ val connection = factory.create
 
-  await(connection.disconnect)
+ awaitFuture(connection.disconnect)
 
-  factory.validate(connection) match {
-  case Failure(e) => ok("Connection successfully rejected")
-  case Success(c) => failure("should not have come here")
-  }
+ factory.validate(connection) match {
+ case Failure(e) => ok("Connection successfully rejected")
+ case Success(c) => failure("should not have come here")
+ }
 
- }
+}
 
  "fail validation if a connection is still waiting for a query" in {
  val connection = factory.create
@@ -103,7 +102,7 @@ class MySQLConnectionFactorySpec extends Specification with ConnectionHelper {
  case Success(c) => failure("should not have come here")
  }
 
- await(connection.close) === connection
+ awaitFuture(connection.close) === connection
  }
 
  "accept a good connection" in {
@@ -114,7 +113,7 @@ class MySQLConnectionFactorySpec extends Specification with ConnectionHelper {
  case Failure(e) => failure("should not have come here")
  }
 
- await(connection.close) === connection
+ awaitFuture(connection.close) === connection
  }
 
  "test a valid connection and say it is ok" in {
@@ -126,15 +125,15 @@ class MySQLConnectionFactorySpec extends Specification with ConnectionHelper {
  case Failure(e) => failure("should not have come here")
  }
 
- await(connection.close) === connection
+ awaitFuture(connection.close) === connection
 
  }
 
  "fail test if a connection is disconnected" in {
 
  val connection = factory.create
 
- await(connection.disconnect)
+ awaitFuture(connection.disconnect)
 
  factory.test(connection) match {
  case Failure(e) => ok("Connection successfully rejected")