cql_collections_test: Move to integration tests

Author: Lorak-mmk

scylla/src/transport/mod.rs

@@ -28,8 +28,6 @@ pub use scylla_cql::frame::request::query::{PagingState, PagingStateResponse};
 #[cfg(test)]
 mod authenticate_test;
 #[cfg(test)]
-mod cql_collections_test;
-#[cfg(test)]
 mod session_test;
 #[cfg(test)]
 mod silent_prepare_batch_test;

scylla/src/transport/cql_collections_test.rs renamed to scylla/tests/integration/cql_collections.rs

@@ -1,9 +1,8 @@
-use crate::deserialize::DeserializeOwnedValue;
-use crate::transport::session::Session;
-
-use crate::frame::response::result::CqlValue;
-use crate::test_utils::{create_new_session_builder, setup_tracing};
-use crate::utils::test_utils::unique_keyspace_name;
+use crate::utils::{
+    create_new_session_builder, setup_tracing, unique_keyspace_name, DeserializeOwnedValue,
+};
+use scylla::frame::response::result::CqlValue;
+use scylla::Session;
 use scylla_cql::types::serialize::value::SerializeValue;
 use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
 

scylla/tests/integration/main.rs

@@ -1,4 +1,5 @@
 mod consistency;
+mod cql_collections;
 mod execution_profiles;
 mod hygiene;
 mod lwt_optimisation;

scylla/tests/integration/utils.rs

@@ -1,4 +1,5 @@
 use futures::Future;
+use scylla::deserialize::DeserializeValue;
 use scylla::frame::response::result::Row;
 use scylla::transport::session_builder::{GenericSessionBuilder, SessionBuilderKind};
 use scylla::Session;
@@ -173,3 +174,14 @@ pub(crate) fn create_new_session_builder() -> GenericSessionBuilder<impl Session
         .tracing_info_fetch_attempts(NonZeroU32::new(200).unwrap())
         .tracing_info_fetch_interval(Duration::from_millis(50))
 }
+
+// Shorthands for better readability.
+// Copied from Scylla because we don't want to make it public there.
+pub(crate) trait DeserializeOwnedValue:
+    for<'frame, 'metadata> DeserializeValue<'frame, 'metadata>
+{
+}
+impl<T> DeserializeOwnedValue for T where
+    T: for<'frame, 'metadata> DeserializeValue<'frame, 'metadata>
+{
+}