cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbros...@apache.org
Subject git commit: minor cleanups in unit tests
Date Mon, 17 Feb 2014 04:10:38 GMT
Repository: cassandra
Updated Branches:
  refs/heads/trunk 6cf15b2b4 -> 9639f9592


minor cleanups in unit tests


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

Branch: refs/heads/trunk
Commit: 9639f95923233a1c8647da688d9f0fa4a15b12a7
Parents: 6cf15b2
Author: Dave Brosius <dbrosius@mebigfatguy.com>
Authored: Sun Feb 16 23:09:57 2014 -0500
Committer: Dave Brosius <dbrosius@mebigfatguy.com>
Committed: Sun Feb 16 23:09:57 2014 -0500

----------------------------------------------------------------------
 .../cassandra/AbstractSerializationsTester.java |  1 -
 .../org/apache/cassandra/EmbeddedServer.java    |  3 +-
 test/unit/org/apache/cassandra/Util.java        |  9 +++---
 test/unit/org/apache/cassandra/cli/CliTest.java |  1 -
 .../DebuggableThreadPoolExecutorTest.java       |  2 +-
 .../org/apache/cassandra/config/DefsTest.java   | 30 ++++++++++----------
 .../org/apache/cassandra/db/CleanupTest.java    |  7 ++---
 .../cassandra/db/CollationControllerTest.java   |  5 ----
 .../cassandra/db/ColumnFamilyStoreTest.java     | 12 ++++----
 .../apache/cassandra/db/ColumnFamilyTest.java   |  2 +-
 .../apache/cassandra/db/CounterCellTest.java    |  7 ++---
 .../apache/cassandra/db/DirectoriesTest.java    |  2 +-
 .../apache/cassandra/db/KeyCollisionTest.java   |  5 ++--
 .../org/apache/cassandra/db/KeyspaceTest.java   |  1 -
 .../org/apache/cassandra/db/MultitableTest.java |  6 +---
 .../cassandra/db/RangeTombstoneListTest.java    |  2 --
 .../apache/cassandra/db/ReadMessageTest.java    |  2 +-
 .../cassandra/db/RecoveryManager2Test.java      |  3 +-
 .../cassandra/db/RecoveryManager3Test.java      |  3 +-
 .../cassandra/db/RecoveryManagerTest.java       |  5 ++--
 .../db/RecoveryManagerTruncateTest.java         |  3 +-
 .../org/apache/cassandra/db/RowCacheTest.java   |  2 --
 .../apache/cassandra/db/RowIterationTest.java   |  9 ++----
 .../unit/org/apache/cassandra/db/ScrubTest.java | 13 ++++-----
 .../apache/cassandra/db/SerializationsTest.java |  2 --
 .../org/apache/cassandra/db/TimeSortTest.java   |  7 ++---
 .../db/compaction/CompactionsPurgeTest.java     | 17 ++++++-----
 .../db/compaction/CompactionsTest.java          | 10 +++----
 .../LeveledCompactionStrategyTest.java          |  3 +-
 .../db/compaction/OneCompactionTest.java        |  7 ++---
 .../cassandra/db/compaction/TTLExpiryTest.java  |  7 ++---
 .../cassandra/db/marshal/TimeUUIDTypeTest.java  |  7 ++---
 .../cassandra/io/sstable/IndexSummaryTest.java  |  4 +--
 .../cassandra/io/sstable/LegacySSTableTest.java |  3 +-
 .../io/sstable/SSTableMetadataTest.java         |  2 +-
 .../cassandra/io/sstable/SSTableReaderTest.java | 15 ++++------
 .../cassandra/io/sstable/SSTableUtils.java      |  4 +--
 .../locator/OldNetworkTopologyStrategyTest.java |  2 +-
 .../cassandra/locator/SimpleStrategyTest.java   | 12 ++++----
 .../cassandra/repair/DifferencerTest.java       |  2 --
 .../cassandra/serializers/ClientUtilsTest.java  |  3 +-
 .../service/EmbeddedCassandraServiceTest.java   |  3 +-
 .../cassandra/service/InitClientTest.java       |  4 +--
 .../service/LeaveAndBootstrapTest.java          |  7 ++---
 .../org/apache/cassandra/service/MoveTest.java  |  7 ++---
 .../apache/cassandra/service/RelocateTest.java  |  5 ++--
 .../apache/cassandra/service/RemoveTest.java    |  2 +-
 .../service/StorageServiceClientTest.java       |  3 +-
 .../service/StorageServiceServerTest.java       |  2 +-
 .../apache/cassandra/utils/CounterIdTest.java   |  4 +--
 .../apache/cassandra/utils/MerkleTreeTest.java  |  1 -
 .../org/apache/cassandra/utils/UUIDTests.java   | 19 ++++---------
 52 files changed, 114 insertions(+), 185 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/test/unit/org/apache/cassandra/AbstractSerializationsTester.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/AbstractSerializationsTester.java b/test/unit/org/apache/cassandra/AbstractSerializationsTester.java
index 311d21b..e9a6513 100644
--- a/test/unit/org/apache/cassandra/AbstractSerializationsTester.java
+++ b/test/unit/org/apache/cassandra/AbstractSerializationsTester.java
@@ -21,7 +21,6 @@ package org.apache.cassandra;
 
 import com.google.common.io.ByteArrayDataOutput;
 import com.google.common.io.ByteStreams;
-import org.apache.cassandra.db.TypeSizes;
 import org.apache.cassandra.io.IVersionedSerializer;
 import org.apache.cassandra.net.MessagingService;
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/test/unit/org/apache/cassandra/EmbeddedServer.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/EmbeddedServer.java b/test/unit/org/apache/cassandra/EmbeddedServer.java
index c948cfa..25754ea 100644
--- a/test/unit/org/apache/cassandra/EmbeddedServer.java
+++ b/test/unit/org/apache/cassandra/EmbeddedServer.java
@@ -18,7 +18,6 @@
  */
 package org.apache.cassandra;
 
-import java.io.IOException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
@@ -44,7 +43,7 @@ public class EmbeddedServer extends SchemaLoader
     static ExecutorService executor = Executors.newSingleThreadExecutor();
 
     @BeforeClass
