You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by bl...@apache.org on 2015/08/28 15:44:37 UTC
[1/2] cassandra git commit: Ninja Fix ColumnTest following up
CASSANDRA-10045
Repository: cassandra
Updated Branches:
refs/heads/trunk 20e101849 -> bf85616f6
Ninja Fix ColumnTest following up CASSANDRA-10045
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8360f4bf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8360f4bf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8360f4bf
Branch: refs/heads/trunk
Commit: 8360f4bf148344960dfd156f6217f7657f070365
Parents: 07dfc20
Author: blerer <be...@datastax.com>
Authored: Fri Aug 28 15:39:54 2015 +0200
Committer: blerer <be...@datastax.com>
Committed: Fri Aug 28 15:41:58 2015 +0200
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/ColumnsTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8360f4bf/test/unit/org/apache/cassandra/db/ColumnsTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/ColumnsTest.java b/test/unit/org/apache/cassandra/db/ColumnsTest.java
index c080948..4962cb2 100644
--- a/test/unit/org/apache/cassandra/db/ColumnsTest.java
+++ b/test/unit/org/apache/cassandra/db/ColumnsTest.java
@@ -124,7 +124,7 @@ public class ColumnsTest
}
@Test
- public void testContainsColumnsWithLargeNumberOfColumns()
+ public void testContainsAllWithLargeNumberOfColumns()
{
List<String> names = new ArrayList<>();
for (int i = 0; i < 50; i++)
@@ -140,7 +140,7 @@ public class ColumnsTest
Columns subset = Columns.from(new HashSet<>(defs));
- org.junit.Assert.assertTrue(columns.contains(subset));
+ Assert.assertTrue(columns.containsAll(subset));
}
private void testSerializeSubset(ColumnsCheck input) throws IOException
[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by bl...@apache.org.
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bf85616f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bf85616f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bf85616f
Branch: refs/heads/trunk
Commit: bf85616f663f1c341cdfcddc8d0f64ee43d05f96
Parents: 20e1018 8360f4b
Author: blerer <be...@datastax.com>
Authored: Fri Aug 28 15:43:42 2015 +0200
Committer: blerer <be...@datastax.com>
Committed: Fri Aug 28 15:43:59 2015 +0200
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/ColumnsTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------