From 4a064d0f72aeea24ea71917d53f5fddc077bcea4 Mon Sep 17 00:00:00 2001 From: Stanislav Tkach Date: Fri, 7 Aug 2020 07:44:38 +0300 Subject: [PATCH] Use pretty_assertions in tests (#451) --- Cargo.toml | 1 + tests/test_backup.rs | 2 ++ tests/test_checkpoint.rs | 26 ++++++++++++++------------ tests/test_column_family.rs | 2 ++ tests/test_compationfilter.rs | 2 ++ tests/test_db.rs | 7 ++++--- tests/test_iterator.rs | 2 ++ tests/test_merge_operator.rs | 2 ++ tests/test_multithreaded.rs | 4 ++-- tests/test_pinnable_slice.rs | 2 ++ tests/test_property.rs | 2 ++ tests/test_raw_iterator.rs | 2 ++ tests/test_rocksdb_options.rs | 3 ++- tests/test_slice_transform.rs | 2 ++ tests/test_sst_file_writer.rs | 3 ++- tests/test_write_batch.rs | 2 ++ 16 files changed, 45 insertions(+), 19 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 1a34ee8b7..3d52175a7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,3 +32,4 @@ librocksdb-sys = { path = "librocksdb-sys", version = "6.10.2" } [dev-dependencies] trybuild = "1.0.21" tempfile = "3.1.0" +pretty_assertions = "0.6.1" diff --git a/tests/test_backup.rs b/tests/test_backup.rs index 572bcd280..0e42c5659 100644 --- a/tests/test_backup.rs +++ b/tests/test_backup.rs @@ -14,6 +14,8 @@ mod util; +use pretty_assertions::assert_eq; + use rocksdb::{ backup::{BackupEngine, BackupEngineOptions, RestoreOptions}, DB, diff --git a/tests/test_checkpoint.rs b/tests/test_checkpoint.rs index 0c63bb7c1..01e4dc5d0 100644 --- a/tests/test_checkpoint.rs +++ b/tests/test_checkpoint.rs @@ -14,6 +14,8 @@ mod util; +use pretty_assertions::assert_eq; + use rocksdb::{checkpoint::Checkpoint, Options, DB}; use util::DBPath; @@ -41,10 +43,10 @@ pub fn test_single_checkpoint() { // Verify checkpoint let cp = DB::open_default(&cp1_path).unwrap(); - assert_eq!(*cp.get(b"k1").unwrap().unwrap(), *b"v1"); - assert_eq!(*cp.get(b"k2").unwrap().unwrap(), *b"v2"); - assert_eq!(*cp.get(b"k3").unwrap().unwrap(), *b"v3"); - assert_eq!(*cp.get(b"k4").unwrap().unwrap(), *b"v4"); + assert_eq!(cp.get(b"k1").unwrap().unwrap(), b"v1"); + assert_eq!(cp.get(b"k2").unwrap().unwrap(), b"v2"); + assert_eq!(cp.get(b"k3").unwrap().unwrap(), b"v3"); + assert_eq!(cp.get(b"k4").unwrap().unwrap(), b"v4"); } #[test] @@ -71,10 +73,10 @@ pub fn test_multi_checkpoints() { // Verify checkpoint let cp = DB::open_default(&cp1_path).unwrap(); - assert_eq!(*cp.get(b"k1").unwrap().unwrap(), *b"v1"); - assert_eq!(*cp.get(b"k2").unwrap().unwrap(), *b"v2"); - assert_eq!(*cp.get(b"k3").unwrap().unwrap(), *b"v3"); - assert_eq!(*cp.get(b"k4").unwrap().unwrap(), *b"v4"); + assert_eq!(cp.get(b"k1").unwrap().unwrap(), b"v1"); + assert_eq!(cp.get(b"k2").unwrap().unwrap(), b"v2"); + assert_eq!(cp.get(b"k3").unwrap().unwrap(), b"v3"); + assert_eq!(cp.get(b"k4").unwrap().unwrap(), b"v4"); // Change some existing keys db.put(b"k1", b"modified").unwrap(); @@ -92,8 +94,8 @@ pub fn test_multi_checkpoints() { // Verify second checkpoint let cp = DB::open_default(&cp2_path).unwrap(); - assert_eq!(*cp.get(b"k1").unwrap().unwrap(), *b"modified"); - assert_eq!(*cp.get(b"k2").unwrap().unwrap(), *b"changed"); - assert_eq!(*cp.get(b"k5").unwrap().unwrap(), *b"v5"); - assert_eq!(*cp.get(b"k6").unwrap().unwrap(), *b"v6"); + assert_eq!(cp.get(b"k1").unwrap().unwrap(), b"modified"); + assert_eq!(cp.get(b"k2").unwrap().unwrap(), b"changed"); + assert_eq!(cp.get(b"k5").unwrap().unwrap(), b"v5"); + assert_eq!(cp.get(b"k6").unwrap().unwrap(), b"v6"); } diff --git a/tests/test_column_family.rs b/tests/test_column_family.rs index fc9e9b289..16afef045 100644 --- a/tests/test_column_family.rs +++ b/tests/test_column_family.rs @@ -14,6 +14,8 @@ mod util; +use pretty_assertions::assert_eq; + use rocksdb::{ColumnFamilyDescriptor, MergeOperands, Options, DB, DEFAULT_COLUMN_FAMILY_NAME}; use util::DBPath; diff --git a/tests/test_compationfilter.rs b/tests/test_compationfilter.rs index 11835c0b7..f5e206dbc 100644 --- a/tests/test_compationfilter.rs +++ b/tests/test_compationfilter.rs @@ -14,6 +14,8 @@ mod util; +use pretty_assertions::assert_eq; + use rocksdb::{CompactionDecision, Options, DB}; use util::DBPath; diff --git a/tests/test_db.rs b/tests/test_db.rs index d21edb9c3..e74c18b03 100644 --- a/tests/test_db.rs +++ b/tests/test_db.rs @@ -14,15 +14,16 @@ mod util; +use std::{mem, sync::Arc, thread, time::Duration}; + +use pretty_assertions::assert_eq; + use rocksdb::{ perf::get_memory_usage_stats, BlockBasedOptions, BottommostLevelCompaction, Cache, CompactOptions, DBCompactionStyle, Env, Error, FifoCompactOptions, IteratorMode, Options, PerfContext, PerfMetric, ReadOptions, SliceTransform, Snapshot, UniversalCompactOptions, UniversalCompactionStopStyle, WriteBatch, DB, }; -use std::sync::Arc; -use std::time::Duration; -use std::{mem, thread}; use util::DBPath; #[test] diff --git a/tests/test_iterator.rs b/tests/test_iterator.rs index f15c61186..60d5b7731 100644 --- a/tests/test_iterator.rs +++ b/tests/test_iterator.rs @@ -14,6 +14,8 @@ mod util; +use pretty_assertions::assert_eq; + use rocksdb::{Direction, IteratorMode, MemtableFactory, Options, DB}; use util::DBPath; diff --git a/tests/test_merge_operator.rs b/tests/test_merge_operator.rs index de544da94..74c0424dc 100644 --- a/tests/test_merge_operator.rs +++ b/tests/test_merge_operator.rs @@ -14,6 +14,8 @@ mod util; +use pretty_assertions::assert_eq; + use rocksdb::{DBCompactionStyle, MergeOperands, Options, DB}; use util::DBPath; diff --git a/tests/test_multithreaded.rs b/tests/test_multithreaded.rs index ec3d9a184..db99758f8 100644 --- a/tests/test_multithreaded.rs +++ b/tests/test_multithreaded.rs @@ -14,9 +14,9 @@ mod util; +use std::{sync::Arc, thread}; + use rocksdb::DB; -use std::sync::Arc; -use std::thread; use util::DBPath; const N: usize = 100_000; diff --git a/tests/test_pinnable_slice.rs b/tests/test_pinnable_slice.rs index bda4165f8..d11744071 100644 --- a/tests/test_pinnable_slice.rs +++ b/tests/test_pinnable_slice.rs @@ -14,6 +14,8 @@ mod util; +use pretty_assertions::assert_eq; + use rocksdb::{Options, DB}; use util::DBPath; diff --git a/tests/test_property.rs b/tests/test_property.rs index 4e04e51b9..2b9d39944 100644 --- a/tests/test_property.rs +++ b/tests/test_property.rs @@ -14,6 +14,8 @@ mod util; +use pretty_assertions::assert_eq; + use rocksdb::{Options, DB}; use util::DBPath; diff --git a/tests/test_raw_iterator.rs b/tests/test_raw_iterator.rs index e2ea63ce6..b9efbab2b 100644 --- a/tests/test_raw_iterator.rs +++ b/tests/test_raw_iterator.rs @@ -14,6 +14,8 @@ mod util; +use pretty_assertions::assert_eq; + use rocksdb::DB; use util::DBPath; diff --git a/tests/test_rocksdb_options.rs b/tests/test_rocksdb_options.rs index 18f57fdc9..8089b3db2 100644 --- a/tests/test_rocksdb_options.rs +++ b/tests/test_rocksdb_options.rs @@ -14,8 +14,9 @@ mod util; -use rocksdb::{BlockBasedOptions, DataBlockIndexType, Options, ReadOptions, DB}; use std::{fs, io::Read as _}; + +use rocksdb::{BlockBasedOptions, DataBlockIndexType, Options, ReadOptions, DB}; use util::DBPath; #[test] diff --git a/tests/test_slice_transform.rs b/tests/test_slice_transform.rs index 68868605a..c2633d8d1 100644 --- a/tests/test_slice_transform.rs +++ b/tests/test_slice_transform.rs @@ -14,6 +14,8 @@ mod util; +use pretty_assertions::assert_eq; + use rocksdb::{Options, SliceTransform, DB}; use util::DBPath; diff --git a/tests/test_sst_file_writer.rs b/tests/test_sst_file_writer.rs index 43b0f8bfe..5376f5ab7 100644 --- a/tests/test_sst_file_writer.rs +++ b/tests/test_sst_file_writer.rs @@ -14,8 +14,9 @@ mod util; -use rocksdb::{Error, Options, SstFileWriter, DB}; +use pretty_assertions::assert_eq; +use rocksdb::{Error, Options, SstFileWriter, DB}; use util::DBPath; #[test] diff --git a/tests/test_write_batch.rs b/tests/test_write_batch.rs index 695633ad0..c1627aad5 100644 --- a/tests/test_write_batch.rs +++ b/tests/test_write_batch.rs @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +use pretty_assertions::assert_eq; + use rocksdb::WriteBatch; #[test]