Author: eevans
Date: Thu Mar 10 01:40:41 2011
New Revision: 1080097
URL: http://svn.apache.org/viewvc?rev=1080097&view=rev
Log:
enable commented BytesType tests missed in earlier commit
Patch by eevans for CASSANDRA-2027
Modified:
cassandra/trunk/drivers/java/test/org/apache/cassandra/cql/JdbcDriverTest.java
Modified:
cassandra/trunk/drivers/java/test/org/apache/cassandra/cql/JdbcDriverTest.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/drivers/java/test/org/apache/cassandra/cql/JdbcDriverTest.java?rev=1080097&r1=1080096&r2=1080097&view=diff
==============================================================================
---
cassandra/trunk/drivers/java/test/org/apache/cassandra/cql/JdbcDriverTest.java
(original)
+++
cassandra/trunk/drivers/java/test/org/apache/cassandra/cql/JdbcDriverTest.java
Thu Mar 10 01:40:41 2011
@@ -73,10 +73,10 @@ public class JdbcDriverTest extends Embe
{
Statement stmt = con.createStatement();
-// String selectQ = String.format("SELECT '%s', '%s' FROM Standard1
WHERE KEY='jsmith'", first, last);
-// checkResultSet(stmt.executeQuery(selectQ), "Bytes", 1, first, last);
+ String selectQ = String.format("SELECT '%s', '%s' FROM Standard1 WHERE
KEY='jsmith'", first, last);
+ checkResultSet(stmt.executeQuery(selectQ), "Bytes", 1, first, last);
- String selectQ = "SELECT 1, 2 FROM JdbcInteger WHERE KEY='jsmith'";
+ selectQ = "SELECT 1, 2 FROM JdbcInteger WHERE KEY='jsmith'";
checkResultSet(stmt.executeQuery(selectQ), "Int", 1, "1", "2");
selectQ = "SELECT 3, 4 FROM JdbcInteger WHERE KEY='jsmith'";
@@ -91,8 +91,8 @@ public class JdbcDriverTest extends Embe
selectQ = "SELECT 'first', 'last' FROM JdbcAscii WHERE KEY='jsmith'";
checkResultSet(stmt.executeQuery(selectQ), "String", 1, "first",
"last");
-// selectQ = String.format("SELECT '%s', '%s' FROM JdbcBytes WHERE
KEY='jsmith'", first, last);
-// checkResultSet(stmt.executeQuery(selectQ), "Bytes", 1, first, last);
+ selectQ = String.format("SELECT '%s', '%s' FROM JdbcBytes WHERE
KEY='jsmith'", first, last);
+ checkResultSet(stmt.executeQuery(selectQ), "Bytes", 1, first, last);
selectQ = "SELECT 'first', 'last' FROM JdbcUtf8 WHERE KEY='jsmith'";
checkResultSet(stmt.executeQuery(selectQ), "String", 1, "first",
"last");
@@ -182,11 +182,11 @@ public class JdbcDriverTest extends Embe
{
String[] stmts =
{
-// "TRUNCATE Standard1",
-// "TRUNCATE JcbcAscii", // todo: this one is broken for some
reason.
+ "TRUNCATE Standard1",
+ "TRUNCATE JdbcAscii", // todo: this one is broken for some
reason.
"TRUNCATE JdbcInteger",
"TRUNCATE JdbcLong",
-// "TRUNCATE JdbcBytes",
+ "TRUNCATE JdbcBytes",
"TRUNCATE JdbcUtf8",
};
for (String stmt : stmts)
