Fix unit tests on java7 Patch by Marcus Eriksson, reviewed by brandonwilliams for CASSANDRA-5315
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/018e82b5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/018e82b5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/018e82b5 Branch: refs/heads/trunk Commit: 018e82b5eff17b50301a01069664ef37a4ae142f Parents: 8517539 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Wed Mar 6 16:21:38 2013 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Wed Mar 6 16:21:38 2013 -0600 ---------------------------------------------------------------------- .../cassandra/config/DatabaseDescriptorTest.java | 3 +++ .../unit/org/apache/cassandra/config/DefsTest.java | 3 +++ .../apache/cassandra/db/ColumnFamilyStoreTest.java | 3 +++ .../cassandra/db/compaction/CompactionsTest.java | 3 +++ .../compaction/LeveledCompactionStrategyTest.java | 3 +++ .../org/apache/cassandra/dht/BootStrapperTest.java | 3 +++ .../cassandra/io/sstable/SSTableReaderTest.java | 3 +++ .../service/StorageServiceServerTest.java | 3 +++ .../cassandra/streaming/StreamingTransferTest.java | 3 +++ 9 files changed, 27 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/018e82b5/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java b/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java index 4273662..87f1a66 100644 --- a/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java +++ b/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java @@ -18,6 +18,7 @@ */ package org.apache.cassandra.config; +import org.apache.cassandra.OrderedJUnit4ClassRunner; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.exceptions.InvalidRequestException; @@ -26,9 +27,11 @@ import org.apache.cassandra.locator.SimpleStrategy; import org.apache.cassandra.service.MigrationManager; import org.junit.Test; +import org.junit.runner.RunWith; import java.io.IOException; +@RunWith(OrderedJUnit4ClassRunner.class) public class DatabaseDescriptorTest { @Test http://git-wip-us.apache.org/repos/asf/cassandra/blob/018e82b5/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 5bb16a0..87c53d4 100644 --- a/test/unit/org/apache/cassandra/config/DefsTest.java +++ b/test/unit/org/apache/cassandra/config/DefsTest.java @@ -24,6 +24,7 @@ import java.nio.ByteBuffer; import java.util.*; import java.util.concurrent.ExecutionException; +import org.apache.cassandra.OrderedJUnit4ClassRunner; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; import org.apache.cassandra.db.*; @@ -43,7 +44,9 @@ import org.apache.cassandra.thrift.IndexType; import org.apache.cassandra.utils.ByteBufferUtil; import org.junit.Test; +import org.junit.runner.RunWith; +@RunWith(OrderedJUnit4ClassRunner.class) public class DefsTest extends SchemaLoader { http://git-wip-us.apache.org/repos/asf/cassandra/blob/018e82b5/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 8318f0d..eab9772 100644 --- a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java +++ b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java @@ -32,6 +32,7 @@ import com.google.common.collect.Sets; import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.StringUtils; import org.junit.Test; +import org.junit.runner.RunWith; import static org.junit.Assert.assertNull; import static junit.framework.Assert.assertEquals; @@ -45,6 +46,7 @@ import static org.apache.cassandra.db.TableTest.assertColumns; import static org.apache.cassandra.utils.ByteBufferUtil.bytes; import static org.apache.commons.lang.ArrayUtils.EMPTY_BYTE_ARRAY; +import org.apache.cassandra.OrderedJUnit4ClassRunner; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; import org.apache.cassandra.config.CFMetaData; @@ -68,6 +70,7 @@ import org.apache.cassandra.thrift.*; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.WrappedRunnable; +@RunWith(OrderedJUnit4ClassRunner.class) public class ColumnFamilyStoreTest extends SchemaLoader { static byte[] bytes1, bytes2; http://git-wip-us.apache.org/repos/asf/cassandra/blob/018e82b5/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 a09451e..3a469bf 100644 --- a/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java @@ -25,7 +25,9 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import org.junit.Test; +import org.junit.runner.RunWith; +import org.apache.cassandra.OrderedJUnit4ClassRunner; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; import org.apache.cassandra.config.DatabaseDescriptor; @@ -43,6 +45,7 @@ import org.apache.cassandra.utils.FBUtilities; import static junit.framework.Assert.*; +@RunWith(OrderedJUnit4ClassRunner.class) public class CompactionsTest extends SchemaLoader { public static final String TABLE1 = "Keyspace1"; http://git-wip-us.apache.org/repos/asf/cassandra/blob/018e82b5/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 6a329c3..e073c41 100644 --- a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java @@ -21,7 +21,9 @@ import java.nio.ByteBuffer; import java.util.Collection; import org.junit.Test; +import org.junit.runner.RunWith; +import org.apache.cassandra.OrderedJUnit4ClassRunner; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; import org.apache.cassandra.db.ColumnFamilyStore; @@ -37,6 +39,7 @@ import org.apache.cassandra.service.AntiEntropyService; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; +@RunWith(OrderedJUnit4ClassRunner.class) public class LeveledCompactionStrategyTest extends SchemaLoader { /* http://git-wip-us.apache.org/repos/asf/cassandra/blob/018e82b5/test/unit/org/apache/cassandra/dht/BootStrapperTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/dht/BootStrapperTest.java b/test/unit/org/apache/cassandra/dht/BootStrapperTest.java index d2b1aec..2381545 100644 --- a/test/unit/org/apache/cassandra/dht/BootStrapperTest.java +++ b/test/unit/org/apache/cassandra/dht/BootStrapperTest.java @@ -31,7 +31,9 @@ import java.util.UUID; import java.util.concurrent.CountDownLatch; import org.junit.Test; +import org.junit.runner.RunWith; +import org.apache.cassandra.OrderedJUnit4ClassRunner; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.config.Schema; import org.apache.cassandra.db.Table; @@ -46,6 +48,7 @@ import org.apache.cassandra.utils.FBUtilities; import static org.junit.Assert.*; +@RunWith(OrderedJUnit4ClassRunner.class) public class BootStrapperTest extends SchemaLoader { @Test http://git-wip-us.apache.org/repos/asf/cassandra/blob/018e82b5/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 0fe9757..64e70f7 100644 --- a/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java @@ -31,7 +31,9 @@ import java.util.concurrent.ExecutionException; import java.util.*; import org.junit.Test; +import org.junit.runner.RunWith; +import org.apache.cassandra.OrderedJUnit4ClassRunner; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; import org.apache.cassandra.config.DatabaseDescriptor; @@ -56,6 +58,7 @@ import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.CLibrary; import org.apache.cassandra.utils.Pair; +@RunWith(OrderedJUnit4ClassRunner.class) public class SSTableReaderTest extends SchemaLoader { static Token t(int i) http://git-wip-us.apache.org/repos/asf/cassandra/blob/018e82b5/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 c4931a6..39fbb4a 100644 --- a/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java +++ b/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java @@ -25,7 +25,9 @@ import java.util.Collections; import java.util.List; import org.junit.Test; +import org.junit.runner.RunWith; +import org.apache.cassandra.OrderedJUnit4ClassRunner; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.db.Table; import org.apache.cassandra.dht.Token; @@ -35,6 +37,7 @@ import org.apache.cassandra.config.DatabaseDescriptor; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +@RunWith(OrderedJUnit4ClassRunner.class) public class StorageServiceServerTest { @Test http://git-wip-us.apache.org/repos/asf/cassandra/blob/018e82b5/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 2d96030..502e5d7 100644 --- a/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java +++ b/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java @@ -20,6 +20,7 @@ package org.apache.cassandra.streaming; */ import static junit.framework.Assert.assertEquals; +import org.apache.cassandra.OrderedJUnit4ClassRunner; import org.apache.cassandra.Util; import static org.apache.cassandra.Util.column; import static org.apache.cassandra.Util.addMutation; @@ -47,11 +48,13 @@ import org.apache.cassandra.utils.FBUtilities; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.runner.RunWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.utils.ByteBufferUtil; +@RunWith(OrderedJUnit4ClassRunner.class) public class StreamingTransferTest extends SchemaLoader { private static final Logger logger = LoggerFactory.getLogger(StreamingTransferTest.class);