-    public static void startCassandra() throws IOException
+    public static void startCassandra()
 
     {
         executor.execute(new Runnable()

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/test/unit/org/apache/cassandra/Util.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/Util.java b/test/unit/org/apache/cassandra/Util.java
index 65a01a1..6bf9e87 100644
--- a/test/unit/org/apache/cassandra/Util.java
+++ b/test/unit/org/apache/cassandra/Util.java
@@ -32,7 +32,6 @@ import java.util.SortedSet;
 import java.util.TreeSet;
 import java.util.UUID;
 import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
 import org.apache.cassandra.db.*;
@@ -167,12 +166,12 @@ public class Util
         return bb;
     }
 
-    public static List<Row> getRangeSlice(ColumnFamilyStore cfs) throws IOException, ExecutionException, InterruptedException
+    public static List<Row> getRangeSlice(ColumnFamilyStore cfs)
     {
         return getRangeSlice(cfs, null);
     }
 
-    public static List<Row> getRangeSlice(ColumnFamilyStore cfs, ByteBuffer superColumn) throws IOException, ExecutionException, InterruptedException
+    public static List<Row> getRangeSlice(ColumnFamilyStore cfs, ByteBuffer superColumn)
     {
         IDiskAtomFilter filter = superColumn == null
                                ? new IdentityQueryFilter()
@@ -188,7 +187,7 @@ public class Util
      * @param mutations A group of Mutations for the same keyspace and column family.
      * @return The ColumnFamilyStore that was used.
      */
-    public static ColumnFamilyStore writeColumnFamily(List<Mutation> mutations) throws IOException, ExecutionException, InterruptedException
+    public static ColumnFamilyStore writeColumnFamily(List<Mutation> mutations)
     {
         IMutation first = mutations.get(0);
         String keyspaceName = first.getKeyspaceName();
@@ -202,7 +201,7 @@ public class Util
         return store;
     }
 
-    public static ColumnFamily getColumnFamily(Keyspace keyspace, DecoratedKey key, String cfName) throws IOException
+    public static ColumnFamily getColumnFamily(Keyspace keyspace, DecoratedKey key, String cfName)
     {
         ColumnFamilyStore cfStore = keyspace.getColumnFamilyStore(cfName);
         assert cfStore != null : "Column family " + cfName + " has not been defined";

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/test/unit/org/apache/cassandra/cli/CliTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cli/CliTest.java b/test/unit/org/apache/cassandra/cli/CliTest.java
index 5789fac..6b7232c 100644
--- a/test/unit/org/apache/cassandra/cli/CliTest.java
+++ b/test/unit/org/apache/cassandra/cli/CliTest.java
@@ -19,7 +19,6 @@
 package org.apache.cassandra.cli;
 
 import org.apache.cassandra.SchemaLoader;
-import org.apache.cassandra.exceptions.ConfigurationException;
 import org.apache.cassandra.config.Schema;
 import org.apache.cassandra.service.EmbeddedCassandraService;
 import org.apache.cassandra.thrift.*;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/test/unit/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutorTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutorTest.java b/test/unit/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutorTest.java
index aba84ea..5040a24 100644
--- a/test/unit/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutorTest.java
+++ b/test/unit/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutorTest.java
@@ -31,7 +31,7 @@ import org.apache.cassandra.utils.WrappedRunnable;
 public class DebuggableThreadPoolExecutorTest
 {
     @Test
-    public void testSerialization() throws InterruptedException
+    public void testSerialization()
     {
         LinkedBlockingQueue<Runnable> q = new LinkedBlockingQueue<Runnable>(1);
         DebuggableThreadPoolExecutor executor = new DebuggableThreadPoolExecutor(1,

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/test/unit/org/apache/cassandra/config/DefsTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/config/DefsTest.java b/test/unit/org/apache/cassandra/config/DefsTest.java
index d1fc54e..1251ff7 100644
--- a/test/unit/org/apache/cassandra/config/DefsTest.java
+++ b/test/unit/org/apache/cassandra/config/DefsTest.java
@@ -19,10 +19,8 @@
 package org.apache.cassandra.config;
 
 import java.io.File;
-import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.*;
-import java.util.concurrent.ExecutionException;
 
 import org.apache.cassandra.OrderedJUnit4ClassRunner;
 import org.apache.cassandra.SchemaLoader;
@@ -42,6 +40,7 @@ import org.apache.cassandra.service.MigrationManager;
 import org.apache.cassandra.utils.ByteBufferUtil;
 import static org.apache.cassandra.Util.cellname;
 
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -92,7 +91,7 @@ public class DefsTest extends SchemaLoader
     }
 
     @Test
-    public void testInvalidNames() throws IOException
+    public void testInvalidNames()
     {
         String[] valid = {"1", "a", "_1", "b_", "__", "1_a"};
         for (String s : valid)
@@ -103,8 +102,9 @@ public class DefsTest extends SchemaLoader
             assert !CFMetaData.isNameValid(s);
     }
 
+    @Ignore
     @Test
-    public void saveAndRestore() throws IOException
+    public void saveAndRestore()
     {
         /*
         // verify dump and reload.
@@ -123,7 +123,7 @@ public class DefsTest extends SchemaLoader
     }
 
     @Test
-    public void addNewCfToBogusKeyspace() throws InterruptedException
+    public void addNewCfToBogusKeyspace()
     {
         CFMetaData newCf = addTestCF("MadeUpKeyspace", "NewCF", "new cf");
         try
@@ -137,7 +137,7 @@ public class DefsTest extends SchemaLoader
     }
 
     @Test
-    public void addNewCfWithNullComment() throws ConfigurationException, IOException, ExecutionException, InterruptedException
+    public void addNewCfWithNullComment() throws ConfigurationException
     {
         final String ks = "Keyspace1";
         final String cf = "BrandNewCfWithNull";
@@ -153,7 +153,7 @@ public class DefsTest extends SchemaLoader
     }
 
     @Test
-    public void addNewCF() throws ConfigurationException, IOException, ExecutionException, InterruptedException
+    public void addNewCF() throws ConfigurationException
     {
         final String ks = "Keyspace1";
         final String cf = "BrandNewCf";
@@ -184,7 +184,7 @@ public class DefsTest extends SchemaLoader
     }
 
     @Test
-    public void dropCf() throws ConfigurationException, IOException, ExecutionException, InterruptedException
+    public void dropCf() throws ConfigurationException
     {
         DecoratedKey dk = Util.dk("dropCf");
         // sanity
@@ -230,7 +230,7 @@ public class DefsTest extends SchemaLoader
     }
 
     @Test
-    public void addNewKS() throws ConfigurationException, IOException, ExecutionException, InterruptedException
+    public void addNewKS() throws ConfigurationException
     {
         DecoratedKey dk = Util.dk("key0");
         CFMetaData newCf = addTestCF("NewKeyspace1", "AddedStandard1", "A new cf for a new ks");
@@ -258,7 +258,7 @@ public class DefsTest extends SchemaLoader
     }
 
     @Test
-    public void dropKS() throws ConfigurationException, IOException, ExecutionException, InterruptedException
+    public void dropKS() throws ConfigurationException
     {
         DecoratedKey dk = Util.dk("dropKs");
         // sanity
@@ -309,7 +309,7 @@ public class DefsTest extends SchemaLoader
     }
 
     @Test
-    public void dropKSUnflushed() throws ConfigurationException, IOException, ExecutionException, InterruptedException
+    public void dropKSUnflushed() throws ConfigurationException
     {
         DecoratedKey dk = Util.dk("dropKs");
         // sanity
@@ -330,7 +330,7 @@ public class DefsTest extends SchemaLoader
     }
 
     @Test
-    public void createEmptyKsAddNewCf() throws ConfigurationException, IOException, ExecutionException, InterruptedException
+    public void createEmptyKsAddNewCf() throws ConfigurationException
     {
         assert Schema.instance.getKSMetaData("EmptyKeyspace") == null;
 
@@ -367,7 +367,7 @@ public class DefsTest extends SchemaLoader
     }
 
     @Test
-    public void testUpdateKeyspace() throws ConfigurationException, IOException, ExecutionException, InterruptedException
+    public void testUpdateKeyspace() throws ConfigurationException
     {
         // create a keyspace to serve as existing.
         CFMetaData cf = addTestCF("UpdatedKeyspace", "AddedStandard1", "A new cf for a new ks");
@@ -399,7 +399,7 @@ public class DefsTest extends SchemaLoader
     }
 
     @Test
-    public void testUpdateColumnFamilyNoIndexes() throws ConfigurationException, IOException, ExecutionException, InterruptedException
+    public void testUpdateColumnFamilyNoIndexes() throws ConfigurationException
     {
         // create a keyspace with a cf to update.
         CFMetaData cf = addTestCF("UpdatedCfKs", "Standard1added", "A new cf that will be updated");
@@ -495,7 +495,7 @@ public class DefsTest extends SchemaLoader
     }
 
     @Test
-    public void testDropIndex() throws IOException, ExecutionException, InterruptedException, ConfigurationException
+    public void testDropIndex() throws ConfigurationException
     {
         // persist keyspace definition in the system keyspace
         Schema.instance.getKSMetaData("Keyspace6").toSchema(System.currentTimeMillis()).apply();

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/test/unit/org/apache/cassandra/db/CleanupTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/CleanupTest.java b/test/unit/org/apache/cassandra/db/CleanupTest.java
index dec3e5d..500f600 100644
--- a/test/unit/org/apache/cassandra/db/CleanupTest.java
+++ b/test/unit/org/apache/cassandra/db/CleanupTest.java
@@ -31,12 +31,10 @@ import java.util.concurrent.TimeUnit;
 import org.apache.cassandra.SchemaLoader;
 import org.apache.cassandra.Util;
 import org.apache.cassandra.db.filter.IDiskAtomFilter;
-import org.apache.cassandra.exceptions.ConfigurationException;
 import org.apache.cassandra.db.columniterator.IdentityQueryFilter;
 import org.apache.cassandra.db.compaction.CompactionManager;
 import org.apache.cassandra.db.index.SecondaryIndex;
 import org.apache.cassandra.dht.BytesToken;
-import org.apache.cassandra.dht.IPartitioner;
 import org.apache.cassandra.dht.Range;
 import org.apache.cassandra.io.sstable.SSTableReader;
 import org.apache.cassandra.locator.TokenMetadata;
@@ -59,7 +57,7 @@ public class CleanupTest extends SchemaLoader
     }
 
     @Test
-    public void testCleanup() throws IOException, ExecutionException, InterruptedException, ConfigurationException
+    public void testCleanup() throws ExecutionException, InterruptedException
     {
         StorageService.instance.getTokenMetadata().clearUnsafe();
 
@@ -110,7 +108,6 @@ public class CleanupTest extends SchemaLoader
         IndexExpression expr = new IndexExpression(COLUMN, IndexExpression.Operator.EQ, VALUE);
         List<IndexExpression> clause = Arrays.asList(expr);
         IDiskAtomFilter filter = new IdentityQueryFilter();
-        IPartitioner p = StorageService.getPartitioner();
         Range<RowPosition> range = Util.range("", "");
         rows = keyspace.getColumnFamilyStore(CF1).search(range, clause, filter, Integer.MAX_VALUE);
         assertEquals(LOOPS, rows.size());
@@ -138,7 +135,7 @@ public class CleanupTest extends SchemaLoader
         assertEquals(0, rows.size());
     }
 
-    protected void fillCF(ColumnFamilyStore cfs, int rowsPerSSTable) throws ExecutionException, InterruptedException, IOException
+    protected void fillCF(ColumnFamilyStore cfs, int rowsPerSSTable)
     {
         CompactionManager.instance.disableAutoCompaction();
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/test/unit/org/apache/cassandra/db/CollationControllerTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/CollationControllerTest.java b/test/unit/org/apache/cassandra/db/CollationControllerTest.java
index 14325a4..b3a9126 100644
--- a/test/unit/org/apache/cassandra/db/CollationControllerTest.java
+++ b/test/unit/org/apache/cassandra/db/CollationControllerTest.java
@@ -20,9 +20,6 @@ package org.apache.cassandra.db;
 
 import static org.junit.Assert.assertEquals;
 
-import java.io.IOException;
-import java.util.concurrent.ExecutionException;
-
 import org.apache.cassandra.SchemaLoader;
 import org.apache.cassandra.Util;
 import org.apache.cassandra.db.composites.CellName;
@@ -35,7 +32,6 @@ public class CollationControllerTest extends SchemaLoader
 {
     @Test
     public void getTopLevelColumnsSkipsSSTablesModifiedBeforeRowDelete() 
-    throws IOException, ExecutionException, InterruptedException
     {
         Keyspace keyspace = Keyspace.open("Keyspace1");
         ColumnFamilyStore cfs = keyspace.getColumnFamilyStore("Standard1");
@@ -85,7 +81,6 @@ public class CollationControllerTest extends SchemaLoader
 
     @Test
     public void ensureTombstonesAppliedAfterGCGS()
-    throws IOException, ExecutionException, InterruptedException
     {
         Keyspace keyspace = Keyspace.open("Keyspace1");
         ColumnFamilyStore cfs = keyspace.getColumnFamilyStore("StandardGCGS0");

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/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 200925c..ac2f567 100644
--- a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
+++ b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
@@ -101,7 +101,7 @@ public class ColumnFamilyStoreTest extends SchemaLoader
     }
 
     @Test
-    public void testGetColumnWithWrongBF() throws IOException, ExecutionException, InterruptedException
+    public void testGetColumnWithWrongBF()
     {
         Keyspace keyspace = Keyspace.open("Keyspace1");
         ColumnFamilyStore cfs = keyspace.getColumnFamilyStore("Standard1");
@@ -152,11 +152,11 @@ public class ColumnFamilyStoreTest extends SchemaLoader
     }
 
     @Test
-    public void testSkipStartKey() throws IOException, ExecutionException, InterruptedException
+    public void testSkipStartKey()
     {
         ColumnFamilyStore cfs = insertKey1Key2();
 
-        IPartitioner p = StorageService.getPartitioner();
+        IPartitioner<?> p = StorageService.getPartitioner();
         List<Row> result = cfs.getRangeSlice(Util.range(p, "key1", "key2"),
                                              null,
                                              Util.namesFilter(cfs, "asdf"),
@@ -678,7 +678,7 @@ public class ColumnFamilyStoreTest extends SchemaLoader
     }
 
     @Test
-    public void testInclusiveBounds() throws IOException, ExecutionException, InterruptedException
+    public void testInclusiveBounds()
     {
         ColumnFamilyStore cfs = insertKey1Key2();
 
@@ -847,7 +847,7 @@ public class ColumnFamilyStoreTest extends SchemaLoader
     }
 
 
-    private ColumnFamilyStore insertKey1Key2() throws IOException, ExecutionException, InterruptedException
+    private ColumnFamilyStore insertKey1Key2()
     {
         ColumnFamilyStore cfs = Keyspace.open("Keyspace2").getColumnFamilyStore("Standard1");
         List<Mutation> rms = new LinkedList<>();
@@ -1718,8 +1718,6 @@ public class ColumnFamilyStoreTest extends SchemaLoader
 
     private void testMultiRangeSlicesBehavior(ColumnFamilyStore cfs)
     {
-        CellNameType type = cfs.getComparator();
-
         // in order not to change thrift interfaces at this stage we build SliceQueryFilter
         // directly instead of using QueryFilter to build it for us
         ColumnSlice[] startMiddleAndEndRanges = new ColumnSlice[] {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java b/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java
index 693a670..b791b03 100644
--- a/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java
+++ b/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java
@@ -152,7 +152,7 @@ public class ColumnFamilyTest extends SchemaLoader
     }
 
     @Test
-    public void testColumnStatsRecordsRowDeletesCorrectly() throws IOException
+    public void testColumnStatsRecordsRowDeletesCorrectly()
     {
         long timestamp = System.currentTimeMillis();
         int localDeletionTime = (int) (System.currentTimeMillis() / 1000);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/test/unit/org/apache/cassandra/db/CounterCellTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/CounterCellTest.java b/test/unit/org/apache/cassandra/db/CounterCellTest.java
index 6949340..16b28d3 100644
--- a/test/unit/org/apache/cassandra/db/CounterCellTest.java
+++ b/test/unit/org/apache/cassandra/db/CounterCellTest.java
@@ -23,7 +23,6 @@ import java.security.MessageDigest;
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
 import java.io.IOException;
-import java.net.UnknownHostException;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 
@@ -64,7 +63,7 @@ public class CounterCellTest extends SchemaLoader
     }
 
     @Test
-    public void testCreate() throws UnknownHostException
+    public void testCreate()
     {
         long delta = 3L;
         CounterCell cell = new CounterCell(Util.cellname("x"),
@@ -81,7 +80,7 @@ public class CounterCellTest extends SchemaLoader
     }
 
     @Test
-    public void testReconcile() throws UnknownHostException
+    public void testReconcile()
     {
         Cell left;
         Cell right;
@@ -207,7 +206,7 @@ public class CounterCellTest extends SchemaLoader
     }
 
     @Test
-    public void testDiff() throws UnknownHostException
+    public void testDiff()
     {
         AbstractAllocator allocator = HeapAllocator.instance;
         ContextState left;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/test/unit/org/apache/cassandra/db/DirectoriesTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/DirectoriesTest.java b/test/unit/org/apache/cassandra/db/DirectoriesTest.java
index c831b29..8130cf4 100644
--- a/test/unit/org/apache/cassandra/db/DirectoriesTest.java
+++ b/test/unit/org/apache/cassandra/db/DirectoriesTest.java
@@ -175,7 +175,7 @@ public class DirectoriesTest
 
 
     @Test
-    public void testDiskFailurePolicy_best_effort() throws IOException
+    public void testDiskFailurePolicy_best_effort()
     {
         DiskFailurePolicy origPolicy = DatabaseDescriptor.getDiskFailurePolicy();
         

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/test/unit/org/apache/cassandra/db/KeyCollisionTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/KeyCollisionTest.java b/test/unit/org/apache/cassandra/db/KeyCollisionTest.java
index 3a91c8c..633c9b2 100644
--- a/test/unit/org/apache/cassandra/db/KeyCollisionTest.java
+++ b/test/unit/org/apache/cassandra/db/KeyCollisionTest.java
@@ -18,7 +18,6 @@
  */
 package org.apache.cassandra.db;
 
-import java.io.IOException;
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
 import java.util.*;
@@ -80,13 +79,13 @@ public class KeyCollisionTest extends SchemaLoader
         assert rows.get(3).key.key.equals(ByteBufferUtil.bytes("key2"));
     }
 
-    private void insert(String... keys) throws IOException
+    private void insert(String... keys)
     {
         for (String key : keys)
             insert(key);
     }
 
-    private void insert(String key) throws IOException
+    private void insert(String key)
     {
         Mutation rm;
         rm = new Mutation(KEYSPACE, ByteBufferUtil.bytes(key));

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/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 caaff65..0ef3333 100644
--- a/test/unit/org/apache/cassandra/db/KeyspaceTest.java
+++ b/test/unit/org/apache/cassandra/db/KeyspaceTest.java
@@ -38,7 +38,6 @@ import org.apache.cassandra.db.filter.QueryFilter;
 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.apache.cassandra.Util.cellname;
 import org.apache.cassandra.Util;
 import org.apache.cassandra.io.sstable.SSTableReader;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/test/unit/org/apache/cassandra/db/MultitableTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/MultitableTest.java b/test/unit/org/apache/cassandra/db/MultitableTest.java
index 16f9532..5d2c467 100644
--- a/test/unit/org/apache/cassandra/db/MultitableTest.java
+++ b/test/unit/org/apache/cassandra/db/MultitableTest.java
@@ -20,10 +20,6 @@ package org.apache.cassandra.db;
  *
  */
 
-
-import java.io.IOException;
-import java.util.concurrent.ExecutionException;
-
 import org.apache.cassandra.Util;
 import org.junit.Test;
 
@@ -34,7 +30,7 @@ import static org.apache.cassandra.Util.column;
 public class MultitableTest extends SchemaLoader
 {
     @Test
-    public void testSameCFs() throws IOException, ExecutionException, InterruptedException
+    public void testSameCFs()
     {
         Keyspace keyspace1 = Keyspace.open("Keyspace1");
         Keyspace keyspace2 = Keyspace.open("Keyspace2");

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java b/test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java
index 7dc86da..d739372 100644
--- a/test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java
+++ b/test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java
@@ -18,14 +18,12 @@
 */
 package org.apache.cassandra.db;
 
-import java.nio.ByteBuffer;
 import java.util.*;
 
 import org.junit.Test;
 import static org.junit.Assert.*;
 
 import org.apache.cassandra.Util;
-import org.apache.cassandra.db.*;
 import org.apache.cassandra.db.composites.*;
 import org.apache.cassandra.db.marshal.IntegerType;
 import org.apache.cassandra.utils.ByteBufferUtil;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/test/unit/org/apache/cassandra/db/ReadMessageTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/ReadMessageTest.java b/test/unit/org/apache/cassandra/db/ReadMessageTest.java
index d54594f..61ef912 100644
--- a/test/unit/org/apache/cassandra/db/ReadMessageTest.java
+++ b/test/unit/org/apache/cassandra/db/ReadMessageTest.java
@@ -79,7 +79,7 @@ public class ReadMessageTest extends SchemaLoader
     }
 
     @Test
-    public void testGetColumn() throws IOException, ColumnFamilyNotDefinedException
+    public void testGetColumn()
     {
         Keyspace keyspace = Keyspace.open("Keyspace1");
         CellNameType type = keyspace.getColumnFamilyStore("Standard1").getComparator();

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/test/unit/org/apache/cassandra/db/RecoveryManager2Test.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RecoveryManager2Test.java b/test/unit/org/apache/cassandra/db/RecoveryManager2Test.java
index 919d7e9..ede3e9b 100644
--- a/test/unit/org/apache/cassandra/db/RecoveryManager2Test.java
+++ b/test/unit/org/apache/cassandra/db/RecoveryManager2Test.java
@@ -21,7 +21,6 @@ package org.apache.cassandra.db;
  */
 
 
-import java.io.IOException;
 import org.junit.Test;
 
 import org.slf4j.Logger;
@@ -69,7 +68,7 @@ public class RecoveryManager2Test extends SchemaLoader
         assert replayed == 1 : "Expecting only 1 replayed mutation, got " + replayed;
     }
 
-    private void insertRow(String cfname, String key) throws IOException
+    private void insertRow(String cfname, String key) 
     {
         ColumnFamily cf = ArrayBackedSortedColumns.factory.create("Keyspace1", cfname);
         cf.addColumn(column("col1", "val1", 1L));

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/test/unit/org/apache/cassandra/db/RecoveryManager3Test.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RecoveryManager3Test.java b/test/unit/org/apache/cassandra/db/RecoveryManager3Test.java
index 6f697fd..5432a21 100644
--- a/test/unit/org/apache/cassandra/db/RecoveryManager3Test.java
+++ b/test/unit/org/apache/cassandra/db/RecoveryManager3Test.java
@@ -23,7 +23,6 @@ package org.apache.cassandra.db;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.concurrent.ExecutionException;
 
 import org.junit.Test;
 
@@ -39,7 +38,7 @@ import static org.apache.cassandra.db.KeyspaceTest.assertColumns;
 public class RecoveryManager3Test extends SchemaLoader
 {
     @Test
-    public void testMissingHeader() throws IOException, ExecutionException, InterruptedException
+    public void testMissingHeader() throws IOException
     {
         Keyspace keyspace1 = Keyspace.open("Keyspace1");
         Keyspace keyspace2 = Keyspace.open("Keyspace2");

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java b/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
index dc4d488..004eb99 100644
--- a/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
+++ b/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
@@ -20,7 +20,6 @@ package org.apache.cassandra.db;
 
 import java.io.IOException;
 import java.util.Date;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.cassandra.Util;
@@ -43,7 +42,7 @@ public class RecoveryManagerTest extends SchemaLoader
     }
 
     @Test
-    public void testOne() throws IOException, ExecutionException, InterruptedException
+    public void testOne() throws IOException
     {
         Keyspace keyspace1 = Keyspace.open("Keyspace1");
         Keyspace keyspace2 = Keyspace.open("Keyspace2");
@@ -73,7 +72,7 @@ public class RecoveryManagerTest extends SchemaLoader
     }
 
     @Test
-    public void testRecoverCounter() throws IOException, ExecutionException, InterruptedException
+    public void testRecoverCounter() throws IOException
     {
         Keyspace keyspace1 = Keyspace.open("Keyspace1");
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/test/unit/org/apache/cassandra/db/RecoveryManagerTruncateTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RecoveryManagerTruncateTest.java b/test/unit/org/apache/cassandra/db/RecoveryManagerTruncateTest.java
index bd39142..1f7d388 100644
--- a/test/unit/org/apache/cassandra/db/RecoveryManagerTruncateTest.java
+++ b/test/unit/org/apache/cassandra/db/RecoveryManagerTruncateTest.java
@@ -23,7 +23,6 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
 import java.io.IOException;
-import java.util.concurrent.ExecutionException;
 
 import org.apache.cassandra.SchemaLoader;
 import org.apache.cassandra.Util;
@@ -37,7 +36,7 @@ import org.apache.cassandra.utils.ByteBufferUtil;
 public class RecoveryManagerTruncateTest extends SchemaLoader
 {
 	@Test
-	public void testTruncate() throws IOException, ExecutionException, InterruptedException
+	public void testTruncate() throws IOException
 	{
 		Keyspace keyspace = Keyspace.open("Keyspace1");
 		ColumnFamilyStore cfs = keyspace.getColumnFamilyStore("Standard1");

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/test/unit/org/apache/cassandra/db/RowCacheTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RowCacheTest.java b/test/unit/org/apache/cassandra/db/RowCacheTest.java
index e21f586..3de1e7d 100644
--- a/test/unit/org/apache/cassandra/db/RowCacheTest.java
+++ b/test/unit/org/apache/cassandra/db/RowCacheTest.java
@@ -21,8 +21,6 @@ package org.apache.cassandra.db;
 import java.net.InetAddress;
 import java.nio.ByteBuffer;
 import java.util.Collection;
-import java.util.SortedSet;
-import java.util.TreeSet;
 
 import org.junit.AfterClass;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/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 fcdd2e1..bfba858 100644
--- a/test/unit/org/apache/cassandra/db/RowIterationTest.java
+++ b/test/unit/org/apache/cassandra/db/RowIterationTest.java
@@ -18,10 +18,8 @@
 */
 package org.apache.cassandra.db;
 
-import java.io.IOException;
 import java.net.InetAddress;
 import java.nio.ByteBuffer;
-import java.util.concurrent.ExecutionException;
 import java.util.Set;
 import java.util.HashSet;
 
@@ -42,7 +40,7 @@ public class RowIterationTest extends SchemaLoader
     public static final InetAddress LOCAL = FBUtilities.getBroadcastAddress();
 
     @Test
-    public void testRowIteration() throws IOException, ExecutionException, InterruptedException
+    public void testRowIteration()
     {
         Keyspace keyspace = Keyspace.open(KEYSPACE1);
         ColumnFamilyStore store = keyspace.getColumnFamilyStore("Super3");
@@ -61,7 +59,7 @@ public class RowIterationTest extends SchemaLoader
     }
 
     @Test
-    public void testRowIterationDeletionTime() throws IOException, ExecutionException, InterruptedException
+    public void testRowIterationDeletionTime()
     {
         Keyspace keyspace = Keyspace.open(KEYSPACE1);
         String CF_NAME = "Standard3";
@@ -72,7 +70,6 @@ public class RowIterationTest extends SchemaLoader
         Mutation rm = new Mutation(KEYSPACE1, key.key);
         rm.delete(CF_NAME, 0);
         rm.add(CF_NAME, Util.cellname("c"), ByteBufferUtil.bytes("values"), 0L);
-        DeletionInfo delInfo1 = rm.getColumnFamilies().iterator().next().deletionInfo();
         rm.apply();
         store.forceBlockingFlush();
 
@@ -90,7 +87,7 @@ public class RowIterationTest extends SchemaLoader
     }
 
     @Test
-    public void testRowIterationDeletion() throws IOException, ExecutionException, InterruptedException
+    public void testRowIterationDeletion()
     {
         Keyspace keyspace = Keyspace.open(KEYSPACE1);
         String CF_NAME = "Standard3";

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/test/unit/org/apache/cassandra/db/ScrubTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/ScrubTest.java b/test/unit/org/apache/cassandra/db/ScrubTest.java
index 01f3f6b..ebdce0e 100644
--- a/test/unit/org/apache/cassandra/db/ScrubTest.java
+++ b/test/unit/org/apache/cassandra/db/ScrubTest.java
@@ -38,7 +38,6 @@ import org.apache.cassandra.Util;
 import org.apache.cassandra.config.CFMetaData;
 import org.apache.cassandra.config.Schema;
 import org.apache.cassandra.db.compaction.Scrubber;
-import org.apache.cassandra.exceptions.ConfigurationException;
 import org.apache.cassandra.db.columniterator.IdentityQueryFilter;
 import org.apache.cassandra.db.compaction.CompactionManager;
 import org.apache.cassandra.exceptions.WriteTimeoutException;
@@ -59,7 +58,7 @@ public class ScrubTest extends SchemaLoader
     public String COUNTER_CF = "Counter1";
 
     @Test
-    public void testScrubOneRow() throws IOException, ExecutionException, InterruptedException, ConfigurationException
+    public void testScrubOneRow() throws ExecutionException, InterruptedException
     {
         CompactionManager.instance.disableAutoCompaction();
         Keyspace keyspace = Keyspace.open(KEYSPACE);
@@ -81,7 +80,7 @@ public class ScrubTest extends SchemaLoader
     }
 
     @Test
-    public void testScrubCorruptedCounterRow() throws IOException, InterruptedException, ExecutionException, WriteTimeoutException
+    public void testScrubCorruptedCounterRow() throws IOException, WriteTimeoutException
     {
         CompactionManager.instance.disableAutoCompaction();
         Keyspace keyspace = Keyspace.open(KEYSPACE);
@@ -128,7 +127,7 @@ public class ScrubTest extends SchemaLoader
     }
 
     @Test
-    public void testScrubDeletedRow() throws IOException, ExecutionException, InterruptedException, ConfigurationException
+    public void testScrubDeletedRow() throws ExecutionException, InterruptedException
     {
         CompactionManager.instance.disableAutoCompaction();
         Keyspace keyspace = Keyspace.open(KEYSPACE);
@@ -146,7 +145,7 @@ public class ScrubTest extends SchemaLoader
     }
 
     @Test
-    public void testScrubMultiRow() throws IOException, ExecutionException, InterruptedException, ConfigurationException
+    public void testScrubMultiRow() throws ExecutionException, InterruptedException
     {
         CompactionManager.instance.disableAutoCompaction();
         Keyspace keyspace = Keyspace.open(KEYSPACE);
@@ -243,7 +242,7 @@ public class ScrubTest extends SchemaLoader
         return true;
     }
 
-    protected void fillCF(ColumnFamilyStore cfs, int rowsPerSSTable) throws ExecutionException, InterruptedException, IOException
+    protected void fillCF(ColumnFamilyStore cfs, int rowsPerSSTable)
     {
         for (int i = 0; i < rowsPerSSTable; i++)
         {
@@ -259,7 +258,7 @@ public class ScrubTest extends SchemaLoader
         cfs.forceBlockingFlush();
     }
 
-    protected void fillCounterCF(ColumnFamilyStore cfs, int rowsPerSSTable) throws ExecutionException, InterruptedException, IOException, WriteTimeoutException
+    protected void fillCounterCF(ColumnFamilyStore cfs, int rowsPerSSTable) throws WriteTimeoutException
     {
         for (int i = 0; i < rowsPerSSTable; i++)
         {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/test/unit/org/apache/cassandra/db/SerializationsTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/SerializationsTest.java b/test/unit/org/apache/cassandra/db/SerializationsTest.java
index de68875..2cd9f81 100644
--- a/test/unit/org/apache/cassandra/db/SerializationsTest.java
+++ b/test/unit/org/apache/cassandra/db/SerializationsTest.java
@@ -28,7 +28,6 @@ import org.apache.cassandra.dht.AbstractBounds;
 import org.apache.cassandra.dht.IPartitioner;
 import org.apache.cassandra.dht.Range;
 import org.apache.cassandra.dht.Token;
-import org.apache.cassandra.exceptions.ConfigurationException;
 import org.apache.cassandra.net.CallbackInfo;
 import org.apache.cassandra.net.MessageIn;
 import org.apache.cassandra.net.MessageOut;
@@ -36,7 +35,6 @@ import org.apache.cassandra.net.MessagingService;
 import org.apache.cassandra.service.StorageService;
 import org.apache.cassandra.utils.ByteBufferUtil;
 
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 import java.io.DataInputStream;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/test/unit/org/apache/cassandra/db/TimeSortTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/TimeSortTest.java b/test/unit/org/apache/cassandra/db/TimeSortTest.java
index c7a4a57..1b02ea5 100644
--- a/test/unit/org/apache/cassandra/db/TimeSortTest.java
+++ b/test/unit/org/apache/cassandra/db/TimeSortTest.java
@@ -19,7 +19,6 @@
 package org.apache.cassandra.db;
 
 import java.io.IOException;
-import java.util.concurrent.ExecutionException;
 import java.util.*;
 
 import org.junit.Test;
@@ -38,7 +37,7 @@ import org.apache.cassandra.utils.ByteBufferUtil;
 public class TimeSortTest extends SchemaLoader
 {
     @Test
-    public void testMixedSources() throws IOException, ExecutionException, InterruptedException
+    public void testMixedSources()
     {
         Keyspace keyspace = Keyspace.open("Keyspace1");
         ColumnFamilyStore cfStore = keyspace.getColumnFamilyStore("StandardLong1");
@@ -60,7 +59,7 @@ public class TimeSortTest extends SchemaLoader
     }
 
     @Test
-    public void testTimeSort() throws IOException, ExecutionException, InterruptedException
+    public void testTimeSort() throws IOException
     {
         Keyspace keyspace = Keyspace.open("Keyspace1");
         ColumnFamilyStore cfStore = keyspace.getColumnFamilyStore("StandardLong1");
@@ -113,7 +112,7 @@ public class TimeSortTest extends SchemaLoader
         assert "c".equals(ByteBufferUtil.string(cf.getColumn(cellname(10)).value()));
     }
 
-    private void validateTimeSort(Keyspace keyspace) throws IOException
+    private void validateTimeSort(Keyspace keyspace)
     {
         for (int i = 900; i < 1000; ++i)
         {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/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 ac58839..42445b5 100644
--- a/test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java
@@ -18,7 +18,6 @@
 */
 package org.apache.cassandra.db.compaction;
 
-import java.io.IOException;
 import java.util.Collection;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
@@ -50,7 +49,7 @@ public class CompactionsPurgeTest extends SchemaLoader
     public static final String KEYSPACE2 = "Keyspace2";
 
     @Test
-    public void testMajorCompactionPurge() throws IOException, ExecutionException, InterruptedException
+    public void testMajorCompactionPurge() throws ExecutionException, InterruptedException
     {
         CompactionManager.instance.disableAutoCompaction();
 
@@ -94,7 +93,7 @@ public class CompactionsPurgeTest extends SchemaLoader
     }
 
     @Test
-    public void testMinorCompactionPurge() throws IOException, ExecutionException, InterruptedException
+    public void testMinorCompactionPurge()
     {
         CompactionManager.instance.disableAutoCompaction();
 
@@ -153,7 +152,7 @@ public class CompactionsPurgeTest extends SchemaLoader
      * verify that we don't drop tombstones during a minor compaction that might still be relevant
      */
     @Test
-    public void testMinTimestampPurge() throws IOException, ExecutionException, InterruptedException
+    public void testMinTimestampPurge()
     {
         CompactionManager.instance.disableAutoCompaction();
 
@@ -193,7 +192,7 @@ public class CompactionsPurgeTest extends SchemaLoader
     }
 
     @Test
-    public void testCompactionPurgeOneFile() throws IOException, ExecutionException, InterruptedException
+    public void testCompactionPurgeOneFile() throws ExecutionException, InterruptedException
     {
         CompactionManager.instance.disableAutoCompaction();
 
@@ -230,7 +229,7 @@ public class CompactionsPurgeTest extends SchemaLoader
     }
 
     @Test
-    public void testCompactionPurgeCachedRow() throws IOException, ExecutionException, InterruptedException
+    public void testCompactionPurgeCachedRow() throws ExecutionException, InterruptedException
     {
         CompactionManager.instance.disableAutoCompaction();
 
@@ -278,7 +277,7 @@ public class CompactionsPurgeTest extends SchemaLoader
     }
 
     @Test
-    public void testCompactionPurgeTombstonedRow() throws IOException, ExecutionException, InterruptedException
+    public void testCompactionPurgeTombstonedRow() throws ExecutionException, InterruptedException
     {
         CompactionManager.instance.disableAutoCompaction();
 
@@ -322,7 +321,7 @@ public class CompactionsPurgeTest extends SchemaLoader
     }
 
     @Test
-    public void testRowTombstoneObservedBeforePurging() throws InterruptedException, ExecutionException, IOException
+    public void testRowTombstoneObservedBeforePurging() throws InterruptedException, ExecutionException
     {
         String keyspace = "cql_keyspace";
         String table = "table1";
@@ -347,7 +346,7 @@ public class CompactionsPurgeTest extends SchemaLoader
         assertEquals(0, result.size());
 
         // compact the two sstables with a gcBefore that does *not* allow the row tombstone to be purged
-        Future future = CompactionManager.instance.submitMaximal(cfs, (int) (System.currentTimeMillis() / 1000) - 10000);
+        Future<?> future = CompactionManager.instance.submitMaximal(cfs, (int) (System.currentTimeMillis() / 1000) - 10000);
         future.get();
 
         // the data should be gone, but the tombstone should still exist

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/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 50f4a65..1497b3a 100644
--- a/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
@@ -119,7 +119,7 @@ public class CompactionsTest extends SchemaLoader
     }
 
     @Test
-    public void testSuperColumnTombstones() throws IOException, ExecutionException, InterruptedException
+    public void testSuperColumnTombstones() throws ExecutionException, InterruptedException
     {
         Keyspace keyspace = Keyspace.open(KEYSPACE1);
         ColumnFamilyStore cfs = keyspace.getColumnFamilyStore("Super1");
@@ -164,7 +164,7 @@ public class CompactionsTest extends SchemaLoader
     }
 
     @Test
-    public void testEchoedRow() throws IOException, ExecutionException, InterruptedException
+    public void testEchoedRow()
     {
         // This test check that EchoedRow doesn't skipp rows: see CASSANDRA-2653
 
@@ -218,7 +218,7 @@ public class CompactionsTest extends SchemaLoader
     }
 
     @Test
-    public void testDontPurgeAccidentaly() throws IOException, ExecutionException, InterruptedException
+    public void testDontPurgeAccidentaly() throws InterruptedException
     {
         testDontPurgeAccidentaly("test1", "Super5");
 
@@ -295,7 +295,7 @@ public class CompactionsTest extends SchemaLoader
         assert !compactionLogs.containsKey(Pair.create(KEYSPACE1, cf));
     }
 
-    private void testDontPurgeAccidentaly(String k, String cfname) throws IOException, ExecutionException, InterruptedException
+    private void testDontPurgeAccidentaly(String k, String cfname) throws InterruptedException
     {
         // This test catches the regression of CASSANDRA-2786
         Keyspace keyspace = Keyspace.open(KEYSPACE1);
@@ -367,7 +367,7 @@ public class CompactionsTest extends SchemaLoader
     }
 
     @Test
-    public void testNeedsCleanup() throws IOException
+    public void testNeedsCleanup()
     {
         Keyspace keyspace = Keyspace.open(KEYSPACE1);
         ColumnFamilyStore store = keyspace.getColumnFamilyStore("Standard1");

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
index 8eb9199..625beac 100644
--- a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
@@ -21,7 +21,6 @@ import java.nio.ByteBuffer;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
-import java.util.concurrent.ExecutionException;
 import java.util.UUID;
 
 import org.junit.After;
@@ -111,7 +110,7 @@ public class LeveledCompactionStrategyTest extends SchemaLoader
     /**
      * wait for leveled compaction to quiesce on the given columnfamily
      */
-    private void waitForLeveling(ColumnFamilyStore cfs) throws InterruptedException, ExecutionException
+    private void waitForLeveling(ColumnFamilyStore cfs) throws InterruptedException
     {
         LeveledCompactionStrategy strategy = (LeveledCompactionStrategy) cfs.getCompactionStrategy();
         // L0 is the lowest priority, so when that's done, we know everything is done

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/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 2cb45f4..abd3829 100644
--- a/test/unit/org/apache/cassandra/db/compaction/OneCompactionTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/OneCompactionTest.java
@@ -18,7 +18,6 @@
 */
 package org.apache.cassandra.db.compaction;
 
-import java.io.IOException;
 import java.util.concurrent.ExecutionException;
 import java.util.Set;
 import java.util.HashSet;
@@ -37,7 +36,7 @@ import org.apache.cassandra.utils.ByteBufferUtil;
 
 public class OneCompactionTest extends SchemaLoader
 {
-    private void testCompaction(String columnFamilyName, int insertsPerTable) throws IOException, ExecutionException, InterruptedException
+    private void testCompaction(String columnFamilyName, int insertsPerTable) throws ExecutionException, InterruptedException
     {
         CompactionManager.instance.disableAutoCompaction();
 
@@ -59,13 +58,13 @@ public class OneCompactionTest extends SchemaLoader
     }
 
     @Test
-    public void testCompaction1() throws IOException, ExecutionException, InterruptedException
+    public void testCompaction1() throws ExecutionException, InterruptedException
     {
         testCompaction("Standard1", 1);
     }
 
     @Test
-    public void testCompaction2() throws IOException, ExecutionException, InterruptedException
+    public void testCompaction2() throws ExecutionException, InterruptedException
     {
         testCompaction("Standard2", 2);
     }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java b/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
index 9aeb6d6..73aab41 100644
--- a/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
@@ -20,9 +20,6 @@ package org.apache.cassandra.db.compaction;
  * 
  */
 
-
-
-import java.util.concurrent.ExecutionException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -41,7 +38,7 @@ import static org.junit.Assert.assertTrue;
 public class TTLExpiryTest extends SchemaLoader
 {
     @Test
-    public void testSimpleExpire() throws ExecutionException, InterruptedException
+    public void testSimpleExpire() throws InterruptedException
     {
         ColumnFamilyStore cfs = Keyspace.open("Keyspace1").getColumnFamilyStore("Standard1");
         cfs.disableAutoCompaction();
@@ -89,7 +86,7 @@ public class TTLExpiryTest extends SchemaLoader
     }
 
     @Test
-    public void testNoExpire() throws ExecutionException, InterruptedException
+    public void testNoExpire() throws InterruptedException
     {
         ColumnFamilyStore cfs = Keyspace.open("Keyspace1").getColumnFamilyStore("Standard1");
         cfs.disableAutoCompaction();

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/test/unit/org/apache/cassandra/db/marshal/TimeUUIDTypeTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/marshal/TimeUUIDTypeTest.java b/test/unit/org/apache/cassandra/db/marshal/TimeUUIDTypeTest.java
index 703845b..4e22df8 100644
--- a/test/unit/org/apache/cassandra/db/marshal/TimeUUIDTypeTest.java
+++ b/test/unit/org/apache/cassandra/db/marshal/TimeUUIDTypeTest.java
@@ -18,7 +18,6 @@
 */
 package org.apache.cassandra.db.marshal;
 
-import java.net.UnknownHostException;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 import java.util.Random;
@@ -35,7 +34,7 @@ public class TimeUUIDTypeTest
     TimeUUIDType timeUUIDType = new TimeUUIDType();
 
     @Test
-    public void testEquality() throws UnknownHostException
+    public void testEquality()
     {
         UUID a = UUIDGen.getTimeUUID();
         UUID b = new UUID(a.getMostSignificantBits(), a.getLeastSignificantBits());
@@ -46,7 +45,7 @@ public class TimeUUIDTypeTest
     }
 
     @Test
-    public void testSmaller() throws UnknownHostException
+    public void testSmaller()
     {
         UUID a = UUIDGen.getTimeUUID();
         UUID b = UUIDGen.getTimeUUID();
@@ -62,7 +61,7 @@ public class TimeUUIDTypeTest
     }
 
     @Test
-    public void testBigger() throws UnknownHostException
+    public void testBigger()
     {
         UUID a = UUIDGen.getTimeUUID();
         UUID b = UUIDGen.getTimeUUID();

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/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 ff991b4..0583e95 100644
--- a/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
@@ -227,7 +227,7 @@ public class IndexSummaryTest
         assertEquals(full.subList(0, full.size() - 1), Downsampling.getOriginalIndexes(BASE_SAMPLING_LEVEL - 1));
 
         // spot check a few values (these depend on BASE_SAMPLING_LEVEL being 128)
-        assert BASE_SAMPLING_LEVEL == 128;
+        assertEquals(128, BASE_SAMPLING_LEVEL);
         assertEquals(Arrays.asList(0, 32, 64, 96), Downsampling.getOriginalIndexes(4));
         assertEquals(Arrays.asList(0, 64), Downsampling.getOriginalIndexes(2));
         assertEquals(Arrays.asList(), Downsampling.getOriginalIndexes(0));
@@ -247,7 +247,7 @@ public class IndexSummaryTest
         assertEquals(indexInterval * 2, Downsampling.getEffectiveIndexIntervalAfterIndex(BASE_SAMPLING_LEVEL - 2, BASE_SAMPLING_LEVEL - 1, indexInterval));
 
         // at samplingLevel=2, the retained summary points are [0, 64] (assumes BASE_SAMPLING_LEVEL is 128)
-        assert BASE_SAMPLING_LEVEL == 128;
+        assertEquals(128, BASE_SAMPLING_LEVEL);
         assertEquals(64 * indexInterval, Downsampling.getEffectiveIndexIntervalAfterIndex(0, 2, indexInterval));
         assertEquals(64 * indexInterval, Downsampling.getEffectiveIndexIntervalAfterIndex(1, 2, indexInterval));
     }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java b/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java
index ae4e12b..ad9ce5b 100644
--- a/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java
@@ -20,7 +20,6 @@
 package org.apache.cassandra.io.sstable;
 
 import java.io.File;
-import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.*;
 
@@ -68,7 +67,7 @@ public class LegacySSTableTest extends SchemaLoader
     /**
      * Get a descriptor for the legacy sstable at the given version.
      */
-    protected Descriptor getDescriptor(String ver) throws IOException
+    protected Descriptor getDescriptor(String ver)
     {
         File directory = new File(LEGACY_SSTABLE_ROOT + File.separator + ver + File.separator + KSNAME);
         return new Descriptor(ver, directory, KSNAME, CFNAME, 0, false);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/test/unit/org/apache/cassandra/io/sstable/SSTableMetadataTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableMetadataTest.java b/test/unit/org/apache/cassandra/io/sstable/SSTableMetadataTest.java
index 5c801c6..78f248b 100644
--- a/test/unit/org/apache/cassandra/io/sstable/SSTableMetadataTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/SSTableMetadataTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertTrue;
 public class SSTableMetadataTest extends SchemaLoader
 {
     @Test
-    public void testTrackMaxDeletionTime() throws ExecutionException, InterruptedException
+    public void testTrackMaxDeletionTime()
     {
         Keyspace keyspace = Keyspace.open("Keyspace1");
         ColumnFamilyStore store = keyspace.getColumnFamilyStore("Standard1");

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java b/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
index a7b8a3a..bd50538 100644
--- a/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
@@ -46,7 +46,6 @@ import org.apache.cassandra.db.columniterator.IdentityQueryFilter;
 import org.apache.cassandra.db.composites.Composites;
 import org.apache.cassandra.db.compaction.CompactionManager;
 import org.apache.cassandra.db.compaction.ICompactionScanner;
-import org.apache.cassandra.dht.IPartitioner;
 import org.apache.cassandra.dht.LocalPartitioner;
 import org.apache.cassandra.dht.LocalToken;
 import org.apache.cassandra.dht.Range;
@@ -62,7 +61,6 @@ import org.apache.cassandra.utils.Pair;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
 import static org.apache.cassandra.Util.cellname;
 
 @RunWith(OrderedJUnit4ClassRunner.class)
@@ -76,7 +74,7 @@ public class SSTableReaderTest extends SchemaLoader
     }
 
     @Test
-    public void testGetPositionsForRanges() throws IOException, ExecutionException, InterruptedException
+    public void testGetPositionsForRanges() throws ExecutionException, InterruptedException
     {
         Keyspace keyspace = Keyspace.open("Keyspace1");
         ColumnFamilyStore store = keyspace.getColumnFamilyStore("Standard2");
@@ -153,7 +151,7 @@ public class SSTableReaderTest extends SchemaLoader
     }
 
     @Test
-    public void testPersistentStatistics() throws IOException, ExecutionException, InterruptedException
+    public void testPersistentStatistics()
     {
 
         Keyspace keyspace = Keyspace.open("Keyspace1");
@@ -172,14 +170,14 @@ public class SSTableReaderTest extends SchemaLoader
         assert store.getMaxRowSize() != 0;
     }
 
-    private void clearAndLoad(ColumnFamilyStore cfs) throws IOException
+    private void clearAndLoad(ColumnFamilyStore cfs)
     {
         cfs.clearUnsafe();
         cfs.loadNewSSTables();
     }
 
     @Test
-    public void testGetPositionsForRangesWithKeyCache() throws IOException, ExecutionException, InterruptedException
+    public void testGetPositionsForRangesWithKeyCache() throws ExecutionException, InterruptedException
     {
         Keyspace keyspace = Keyspace.open("Keyspace1");
         ColumnFamilyStore store = keyspace.getColumnFamilyStore("Standard2");
@@ -213,7 +211,7 @@ public class SSTableReaderTest extends SchemaLoader
     }
 
     @Test
-    public void testPersistentStatisticsWithSecondaryIndex() throws IOException, ExecutionException, InterruptedException
+    public void testPersistentStatisticsWithSecondaryIndex()
     {
         // Create secondary index and flush to disk
         Keyspace keyspace = Keyspace.open("Keyspace1");
@@ -410,7 +408,7 @@ public class SSTableReaderTest extends SchemaLoader
         assertEquals(sstable.estimatedKeys(), replacement.estimatedKeys(), 1);
     }
 
-    private void assertIndexQueryWorks(ColumnFamilyStore indexedCFS) throws IOException
+    private void assertIndexQueryWorks(ColumnFamilyStore indexedCFS)
     {
         assert "Indexed1".equals(indexedCFS.name);
 
@@ -421,7 +419,6 @@ public class SSTableReaderTest extends SchemaLoader
         // query using index to see if sstable for secondary index opens
         IndexExpression expr = new IndexExpression(ByteBufferUtil.bytes("birthdate"), IndexExpression.Operator.EQ, ByteBufferUtil.bytes(1L));
         List<IndexExpression> clause = Arrays.asList(expr);
-        IPartitioner p = StorageService.getPartitioner();
         Range<RowPosition> range = Util.range("", "");
         List<Row> rows = indexedCFS.search(range, clause, new IdentityQueryFilter(), 100);
         assert rows.size() == 1;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/test/unit/org/apache/cassandra/io/sstable/SSTableUtils.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableUtils.java b/test/unit/org/apache/cassandra/io/sstable/SSTableUtils.java
index 713a05a..292a51e 100644
--- a/test/unit/org/apache/cassandra/io/sstable/SSTableUtils.java
+++ b/test/unit/org/apache/cassandra/io/sstable/SSTableUtils.java
@@ -67,7 +67,7 @@ public class SSTableUtils
         return datafile;
     }
 
-    public static void assertContentEquals(SSTableReader lhs, SSTableReader rhs) throws IOException
+    public static void assertContentEquals(SSTableReader lhs, SSTableReader rhs)
     {
         SSTableScanner slhs = lhs.getScanner();
         SSTableScanner srhs = rhs.getScanner();
@@ -81,7 +81,7 @@ public class SSTableUtils
         assert !srhs.hasNext() : "RHS contained more rows than LHS";
     }
 
-    public static void assertContentEquals(OnDiskAtomIterator lhs, OnDiskAtomIterator rhs) throws IOException
+    public static void assertContentEquals(OnDiskAtomIterator lhs, OnDiskAtomIterator rhs)
     {
         assertEquals(lhs.getKey(), rhs.getKey());
         // check metadata

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/test/unit/org/apache/cassandra/locator/OldNetworkTopologyStrategyTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/locator/OldNetworkTopologyStrategyTest.java b/test/unit/org/apache/cassandra/locator/OldNetworkTopologyStrategyTest.java
index c7470f8..14cb54d 100644
--- a/test/unit/org/apache/cassandra/locator/OldNetworkTopologyStrategyTest.java
+++ b/test/unit/org/apache/cassandra/locator/OldNetworkTopologyStrategyTest.java
@@ -154,7 +154,7 @@ public class OldNetworkTopologyStrategyTest extends SchemaLoader
         tmd.updateNormalToken(endpointToken, ep);
     }
 
-    private void testGetEndpoints(AbstractReplicationStrategy strategy, Token[] keyTokens) throws UnknownHostException
+    private void testGetEndpoints(AbstractReplicationStrategy strategy, Token[] keyTokens)
     {
         for (Token keyToken : keyTokens)
         {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/test/unit/org/apache/cassandra/locator/SimpleStrategyTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/locator/SimpleStrategyTest.java b/test/unit/org/apache/cassandra/locator/SimpleStrategyTest.java
index 67b80f2..d4978ae 100644
--- a/test/unit/org/apache/cassandra/locator/SimpleStrategyTest.java
+++ b/test/unit/org/apache/cassandra/locator/SimpleStrategyTest.java
@@ -31,11 +31,9 @@ import org.apache.cassandra.service.PendingRangeCalculatorService;
 import org.junit.Test;
 
 import org.apache.cassandra.SchemaLoader;
-import org.apache.cassandra.exceptions.ConfigurationException;
 import org.apache.cassandra.config.KSMetaData;
 import org.apache.cassandra.db.Keyspace;
 import org.apache.cassandra.dht.*;
-import org.apache.cassandra.service.StorageService;
 import org.apache.cassandra.service.StorageServiceAccessor;
 import org.apache.cassandra.utils.ByteBufferUtil;
 
@@ -50,7 +48,7 @@ public class SimpleStrategyTest extends SchemaLoader
     }
 
     @Test
-    public void testBigIntegerEndpoints() throws UnknownHostException, ConfigurationException
+    public void testBigIntegerEndpoints() throws UnknownHostException
     {
         List<Token> endpointTokens = new ArrayList<Token>();
         List<Token> keyTokens = new ArrayList<Token>();
@@ -62,7 +60,7 @@ public class SimpleStrategyTest extends SchemaLoader
     }
 
     @Test
-    public void testStringEndpoints() throws UnknownHostException, ConfigurationException
+    public void testStringEndpoints() throws UnknownHostException
     {
         IPartitioner partitioner = new OrderPreservingPartitioner();
 
@@ -77,7 +75,7 @@ public class SimpleStrategyTest extends SchemaLoader
 
     // given a list of endpoint tokens, and a set of key tokens falling between the endpoint tokens,
     // make sure that the Strategy picks the right endpoints for the keys.
-    private void verifyGetNaturalEndpoints(Token[] endpointTokens, Token[] keyTokens) throws UnknownHostException, ConfigurationException
+    private void verifyGetNaturalEndpoints(Token[] endpointTokens, Token[] keyTokens) throws UnknownHostException
     {
         TokenMetadata tmd;
         AbstractReplicationStrategy strategy;
@@ -106,7 +104,7 @@ public class SimpleStrategyTest extends SchemaLoader
     }
 
     @Test
-    public void testGetEndpointsDuringBootstrap() throws UnknownHostException, ConfigurationException
+    public void testGetEndpointsDuringBootstrap() throws UnknownHostException
     {
         // the token difference will be RING_SIZE * 2.
         final int RING_SIZE = 10;
@@ -166,7 +164,7 @@ public class SimpleStrategyTest extends SchemaLoader
         StorageServiceAccessor.setTokenMetadata(oldTmd);
     }
 
-    private AbstractReplicationStrategy getStrategy(String keyspaceName, TokenMetadata tmd) throws ConfigurationException
+    private AbstractReplicationStrategy getStrategy(String keyspaceName, TokenMetadata tmd)
     {
         KSMetaData ksmd = Schema.instance.getKSMetaData(keyspaceName);
         return AbstractReplicationStrategy.createReplicationStrategy(

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/test/unit/org/apache/cassandra/repair/DifferencerTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/repair/DifferencerTest.java b/test/unit/org/apache/cassandra/repair/DifferencerTest.java
index 7adbb06..bc0f0de 100644
--- a/test/unit/org/apache/cassandra/repair/DifferencerTest.java
+++ b/test/unit/org/apache/cassandra/repair/DifferencerTest.java
@@ -19,7 +19,6 @@ package org.apache.cassandra.repair;
 
 import java.net.InetAddress;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.UUID;
@@ -34,7 +33,6 @@ import org.apache.cassandra.dht.IPartitioner;
 import org.apache.cassandra.dht.Murmur3Partitioner;
 import org.apache.cassandra.dht.Range;
 import org.apache.cassandra.dht.Token;
-import org.apache.cassandra.io.sstable.SSTableReader;
 import org.apache.cassandra.net.MessageIn;
 import org.apache.cassandra.net.MessageOut;
 import org.apache.cassandra.net.MessagingService;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/test/unit/org/apache/cassandra/serializers/ClientUtilsTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/serializers/ClientUtilsTest.java b/test/unit/org/apache/cassandra/serializers/ClientUtilsTest.java
index 67bef2e..563d6cb 100644
--- a/test/unit/org/apache/cassandra/serializers/ClientUtilsTest.java
+++ b/test/unit/org/apache/cassandra/serializers/ClientUtilsTest.java
@@ -23,7 +23,6 @@ package org.apache.cassandra.serializers;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.net.UnknownHostException;
 import java.nio.ByteBuffer;
 import java.sql.Date;
 import java.util.UUID;
@@ -35,7 +34,7 @@ public class ClientUtilsTest
 {
     /** Exercises the classes in the clientutil jar to expose missing dependencies. */
     @Test
-    public void test() throws UnknownHostException
+    public void test()
     {
         AsciiSerializer.instance.deserialize(AsciiSerializer.instance.serialize("string"));
         BooleanSerializer.instance.deserialize(BooleanSerializer.instance.serialize(true));

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/test/unit/org/apache/cassandra/service/EmbeddedCassandraServiceTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/service/EmbeddedCassandraServiceTest.java b/test/unit/org/apache/cassandra/service/EmbeddedCassandraServiceTest.java
index a70c7c0..24b5a74 100644
--- a/test/unit/org/apache/cassandra/service/EmbeddedCassandraServiceTest.java
+++ b/test/unit/org/apache/cassandra/service/EmbeddedCassandraServiceTest.java
@@ -26,7 +26,6 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 
 import org.apache.cassandra.SchemaLoader;
-import org.apache.cassandra.exceptions.ConfigurationException;
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.config.Schema;
 import org.apache.cassandra.thrift.*;
@@ -61,7 +60,7 @@ public class EmbeddedCassandraServiceTest extends SchemaLoader
      * @throws InterruptedException
      */
     @BeforeClass
-    public static void setup() throws TTransportException, IOException, InterruptedException, ConfigurationException
+    public static void setup() throws TTransportException, IOException, InterruptedException
     {
         Schema.instance.clear(); // Schema are now written on disk and will be reloaded
         cassandra = new EmbeddedCassandraService();

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/test/unit/org/apache/cassandra/service/InitClientTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/service/InitClientTest.java b/test/unit/org/apache/cassandra/service/InitClientTest.java
index 7d44cd8..4ce0678 100644
--- a/test/unit/org/apache/cassandra/service/InitClientTest.java
+++ b/test/unit/org/apache/cassandra/service/InitClientTest.java
@@ -2,8 +2,6 @@ package org.apache.cassandra.service;
 
 import org.junit.Test;
 
-import java.io.IOException;
-
 import org.apache.cassandra.exceptions.ConfigurationException;
 
 /**
@@ -28,7 +26,7 @@ import org.apache.cassandra.exceptions.ConfigurationException;
 public class InitClientTest // extends CleanupHelper
 {
     @Test
-    public void testInitClientStartup() throws IOException, ConfigurationException
+    public void testInitClientStartup() throws ConfigurationException
     {
         StorageService.instance.initClient(0);
     }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java b/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java
index a3661c5..ff5a394 100644
--- a/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java
+++ b/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java
@@ -19,7 +19,6 @@
 
 package org.apache.cassandra.service;
 
-import java.io.IOException;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.*;
@@ -51,7 +50,7 @@ public class LeaveAndBootstrapTest
     private static IPartitioner oldPartitioner;
 
     @BeforeClass
-    public static void setup() throws IOException, ConfigurationException
+    public static void setup() throws ConfigurationException
     {
         oldPartitioner = StorageService.instance.setPartitionerUnsafe(partitioner);
         SchemaLoader.loadSchema();
@@ -142,7 +141,7 @@ public class LeaveAndBootstrapTest
      * simultaneously
      */
     @Test
-    public void testSimultaneousMove() throws UnknownHostException, ConfigurationException
+    public void testSimultaneousMove() throws UnknownHostException
     {
         StorageService ss = StorageService.instance;
         final int RING_SIZE = 10;
@@ -703,7 +702,7 @@ public class LeaveAndBootstrapTest
         return addrs;
     }
 
-    private AbstractReplicationStrategy getStrategy(String keyspaceName, TokenMetadata tmd) throws ConfigurationException
+    private AbstractReplicationStrategy getStrategy(String keyspaceName, TokenMetadata tmd)
     {
         KSMetaData ksmd = Schema.instance.getKSMetaData(keyspaceName);
         return AbstractReplicationStrategy.createReplicationStrategy(

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/test/unit/org/apache/cassandra/service/MoveTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/service/MoveTest.java b/test/unit/org/apache/cassandra/service/MoveTest.java
index a688943..a3fd89c 100644
--- a/test/unit/org/apache/cassandra/service/MoveTest.java
+++ b/test/unit/org/apache/cassandra/service/MoveTest.java
@@ -19,7 +19,6 @@
 
 package org.apache.cassandra.service;
 
-import java.io.IOException;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.*;
@@ -57,7 +56,7 @@ public class MoveTest
      * So instead of extending SchemaLoader, we call it's method below.
      */
     @BeforeClass
-    public static void setup() throws IOException, ConfigurationException
+    public static void setup() throws ConfigurationException
     {
         oldPartitioner = StorageService.instance.setPartitionerUnsafe(partitioner);
         SchemaLoader.loadSchema();
@@ -149,7 +148,7 @@ public class MoveTest
      * Test ranges and write endpoints when multiple nodes are on the move simultaneously
      */
     @Test
-    public void testSimultaneousMove() throws UnknownHostException, ConfigurationException
+    public void testSimultaneousMove() throws UnknownHostException
     {
         StorageService ss = StorageService.instance;
         final int RING_SIZE = 10;
@@ -540,7 +539,7 @@ public class MoveTest
         return addrs;
     }
 
-    private AbstractReplicationStrategy getStrategy(String keyspaceName, TokenMetadata tmd) throws ConfigurationException
+    private AbstractReplicationStrategy getStrategy(String keyspaceName, TokenMetadata tmd)
     {
         KSMetaData ksmd = Schema.instance.getKSMetaData(keyspaceName);
         return AbstractReplicationStrategy.createReplicationStrategy(

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/test/unit/org/apache/cassandra/service/RelocateTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/service/RelocateTest.java b/test/unit/org/apache/cassandra/service/RelocateTest.java
index 21dfb96..e8f66ad 100644
--- a/test/unit/org/apache/cassandra/service/RelocateTest.java
+++ b/test/unit/org/apache/cassandra/service/RelocateTest.java
@@ -34,7 +34,6 @@ import java.util.concurrent.TimeUnit;
 
 import org.apache.cassandra.SchemaLoader;
 import org.apache.cassandra.db.SystemKeyspace;
-import org.apache.cassandra.exceptions.ConfigurationException;
 import org.apache.cassandra.config.KSMetaData;
 import org.apache.cassandra.config.Schema;
 import org.apache.cassandra.dht.BigIntegerToken;
@@ -113,8 +112,8 @@ public class RelocateTest
         return tokenMap;
     }
 
-    // Copy-pasta from MoveTest.java
-    private AbstractReplicationStrategy getStrategy(String keyspaceName, TokenMetadata tmd) throws ConfigurationException
+    // Copy-paste from MoveTest.java
+    private AbstractReplicationStrategy getStrategy(String keyspaceName, TokenMetadata tmd)
     {
         KSMetaData ksmd = Schema.instance.getKSMetaData(keyspaceName);
         return AbstractReplicationStrategy.createReplicationStrategy(

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/test/unit/org/apache/cassandra/service/RemoveTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/service/RemoveTest.java b/test/unit/org/apache/cassandra/service/RemoveTest.java
index 62dd636..649a3f2 100644
--- a/test/unit/org/apache/cassandra/service/RemoveTest.java
+++ b/test/unit/org/apache/cassandra/service/RemoveTest.java
@@ -59,7 +59,7 @@ public class RemoveTest
     UUID removalId;
 
     @BeforeClass
-    public static void setupClass() throws IOException, ConfigurationException
+    public static void setupClass() throws ConfigurationException
     {
         oldPartitioner = StorageService.instance.setPartitionerUnsafe(partitioner);
         SchemaLoader.loadSchema();

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/test/unit/org/apache/cassandra/service/StorageServiceClientTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/service/StorageServiceClientTest.java b/test/unit/org/apache/cassandra/service/StorageServiceClientTest.java
index 19efe3a..f3ba754 100644
--- a/test/unit/org/apache/cassandra/service/StorageServiceClientTest.java
+++ b/test/unit/org/apache/cassandra/service/StorageServiceClientTest.java
@@ -26,12 +26,11 @@ import org.junit.Test;
 import static org.junit.Assert.assertFalse;
 
 import java.io.File;
-import java.io.IOException;
 
 public class StorageServiceClientTest
 {
     @Test
-    public void testClientOnlyMode() throws IOException, ConfigurationException
+    public void testClientOnlyMode() throws ConfigurationException
     {
         SchemaLoader.mkdirs();
         SchemaLoader.cleanup();

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java b/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java
index 503a730..f58ded6 100644
--- a/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java
+++ b/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java
@@ -59,7 +59,7 @@ public class StorageServiceServerTest
     }
 
     @Test
-    public void testRegularMode() throws IOException, InterruptedException, ConfigurationException
+    public void testRegularMode() throws ConfigurationException
     {
         SchemaLoader.mkdirs();
         SchemaLoader.cleanup();

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/test/unit/org/apache/cassandra/utils/CounterIdTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/utils/CounterIdTest.java b/test/unit/org/apache/cassandra/utils/CounterIdTest.java
index e7975f2..2b6cb32 100644
--- a/test/unit/org/apache/cassandra/utils/CounterIdTest.java
+++ b/test/unit/org/apache/cassandra/utils/CounterIdTest.java
@@ -17,8 +17,6 @@
  */
 package org.apache.cassandra.utils;
 
-import java.io.IOException;
-
 import org.junit.Test;
 
 import org.apache.cassandra.SchemaLoader;
@@ -30,7 +28,7 @@ import static org.junit.Assert.assertTrue;
 public class CounterIdTest extends SchemaLoader
 {
     @Test
-    public void testGetCurrentIdFromSystemKeyspace() throws IOException
+    public void testGetCurrentIdFromSystemKeyspace()
     {
         // Renewing a bunch of times and checking we get the same thing from
         // the system keyspace that what is in memory

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/test/unit/org/apache/cassandra/utils/MerkleTreeTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/utils/MerkleTreeTest.java b/test/unit/org/apache/cassandra/utils/MerkleTreeTest.java
index 2b459c6..864b5b8 100644
--- a/test/unit/org/apache/cassandra/utils/MerkleTreeTest.java
+++ b/test/unit/org/apache/cassandra/utils/MerkleTreeTest.java
@@ -33,7 +33,6 @@ import org.apache.cassandra.dht.*;
 import org.apache.cassandra.net.MessagingService;
 import org.apache.cassandra.utils.MerkleTree.Hashable;
 import org.apache.cassandra.utils.MerkleTree.RowHash;
-import org.apache.cassandra.utils.MerkleTree.TreeDifference;
 import org.apache.cassandra.utils.MerkleTree.TreeRange;
 import org.apache.cassandra.utils.MerkleTree.TreeRangeIterator;
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9639f959/test/unit/org/apache/cassandra/utils/UUIDTests.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/utils/UUIDTests.java b/test/unit/org/apache/cassandra/utils/UUIDTests.java
index 970c753..99cd5ae 100644
--- a/test/unit/org/apache/cassandra/utils/UUIDTests.java
+++ b/test/unit/org/apache/cassandra/utils/UUIDTests.java
@@ -24,9 +24,6 @@ package org.apache.cassandra.utils;
 import org.apache.cassandra.db.marshal.TimeUUIDType;
 import org.junit.Test;
 
-import java.math.BigInteger;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
 import java.nio.ByteBuffer;
 import java.util.UUID;
 
@@ -34,7 +31,7 @@ import java.util.UUID;
 public class UUIDTests
 {
     @Test
-    public void verifyType1() throws UnknownHostException
+    public void verifyType1()
     {
 
         UUID uuid = UUIDGen.getTimeUUID();
@@ -42,7 +39,7 @@ public class UUIDTests
     }
 
     @Test
-    public void verifyOrdering1() throws UnknownHostException
+    public void verifyOrdering1()
     {
         UUID one = UUIDGen.getTimeUUID();
         UUID two = UUIDGen.getTimeUUID();
@@ -51,7 +48,7 @@ public class UUIDTests
 
 
     @Test
-    public void testDecomposeAndRaw() throws UnknownHostException
+    public void testDecomposeAndRaw()
     {
         UUID a = UUIDGen.getTimeUUID();
         byte[] decomposed = UUIDGen.decompose(a);
@@ -60,7 +57,7 @@ public class UUIDTests
     }
 
     @Test
-    public void testTimeUUIDType() throws UnknownHostException
+    public void testTimeUUIDType()
     {
         TimeUUIDType comp = TimeUUIDType.instance;
         ByteBuffer first = ByteBuffer.wrap(UUIDGen.getTimeUUIDBytes());
@@ -72,9 +69,8 @@ public class UUIDTests
     }
 
     @Test
-    public void testUUIDTimestamp() throws UnknownHostException
+    public void testUUIDTimestamp()
     {
-        InetAddress addr = InetAddress.getByName("127.0.0.1");
         long now = System.currentTimeMillis();
         UUID uuid = UUIDGen.getTimeUUID();
         long tstamp = UUIDGen.getAdjustedTimestamp(uuid);
@@ -82,9 +78,4 @@ public class UUIDTests
         // I'll be damn is the uuid timestamp is more than 10ms after now
         assert now <= tstamp && now >= tstamp - 10 : "now = " + now + ", timestamp = " + tstamp;
     }
-
-    private void assertNonZero(BigInteger i)
-    {
-        assert i.toString(2).indexOf("1") > -1;
-    }
 }


Mime
View raw message