Make proptest feature more consistent

Signed-off-by: Ana Hobden <[email protected]>

Author: Hoverbear

src/kv.rs

@@ -1,17 +1,17 @@
 // Copyright 2019 TiKV Project Authors. Licensed under Apache-2.0.
 
-#[cfg(feature = "proptest-derive")]
+#[cfg(feature = "property-testing")]
 use proptest::{arbitrary::any_with, collection::size_range};
-#[cfg(feature = "proptest-derive")]
+#[cfg(feature = "property-testing")]
 use proptest_derive::Arbitrary;
 use std::ops::{
     Bound, Deref, DerefMut, Range, RangeFrom, RangeFull, RangeInclusive, RangeTo, RangeToInclusive,
 };
 use std::{fmt, str, u8};
 
-#[cfg(feature = "proptest-derive")]
+#[cfg(feature = "property-testing")]
 const PROPTEST_KEY_MAX: usize = 1024 * 2; // 2 KB
-#[cfg(feature = "proptest-derive")]
+#[cfg(feature = "property-testing")]
 const PROPTEST_VALUE_MAX: usize = 1024 * 16; // 16 KB
 
 use crate::{Error, Result};
@@ -65,10 +65,10 @@ impl<'a> fmt::Display for HexRepr<'a> {
 /// accept an `Into<Key>`, which means all of the above types can be passed directly to those
 /// functions.
 #[derive(Default, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
-#[cfg_attr(feature = "proptest-derive", derive(Arbitrary))]
+#[cfg_attr(feature = "property-testing", derive(Arbitrary))]
 pub struct Key(
     #[cfg_attr(
-        feature = "proptest-derive",
+        feature = "property-testing",
         proptest(strategy = "any_with::<Vec<u8>>((size_range(PROPTEST_KEY_MAX), ()))")
     )]
     Vec<u8>,
@@ -186,10 +186,10 @@ impl fmt::Debug for Key {
 /// accept an `Into<Value>`, which means all of the above types can be passed directly to those
 /// functions.
 #[derive(Default, Clone, Eq, PartialEq, Hash)]
-#[cfg_attr(feature = "proptest-derive", derive(Arbitrary))]
+#[cfg_attr(feature = "property-testing", derive(Arbitrary))]
 pub struct Value(
     #[cfg_attr(
-        feature = "proptest-derive",
+        feature = "property-testing",
         proptest(strategy = "any_with::<Vec<u8>>((size_range(PROPTEST_VALUE_MAX), ()))")
     )]
     Vec<u8>,
@@ -262,7 +262,7 @@ impl fmt::Debug for Value {
 /// Many functions which accept a `KvPair` accept an `Into<KvPair>`, which means all of the above
 /// types (Like a `(Key, Value)`) can be passed directly to those functions.
 #[derive(Default, Clone, Eq, PartialEq)]
-#[cfg_attr(feature = "proptest-derive", derive(Arbitrary))]
+#[cfg_attr(feature = "property-testing", derive(Arbitrary))]
 pub struct KvPair(Key, Value);
 
 impl KvPair {

tests/integration/raw.proptest-regressions

@@ -6,6 +6,7 @@ use proptest::{arbitrary::any, proptest};
 use tikv_client::{raw::Client, Config, KvPair, Value};
 
 proptest! {
+    /// Test single point (put, get, delete) operations on keys.
     #[test]
     fn point(
         pair in any::<KvPair>(),
@@ -28,6 +29,7 @@ proptest! {
 }
 
 proptest! {
+    /// Test batch (put, get, delete) operations on keys.
     #[test]
     fn batch(
         kvs in arb_batch(any::<KvPair>(), None),
@@ -49,34 +51,3 @@ proptest! {
         ).unwrap();
     }
 }
-
-proptest! {
-    #[test]
-    fn scan(
-        kvs in arb_batch(any::<KvPair>(), None),
-    ) {
-        let client = block_on(Client::connect(Config::new(pd_addr()))).unwrap();
-        let mut keys = kvs.iter().map(|kv| kv.key()).cloned().collect::<Vec<_>>();
-        keys.sort();
-        // If we aren't getting values this is an empty vector, so use dummy values.
-        let start_key = keys.iter().cloned().next().unwrap_or(vec![0].into());
-        let end_key = keys.iter().cloned().last().unwrap_or(vec![0].into());
-
-        block_on(
-            client.batch_put(kvs.clone())
-        ).unwrap();
-
-        let out_value = block_on(
-            client.scan(start_key..=end_key, 10240) // Magic max number is TiKV intrinsic
-        ).unwrap();
-
-        // Since TiKV returns empty keys as tombstones in scans, we just check we can find all the items.
-        assert!(kvs.iter().all(|kv| {
-            out_value.iter().find(|out| kv == *out).is_some()
-        }));
-
-        block_on(
-            client.batch_delete(keys.clone())
-        ).unwrap();
-    }
-}

tests/integration/raw.rs

@@ -5,13 +5,13 @@
 #[cfg(feature = "integration-tests")]
 mod integration;
 
-#[cfg(feature = "proptest")]
+#[cfg(feature = "property-testing")]
 use proptest::strategy::Strategy;
 
-#[cfg(feature = "proptest")]
+#[cfg(feature = "property-testing")]
 const PROPTEST_BATCH_SIZE_MAX: usize = 16;
 
-#[cfg(feature = "proptest")]
+#[cfg(feature = "property-testing")]
 pub fn arb_batch<T: core::fmt::Debug>(
     single_strategy: impl Strategy<Value = T>,
     max_batch_size: impl Into<Option<usize>>,