You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2013/09/01 03:35:00 UTC
[1/2] git commit: replace import junit.framework.* with org.junit.*
(junit3 vs junit4)
Updated Branches:
refs/heads/trunk 38758c3c4 -> 0ebfa3fbb
replace import junit.framework.* with org.junit.* (junit3 vs junit4)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/83a43f12
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/83a43f12
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/83a43f12
Branch: refs/heads/trunk
Commit: 83a43f121485a66c6862baca52e740cc479910e0
Parents: 571659f
Author: Dave Brosius <db...@apache.org>
Authored: Sat Aug 31 21:33:08 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Sat Aug 31 21:33:08 2013 -0400
----------------------------------------------------------------------
.../db/compaction/LongCompactionsTest.java | 2 +-
.../apache/cassandra/utils/LongBitSetTest.java | 2 +-
.../apache/cassandra/cache/ObjectSizeTest.java | 3 +--
.../cassandra/db/ColumnFamilyStoreTest.java | 3 +--
.../org/apache/cassandra/db/CommitLogTest.java | 17 ++++++-------
.../apache/cassandra/db/HintedHandOffTest.java | 2 +-
.../org/apache/cassandra/db/KeyCacheTest.java | 4 ++--
.../org/apache/cassandra/db/KeyspaceTest.java | 13 ++++------
.../org/apache/cassandra/db/NameSortTest.java | 11 ++++-----
.../cassandra/db/RemoveColumnFamilyTest.java | 7 ++----
.../db/RemoveColumnFamilyWithFlush1Test.java | 7 ++----
.../db/RemoveColumnFamilyWithFlush2Test.java | 7 ++----
.../apache/cassandra/db/RemoveColumnTest.java | 7 ++----
.../cassandra/db/RemoveSubColumnTest.java | 6 ++---
.../apache/cassandra/db/RowIterationTest.java | 2 +-
test/unit/org/apache/cassandra/db/RowTest.java | 2 +-
.../compaction/BlacklistingCompactionsTest.java | 4 ++--
.../db/compaction/CompactionsPurgeTest.java | 4 ++--
.../db/compaction/CompactionsTest.java | 2 +-
.../db/compaction/OneCompactionTest.java | 2 +-
.../db/index/PerRowSecondaryIndexTest.java | 4 ++--
.../cassandra/dht/PartitionerTestCase.java | 4 ++--
.../cassandra/io/LazilyCompactedRowTest.java | 17 +++++++------
.../cassandra/io/sstable/IndexHelperTest.java | 2 +-
.../cassandra/io/sstable/IndexSummaryTest.java | 2 +-
.../cassandra/io/sstable/SSTableLoaderTest.java | 2 +-
.../io/sstable/SSTableScannerTest.java | 2 +-
.../apache/cassandra/locator/EC2SnitchTest.java | 2 +-
.../locator/NetworkTopologyStrategyTest.java | 2 +-
.../apache/cassandra/repair/ValidatorTest.java | 5 ++--
.../cassandra/service/QueryPagerTest.java | 3 +--
.../cassandra/service/RowResolverTest.java | 2 +-
.../streaming/StreamingTransferTest.java | 4 ++--
.../cassandra/tools/SSTableExportTest.java | 25 ++++++++++----------
.../cassandra/tools/SSTableImportTest.java | 6 ++---
.../org/apache/cassandra/utils/BitSetTest.java | 4 ++--
.../apache/cassandra/utils/BloomFilterTest.java | 3 +--
.../cassandra/utils/IntervalTreeTest.java | 5 ++--
.../cassandra/utils/StreamingHistogramTest.java | 2 +-
39 files changed, 89 insertions(+), 114 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83a43f12/test/long/org/apache/cassandra/db/compaction/LongCompactionsTest.java
----------------------------------------------------------------------
diff --git a/test/long/org/apache/cassandra/db/compaction/LongCompactionsTest.java b/test/long/org/apache/cassandra/db/compaction/LongCompactionsTest.java
index 48c64e3..21c6457 100644
--- a/test/long/org/apache/cassandra/db/compaction/LongCompactionsTest.java
+++ b/test/long/org/apache/cassandra/db/compaction/LongCompactionsTest.java
@@ -34,7 +34,7 @@ import org.apache.cassandra.io.sstable.SSTableUtils;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
public class LongCompactionsTest extends SchemaLoader
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83a43f12/test/long/org/apache/cassandra/utils/LongBitSetTest.java
----------------------------------------------------------------------
diff --git a/test/long/org/apache/cassandra/utils/LongBitSetTest.java b/test/long/org/apache/cassandra/utils/LongBitSetTest.java
index 5c5f4e3..f20a4f8 100644
--- a/test/long/org/apache/cassandra/utils/LongBitSetTest.java
+++ b/test/long/org/apache/cassandra/utils/LongBitSetTest.java
@@ -20,7 +20,7 @@ package org.apache.cassandra.utils;
import java.util.Random;
import java.util.concurrent.TimeUnit;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.cassandra.utils.obs.OffHeapBitSet;
import org.apache.cassandra.utils.obs.OpenBitSet;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83a43f12/test/unit/org/apache/cassandra/cache/ObjectSizeTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cache/ObjectSizeTest.java b/test/unit/org/apache/cassandra/cache/ObjectSizeTest.java
index 6cafe25..4bb9b20 100644
--- a/test/unit/org/apache/cassandra/cache/ObjectSizeTest.java
+++ b/test/unit/org/apache/cassandra/cache/ObjectSizeTest.java
@@ -24,10 +24,9 @@ package org.apache.cassandra.cache;
import java.nio.ByteBuffer;
import java.util.UUID;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.cassandra.db.ColumnIndex;
-import org.apache.cassandra.db.DeletionInfo;
import org.apache.cassandra.db.DeletionTime;
import org.apache.cassandra.db.RowIndexEntry;
import org.apache.cassandra.utils.ObjectSizes;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83a43f12/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
index 95aeb57..f21b60e 100644
--- a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
+++ b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
@@ -54,11 +54,10 @@ import org.apache.cassandra.thrift.*;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.WrappedRunnable;
-import static junit.framework.Assert.*;
+import static org.junit.Assert.*;
import static org.apache.cassandra.Util.*;
import static org.apache.cassandra.utils.ByteBufferUtil.bytes;
import static org.apache.commons.lang3.ArrayUtils.EMPTY_BYTE_ARRAY;
-import static org.junit.Assert.assertNull;
@RunWith(OrderedJUnit4ClassRunner.class)
public class ColumnFamilyStoreTest extends SchemaLoader
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83a43f12/test/unit/org/apache/cassandra/db/CommitLogTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/CommitLogTest.java b/test/unit/org/apache/cassandra/db/CommitLogTest.java
index 68d7028..8e5f418 100644
--- a/test/unit/org/apache/cassandra/db/CommitLogTest.java
+++ b/test/unit/org/apache/cassandra/db/CommitLogTest.java
@@ -25,8 +25,7 @@ import java.util.UUID;
import java.util.zip.CRC32;
import java.util.zip.Checksum;
-import junit.framework.Assert;
-
+import org.junit.Assert;
import org.junit.Test;
import org.apache.cassandra.SchemaLoader;
@@ -203,12 +202,14 @@ public class CommitLogTest extends SchemaLoader
protected void testRecovery(byte[] logData) throws Exception
{
File logFile = tmpFile();
- OutputStream lout = new FileOutputStream(logFile);
- lout.write(logData);
- //statics make it annoying to test things correctly
- CommitLog.instance.recover(new File[]{ logFile }); //CASSANDRA-1119 / CASSANDRA-1179 throw on failure*/
- }
-
+ try (OutputStream lout = new FileOutputStream(logFile))
+ {
+ lout.write(logData);
+ //statics make it annoying to test things correctly
+ CommitLog.instance.recover(new File[]{ logFile }); //CASSANDRA-1119 / CASSANDRA-1179 throw on failure*/
+ }
+ }
+
@Test
public void testVersions()
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83a43f12/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/HintedHandOffTest.java b/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
index 2f55770..23db4bb 100644
--- a/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
+++ b/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
@@ -39,7 +39,7 @@ import org.apache.cassandra.utils.FBUtilities;
import com.google.common.collect.Iterators;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
import static org.apache.cassandra.cql3.QueryProcessor.processInternal;
public class HintedHandOffTest extends SchemaLoader
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83a43f12/test/unit/org/apache/cassandra/db/KeyCacheTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/KeyCacheTest.java b/test/unit/org/apache/cassandra/db/KeyCacheTest.java
index 10bcedd..fd685b4 100644
--- a/test/unit/org/apache/cassandra/db/KeyCacheTest.java
+++ b/test/unit/org/apache/cassandra/db/KeyCacheTest.java
@@ -33,7 +33,7 @@ import org.apache.cassandra.db.filter.QueryFilter;
import org.apache.cassandra.service.CacheService;
import org.apache.cassandra.utils.ByteBufferUtil;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
public class KeyCacheTest extends SchemaLoader
{
@@ -98,7 +98,7 @@ public class KeyCacheTest extends SchemaLoader
}
@Test
- public void testKeyCache() throws IOException, ExecutionException, InterruptedException
+ public void testKeyCache() throws ExecutionException, InterruptedException
{
CompactionManager.instance.disableAutoCompaction();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83a43f12/test/unit/org/apache/cassandra/db/KeyspaceTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/KeyspaceTest.java b/test/unit/org/apache/cassandra/db/KeyspaceTest.java
index e7a2b69..f1fcb29 100644
--- a/test/unit/org/apache/cassandra/db/KeyspaceTest.java
+++ b/test/unit/org/apache/cassandra/db/KeyspaceTest.java
@@ -24,13 +24,12 @@ import java.text.DecimalFormat;
import java.text.NumberFormat;
import java.util.*;
import java.io.IOException;
-import java.util.concurrent.ExecutionException;
import com.google.common.collect.Iterables;
import org.apache.commons.lang3.StringUtils;
import org.junit.Test;
-import static junit.framework.Assert.*;
+import static org.junit.Assert.*;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.db.compaction.CompactionManager;
@@ -41,8 +40,6 @@ import org.apache.cassandra.db.marshal.IntegerType;
import org.apache.cassandra.utils.WrappedRunnable;
import static org.apache.cassandra.Util.column;
import static org.apache.cassandra.Util.expiringColumn;
-import static org.apache.cassandra.Util.getBytes;
-import static org.junit.Assert.assertEquals;
import org.apache.cassandra.Util;
import org.apache.cassandra.io.sstable.SSTableReader;
import org.apache.cassandra.utils.ByteBufferUtil;
@@ -239,7 +236,7 @@ public class KeyspaceTest extends SchemaLoader
}
@Test
- public void testReversedWithFlushing() throws IOException, ExecutionException, InterruptedException
+ public void testReversedWithFlushing()
{
final Keyspace keyspace = Keyspace.open("Keyspace1");
final ColumnFamilyStore cfs = keyspace.getColumnFamilyStore("StandardLong1");
@@ -268,7 +265,7 @@ public class KeyspaceTest extends SchemaLoader
}
}
- private void validateGetSliceNoMatch(Keyspace keyspace) throws IOException
+ private void validateGetSliceNoMatch(Keyspace keyspace)
{
ColumnFamilyStore cfStore = keyspace.getColumnFamilyStore("Standard2");
ColumnFamily cf;
@@ -450,7 +447,7 @@ public class KeyspaceTest extends SchemaLoader
}
@Test
- public void testLimitSSTables() throws CharacterCodingException, InterruptedException
+ public void testLimitSSTables() throws CharacterCodingException
{
Keyspace keyspace = Keyspace.open("Keyspace1");
ColumnFamilyStore cfStore = keyspace.getColumnFamilyStore("Standard1");
@@ -500,7 +497,7 @@ public class KeyspaceTest extends SchemaLoader
}
@Test
- public void testLimitSSTablesComposites() throws CharacterCodingException, ExecutionException, InterruptedException
+ public void testLimitSSTablesComposites()
{
/*
creates 10 sstables, composite columns like this:
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83a43f12/test/unit/org/apache/cassandra/db/NameSortTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/NameSortTest.java b/test/unit/org/apache/cassandra/db/NameSortTest.java
index 4babab2..1a8905e 100644
--- a/test/unit/org/apache/cassandra/db/NameSortTest.java
+++ b/test/unit/org/apache/cassandra/db/NameSortTest.java
@@ -18,12 +18,11 @@
*/
package org.apache.cassandra.db;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
import static org.apache.cassandra.Util.addMutation;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.Collection;
-import java.util.concurrent.ExecutionException;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
@@ -34,27 +33,27 @@ import org.junit.Test;
public class NameSortTest extends SchemaLoader
{
@Test
- public void testNameSort1() throws IOException, ExecutionException, InterruptedException
+ public void testNameSort1() throws IOException
{
// single key
testNameSort(1);
}
@Test
- public void testNameSort10() throws IOException, ExecutionException, InterruptedException
+ public void testNameSort10() throws IOException
{
// multiple keys, flushing concurrently w/ inserts
testNameSort(10);
}
@Test
- public void testNameSort100() throws IOException, ExecutionException, InterruptedException
+ public void testNameSort100() throws IOException
{
// enough keys to force compaction concurrently w/ inserts
testNameSort(100);
}
- private void testNameSort(int N) throws IOException, ExecutionException, InterruptedException
+ private void testNameSort(int N) throws IOException
{
Keyspace keyspace = Keyspace.open("Keyspace1");
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83a43f12/test/unit/org/apache/cassandra/db/RemoveColumnFamilyTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RemoveColumnFamilyTest.java b/test/unit/org/apache/cassandra/db/RemoveColumnFamilyTest.java
index f937709..e3db863 100644
--- a/test/unit/org/apache/cassandra/db/RemoveColumnFamilyTest.java
+++ b/test/unit/org/apache/cassandra/db/RemoveColumnFamilyTest.java
@@ -18,12 +18,9 @@
*/
package org.apache.cassandra.db;
-import java.io.IOException;
-import java.util.concurrent.ExecutionException;
-
import org.junit.Test;
-import static junit.framework.Assert.assertNull;
+import static org.junit.Assert.assertNull;
import org.apache.cassandra.db.filter.QueryFilter;
import org.apache.cassandra.SchemaLoader;
@@ -34,7 +31,7 @@ import org.apache.cassandra.utils.ByteBufferUtil;
public class RemoveColumnFamilyTest extends SchemaLoader
{
@Test
- public void testRemoveColumnFamily() throws IOException, ExecutionException, InterruptedException
+ public void testRemoveColumnFamily()
{
Keyspace keyspace = Keyspace.open("Keyspace1");
ColumnFamilyStore store = keyspace.getColumnFamilyStore("Standard1");
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83a43f12/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush1Test.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush1Test.java b/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush1Test.java
index 08913c6..7c71dc9 100644
--- a/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush1Test.java
+++ b/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush1Test.java
@@ -18,12 +18,9 @@
*/
package org.apache.cassandra.db;
-import java.io.IOException;
-import java.util.concurrent.ExecutionException;
-
import org.junit.Test;
-import static junit.framework.Assert.assertNull;
+import static org.junit.Assert.assertNull;
import org.apache.cassandra.db.filter.QueryFilter;
import org.apache.cassandra.SchemaLoader;
@@ -34,7 +31,7 @@ import org.apache.cassandra.utils.ByteBufferUtil;
public class RemoveColumnFamilyWithFlush1Test extends SchemaLoader
{
@Test
- public void testRemoveColumnFamilyWithFlush1() throws IOException, ExecutionException, InterruptedException
+ public void testRemoveColumnFamilyWithFlush1()
{
Keyspace keyspace = Keyspace.open("Keyspace1");
ColumnFamilyStore store = keyspace.getColumnFamilyStore("Standard1");
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83a43f12/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush2Test.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush2Test.java b/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush2Test.java
index b7fc640..f6fae5a 100644
--- a/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush2Test.java
+++ b/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush2Test.java
@@ -18,12 +18,9 @@
*/
package org.apache.cassandra.db;
-import java.io.IOException;
-import java.util.concurrent.ExecutionException;
-
import org.junit.Test;
-import static junit.framework.Assert.assertNull;
+import static org.junit.Assert.assertNull;
import org.apache.cassandra.db.filter.QueryFilter;
import org.apache.cassandra.SchemaLoader;
@@ -34,7 +31,7 @@ import org.apache.cassandra.utils.ByteBufferUtil;
public class RemoveColumnFamilyWithFlush2Test extends SchemaLoader
{
@Test
- public void testRemoveColumnFamilyWithFlush2() throws IOException, ExecutionException, InterruptedException
+ public void testRemoveColumnFamilyWithFlush2()
{
Keyspace keyspace = Keyspace.open("Keyspace1");
ColumnFamilyStore store = keyspace.getColumnFamilyStore("Standard1");
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83a43f12/test/unit/org/apache/cassandra/db/RemoveColumnTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RemoveColumnTest.java b/test/unit/org/apache/cassandra/db/RemoveColumnTest.java
index 0544da7..dfbf513 100644
--- a/test/unit/org/apache/cassandra/db/RemoveColumnTest.java
+++ b/test/unit/org/apache/cassandra/db/RemoveColumnTest.java
@@ -18,12 +18,9 @@
*/
package org.apache.cassandra.db;
-import java.io.IOException;
-import java.util.concurrent.ExecutionException;
-
import org.junit.Test;
-import static junit.framework.Assert.assertNull;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import org.apache.cassandra.db.filter.QueryFilter;
@@ -36,7 +33,7 @@ import org.apache.cassandra.utils.ByteBufferUtil;
public class RemoveColumnTest extends SchemaLoader
{
@Test
- public void testRemoveColumn() throws IOException, ExecutionException, InterruptedException
+ public void testRemoveColumn()
{
Keyspace keyspace = Keyspace.open("Keyspace1");
ColumnFamilyStore store = keyspace.getColumnFamilyStore("Standard1");
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83a43f12/test/unit/org/apache/cassandra/db/RemoveSubColumnTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RemoveSubColumnTest.java b/test/unit/org/apache/cassandra/db/RemoveSubColumnTest.java
index add7ccd..6d2be75 100644
--- a/test/unit/org/apache/cassandra/db/RemoveSubColumnTest.java
+++ b/test/unit/org/apache/cassandra/db/RemoveSubColumnTest.java
@@ -19,13 +19,11 @@
package org.apache.cassandra.db;
import java.nio.ByteBuffer;
-import java.io.IOException;
-import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import org.junit.Test;
-import static junit.framework.Assert.assertNull;
+import static org.junit.Assert.assertNull;
import org.apache.cassandra.db.filter.QueryFilter;
import org.apache.cassandra.db.marshal.CompositeType;
import static org.apache.cassandra.Util.getBytes;
@@ -39,7 +37,7 @@ import com.google.common.util.concurrent.Uninterruptibles;
public class RemoveSubColumnTest extends SchemaLoader
{
@Test
- public void testRemoveSubColumn() throws IOException, ExecutionException, InterruptedException
+ public void testRemoveSubColumn()
{
Keyspace keyspace = Keyspace.open("Keyspace1");
ColumnFamilyStore store = keyspace.getColumnFamilyStore("Super1");
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83a43f12/test/unit/org/apache/cassandra/db/RowIterationTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RowIterationTest.java b/test/unit/org/apache/cassandra/db/RowIterationTest.java
index c083b19..6353a8c 100644
--- a/test/unit/org/apache/cassandra/db/RowIterationTest.java
+++ b/test/unit/org/apache/cassandra/db/RowIterationTest.java
@@ -32,7 +32,7 @@ import org.junit.Test;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.db.marshal.CompositeType;
import org.apache.cassandra.utils.FBUtilities;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
import org.apache.cassandra.utils.ByteBufferUtil;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83a43f12/test/unit/org/apache/cassandra/db/RowTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RowTest.java b/test/unit/org/apache/cassandra/db/RowTest.java
index e45977a..2571fa5 100644
--- a/test/unit/org/apache/cassandra/db/RowTest.java
+++ b/test/unit/org/apache/cassandra/db/RowTest.java
@@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.cassandra.SchemaLoader;
import org.junit.Test;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
import static org.apache.cassandra.Util.column;
import org.apache.cassandra.utils.ByteBufferUtil;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83a43f12/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java b/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java
index 0b4c78d..e392a4b 100644
--- a/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java
@@ -39,8 +39,8 @@ import org.apache.cassandra.io.sstable.SSTableReader;
import org.apache.cassandra.io.util.FileUtils;
import org.apache.cassandra.utils.ByteBufferUtil;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
public class BlacklistingCompactionsTest extends SchemaLoader
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83a43f12/test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java b/test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java
index 54c9e4f..48c0b3c 100644
--- a/test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java
@@ -22,7 +22,7 @@ import java.io.IOException;
import java.util.Collection;
import java.util.concurrent.ExecutionException;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.junit.Test;
@@ -37,7 +37,7 @@ import org.apache.cassandra.db.filter.QueryFilter;
import org.apache.cassandra.io.sstable.SSTableReader;
import org.apache.cassandra.Util;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
import static org.apache.cassandra.db.KeyspaceTest.assertColumns;
import org.apache.cassandra.utils.ByteBufferUtil;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83a43f12/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java b/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
index bc89f4f..a338290 100644
--- a/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
@@ -49,7 +49,7 @@ import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.Pair;
-import static junit.framework.Assert.*;
+import static org.junit.Assert.*;
@RunWith(OrderedJUnit4ClassRunner.class)
public class CompactionsTest extends SchemaLoader
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83a43f12/test/unit/org/apache/cassandra/db/compaction/OneCompactionTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/compaction/OneCompactionTest.java b/test/unit/org/apache/cassandra/db/compaction/OneCompactionTest.java
index 0cc669d..444e30c 100644
--- a/test/unit/org/apache/cassandra/db/compaction/OneCompactionTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/OneCompactionTest.java
@@ -27,7 +27,7 @@ import org.apache.cassandra.Util;
import org.junit.Test;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
import org.apache.cassandra.db.Keyspace;
import org.apache.cassandra.db.DecoratedKey;
import org.apache.cassandra.db.RowMutation;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83a43f12/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java b/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java
index 6ea1554..3e9d3a1 100644
--- a/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java
+++ b/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java
@@ -33,8 +33,8 @@ import org.apache.cassandra.db.filter.QueryFilter;
import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.utils.ByteBufferUtil;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
public class PerRowSecondaryIndexTest extends SchemaLoader
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83a43f12/test/unit/org/apache/cassandra/dht/PartitionerTestCase.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/dht/PartitionerTestCase.java b/test/unit/org/apache/cassandra/dht/PartitionerTestCase.java
index 79b0d78..5d5e65c 100644
--- a/test/unit/org/apache/cassandra/dht/PartitionerTestCase.java
+++ b/test/unit/org/apache/cassandra/dht/PartitionerTestCase.java
@@ -24,8 +24,8 @@ import java.util.*;
import org.junit.Before;
import org.junit.Test;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.fail;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
public abstract class PartitionerTestCase<T extends Token>
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83a43f12/test/unit/org/apache/cassandra/io/LazilyCompactedRowTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/io/LazilyCompactedRowTest.java b/test/unit/org/apache/cassandra/io/LazilyCompactedRowTest.java
index f9a1467..0cd9622 100644
--- a/test/unit/org/apache/cassandra/io/LazilyCompactedRowTest.java
+++ b/test/unit/org/apache/cassandra/io/LazilyCompactedRowTest.java
@@ -25,7 +25,6 @@ import java.security.NoSuchAlgorithmException;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
-import java.util.concurrent.ExecutionException;
import com.google.common.base.Objects;
import org.junit.Test;
@@ -43,7 +42,7 @@ import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.CloseableIterator;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
public class LazilyCompactedRowTest extends SchemaLoader
@@ -129,7 +128,7 @@ public class LazilyCompactedRowTest extends SchemaLoader
}
}
- private void assertDigest(ColumnFamilyStore cfs, int gcBefore) throws IOException, NoSuchAlgorithmException
+ private void assertDigest(ColumnFamilyStore cfs, int gcBefore) throws NoSuchAlgorithmException
{
AbstractCompactionStrategy strategy = cfs.getCompactionStrategy();
Collection<SSTableReader> sstables = cfs.getSSTables();
@@ -159,7 +158,7 @@ public class LazilyCompactedRowTest extends SchemaLoader
}
@Test
- public void testOneRow() throws IOException, ExecutionException, InterruptedException, NoSuchAlgorithmException
+ public void testOneRow() throws IOException, NoSuchAlgorithmException
{
CompactionManager.instance.disableAutoCompaction();
@@ -177,7 +176,7 @@ public class LazilyCompactedRowTest extends SchemaLoader
}
@Test
- public void testOneRowTwoColumns() throws IOException, ExecutionException, InterruptedException, NoSuchAlgorithmException
+ public void testOneRowTwoColumns() throws IOException, NoSuchAlgorithmException
{
CompactionManager.instance.disableAutoCompaction();
@@ -196,7 +195,7 @@ public class LazilyCompactedRowTest extends SchemaLoader
}
@Test
- public void testOneRowManyColumns() throws IOException, ExecutionException, InterruptedException, NoSuchAlgorithmException
+ public void testOneRowManyColumns() throws IOException, NoSuchAlgorithmException
{
CompactionManager.instance.disableAutoCompaction();
@@ -218,7 +217,7 @@ public class LazilyCompactedRowTest extends SchemaLoader
}
@Test
- public void testTwoRows() throws IOException, ExecutionException, InterruptedException, NoSuchAlgorithmException
+ public void testTwoRows() throws IOException, NoSuchAlgorithmException
{
CompactionManager.instance.disableAutoCompaction();
@@ -239,7 +238,7 @@ public class LazilyCompactedRowTest extends SchemaLoader
}
@Test
- public void testTwoRowsTwoColumns() throws IOException, ExecutionException, InterruptedException, NoSuchAlgorithmException
+ public void testTwoRowsTwoColumns() throws IOException, NoSuchAlgorithmException
{
CompactionManager.instance.disableAutoCompaction();
@@ -261,7 +260,7 @@ public class LazilyCompactedRowTest extends SchemaLoader
}
@Test
- public void testManyRows() throws IOException, ExecutionException, InterruptedException, NoSuchAlgorithmException
+ public void testManyRows() throws IOException, NoSuchAlgorithmException
{
CompactionManager.instance.disableAutoCompaction();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83a43f12/test/unit/org/apache/cassandra/io/sstable/IndexHelperTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/io/sstable/IndexHelperTest.java b/test/unit/org/apache/cassandra/io/sstable/IndexHelperTest.java
index eb297da..53a79f8 100644
--- a/test/unit/org/apache/cassandra/io/sstable/IndexHelperTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/IndexHelperTest.java
@@ -21,7 +21,7 @@ package org.apache.cassandra.io.sstable;
import java.util.ArrayList;
import java.util.List;
-import static junit.framework.Assert.*;
+import static org.junit.Assert.*;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83a43f12/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java b/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
index 22e4a4d..cdb7242 100644
--- a/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
@@ -31,7 +31,7 @@ import java.util.Collections;
import java.util.List;
import java.util.UUID;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.db.DecoratedKey;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83a43f12/test/unit/org/apache/cassandra/io/sstable/SSTableLoaderTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableLoaderTest.java b/test/unit/org/apache/cassandra/io/sstable/SSTableLoaderTest.java
index 236ee2d..45a69e2 100644
--- a/test/unit/org/apache/cassandra/io/sstable/SSTableLoaderTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/SSTableLoaderTest.java
@@ -38,7 +38,7 @@ import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.OutputHandler;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
public class SSTableLoaderTest extends SchemaLoader
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83a43f12/test/unit/org/apache/cassandra/io/sstable/SSTableScannerTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableScannerTest.java b/test/unit/org/apache/cassandra/io/sstable/SSTableScannerTest.java
index 3787b3e..c17fb71 100644
--- a/test/unit/org/apache/cassandra/io/sstable/SSTableScannerTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/SSTableScannerTest.java
@@ -34,7 +34,7 @@ import org.apache.cassandra.dht.Range;
import org.apache.cassandra.dht.Token;
import org.apache.cassandra.utils.ByteBufferUtil;
-import static junit.framework.Assert.*;
+import static org.junit.Assert.*;
public class SSTableScannerTest extends SchemaLoader
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83a43f12/test/unit/org/apache/cassandra/locator/EC2SnitchTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/locator/EC2SnitchTest.java b/test/unit/org/apache/cassandra/locator/EC2SnitchTest.java
index 456d3ac..fe48ce5 100644
--- a/test/unit/org/apache/cassandra/locator/EC2SnitchTest.java
+++ b/test/unit/org/apache/cassandra/locator/EC2SnitchTest.java
@@ -28,7 +28,7 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.Map;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.exceptions.ConfigurationException;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83a43f12/test/unit/org/apache/cassandra/locator/NetworkTopologyStrategyTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/locator/NetworkTopologyStrategyTest.java b/test/unit/org/apache/cassandra/locator/NetworkTopologyStrategyTest.java
index 82bd42c..d4d5a85 100644
--- a/test/unit/org/apache/cassandra/locator/NetworkTopologyStrategyTest.java
+++ b/test/unit/org/apache/cassandra/locator/NetworkTopologyStrategyTest.java
@@ -29,7 +29,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83a43f12/test/unit/org/apache/cassandra/repair/ValidatorTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/repair/ValidatorTest.java b/test/unit/org/apache/cassandra/repair/ValidatorTest.java
index 622f67d..a6be1b1 100644
--- a/test/unit/org/apache/cassandra/repair/ValidatorTest.java
+++ b/test/unit/org/apache/cassandra/repair/ValidatorTest.java
@@ -41,11 +41,10 @@ import org.apache.cassandra.repair.messages.RepairMessage;
import org.apache.cassandra.repair.messages.ValidationComplete;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.ByteBufferUtil;
-import org.apache.cassandra.utils.MerkleTree;
import org.apache.cassandra.utils.SimpleCondition;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertNull;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83a43f12/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 48893d4..3fc2ac2 100644
--- a/test/unit/org/apache/cassandra/service/QueryPagerTest.java
+++ b/test/unit/org/apache/cassandra/service/QueryPagerTest.java
@@ -35,8 +35,7 @@ import org.apache.cassandra.dht.*;
import org.apache.cassandra.service.pager.*;
import org.apache.cassandra.utils.ByteBufferUtil;
-import static junit.framework.Assert.*;
-import static org.apache.cassandra.Util.bounds;
+import static org.junit.Assert.*;
import static org.apache.cassandra.Util.range;
import static org.apache.cassandra.utils.ByteBufferUtil.bytes;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83a43f12/test/unit/org/apache/cassandra/service/RowResolverTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/service/RowResolverTest.java b/test/unit/org/apache/cassandra/service/RowResolverTest.java
index 72cafd1..c2d57c6 100644
--- a/test/unit/org/apache/cassandra/service/RowResolverTest.java
+++ b/test/unit/org/apache/cassandra/service/RowResolverTest.java
@@ -30,7 +30,7 @@ import org.apache.cassandra.db.ColumnFamily;
import org.apache.cassandra.db.DeletionInfo;
import org.apache.cassandra.db.TreeMapBackedSortedColumns;
-import static junit.framework.Assert.*;
+import static org.junit.Assert.*;
import static org.apache.cassandra.Util.column;
import static org.apache.cassandra.db.KeyspaceTest.*;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83a43f12/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java b/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
index 0fceb17..7787314 100644
--- a/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
+++ b/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
@@ -53,8 +53,8 @@ import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.CounterId;
import org.apache.cassandra.utils.FBUtilities;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.fail;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
import static org.apache.cassandra.Util.column;
@RunWith(OrderedJUnit4ClassRunner.class)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83a43f12/test/unit/org/apache/cassandra/tools/SSTableExportTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/tools/SSTableExportTest.java b/test/unit/org/apache/cassandra/tools/SSTableExportTest.java
index 5528d4c..54c65f4 100644
--- a/test/unit/org/apache/cassandra/tools/SSTableExportTest.java
+++ b/test/unit/org/apache/cassandra/tools/SSTableExportTest.java
@@ -18,8 +18,8 @@
*/
package org.apache.cassandra.tools;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import static org.apache.cassandra.io.sstable.SSTableUtils.tempSSTableFile;
import static org.apache.cassandra.utils.ByteBufferUtil.bytesToHex;
import static org.apache.cassandra.utils.ByteBufferUtil.hexToBytes;
@@ -30,9 +30,6 @@ import java.io.FileReader;
import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
@@ -110,13 +107,15 @@ public class SSTableExportTest extends SchemaLoader
SSTableExport.enumeratekeys(Descriptor.fromFilename(writer.getFilename()), new PrintStream(temp.getPath()));
- FileReader file = new FileReader(temp);
- char[] buf = new char[(int) temp.length()];
- file.read(buf);
- String output = new String(buf);
-
- String sep = System.getProperty("line.separator");
- assert output.equals(asHex("rowA") + sep + asHex("rowB") + sep) : output;
+ try (FileReader file = new FileReader(temp))
+ {
+ char[] buf = new char[(int) temp.length()];
+ file.read(buf);
+ String output = new String(buf);
+
+ String sep = System.getProperty("line.separator");
+ assert output.equals(asHex("rowA") + sep + asHex("rowB") + sep) : output;
+ }
}
@Test
@@ -175,7 +174,7 @@ public class SSTableExportTest extends SchemaLoader
}
@Test
- public void testRoundTripStandardCf() throws IOException, ParseException
+ public void testRoundTripStandardCf() throws IOException
{
File tempSS = tempSSTableFile("Keyspace1", "Standard1");
ColumnFamily cfamily = TreeMapBackedSortedColumns.factory.create("Keyspace1", "Standard1");
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83a43f12/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/tools/SSTableImportTest.java b/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
index c98ba48..ae2ade2 100644
--- a/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
+++ b/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.cassandra.tools;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
import static org.apache.cassandra.io.sstable.SSTableUtils.tempSSTableFile;
import static org.apache.cassandra.utils.ByteBufferUtil.hexToBytes;
@@ -26,7 +26,6 @@ import java.io.File;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
-import java.util.Collections;
import org.junit.Test;
@@ -39,7 +38,6 @@ import org.apache.cassandra.db.marshal.CompositeType;
import org.apache.cassandra.io.sstable.Descriptor;
import org.apache.cassandra.io.sstable.SSTableReader;
import org.apache.cassandra.utils.ByteBufferUtil;
-import org.json.simple.parser.ParseException;
public class SSTableImportTest extends SchemaLoader
{
@@ -100,7 +98,7 @@ public class SSTableImportTest extends SchemaLoader
}
@Test
- public void testImportSuperCf() throws IOException, ParseException, URISyntaxException
+ public void testImportSuperCf() throws IOException, URISyntaxException
{
String jsonUrl = resourcePath("SuperCF.json");
File tempSS = tempSSTableFile("Keyspace1", "Super4");
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83a43f12/test/unit/org/apache/cassandra/utils/BitSetTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/utils/BitSetTest.java b/test/unit/org/apache/cassandra/utils/BitSetTest.java
index f0959e8..e9f9211 100644
--- a/test/unit/org/apache/cassandra/utils/BitSetTest.java
+++ b/test/unit/org/apache/cassandra/utils/BitSetTest.java
@@ -27,14 +27,14 @@ import java.util.Random;
import com.google.common.collect.Lists;
import org.junit.Test;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.cassandra.io.util.DataOutputBuffer;
import org.apache.cassandra.utils.KeyGenerator.WordGenerator;
import org.apache.cassandra.utils.obs.IBitSet;
import org.apache.cassandra.utils.obs.OffHeapBitSet;
import org.apache.cassandra.utils.obs.OpenBitSet;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
public class BitSetTest
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83a43f12/test/unit/org/apache/cassandra/utils/BloomFilterTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/utils/BloomFilterTest.java b/test/unit/org/apache/cassandra/utils/BloomFilterTest.java
index feff193..f0dc602 100644
--- a/test/unit/org/apache/cassandra/utils/BloomFilterTest.java
+++ b/test/unit/org/apache/cassandra/utils/BloomFilterTest.java
@@ -30,8 +30,7 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-import junit.framework.Assert;
-
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83a43f12/test/unit/org/apache/cassandra/utils/IntervalTreeTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/utils/IntervalTreeTest.java b/test/unit/org/apache/cassandra/utils/IntervalTreeTest.java
index 974befa..8113703 100644
--- a/test/unit/org/apache/cassandra/utils/IntervalTreeTest.java
+++ b/test/unit/org/apache/cassandra/utils/IntervalTreeTest.java
@@ -21,7 +21,6 @@ package org.apache.cassandra.utils;
*/
-import junit.framework.TestCase;
import org.junit.Test;
import java.util.ArrayList;
@@ -29,11 +28,13 @@ import java.util.Collections;
import java.util.List;
import java.io.*;
+import static org.junit.Assert.*;
+
import org.apache.cassandra.db.TypeSizes;
import org.apache.cassandra.io.ISerializer;
import org.apache.cassandra.io.IVersionedSerializer;
-public class IntervalTreeTest extends TestCase
+public class IntervalTreeTest
{
@Test
public void testSearch() throws Exception
http://git-wip-us.apache.org/repos/asf/cassandra/blob/83a43f12/test/unit/org/apache/cassandra/utils/StreamingHistogramTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/utils/StreamingHistogramTest.java b/test/unit/org/apache/cassandra/utils/StreamingHistogramTest.java
index 190dad9..8f75935 100644
--- a/test/unit/org/apache/cassandra/utils/StreamingHistogramTest.java
+++ b/test/unit/org/apache/cassandra/utils/StreamingHistogramTest.java
@@ -25,7 +25,7 @@ import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.util.*;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
public class StreamingHistogramTest
{
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by db...@apache.org.
Merge branch 'cassandra-2.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/0ebfa3fb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0ebfa3fb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0ebfa3fb
Branch: refs/heads/trunk
Commit: 0ebfa3fbbe8cda0e2b91086466e29771303c9020
Parents: 38758c3 83a43f1
Author: Dave Brosius <db...@apache.org>
Authored: Sat Aug 31 21:33:57 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Sat Aug 31 21:33:57 2013 -0400
----------------------------------------------------------------------
.../db/compaction/LongCompactionsTest.java | 2 +-
.../apache/cassandra/utils/LongBitSetTest.java | 2 +-
.../apache/cassandra/cache/ObjectSizeTest.java | 3 +--
.../cassandra/db/ColumnFamilyStoreTest.java | 3 +--
.../org/apache/cassandra/db/CommitLogTest.java | 17 ++++++-------
.../apache/cassandra/db/HintedHandOffTest.java | 2 +-
.../org/apache/cassandra/db/KeyCacheTest.java | 4 ++--
.../org/apache/cassandra/db/KeyspaceTest.java | 13 ++++------
.../org/apache/cassandra/db/NameSortTest.java | 11 ++++-----
.../cassandra/db/RemoveColumnFamilyTest.java | 7 ++----
.../db/RemoveColumnFamilyWithFlush1Test.java | 7 ++----
.../db/RemoveColumnFamilyWithFlush2Test.java | 7 ++----
.../apache/cassandra/db/RemoveColumnTest.java | 7 ++----
.../cassandra/db/RemoveSubColumnTest.java | 6 ++---
.../apache/cassandra/db/RowIterationTest.java | 2 +-
test/unit/org/apache/cassandra/db/RowTest.java | 2 +-
.../compaction/BlacklistingCompactionsTest.java | 4 ++--
.../db/compaction/CompactionsPurgeTest.java | 4 ++--
.../db/compaction/CompactionsTest.java | 2 +-
.../db/compaction/OneCompactionTest.java | 2 +-
.../db/index/PerRowSecondaryIndexTest.java | 4 ++--
.../cassandra/dht/PartitionerTestCase.java | 4 ++--
.../cassandra/io/LazilyCompactedRowTest.java | 17 +++++++------
.../cassandra/io/sstable/IndexHelperTest.java | 2 +-
.../cassandra/io/sstable/IndexSummaryTest.java | 2 +-
.../cassandra/io/sstable/SSTableLoaderTest.java | 2 +-
.../io/sstable/SSTableScannerTest.java | 2 +-
.../apache/cassandra/locator/EC2SnitchTest.java | 2 +-
.../locator/NetworkTopologyStrategyTest.java | 2 +-
.../apache/cassandra/repair/ValidatorTest.java | 5 ++--
.../cassandra/service/QueryPagerTest.java | 3 +--
.../cassandra/service/RowResolverTest.java | 2 +-
.../streaming/StreamingTransferTest.java | 4 ++--
.../cassandra/tools/SSTableExportTest.java | 25 ++++++++++----------
.../cassandra/tools/SSTableImportTest.java | 6 ++---
.../org/apache/cassandra/utils/BitSetTest.java | 4 ++--
.../apache/cassandra/utils/BloomFilterTest.java | 3 +--
.../cassandra/utils/IntervalTreeTest.java | 5 ++--
.../cassandra/utils/StreamingHistogramTest.java | 2 +-
39 files changed, 89 insertions(+), 114 deletions(-)
----------------------------------------------------------------------