Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 88FFE10516 for ; Wed, 15 Jan 2014 21:54:14 +0000 (UTC) Received: (qmail 39448 invoked by uid 500); 15 Jan 2014 21:54:14 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 39431 invoked by uid 500); 15 Jan 2014 21:54:13 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 39412 invoked by uid 99); 15 Jan 2014 21:54:13 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Jan 2014 21:54:13 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D66C2834644; Wed, 15 Jan 2014 21:54:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dbrosius@apache.org To: commits@cassandra.apache.org Message-Id: <2c9171b49dd34db0824c79209293ec58@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: use junit assertions Date: Wed, 15 Jan 2014 21:54:12 +0000 (UTC) Updated Branches: refs/heads/trunk 602dd62e5 -> 8b0906126 use junit assertions Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8b090612 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8b090612 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8b090612 Branch: refs/heads/trunk Commit: 8b09061268a4ea94dd617ee53927d06560bbce8e Parents: 602dd62 Author: Dave Brosius Authored: Wed Jan 15 16:53:47 2014 -0500 Committer: Dave Brosius Committed: Wed Jan 15 16:53:47 2014 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/cache/AutoSavingCacheTest.java | 9 +++++---- .../org/apache/cassandra/config/ColumnDefinitionTest.java | 9 ++++----- 2 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b090612/test/unit/org/apache/cassandra/cache/AutoSavingCacheTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cache/AutoSavingCacheTest.java b/test/unit/org/apache/cassandra/cache/AutoSavingCacheTest.java index ef04746..28afef1 100644 --- a/test/unit/org/apache/cassandra/cache/AutoSavingCacheTest.java +++ b/test/unit/org/apache/cassandra/cache/AutoSavingCacheTest.java @@ -17,6 +17,7 @@ */ package org.apache.cassandra.cache; +import org.junit.Assert; import org.junit.Test; import org.apache.cassandra.SchemaLoader; @@ -43,7 +44,7 @@ public class AutoSavingCacheTest extends SchemaLoader cfs.forceBlockingFlush(); } - assert cfs.getSSTables().size() == 2; + Assert.assertEquals(2, cfs.getSSTables().size()); // preheat key cache for (SSTableReader sstable : cfs.getSSTables()) @@ -55,12 +56,12 @@ public class AutoSavingCacheTest extends SchemaLoader keyCache.submitWrite(keyCache.size()).get(); keyCache.clear(); - assert keyCache.size() == 0; + Assert.assertEquals(0, keyCache.size()); // then load saved keyCache.loadSaved(cfs); - assert keyCache.size() == 2; + Assert.assertEquals(2, keyCache.size()); for (SSTableReader sstable : cfs.getSSTables()) - assert keyCache.get(new KeyCacheKey(cfs.metadata.cfId, sstable.descriptor, ByteBufferUtil.bytes("key1"))) != null; + Assert.assertNotNull(keyCache.get(new KeyCacheKey(cfs.metadata.cfId, sstable.descriptor, ByteBufferUtil.bytes("key1")))); } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b090612/test/unit/org/apache/cassandra/config/ColumnDefinitionTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/config/ColumnDefinitionTest.java b/test/unit/org/apache/cassandra/config/ColumnDefinitionTest.java index 8cc543d..8ae2d5f 100644 --- a/test/unit/org/apache/cassandra/config/ColumnDefinitionTest.java +++ b/test/unit/org/apache/cassandra/config/ColumnDefinitionTest.java @@ -20,11 +20,10 @@ package org.apache.cassandra.config; * */ - +import org.junit.Assert; import org.junit.Test; import org.apache.cassandra.config.CFMetaData; -import org.apache.cassandra.db.ColumnFamilyType; import org.apache.cassandra.db.marshal.*; import org.apache.cassandra.utils.ByteBufferUtil; @@ -47,8 +46,8 @@ public class ColumnDefinitionTest protected void testSerializeDeserialize(CFMetaData cfm, ColumnDefinition cd) throws Exception { ColumnDefinition newCd = ColumnDefinition.fromThrift(cfm, cd.toThrift()); - assert cd != newCd; - assert cd.hashCode() == newCd.hashCode(); - assert cd.equals(newCd); + Assert.assertNotSame(cd, newCd); + Assert.assertEquals(cd.hashCode(), newCd.hashCode()); + Assert.assertEquals(cd, newCd); } }