cql_types_test: Move to integration

Author: Lorak-mmk

scylla/src/transport/mod.rs

@@ -30,8 +30,6 @@ mod session_test;
 #[cfg(test)]
 mod silent_prepare_batch_test;
 
-#[cfg(test)]
-mod cql_types_test;
 #[cfg(test)]
 mod cql_value_test;
 #[cfg(test)]

scylla/src/transport/cql_types_test.rs renamed to scylla/tests/integration/cql_types.rs

@@ -1,19 +1,19 @@
-use crate as scylla;
-use crate::deserialize::DeserializeOwnedValue;
-use crate::frame::response::result::CqlValue;
-use crate::frame::value::{Counter, CqlDate, CqlTime, CqlTimestamp};
-use crate::test_utils::{create_new_session_builder, scylla_supports_tablets, setup_tracing};
-use crate::transport::session::Session;
-use crate::utils::test_utils::unique_keyspace_name;
 use itertools::Itertools;
-use scylla_cql::frame::value::{CqlTimeuuid, CqlVarint};
-use scylla_cql::types::serialize::value::SerializeValue;
-use scylla_macros::{DeserializeValue, SerializeValue};
+use scylla::frame::response::result::CqlValue;
+use scylla::frame::value::{Counter, CqlDate, CqlTime, CqlTimestamp, CqlTimeuuid, CqlVarint};
+use scylla::serialize::value::SerializeValue;
+use scylla::Session;
+use scylla::{DeserializeValue, SerializeValue};
 use std::cmp::PartialEq;
 use std::fmt::Debug;
 use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
 use std::str::FromStr;
 
+use crate::utils::{
+    create_new_session_builder, scylla_supports_tablets, setup_tracing, unique_keyspace_name,
+    DeserializeOwnedValue,
+};
+
 // Used to prepare a table for test
 // Creates a new keyspace, without tablets if requested and the ScyllaDB instance supports them.
 // Drops and creates table {table_name} (id int PRIMARY KEY, val {type_name})
@@ -1572,7 +1572,6 @@ async fn test_udt_after_schema_update() {
         .unwrap();
 
     #[derive(SerializeValue, DeserializeValue, Debug, PartialEq)]
-    #[scylla(crate = crate)]
     struct UdtV1 {
         first: i32,
         second: bool,
@@ -1796,7 +1795,6 @@ async fn test_udt_with_missing_field() {
     }
 
     #[derive(SerializeValue)]
-    #[scylla(crate = crate)]
     struct UdtV1 {
         first: i32,
         second: bool,
@@ -1822,7 +1820,6 @@ async fn test_udt_with_missing_field() {
     id += 1;
 
     #[derive(SerializeValue)]
-    #[scylla(crate = crate)]
     struct UdtV2 {
         first: i32,
         second: bool,
@@ -1850,7 +1847,6 @@ async fn test_udt_with_missing_field() {
     id += 1;
 
     #[derive(SerializeValue)]
-    #[scylla(crate = crate)]
     struct UdtV3 {
         first: i32,
         second: bool,
@@ -1878,7 +1874,7 @@ async fn test_udt_with_missing_field() {
     id += 1;
 
     #[derive(SerializeValue)]
-    #[scylla(crate = crate, flavor="enforce_order")]
+    #[scylla(flavor = "enforce_order")]
     struct UdtV4 {
         first: i32,
         second: bool,

scylla/tests/integration/main.rs

@@ -1,6 +1,7 @@
 mod authenticate;
 mod consistency;
 mod cql_collections;
+mod cql_types;
 mod execution_profiles;
 mod hygiene;
 mod lwt_optimisation;