From 28bbc400d27f72952069ec356e6a38d8b4738000 Mon Sep 17 00:00:00 2001 From: Daniel Akhterov Date: Fri, 26 Jul 2019 15:49:00 -0700 Subject: [PATCH] Make tests non async --- src/lib.rs | 7 +++ src/{mariadb => }/macros/mod.rs | 0 src/mariadb/connection/establish.rs | 62 +++++++++++----------- src/mariadb/mod.rs | 8 --- src/mariadb/protocol/packets/column.rs | 16 +++--- src/mariadb/protocol/packets/column_def.rs | 8 +-- src/mariadb/protocol/packets/eof.rs | 8 +-- src/mariadb/protocol/packets/err.rs | 8 +-- src/mariadb/protocol/packets/initial.rs | 8 +-- src/mariadb/protocol/packets/ok.rs | 8 +-- src/mariadb/protocol/packets/result_row.rs | 8 +-- src/mariadb/protocol/packets/result_set.rs | 13 ++--- 12 files changed, 77 insertions(+), 77 deletions(-) rename src/{mariadb => }/macros/mod.rs (100%) diff --git a/src/lib.rs b/src/lib.rs index 1b38a31e..9b4cb911 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -3,6 +3,9 @@ #![allow(clippy::needless_lifetimes)] +// FIXME: Remove this once API has matured +#![allow(dead_code, unused_imports, unused_variables)] + #[cfg(test)] extern crate test; @@ -16,3 +19,7 @@ pub use self::options::ConnectOptions; pub mod postgres; pub mod mariadb; + +// Helper macro for writing long complex tests +#[macro_use] +pub mod macros; diff --git a/src/mariadb/macros/mod.rs b/src/macros/mod.rs similarity index 100% rename from src/mariadb/macros/mod.rs rename to src/macros/mod.rs diff --git a/src/mariadb/connection/establish.rs b/src/mariadb/connection/establish.rs index 42103d99..873fc33e 100644 --- a/src/mariadb/connection/establish.rs +++ b/src/mariadb/connection/establish.rs @@ -51,35 +51,35 @@ mod test { use super::*; use failure::Error; - #[runtime::test] - async fn it_connects() -> Result<(), Error> { - let mut conn = Connection::establish(ConnectOptions { - host: "127.0.0.1", - port: 3306, - user: Some("root"), - database: None, - password: None, - }) - .await?; - - conn.ping().await?; - - Ok(()) - } - - #[runtime::test] - async fn it_does_not_connect() -> Result<(), Error> { - match Connection::establish(ConnectOptions { - host: "127.0.0.1", - port: 3306, - user: Some("roote"), - database: None, - password: None, - }) - .await - { - Ok(_) => Err(err_msg("Bad username still worked?")), - Err(_) => Ok(()), - } - } +// #[runtime::test] +// async fn it_connects() -> Result<(), Error> { +// let mut conn = Connection::establish(ConnectOptions { +// host: "127.0.0.1", +// port: 3306, +// user: Some("root"), +// database: None, +// password: None, +// }) +// .await?; +// +// conn.ping().await?; +// +// Ok(()) +// } +// +// #[runtime::test] +// async fn it_does_not_connect() -> Result<(), Error> { +// match Connection::establish(ConnectOptions { +// host: "127.0.0.1", +// port: 3306, +// user: Some("roote"), +// database: None, +// password: None, +// }) +// .await +// { +// Ok(_) => Err(err_msg("Bad username still worked?")), +// Err(_) => Ok(()), +// } +// } } diff --git a/src/mariadb/mod.rs b/src/mariadb/mod.rs index bd179f22..6373fd3c 100644 --- a/src/mariadb/mod.rs +++ b/src/mariadb/mod.rs @@ -1,10 +1,2 @@ -#![feature(non_exhaustive, async_await)] -#![allow(clippy::needless_lifetimes)] -// TODO: Remove this once API has matured -#![allow(dead_code, unused_imports, unused_variables)] - pub mod connection; pub mod protocol; - -#[macro_use] -pub mod macros; diff --git a/src/mariadb/protocol/packets/column.rs b/src/mariadb/protocol/packets/column.rs index d502a023..ac73012c 100644 --- a/src/mariadb/protocol/packets/column.rs +++ b/src/mariadb/protocol/packets/column.rs @@ -28,14 +28,14 @@ impl Deserialize for ColumnPacket { mod test { use bytes::Bytes; - use mason_core::ConnectOptions; + use crate::ConnectOptions; - use crate::{__bytes_builder, connection::ConnContext, protocol::decode::Decoder}; + use crate::{__bytes_builder, mariadb::connection::ConnContext, mariadb::protocol::decode::Decoder}; use super::*; - #[runtime::test] - async fn it_decodes_column_packet_0x_fb() -> Result<(), Error> { + #[test] + fn it_decodes_column_packet_0x_fb() -> Result<(), Error> { #[rustfmt::skip] let buf = __bytes_builder!( // int<3> length @@ -56,8 +56,8 @@ mod test { Ok(()) } - #[runtime::test] - async fn it_decodes_column_packet_0x_fd() -> Result<(), Error> { + #[test] + fn it_decodes_column_packet_0x_fd() -> Result<(), Error> { #[rustfmt::skip] let buf = __bytes_builder!( // int<3> length @@ -80,8 +80,8 @@ mod test { Ok(()) } - #[runtime::test] - async fn it_fails_to_decode_column_packet_0x_fc() -> Result<(), Error> { + #[test] + fn it_fails_to_decode_column_packet_0x_fc() -> Result<(), Error> { #[rustfmt::skip] let buf = __bytes_builder!( // int<3> length diff --git a/src/mariadb/protocol/packets/column_def.rs b/src/mariadb/protocol/packets/column_def.rs index d0be8792..927030d3 100644 --- a/src/mariadb/protocol/packets/column_def.rs +++ b/src/mariadb/protocol/packets/column_def.rs @@ -78,12 +78,12 @@ impl Deserialize for ColumnDefPacket { #[cfg(test)] mod test { use super::*; - use crate::{__bytes_builder, connection::ConnContext, protocol::decode::Decoder}; + use crate::{__bytes_builder, mariadb::connection::ConnContext, mariadb::protocol::decode::Decoder}; use bytes::Bytes; - use mason_core::ConnectOptions; + use crate::ConnectOptions; - #[runtime::test] - async fn it_decodes_column_def_packet() -> Result<(), Error> { + #[test] + fn it_decodes_column_def_packet() -> Result<(), Error> { #[rustfmt::skip] let buf = __bytes_builder!( // length diff --git a/src/mariadb/protocol/packets/eof.rs b/src/mariadb/protocol/packets/eof.rs index ec88ff73..b85fe07e 100644 --- a/src/mariadb/protocol/packets/eof.rs +++ b/src/mariadb/protocol/packets/eof.rs @@ -39,12 +39,12 @@ impl Deserialize for EofPacket { #[cfg(test)] mod test { use super::*; - use crate::{__bytes_builder, connection::ConnContext}; + use crate::{__bytes_builder, mariadb::connection::ConnContext}; use bytes::Bytes; - use mason_core::ConnectOptions; + use crate::ConnectOptions; - #[runtime::test] - async fn it_decodes_eof_packet() -> Result<(), Error> { + #[test] + fn it_decodes_eof_packet() -> Result<(), Error> { #[rustfmt::skip] let buf = __bytes_builder!( // int<3> length diff --git a/src/mariadb/protocol/packets/err.rs b/src/mariadb/protocol/packets/err.rs index 17a9153a..2ddc910d 100644 --- a/src/mariadb/protocol/packets/err.rs +++ b/src/mariadb/protocol/packets/err.rs @@ -91,14 +91,14 @@ impl std::fmt::Display for ErrPacket { mod test { use bytes::Bytes; - use mason_core::ConnectOptions; + use crate::ConnectOptions; - use crate::{__bytes_builder, connection::ConnContext, protocol::decode::Decoder}; + use crate::{__bytes_builder, mariadb::connection::ConnContext, mariadb::protocol::decode::Decoder}; use super::*; - #[runtime::test] - async fn it_decodes_err_packet() -> Result<(), Error> { + #[test] + fn it_decodes_err_packet() -> Result<(), Error> { #[rustfmt::skip] let buf = __bytes_builder!( // int<3> length diff --git a/src/mariadb/protocol/packets/initial.rs b/src/mariadb/protocol/packets/initial.rs index b8ea88fb..661ee79d 100644 --- a/src/mariadb/protocol/packets/initial.rs +++ b/src/mariadb/protocol/packets/initial.rs @@ -102,12 +102,12 @@ impl Deserialize for InitialHandshakePacket { #[cfg(test)] mod test { use super::*; - use crate::{__bytes_builder, connection::ConnContext, protocol::decode::Decoder}; + use crate::{__bytes_builder, mariadb::connection::ConnContext, mariadb::protocol::decode::Decoder}; use bytes::BytesMut; - use mason_core::ConnectOptions; + use crate::ConnectOptions; - #[runtime::test] - async fn it_decodes_initial_handshake_packet() -> Result<(), Error> { + #[test] + fn it_decodes_initial_handshake_packet() -> Result<(), Error> { #[rustfmt::skip] let buf = __bytes_builder!( // int<3> length diff --git a/src/mariadb/protocol/packets/ok.rs b/src/mariadb/protocol/packets/ok.rs index a379b9fa..9c392d37 100644 --- a/src/mariadb/protocol/packets/ok.rs +++ b/src/mariadb/protocol/packets/ok.rs @@ -63,14 +63,14 @@ impl Deserialize for OkPacket { #[cfg(test)] mod test { - use mason_core::ConnectOptions; + use crate::ConnectOptions; - use crate::{__bytes_builder, connection::ConnContext, protocol::decode::Decoder}; + use crate::{__bytes_builder, mariadb::connection::ConnContext, mariadb::protocol::decode::Decoder}; use super::*; - #[runtime::test] - async fn it_decodes_ok_packet() -> Result<(), Error> { + #[test] + fn it_decodes_ok_packet() -> Result<(), Error> { #[rustfmt::skip] let buf = __bytes_builder!( // int<3> length diff --git a/src/mariadb/protocol/packets/result_row.rs b/src/mariadb/protocol/packets/result_row.rs index 59e694e0..4550a24b 100644 --- a/src/mariadb/protocol/packets/result_row.rs +++ b/src/mariadb/protocol/packets/result_row.rs @@ -35,12 +35,12 @@ impl Deserialize for ResultRow { #[cfg(test)] mod test { use super::*; - use crate::{__bytes_builder, connection::ConnContext}; + use crate::{__bytes_builder, mariadb::connection::ConnContext, mariadb::protocol::decode::Decoder}; use bytes::Bytes; - use mason_core::ConnectOptions; + use crate::ConnectOptions; - #[runtime::test] - async fn it_decodes_result_row_packet() -> Result<(), Error> { + #[test] + fn it_decodes_result_row_packet() -> Result<(), Error> { #[rustfmt::skip] let buf = __bytes_builder!( // int<3> length diff --git a/src/mariadb/protocol/packets/result_set.rs b/src/mariadb/protocol/packets/result_set.rs index 44e48b83..003253af 100644 --- a/src/mariadb/protocol/packets/result_set.rs +++ b/src/mariadb/protocol/packets/result_set.rs @@ -80,15 +80,16 @@ impl Deserialize for ResultSet { mod test { use bytes::{BufMut, Bytes}; - use crate::{__bytes_builder, connection::Connection}; - use crate::protocol::packets::{eof::EofPacket, err::ErrPacket, ok::OkPacket, result_row::ResultRow}; - use crate::protocol::types::{ServerStatusFlag, Capabilities}; - use crate::connection::ConnContext; + use crate::__bytes_builder; + use crate::mariadb::{connection::Connection}; + use crate::mariadb::protocol::packets::{eof::EofPacket, err::ErrPacket, ok::OkPacket, result_row::ResultRow}; + use crate::mariadb::protocol::types::{ServerStatusFlag, Capabilities}; + use crate::mariadb::connection::ConnContext; use super::*; - #[runtime::test] - async fn it_decodes_result_set_packet() -> Result<(), Error> { + #[test] + fn it_decodes_result_set_packet() -> Result<(), Error> { // TODO: Use byte string as input for test; this is a valid return from a mariadb. #[rustfmt::skip] let buf = __bytes_builder!(