cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [1/2] git commit: Fix unit test post-merge
Date Tue, 25 Feb 2014 09:50:07 GMT
Repository: cassandra
Updated Branches:
  refs/heads/trunk e975ab8c5 -> 6bc3e7f18


Fix unit test post-merge


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e0857f2d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e0857f2d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e0857f2d

Branch: refs/heads/trunk
Commit: e0857f2dc6d2ad1a35a88a4f33c4d49bd0186727
Parents: 3d93053
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Tue Feb 25 10:49:48 2014 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Tue Feb 25 10:49:48 2014 +0100

----------------------------------------------------------------------
 test/unit/org/apache/cassandra/service/QueryPagerTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e0857f2d/test/unit/org/apache/cassandra/service/QueryPagerTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/service/QueryPagerTest.java b/test/unit/org/apache/cassandra/service/QueryPagerTest.java
index 84f51f4..26295af 100644
--- a/test/unit/org/apache/cassandra/service/QueryPagerTest.java
+++ b/test/unit/org/apache/cassandra/service/QueryPagerTest.java
@@ -169,7 +169,7 @@ public class QueryPagerTest extends SchemaLoader
                 continue;
 
             ByteBuffer expected = names[i++];
-            assertEquals("column " + i + " doesn't match: " + toString(r.cf), expected, c.name());
+            assertEquals("column " + i + " doesn't match: " + toString(r.cf), expected, c.name().toByteBuffer());
         }
     }
 
@@ -337,7 +337,7 @@ public class QueryPagerTest extends SchemaLoader
         String keyspace = "cql_keyspace";
         String table = "table2";
         ColumnFamilyStore cfs = Keyspace.open(keyspace).getColumnFamilyStore(table);
-        CompositeType ct = (CompositeType)cfs.metadata.comparator;
+        CompositeType ct = (CompositeType)cfs.metadata.comparator.asAbstractType();
 
         // Insert rows but with a tombstone as last cell
         for (int i = 0; i < 5; i++)


Mime
View raw message