You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2014/01/29 11:18:17 UTC
git commit: Fix test.
Updated Branches:
refs/heads/trunk 025b84efd -> 1a24611ee
Fix test.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1a24611e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1a24611e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1a24611e
Branch: refs/heads/trunk
Commit: 1a24611ee378e9afaf990230f0eeef038a10f186
Parents: 025b84e
Author: Marcus Eriksson <ma...@apache.org>
Authored: Wed Jan 29 11:17:54 2014 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Wed Jan 29 11:17:54 2014 +0100
----------------------------------------------------------------------
.../cassandra/service/pager/AbstractQueryPagerTest.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a24611e/test/unit/org/apache/cassandra/service/pager/AbstractQueryPagerTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/service/pager/AbstractQueryPagerTest.java b/test/unit/org/apache/cassandra/service/pager/AbstractQueryPagerTest.java
index 5467ec0..9df9f6d 100644
--- a/test/unit/org/apache/cassandra/service/pager/AbstractQueryPagerTest.java
+++ b/test/unit/org/apache/cassandra/service/pager/AbstractQueryPagerTest.java
@@ -26,6 +26,7 @@ import static org.junit.Assert.*;
import org.apache.cassandra.Util;
import org.apache.cassandra.config.*;
import org.apache.cassandra.db.*;
+import org.apache.cassandra.db.composites.CellNames;
import org.apache.cassandra.db.filter.ColumnCounter;
import org.apache.cassandra.db.marshal.Int32Type;
import org.apache.cassandra.utils.ByteBufferUtil;
@@ -108,8 +109,8 @@ public class AbstractQueryPagerTest
assertEquals(values.length, row.cf.getColumnCount());
int i = 0;
- for (Column c : row.cf)
- assertEquals(values[i++], i(c.name()));
+ for (Cell c : row.cf)
+ assertEquals(values[i++], i(c.name().toByteBuffer()));
}
private Row createRow(String name, int nbCol)
@@ -121,13 +122,13 @@ public class AbstractQueryPagerTest
{
ColumnFamily cf = TreeMapBackedSortedColumns.factory.create(createMetadata());
for (int i = 0; i < nbCol; i++)
- cf.addColumn(bb(i), bb(i), 0);
+ cf.addColumn(CellNames.simpleDense(bb(i)), bb(i), 0);
return cf;
}
private CFMetaData createMetadata()
{
- return new CFMetaData("ks", "cf", ColumnFamilyType.Standard, Int32Type.instance);
+ return new CFMetaData("ks", "cf", ColumnFamilyType.Standard, CellNames.fromAbstractType(Int32Type.instance, false));
}
private static ByteBuffer bb(int i)