newer versions, fixes in tests

Zwergal · Zwergal · commit 3a239fc4e4ab · 2013-12-03T16:00:23.000+01:00
diff --git a/gradle.properties b/gradle.properties
@@ -29,7 +29,7 @@ scalaVersion=2.10.2
 gradleVersion=1.6
 
 # The version of Vert.x
-vertxVersion=2.1M1
+vertxVersion=2.1M2
 
 # The version of Vert.x test tools
 toolsVersion=2.0.2-final
diff --git a/src/test/scala/io/vertx/asyncsql/test/BaseSqlTests.scala b/src/test/scala/io/vertx/asyncsql/test/BaseSqlTests.scala
@@ -34,7 +34,7 @@ trait BaseSqlTests { this: SqlTestVerticle =>
     expectOk(raw("SELECT 0")) map { reply =>
       val res = reply.getArray("results")
       assertEquals(1, res.size())
-      assertEquals(0, res.get[JsonArray](0).get[Int](0))
+      assertEquals(0, res.get[JsonArray](0).get[Number](0).intValue())
     }
   }
 
@@ -43,8 +43,8 @@ trait BaseSqlTests { this: SqlTestVerticle =>
       val res = reply.getArray("results")
       assertEquals(1, res.size())
       val firstElem = res.get[JsonArray](0)
-      assertEquals(1, firstElem.get[Integer](0))
-      assertEquals(0, firstElem.get[Integer](1))
+      assertEquals(1, firstElem.get[Number](0).intValue())
+      assertEquals(0, firstElem.get[Number](1).intValue())
     }
   }
 
@@ -54,7 +54,7 @@ trait BaseSqlTests { this: SqlTestVerticle =>
       val receivedFields = reply.getArray("fields")
       val results = reply.getArray("results").get[JsonArray](0)
 
-      assertEquals(1, reply.getNumber("rows"))
+      assertEquals(1, reply.getInteger("rows"))
 
       val columnNamesList = receivedFields.asScala.toList
 
@@ -63,16 +63,16 @@ trait BaseSqlTests { this: SqlTestVerticle =>
       assertEquals(15, results.get[Int](columnNamesList.indexOf("age")))
       assertTrue(results.get[Any](columnNamesList.indexOf("is_male")) match {
         case b: Boolean => b
-        case i: Int => i == 1
+        case i: Number => i.intValue() == 1
         case x => false
       })
-      assertEquals(167.31, results.get(columnNamesList.indexOf("money")), 0.1)
+      assertEquals(167.31, results.get[Number](columnNamesList.indexOf("money")).doubleValue(), 0.01)
     }
   }
 
   def createAndDropTable(): Unit = asyncTest {
     createTable("some_test") flatMap (_ => dropTable("some_test")) map { reply =>
-      assertEquals(0, reply.getNumber("rows"))
+      assertEquals(0, reply.getInteger("rows"))
     }
   }
 
@@ -113,13 +113,14 @@ trait BaseSqlTests { this: SqlTestVerticle =>
       assertFieldName("age")
       assertFieldName("money")
       assertFieldName("wedding_date")
+      val moneyField = receivedFields.toArray().indexOf("money")
 
       val mrTest = reply.getArray("results").get[JsonArray](0)
       assertTrue(mrTest.contains("Mr. Test"))
       assertTrue(mrTest.contains("test@example.com"))
       assertTrue(mrTest.contains(true) || mrTest.contains(1))
       assertTrue(mrTest.contains(15))
-      assertTrue(mrTest.contains(167.31))
+      assertEquals(167.31, mrTest.get[Number](moneyField).doubleValue(), 0.0001)
     }
   }
 
@@ -130,8 +131,10 @@ trait BaseSqlTests { this: SqlTestVerticle =>
       logger.info("received: " + receivedFields.encode())
       logger.info("fieldsAr: " + fieldsArray.encode())
       checkSameFields(fieldsArray, receivedFields)
+      logger.info("checked same fields!")
       val results = reply.getArray("results")
       val mrTest = results.get[JsonArray](0)
+      logger.info("checking mr test")
       checkMrTest(mrTest)
     }
   }
@@ -149,15 +152,21 @@ trait BaseSqlTests { this: SqlTestVerticle =>
   }
 
   private def checkMrTest(mrTest: JsonArray) = {
+      logger.info("checking mr test name")
     assertEquals("Mr. Test", mrTest.get[String](0))
+      logger.info("checking email")
     assertEquals("test@example.com", mrTest.get[String](1))
+      logger.info("checking is male")
     assertTrue(mrTest.get[Any](2) match {
       case b: Boolean => b
-      case i: Int => i == 1
+      case i: Number => i.intValue() == 1
       case x => false
     })
-    assertEquals(15, mrTest.get[Integer](3))
-    assertEquals(167.31, mrTest.get[Integer](4))
+      logger.info("checking age")
+    assertEquals(15, mrTest.get[Number](3).intValue())
+      logger.info("checking money -> exception?!")
+    assertEquals(167.31, mrTest.get[Number](4).doubleValue(), 0.0001)
+      logger.info("checking money -> NO exception?!")
     // FIXME check date conversion
     // assertEquals("2024-04-01", mrTest.get[JsonObject](5))
   }
@@ -166,8 +175,8 @@ trait BaseSqlTests { this: SqlTestVerticle =>
     assertEquals("Mrs. Test", mrsTest.get[String](0))
     assertEquals("test2@example.com", mrsTest.get[String](1))
     assertEquals(false, mrsTest.get[Boolean](2))
-    assertEquals(43, mrsTest.get[Integer](3))
-    assertEquals(167.31, mrsTest.get[Integer](4))
+    assertEquals(43L, mrsTest.get[Long](3))
+    assertEquals(167.31, mrsTest.get[Number](4).doubleValue(), 0.0001)
     // FIXME check date conversion
     // assertEquals("1997-12-24", mrsTest.get[JsonObject](5))
   }
@@ -212,7 +221,7 @@ trait BaseSqlTests { this: SqlTestVerticle =>
     } yield b) map { reply =>
       val results = reply.getArray("results")
       assertEquals(1, results.size())
-      assertEquals(21, results.get[JsonArray](0).get[Int](0))
+      assertEquals(21, results.get[JsonArray](0).get[Number](0).intValue())
     }
   }
 
@@ -227,7 +236,7 @@ trait BaseSqlTests { this: SqlTestVerticle =>
     } yield b) map { reply =>
       val results = reply.getArray("results")
       assertEquals(1, results.size())
-      assertEquals(21, results.get[JsonArray](0).get[Int](0))
+      assertEquals(21, results.get[JsonArray](0).get[Number](0).intValue())
     }
   }
 }
diff --git a/src/test/scala/io/vertx/asyncsql/test/SqlTestVerticle.scala b/src/test/scala/io/vertx/asyncsql/test/SqlTestVerticle.scala
@@ -65,7 +65,7 @@ abstract class SqlTestVerticle extends TestVerticle with BaseVertxIntegrationTes
   protected def transaction(statements: JsonObject*) = Json.obj("action" -> "transaction", "statements" -> Json.arr(statements: _*))
 
   protected def createTable(tableName: String) = expectOk(raw(createTableStatement(tableName))) map { reply =>
-    assertEquals(0, reply.getNumber("rows"))
+    assertEquals(0, reply.getInteger("rows"))
     reply
   }
 
@@ -81,7 +81,7 @@ CREATE TABLE """ + tableName + """ (
   email VARCHAR(255) UNIQUE,
   is_male BOOLEAN,
   age INT,
-  money FLOAT,
+  money DOUBLE PRECISION,
   wedding_date DATE
 );
 """
