Fix visible tests in mariadb protocol

This commit is contained in:
Ryan Leckey 2019-09-06 14:14:35 -07:00
parent 6949b35eec
commit 8ada85ef62
5 changed files with 21 additions and 43 deletions

View File

@ -28,10 +28,6 @@ mod test {
fn it_decodes_column_packet_0x_fb() -> io::Result<()> {
#[rustfmt::skip]
let buf = __bytes_builder!(
// int<3> length
0u8, 0u8, 0u8,
// int<1> seq_no
0u8,
// int<lenenc> tag code: Some(3 bytes)
0xFD_u8,
// value: 3 bytes
@ -40,7 +36,7 @@ mod test {
let message = ColumnCountPacket::decode(&buf)?;
assert_eq!(message.columns, Some(0x010101));
assert_eq!(message.columns, 0x010101);
Ok(())
}

View File

@ -82,10 +82,6 @@ mod test {
fn it_decodes_column_def_packet() -> io::Result<()> {
#[rustfmt::skip]
let buf = __bytes_builder!(
// length
1u8, 0u8, 0u8,
// seq_no
0u8,
// string<lenenc> catalog (always 'def')
1u8, b'a',
// string<lenenc> schema
@ -116,11 +112,11 @@ mod test {
let message = ColumnDefinitionPacket::decode(&buf)?;
assert_eq!(message.schema, Some(b"b"));
assert_eq!(message.table_alias, Some(b"c"));
assert_eq!(message.table, Some(b"d"));
assert_eq!(message.column_alias, Some(b"e"));
assert_eq!(message.column, Some(b"f"));
assert_eq!(message.schema, Some("b".into()));
assert_eq!(message.table_alias, Some("c".into()));
assert_eq!(message.table, Some("d".into()));
assert_eq!(message.column_alias, Some("e".into()));
assert_eq!(message.column, Some("f".into()));
Ok(())
}

View File

@ -37,17 +37,13 @@ impl EofPacket {
#[cfg(test)]
mod test {
use super::*;
use crate::{__bytes_builder, mariadb::ConnContext};
use bytes::Bytes;
use crate::__bytes_builder;
use std::io;
#[test]
fn it_decodes_eof_packet() -> Result<(), Error> {
fn it_decodes_eof_packet() -> io::Result<()> {
#[rustfmt::skip]
let buf = __bytes_builder!(
// int<3> length
1u8, 0u8, 0u8,
// int<1> seq_no
1u8,
// int<1> 0xfe : EOF header
0xFE_u8,
// int<2> warning count

View File

@ -74,13 +74,9 @@ mod test {
use crate::__bytes_builder;
#[test]
fn it_decodes_err_packet() -> Result<(), Error> {
fn it_decodes_err_packet() -> io::Result<()> {
#[rustfmt::skip]
let buf = __bytes_builder!(
// int<3> length
1u8, 0u8, 0u8,
// int<1> seq_no
1u8,
// int<1> 0xfe : EOF header
0xFF_u8,
// int<2> error code

View File

@ -66,19 +66,12 @@ impl OkPacket {
#[cfg(test)]
mod test {
use super::*;
use crate::{
__bytes_builder,
mariadb::{ConnContext, Decoder},
};
use crate::__bytes_builder;
#[test]
fn it_decodes_ok_packet() -> Result<(), Error> {
fn it_decodes_ok_packet() -> io::Result<()> {
#[rustfmt::skip]
let buf = __bytes_builder!(
// int<3> length
0u8, 0u8, 0u8,
// // int<1> seq_no
1u8,
// 0x00 : OK_Packet header or (0xFE if CLIENT_DEPRECATE_EOF is set)
0u8,
// int<lenenc> affected rows
@ -101,16 +94,17 @@ mod test {
// }
);
let mut context = ConnContext::new();
let mut ctx = DeContext::new(&mut context, buf);
let message = OkPacket::decode(&buf, Capabilities::empty())?;
let message = OkPacket::decode(&mut ctx)?;
assert_eq!(message.affected_rows, None);
assert_eq!(message.last_insert_id, None);
assert!(!(message.server_status & ServerStatusFlag::SERVER_STATUS_IN_TRANS).is_empty());
assert_eq!(message.affected_rows, 0);
assert_eq!(message.last_insert_id, 0);
assert!(
message
.server_status
.contains(ServerStatusFlag::SERVER_STATUS_IN_TRANS)
);
assert_eq!(message.warning_count, 0);
assert_eq!(message.info, b"info".to_vec());
assert_eq!(message.info, "info".into());
Ok(())
}