Repository: cassandra Updated Branches: refs/heads/trunk e9418f808 -> 01439740b
Replace deprecated junit.framework.Assert usages with org.junit.Assert patch by Iuri Sitinschi; reviewed by jasobrown for CASSANDRA-14431 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/01439740 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/01439740 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/01439740 Branch: refs/heads/trunk Commit: 01439740bc26804b10c4cf6f6061925175598241 Parents: e9418f8 Author: Iuri Sitinschi <yuka...@gmail.com> Authored: Tue May 1 23:05:09 2018 +0200 Committer: Jason Brown <jasedbr...@gmail.com> Committed: Tue May 1 19:20:35 2018 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/cql3/CachingBench.java | 2 +- .../cassandra/cql3/GcCompactionBench.java | 2 +- .../NoReplicationTokenAllocatorTest.java | 2 +- ...buggableScheduledThreadPoolExecutorTest.java | 2 +- .../cassandra/cql3/ColumnIdentifierTest.java | 2 +- .../cassandra/cql3/PstmtPersistenceTest.java | 2 +- .../cassandra/cql3/ReservedKeywordsTest.java | 2 +- .../cassandra/cql3/SerializationMirrorTest.java | 2 +- .../cassandra/cql3/ViewFilteringTest.java | 2 +- .../apache/cassandra/cql3/ViewSchemaTest.java | 2 +- .../org/apache/cassandra/cql3/ViewTest.java | 2 +- .../cql3/validation/entities/TimestampTest.java | 2 +- .../miscellaneous/CrcCheckChanceTest.java | 42 ++++++++++---------- test/unit/org/apache/cassandra/db/CellTest.java | 2 +- .../org/apache/cassandra/db/ColumnsTest.java | 2 +- .../apache/cassandra/db/TransformerTest.java | 2 +- .../db/commitlog/CommitLogUpgradeTest.java | 2 +- .../AbstractCompactionStrategyTest.java | 2 +- .../LeveledCompactionStrategyTest.java | 2 +- .../cassandra/db/filter/ColumnFilterTest.java | 2 +- .../cassandra/db/lifecycle/HelpersTest.java | 2 +- .../db/lifecycle/LifecycleTransactionTest.java | 2 +- .../db/lifecycle/LogTransactionTest.java | 2 +- .../db/lifecycle/RealTransactionsTest.java | 2 +- .../cassandra/db/lifecycle/TrackerTest.java | 2 +- .../apache/cassandra/db/lifecycle/ViewTest.java | 2 +- .../cassandra/db/marshal/TimeUUIDTypeTest.java | 2 +- .../cassandra/db/marshal/UUIDTypeTest.java | 2 +- .../db/partition/PartitionUpdateTest.java | 2 +- .../db/rows/UnfilteredRowIteratorsTest.java | 2 +- .../apache/cassandra/db/view/ViewUtilsTest.java | 2 +- .../cassandra/index/sasi/SASICQLTest.java | 2 +- .../cassandra/index/sasi/SASIIndexTest.java | 18 ++++----- .../index/sasi/disk/OnDiskIndexTest.java | 2 +- .../index/sasi/disk/TokenTreeTest.java | 2 +- .../CompressedSequentialWriterTest.java | 2 +- .../io/sstable/BigTableWriterTest.java | 2 +- .../format/SSTableFlushObserverTest.java | 2 +- .../util/ChecksummedSequentialWriterTest.java | 2 +- .../apache/cassandra/io/util/MemoryTest.java | 2 +- .../cassandra/io/util/SequentialWriterTest.java | 2 +- .../cassandra/net/WriteCallbackInfoTest.java | 2 +- .../streaming/StreamTransferTaskTest.java | 2 +- .../streaming/StreamingTransferTest.java | 2 +- .../org/apache/cassandra/utils/BTreeTest.java | 2 +- .../apache/cassandra/utils/TopKSamplerTest.java | 2 +- .../concurrent/AbstractTransactionalTest.java | 2 +- .../utils/concurrent/RefCountedTest.java | 2 +- .../utils/memory/NativeAllocatorTest.java | 2 +- .../cassandra/utils/vint/VIntCodingTest.java | 2 +- 51 files changed, 79 insertions(+), 78 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 2545e83..27e69b8 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 4.0 + * Replace deprecated junit.framework.Assert usages with org.junit.Assert (CASSANDRA-14431) * cassandra-stress throws NPE if insert section isn't specified in user profile (CASSSANDRA-14426) * Improve LatencyMetrics performance by reducing write path processing (CASSANDRA-14281) * Add network authz (CASSANDRA-13985) http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/long/org/apache/cassandra/cql3/CachingBench.java ---------------------------------------------------------------------- diff --git a/test/long/org/apache/cassandra/cql3/CachingBench.java b/test/long/org/apache/cassandra/cql3/CachingBench.java index a0e4226..0a6657f 100644 --- a/test/long/org/apache/cassandra/cql3/CachingBench.java +++ b/test/long/org/apache/cassandra/cql3/CachingBench.java @@ -33,7 +33,7 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.cassandra.config.Config.CommitLogSync; import org.apache.cassandra.config.Config.DiskAccessMode; import org.apache.cassandra.cache.ChunkCache; http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/long/org/apache/cassandra/cql3/GcCompactionBench.java ---------------------------------------------------------------------- diff --git a/test/long/org/apache/cassandra/cql3/GcCompactionBench.java b/test/long/org/apache/cassandra/cql3/GcCompactionBench.java index 5d27fa6..01abb63 100644 --- a/test/long/org/apache/cassandra/cql3/GcCompactionBench.java +++ b/test/long/org/apache/cassandra/cql3/GcCompactionBench.java @@ -33,7 +33,7 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.cassandra.config.Config.CommitLogSync; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamilyStore; http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/long/org/apache/cassandra/dht/tokenallocator/NoReplicationTokenAllocatorTest.java ---------------------------------------------------------------------- diff --git a/test/long/org/apache/cassandra/dht/tokenallocator/NoReplicationTokenAllocatorTest.java b/test/long/org/apache/cassandra/dht/tokenallocator/NoReplicationTokenAllocatorTest.java index 202c0f2..ccad0f8 100644 --- a/test/long/org/apache/cassandra/dht/tokenallocator/NoReplicationTokenAllocatorTest.java +++ b/test/long/org/apache/cassandra/dht/tokenallocator/NoReplicationTokenAllocatorTest.java @@ -28,7 +28,7 @@ import com.google.common.collect.Maps; import org.apache.commons.math3.stat.descriptive.SummaryStatistics; import org.junit.Test; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.dht.RandomPartitioner; http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/unit/org/apache/cassandra/concurrent/DebuggableScheduledThreadPoolExecutorTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/concurrent/DebuggableScheduledThreadPoolExecutorTest.java b/test/unit/org/apache/cassandra/concurrent/DebuggableScheduledThreadPoolExecutorTest.java index bf78d65..1aac470 100644 --- a/test/unit/org/apache/cassandra/concurrent/DebuggableScheduledThreadPoolExecutorTest.java +++ b/test/unit/org/apache/cassandra/concurrent/DebuggableScheduledThreadPoolExecutorTest.java @@ -29,7 +29,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.junit.BeforeClass; import org.junit.Test; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.cassandra.service.EmbeddedCassandraService; import org.apache.cassandra.service.StorageService; http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/unit/org/apache/cassandra/cql3/ColumnIdentifierTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/ColumnIdentifierTest.java b/test/unit/org/apache/cassandra/cql3/ColumnIdentifierTest.java index ea483c4..c37d82a 100644 --- a/test/unit/org/apache/cassandra/cql3/ColumnIdentifierTest.java +++ b/test/unit/org/apache/cassandra/cql3/ColumnIdentifierTest.java @@ -23,7 +23,7 @@ import java.util.concurrent.ThreadLocalRandom; import org.junit.Test; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.BytesType; import org.apache.cassandra.db.marshal.UTF8Type; http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/unit/org/apache/cassandra/cql3/PstmtPersistenceTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/PstmtPersistenceTest.java b/test/unit/org/apache/cassandra/cql3/PstmtPersistenceTest.java index 7ca6ab9..2b5a14a 100644 --- a/test/unit/org/apache/cassandra/cql3/PstmtPersistenceTest.java +++ b/test/unit/org/apache/cassandra/cql3/PstmtPersistenceTest.java @@ -25,7 +25,7 @@ import java.util.List; import org.junit.Before; import org.junit.Test; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.cassandra.cql3.statements.ParsedStatement; import org.apache.cassandra.db.SystemKeyspace; import org.apache.cassandra.db.marshal.Int32Type; http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/unit/org/apache/cassandra/cql3/ReservedKeywordsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/ReservedKeywordsTest.java b/test/unit/org/apache/cassandra/cql3/ReservedKeywordsTest.java index aaf9824..111897e 100644 --- a/test/unit/org/apache/cassandra/cql3/ReservedKeywordsTest.java +++ b/test/unit/org/apache/cassandra/cql3/ReservedKeywordsTest.java @@ -20,7 +20,7 @@ package org.apache.cassandra.cql3; import org.junit.Test; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.cassandra.exceptions.SyntaxException; public class ReservedKeywordsTest http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/unit/org/apache/cassandra/cql3/SerializationMirrorTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/SerializationMirrorTest.java b/test/unit/org/apache/cassandra/cql3/SerializationMirrorTest.java index 3268784..ed49d70 100644 --- a/test/unit/org/apache/cassandra/cql3/SerializationMirrorTest.java +++ b/test/unit/org/apache/cassandra/cql3/SerializationMirrorTest.java @@ -24,7 +24,7 @@ import java.util.concurrent.ThreadLocalRandom; import org.junit.Test; -import junit.framework.Assert; +import org.junit.Assert; public class SerializationMirrorTest extends CQLTester { http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/unit/org/apache/cassandra/cql3/ViewFilteringTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/ViewFilteringTest.java b/test/unit/org/apache/cassandra/cql3/ViewFilteringTest.java index f2d8f2a..b7d3647 100644 --- a/test/unit/org/apache/cassandra/cql3/ViewFilteringTest.java +++ b/test/unit/org/apache/cassandra/cql3/ViewFilteringTest.java @@ -28,7 +28,7 @@ import org.junit.Ignore; import org.junit.Test; import com.datastax.driver.core.exceptions.InvalidQueryException; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.cassandra.concurrent.SEPExecutor; import org.apache.cassandra.concurrent.Stage; http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/unit/org/apache/cassandra/cql3/ViewSchemaTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/ViewSchemaTest.java b/test/unit/org/apache/cassandra/cql3/ViewSchemaTest.java index 2544e84..63ac3e3 100644 --- a/test/unit/org/apache/cassandra/cql3/ViewSchemaTest.java +++ b/test/unit/org/apache/cassandra/cql3/ViewSchemaTest.java @@ -29,7 +29,7 @@ import java.util.HashSet; import java.util.List; import java.util.UUID; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.cassandra.concurrent.SEPExecutor; import org.apache.cassandra.concurrent.Stage; http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/unit/org/apache/cassandra/cql3/ViewTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/ViewTest.java b/test/unit/org/apache/cassandra/cql3/ViewTest.java index 2b95574..40d75c4 100644 --- a/test/unit/org/apache/cassandra/cql3/ViewTest.java +++ b/test/unit/org/apache/cassandra/cql3/ViewTest.java @@ -27,7 +27,7 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import com.google.common.util.concurrent.Uninterruptibles; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/unit/org/apache/cassandra/cql3/validation/entities/TimestampTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/validation/entities/TimestampTest.java b/test/unit/org/apache/cassandra/cql3/validation/entities/TimestampTest.java index ddc402c..63cd2b7 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/entities/TimestampTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/entities/TimestampTest.java @@ -19,7 +19,7 @@ package org.apache.cassandra.cql3.validation.entities; import org.junit.Test; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.cassandra.cql3.CQLTester; import static junit.framework.Assert.assertNull; http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/unit/org/apache/cassandra/cql3/validation/miscellaneous/CrcCheckChanceTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/validation/miscellaneous/CrcCheckChanceTest.java b/test/unit/org/apache/cassandra/cql3/validation/miscellaneous/CrcCheckChanceTest.java index becbdad..246f512 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/miscellaneous/CrcCheckChanceTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/miscellaneous/CrcCheckChanceTest.java @@ -23,7 +23,7 @@ import java.util.concurrent.Future; import org.junit.Test; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.db.ColumnFamilyStore; @@ -70,11 +70,11 @@ public class CrcCheckChanceTest extends CQLTester ColumnFamilyStore indexCfs = cfs.indexManager.getAllIndexColumnFamilyStores().iterator().next(); cfs.forceBlockingFlush(); - Assert.assertEquals(0.99, cfs.getCrcCheckChance()); - Assert.assertEquals(0.99, cfs.getLiveSSTables().iterator().next().getCrcCheckChance()); + Assert.assertEquals(0.99, cfs.getCrcCheckChance(), 0.0); + Assert.assertEquals(0.99, cfs.getLiveSSTables().iterator().next().getCrcCheckChance(), 0.0); - Assert.assertEquals(0.99, indexCfs.getCrcCheckChance()); - Assert.assertEquals(0.99, indexCfs.getLiveSSTables().iterator().next().getCrcCheckChance()); + Assert.assertEquals(0.99, indexCfs.getCrcCheckChance(), 0.0); + Assert.assertEquals(0.99, indexCfs.getLiveSSTables().iterator().next().getCrcCheckChance(), 0.0); //Test for stack overflow if (newFormat) @@ -114,10 +114,10 @@ public class CrcCheckChanceTest extends CQLTester //Now let's change via JMX cfs.setCrcCheckChance(0.01); - Assert.assertEquals(0.01, cfs.getCrcCheckChance()); - Assert.assertEquals(0.01, cfs.getLiveSSTables().iterator().next().getCrcCheckChance()); - Assert.assertEquals(0.01, indexCfs.getCrcCheckChance()); - Assert.assertEquals(0.01, indexCfs.getLiveSSTables().iterator().next().getCrcCheckChance()); + Assert.assertEquals(0.01, cfs.getCrcCheckChance(), 0.0); + Assert.assertEquals(0.01, cfs.getLiveSSTables().iterator().next().getCrcCheckChance(), 0.0); + Assert.assertEquals(0.01, indexCfs.getCrcCheckChance(), 0.0); + Assert.assertEquals(0.01, indexCfs.getLiveSSTables().iterator().next().getCrcCheckChance(), 0.0); assertRows(execute("SELECT * FROM %s WHERE p=?", "p1"), row("p1", "k1", "sv1", "v1"), @@ -135,19 +135,19 @@ public class CrcCheckChanceTest extends CQLTester alterTable("ALTER TABLE %s WITH compression = {'sstable_compression': 'LZ4Compressor', 'crc_check_chance': 0.5}"); //We should be able to get the new value by accessing directly the schema metadata - Assert.assertEquals(0.5, cfs.metadata().params.crcCheckChance); + Assert.assertEquals(0.5, cfs.metadata().params.crcCheckChance, 0.0); //but previous JMX-set value will persist until next restart - Assert.assertEquals(0.01, cfs.getLiveSSTables().iterator().next().getCrcCheckChance()); - Assert.assertEquals(0.01, indexCfs.getCrcCheckChance()); - Assert.assertEquals(0.01, indexCfs.getLiveSSTables().iterator().next().getCrcCheckChance()); + Assert.assertEquals(0.01, cfs.getLiveSSTables().iterator().next().getCrcCheckChance(), 0.0); + Assert.assertEquals(0.01, indexCfs.getCrcCheckChance(), 0.0); + Assert.assertEquals(0.01, indexCfs.getLiveSSTables().iterator().next().getCrcCheckChance(), 0.0); //Verify the call used by JMX still works cfs.setCrcCheckChance(0.03); - Assert.assertEquals(0.03, cfs.getCrcCheckChance()); - Assert.assertEquals(0.03, cfs.getLiveSSTables().iterator().next().getCrcCheckChance()); - Assert.assertEquals(0.03, indexCfs.getCrcCheckChance()); - Assert.assertEquals(0.03, indexCfs.getLiveSSTables().iterator().next().getCrcCheckChance()); + Assert.assertEquals(0.03, cfs.getCrcCheckChance(), 0.0); + Assert.assertEquals(0.03, cfs.getLiveSSTables().iterator().next().getCrcCheckChance(), 0.0); + Assert.assertEquals(0.03, indexCfs.getCrcCheckChance(), 0.0); + Assert.assertEquals(0.03, indexCfs.getLiveSSTables().iterator().next().getCrcCheckChance(), 0.0); // Also check that any open readers also use the updated value // note: only compressed files currently perform crc checks, so only the dfile reader is relevant here @@ -156,12 +156,12 @@ public class CrcCheckChanceTest extends CQLTester try (RandomAccessReader baseDataReader = baseSSTable.openDataReader(); RandomAccessReader idxDataReader = idxSSTable.openDataReader()) { - Assert.assertEquals(0.03, baseDataReader.getCrcCheckChance()); - Assert.assertEquals(0.03, idxDataReader.getCrcCheckChance()); + Assert.assertEquals(0.03, baseDataReader.getCrcCheckChance(), 0.0); + Assert.assertEquals(0.03, idxDataReader.getCrcCheckChance(), 0.0); cfs.setCrcCheckChance(0.31); - Assert.assertEquals(0.31, baseDataReader.getCrcCheckChance()); - Assert.assertEquals(0.31, idxDataReader.getCrcCheckChance()); + Assert.assertEquals(0.31, baseDataReader.getCrcCheckChance(), 0.0); + Assert.assertEquals(0.31, idxDataReader.getCrcCheckChance(), 0.0); } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/unit/org/apache/cassandra/db/CellTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/CellTest.java b/test/unit/org/apache/cassandra/db/CellTest.java index df3d150..c94282f 100644 --- a/test/unit/org/apache/cassandra/db/CellTest.java +++ b/test/unit/org/apache/cassandra/db/CellTest.java @@ -23,7 +23,7 @@ import java.util.List; import com.google.common.collect.Lists; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/unit/org/apache/cassandra/db/ColumnsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/ColumnsTest.java b/test/unit/org/apache/cassandra/db/ColumnsTest.java index ae0bbd8..6a3b86f 100644 --- a/test/unit/org/apache/cassandra/db/ColumnsTest.java +++ b/test/unit/org/apache/cassandra/db/ColumnsTest.java @@ -29,7 +29,7 @@ import com.google.common.collect.Lists; import org.junit.AfterClass; import org.junit.Test; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.marshal.SetType; import org.apache.cassandra.db.marshal.UTF8Type; http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/unit/org/apache/cassandra/db/TransformerTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/TransformerTest.java b/test/unit/org/apache/cassandra/db/TransformerTest.java index eda3a52..9c2ed91 100644 --- a/test/unit/org/apache/cassandra/db/TransformerTest.java +++ b/test/unit/org/apache/cassandra/db/TransformerTest.java @@ -23,7 +23,7 @@ import java.util.List; import org.junit.Test; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.cassandra.Util; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.config.DatabaseDescriptor; http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTest.java b/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTest.java index f89f16c..7d3689e 100644 --- a/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTest.java +++ b/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTest.java @@ -25,7 +25,7 @@ import java.io.*; import java.nio.ByteBuffer; import java.util.Properties; -import junit.framework.Assert; +import org.junit.Assert; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/unit/org/apache/cassandra/db/compaction/AbstractCompactionStrategyTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/compaction/AbstractCompactionStrategyTest.java b/test/unit/org/apache/cassandra/db/compaction/AbstractCompactionStrategyTest.java index b77589d..e4be57b 100644 --- a/test/unit/org/apache/cassandra/db/compaction/AbstractCompactionStrategyTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/AbstractCompactionStrategyTest.java @@ -26,7 +26,7 @@ import org.junit.After; import org.junit.BeforeClass; import org.junit.Test; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; import org.apache.cassandra.db.ColumnFamilyStore; http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/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 f7e9b90..9ebe326 100644 --- a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java @@ -27,7 +27,7 @@ import java.util.List; import java.util.Random; import java.util.UUID; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/unit/org/apache/cassandra/db/filter/ColumnFilterTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/filter/ColumnFilterTest.java b/test/unit/org/apache/cassandra/db/filter/ColumnFilterTest.java index 15bfb9c..42f6957 100644 --- a/test/unit/org/apache/cassandra/db/filter/ColumnFilterTest.java +++ b/test/unit/org/apache/cassandra/db/filter/ColumnFilterTest.java @@ -37,7 +37,7 @@ import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.utils.ByteBufferUtil; import org.junit.Test; -import junit.framework.Assert; +import org.junit.Assert; public class ColumnFilterTest { http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/unit/org/apache/cassandra/db/lifecycle/HelpersTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/lifecycle/HelpersTest.java b/test/unit/org/apache/cassandra/db/lifecycle/HelpersTest.java index 612c5ac..2bba7bd 100644 --- a/test/unit/org/apache/cassandra/db/lifecycle/HelpersTest.java +++ b/test/unit/org/apache/cassandra/db/lifecycle/HelpersTest.java @@ -30,7 +30,7 @@ import com.google.common.collect.Lists; import org.junit.BeforeClass; import org.junit.Test; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.compaction.OperationType; http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/unit/org/apache/cassandra/db/lifecycle/LifecycleTransactionTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/lifecycle/LifecycleTransactionTest.java b/test/unit/org/apache/cassandra/db/lifecycle/LifecycleTransactionTest.java index 0cc5b72..1e0d157 100644 --- a/test/unit/org/apache/cassandra/db/lifecycle/LifecycleTransactionTest.java +++ b/test/unit/org/apache/cassandra/db/lifecycle/LifecycleTransactionTest.java @@ -27,7 +27,7 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Memtable; http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/unit/org/apache/cassandra/db/lifecycle/LogTransactionTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/lifecycle/LogTransactionTest.java b/test/unit/org/apache/cassandra/db/lifecycle/LogTransactionTest.java index 536bdca..5694e86 100644 --- a/test/unit/org/apache/cassandra/db/lifecycle/LogTransactionTest.java +++ b/test/unit/org/apache/cassandra/db/lifecycle/LogTransactionTest.java @@ -32,7 +32,7 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Sets; import org.junit.BeforeClass; import org.junit.Test; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Directories; http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/unit/org/apache/cassandra/db/lifecycle/RealTransactionsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/lifecycle/RealTransactionsTest.java b/test/unit/org/apache/cassandra/db/lifecycle/RealTransactionsTest.java index bb8cc68..5cda2ad 100644 --- a/test/unit/org/apache/cassandra/db/lifecycle/RealTransactionsTest.java +++ b/test/unit/org/apache/cassandra/db/lifecycle/RealTransactionsTest.java @@ -28,7 +28,7 @@ import java.util.concurrent.TimeUnit; import org.junit.BeforeClass; import org.junit.Test; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.schema.TableMetadataRef; import org.apache.cassandra.schema.Schema; http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/unit/org/apache/cassandra/db/lifecycle/TrackerTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/lifecycle/TrackerTest.java b/test/unit/org/apache/cassandra/db/lifecycle/TrackerTest.java index 93ee198..bee322c 100644 --- a/test/unit/org/apache/cassandra/db/lifecycle/TrackerTest.java +++ b/test/unit/org/apache/cassandra/db/lifecycle/TrackerTest.java @@ -34,7 +34,7 @@ import com.google.common.collect.Iterables; import org.junit.BeforeClass; import org.junit.Test; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Memtable; http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/unit/org/apache/cassandra/db/lifecycle/ViewTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/lifecycle/ViewTest.java b/test/unit/org/apache/cassandra/db/lifecycle/ViewTest.java index f092854..5fa8540 100644 --- a/test/unit/org/apache/cassandra/db/lifecycle/ViewTest.java +++ b/test/unit/org/apache/cassandra/db/lifecycle/ViewTest.java @@ -31,7 +31,7 @@ import com.google.common.collect.Iterables; import org.junit.BeforeClass; import org.junit.Test; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Memtable; http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/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 b6160bf..9a71e06 100644 --- a/test/unit/org/apache/cassandra/db/marshal/TimeUUIDTypeTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/TimeUUIDTypeTest.java @@ -21,7 +21,7 @@ package org.apache.cassandra.db.marshal; import java.nio.ByteBuffer; import java.util.UUID; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.cassandra.serializers.MarshalException; import org.junit.Test; import static org.junit.Assert.assertEquals; http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/unit/org/apache/cassandra/db/marshal/UUIDTypeTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/marshal/UUIDTypeTest.java b/test/unit/org/apache/cassandra/db/marshal/UUIDTypeTest.java index 335860c..12a8871 100644 --- a/test/unit/org/apache/cassandra/db/marshal/UUIDTypeTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/UUIDTypeTest.java @@ -30,7 +30,7 @@ import java.util.UUID; import org.junit.Test; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.UUIDGen; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/unit/org/apache/cassandra/db/partition/PartitionUpdateTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/partition/PartitionUpdateTest.java b/test/unit/org/apache/cassandra/db/partition/PartitionUpdateTest.java index f887ede..8f2f35b 100644 --- a/test/unit/org/apache/cassandra/db/partition/PartitionUpdateTest.java +++ b/test/unit/org/apache/cassandra/db/partition/PartitionUpdateTest.java @@ -25,7 +25,7 @@ import org.apache.cassandra.db.partitions.PartitionUpdate; import org.apache.cassandra.utils.FBUtilities; import org.junit.Test; -import junit.framework.Assert; +import org.junit.Assert; public class PartitionUpdateTest extends CQLTester { http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/unit/org/apache/cassandra/db/rows/UnfilteredRowIteratorsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/rows/UnfilteredRowIteratorsTest.java b/test/unit/org/apache/cassandra/db/rows/UnfilteredRowIteratorsTest.java index ccf9781..a936504 100644 --- a/test/unit/org/apache/cassandra/db/rows/UnfilteredRowIteratorsTest.java +++ b/test/unit/org/apache/cassandra/db/rows/UnfilteredRowIteratorsTest.java @@ -23,7 +23,7 @@ import java.util.Iterator; import org.junit.Test; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.cassandra.Util; import org.apache.cassandra.db.BufferDecoratedKey; import org.apache.cassandra.db.DecoratedKey; http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/unit/org/apache/cassandra/db/view/ViewUtilsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/view/ViewUtilsTest.java b/test/unit/org/apache/cassandra/db/view/ViewUtilsTest.java index 423ad28..ec0f6b1 100644 --- a/test/unit/org/apache/cassandra/db/view/ViewUtilsTest.java +++ b/test/unit/org/apache/cassandra/db/view/ViewUtilsTest.java @@ -25,7 +25,7 @@ import java.util.Optional; import org.junit.BeforeClass; import org.junit.Test; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.schema.Schema; http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/unit/org/apache/cassandra/index/sasi/SASICQLTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/index/sasi/SASICQLTest.java b/test/unit/org/apache/cassandra/index/sasi/SASICQLTest.java index efef880..f46e0b8 100644 --- a/test/unit/org/apache/cassandra/index/sasi/SASICQLTest.java +++ b/test/unit/org/apache/cassandra/index/sasi/SASICQLTest.java @@ -27,7 +27,7 @@ import org.junit.Test; import com.datastax.driver.core.Row; import com.datastax.driver.core.Session; import com.datastax.driver.core.SimpleStatement; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.cassandra.cql3.CQLTester; public class SASICQLTest extends CQLTester http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java b/test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java index 071f84d..fac7008 100644 --- a/test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java +++ b/test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java @@ -75,7 +75,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.google.common.util.concurrent.Uninterruptibles; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.*; @@ -1819,18 +1819,18 @@ public class SASIIndexTest UntypedResultSet.Row row1 = iterator.next(); Assert.assertEquals(20160401L, row1.getLong("date")); - Assert.assertEquals(24.46, row1.getDouble("value")); + Assert.assertEquals(24.46, row1.getDouble("value"), 0.0); Assert.assertEquals(2, row1.getInt("variance")); UntypedResultSet.Row row2 = iterator.next(); Assert.assertEquals(20160402L, row2.getLong("date")); - Assert.assertEquals(25.62, row2.getDouble("value")); + Assert.assertEquals(25.62, row2.getDouble("value"), 0.0); Assert.assertEquals(5, row2.getInt("variance")); UntypedResultSet.Row row3 = iterator.next(); Assert.assertEquals(20160403L, row3.getLong("date")); - Assert.assertEquals(24.96, row3.getDouble("value")); + Assert.assertEquals(24.96, row3.getDouble("value"), 0.0); Assert.assertEquals(4, row3.getInt("variance")); @@ -1842,7 +1842,7 @@ public class SASIIndexTest row1 = results.one(); Assert.assertEquals(20160402L, row1.getLong("date")); - Assert.assertEquals(1.04, row1.getDouble("value")); + Assert.assertEquals(1.04, row1.getDouble("value"), 0.0); Assert.assertEquals(7, row1.getInt("variance")); // Only non statc columns filtering @@ -1855,26 +1855,26 @@ public class SASIIndexTest row1 = iterator.next(); Assert.assertEquals("TEMPERATURE", row1.getString("sensor_type")); Assert.assertEquals(20160401L, row1.getLong("date")); - Assert.assertEquals(24.46, row1.getDouble("value")); + Assert.assertEquals(24.46, row1.getDouble("value"), 0.0); Assert.assertEquals(2, row1.getInt("variance")); row2 = iterator.next(); Assert.assertEquals("TEMPERATURE", row2.getString("sensor_type")); Assert.assertEquals(20160402L, row2.getLong("date")); - Assert.assertEquals(25.62, row2.getDouble("value")); + Assert.assertEquals(25.62, row2.getDouble("value"), 0.0); Assert.assertEquals(5, row2.getInt("variance")); row3 = iterator.next(); Assert.assertEquals("TEMPERATURE", row3.getString("sensor_type")); Assert.assertEquals(20160403L, row3.getLong("date")); - Assert.assertEquals(24.96, row3.getDouble("value")); + Assert.assertEquals(24.96, row3.getDouble("value"), 0.0); Assert.assertEquals(4, row3.getInt("variance")); UntypedResultSet.Row row4 = iterator.next(); Assert.assertEquals("PRESSURE", row4.getString("sensor_type")); Assert.assertEquals(20160402L, row4.getLong("date")); - Assert.assertEquals(1.04, row4.getDouble("value")); + Assert.assertEquals(1.04, row4.getDouble("value"), 0.0); Assert.assertEquals(7, row4.getInt("variance")); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/unit/org/apache/cassandra/index/sasi/disk/OnDiskIndexTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/index/sasi/disk/OnDiskIndexTest.java b/test/unit/org/apache/cassandra/index/sasi/disk/OnDiskIndexTest.java index 10dc7a8..c0e6587 100644 --- a/test/unit/org/apache/cassandra/index/sasi/disk/OnDiskIndexTest.java +++ b/test/unit/org/apache/cassandra/index/sasi/disk/OnDiskIndexTest.java @@ -48,7 +48,7 @@ import com.google.common.base.Function; import com.google.common.collect.Iterators; import com.google.common.collect.Sets; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/unit/org/apache/cassandra/index/sasi/disk/TokenTreeTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/index/sasi/disk/TokenTreeTest.java b/test/unit/org/apache/cassandra/index/sasi/disk/TokenTreeTest.java index 3d0850a..597993a 100644 --- a/test/unit/org/apache/cassandra/index/sasi/disk/TokenTreeTest.java +++ b/test/unit/org/apache/cassandra/index/sasi/disk/TokenTreeTest.java @@ -42,7 +42,7 @@ import org.apache.cassandra.utils.MurmurHash; import org.apache.cassandra.io.util.RandomAccessReader; import org.apache.cassandra.io.util.SequentialWriter; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterTest.java b/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterTest.java index feb974a..e07381a 100644 --- a/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterTest.java +++ b/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterTest.java @@ -33,7 +33,7 @@ import org.junit.After; import org.junit.BeforeClass; import org.junit.Test; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ClusteringComparator; http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/unit/org/apache/cassandra/io/sstable/BigTableWriterTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/sstable/BigTableWriterTest.java b/test/unit/org/apache/cassandra/io/sstable/BigTableWriterTest.java index 666c2e9..cee8802 100644 --- a/test/unit/org/apache/cassandra/io/sstable/BigTableWriterTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/BigTableWriterTest.java @@ -23,7 +23,7 @@ import java.io.IOException; import org.junit.BeforeClass; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.UpdateBuilder; import org.apache.cassandra.db.ColumnFamilyStore; http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/unit/org/apache/cassandra/io/sstable/format/SSTableFlushObserverTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/sstable/format/SSTableFlushObserverTest.java b/test/unit/org/apache/cassandra/io/sstable/format/SSTableFlushObserverTest.java index 18bb6b1..9aa4e28 100644 --- a/test/unit/org/apache/cassandra/io/sstable/format/SSTableFlushObserverTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/format/SSTableFlushObserverTest.java @@ -52,7 +52,7 @@ import org.apache.cassandra.utils.Pair; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/unit/org/apache/cassandra/io/util/ChecksummedSequentialWriterTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/util/ChecksummedSequentialWriterTest.java b/test/unit/org/apache/cassandra/io/util/ChecksummedSequentialWriterTest.java index 29d4eea..6837d1d 100644 --- a/test/unit/org/apache/cassandra/io/util/ChecksummedSequentialWriterTest.java +++ b/test/unit/org/apache/cassandra/io/util/ChecksummedSequentialWriterTest.java @@ -26,7 +26,7 @@ import java.util.List; import org.junit.After; import org.junit.BeforeClass; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.cassandra.config.DatabaseDescriptor; public class ChecksummedSequentialWriterTest extends SequentialWriterTest http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/unit/org/apache/cassandra/io/util/MemoryTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/util/MemoryTest.java b/test/unit/org/apache/cassandra/io/util/MemoryTest.java index 81dee7e..677992f 100644 --- a/test/unit/org/apache/cassandra/io/util/MemoryTest.java +++ b/test/unit/org/apache/cassandra/io/util/MemoryTest.java @@ -27,7 +27,7 @@ import java.util.concurrent.ThreadLocalRandom; import org.junit.Test; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.cassandra.utils.memory.MemoryUtil; import static org.junit.Assert.assertEquals; http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/unit/org/apache/cassandra/io/util/SequentialWriterTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/util/SequentialWriterTest.java b/test/unit/org/apache/cassandra/io/util/SequentialWriterTest.java index 002ed23..c1ffda2 100644 --- a/test/unit/org/apache/cassandra/io/util/SequentialWriterTest.java +++ b/test/unit/org/apache/cassandra/io/util/SequentialWriterTest.java @@ -31,7 +31,7 @@ import org.junit.After; import org.junit.BeforeClass; import org.junit.Test; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.io.compress.BufferType; http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/unit/org/apache/cassandra/net/WriteCallbackInfoTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/net/WriteCallbackInfoTest.java b/test/unit/org/apache/cassandra/net/WriteCallbackInfoTest.java index c8469a8..d97cdb8 100644 --- a/test/unit/org/apache/cassandra/net/WriteCallbackInfoTest.java +++ b/test/unit/org/apache/cassandra/net/WriteCallbackInfoTest.java @@ -23,7 +23,7 @@ import java.util.UUID; import org.junit.BeforeClass; import org.junit.Test; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.BufferDecoratedKey; import org.apache.cassandra.db.ConsistencyLevel; http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java b/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java index 63dcfba..78b3094 100644 --- a/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java +++ b/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java @@ -32,7 +32,7 @@ import org.junit.After; import org.junit.Test; import io.netty.channel.embedded.EmbeddedChannel; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/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 2143903..72b9cbe 100644 --- a/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java +++ b/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java @@ -30,7 +30,7 @@ import org.junit.runner.RunWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.cassandra.OrderedJUnit4ClassRunner; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/unit/org/apache/cassandra/utils/BTreeTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/utils/BTreeTest.java b/test/unit/org/apache/cassandra/utils/BTreeTest.java index ec4cdb8..02249ad 100644 --- a/test/unit/org/apache/cassandra/utils/BTreeTest.java +++ b/test/unit/org/apache/cassandra/utils/BTreeTest.java @@ -24,7 +24,7 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import org.junit.Test; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.cassandra.utils.btree.BTree; import org.apache.cassandra.utils.btree.UpdateFunction; http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/unit/org/apache/cassandra/utils/TopKSamplerTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/utils/TopKSamplerTest.java b/test/unit/org/apache/cassandra/utils/TopKSamplerTest.java index 42aef0c..f35d072 100644 --- a/test/unit/org/apache/cassandra/utils/TopKSamplerTest.java +++ b/test/unit/org/apache/cassandra/utils/TopKSamplerTest.java @@ -33,7 +33,7 @@ import org.junit.Test; import com.clearspring.analytics.hash.MurmurHash; import com.clearspring.analytics.stream.Counter; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.cassandra.concurrent.NamedThreadFactory; import org.apache.cassandra.utils.TopKSampler.SamplerResult; http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/unit/org/apache/cassandra/utils/concurrent/AbstractTransactionalTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/utils/concurrent/AbstractTransactionalTest.java b/test/unit/org/apache/cassandra/utils/concurrent/AbstractTransactionalTest.java index 5a20d67..f5ea3e8 100644 --- a/test/unit/org/apache/cassandra/utils/concurrent/AbstractTransactionalTest.java +++ b/test/unit/org/apache/cassandra/utils/concurrent/AbstractTransactionalTest.java @@ -22,7 +22,7 @@ import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.cassandra.config.DatabaseDescriptor; @Ignore http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/unit/org/apache/cassandra/utils/concurrent/RefCountedTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/utils/concurrent/RefCountedTest.java b/test/unit/org/apache/cassandra/utils/concurrent/RefCountedTest.java index 0582ad4..7ea23eb 100644 --- a/test/unit/org/apache/cassandra/utils/concurrent/RefCountedTest.java +++ b/test/unit/org/apache/cassandra/utils/concurrent/RefCountedTest.java @@ -20,7 +20,7 @@ package org.apache.cassandra.utils.concurrent; import org.junit.Test; -import junit.framework.Assert; +import org.junit.Assert; import java.io.File; import java.lang.ref.WeakReference; http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/unit/org/apache/cassandra/utils/memory/NativeAllocatorTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/utils/memory/NativeAllocatorTest.java b/test/unit/org/apache/cassandra/utils/memory/NativeAllocatorTest.java index b636bf7..e8a7b54 100644 --- a/test/unit/org/apache/cassandra/utils/memory/NativeAllocatorTest.java +++ b/test/unit/org/apache/cassandra/utils/memory/NativeAllocatorTest.java @@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicReference; import com.google.common.util.concurrent.Uninterruptibles; import org.junit.Test; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.cassandra.utils.concurrent.OpOrder; public class NativeAllocatorTest http://git-wip-us.apache.org/repos/asf/cassandra/blob/01439740/test/unit/org/apache/cassandra/utils/vint/VIntCodingTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/utils/vint/VIntCodingTest.java b/test/unit/org/apache/cassandra/utils/vint/VIntCodingTest.java index f08b181..1db8f9d 100644 --- a/test/unit/org/apache/cassandra/utils/vint/VIntCodingTest.java +++ b/test/unit/org/apache/cassandra/utils/vint/VIntCodingTest.java @@ -24,7 +24,7 @@ import java.io.DataOutputStream; import org.apache.cassandra.io.util.DataOutputBuffer; import org.junit.Test; -import junit.framework.Assert; +import org.junit.Assert; public class VIntCodingTest { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org