From 8ada85ef623ddc6c84f48fe851a300fcbee7a666 Mon Sep 17 00:00:00 2001
From: Ryan Leckey <ryan@launchbadge.com>
Date: Fri, 6 Sep 2019 14:14:35 -0700
Subject: [PATCH] Fix visible tests in mariadb protocol

---
 src/mariadb/protocol/response/column_count.rs |  6 +---
 src/mariadb/protocol/response/column_def.rs   | 14 ++++------
 src/mariadb/protocol/response/eof.rs          | 10 ++-----
 src/mariadb/protocol/response/err.rs          |  6 +---
 src/mariadb/protocol/response/ok.rs           | 28 ++++++++-----------
 5 files changed, 21 insertions(+), 43 deletions(-)

diff --git a/src/mariadb/protocol/response/column_count.rs b/src/mariadb/protocol/response/column_count.rs
index 54535783..43112873 100644
--- a/src/mariadb/protocol/response/column_count.rs
+++ b/src/mariadb/protocol/response/column_count.rs
@@ -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(())
     }
diff --git a/src/mariadb/protocol/response/column_def.rs b/src/mariadb/protocol/response/column_def.rs
index 0b415c9d..30f3c9ed 100644
--- a/src/mariadb/protocol/response/column_def.rs
+++ b/src/mariadb/protocol/response/column_def.rs
@@ -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(())
     }
diff --git a/src/mariadb/protocol/response/eof.rs b/src/mariadb/protocol/response/eof.rs
index b5c47996..2f515e97 100644
--- a/src/mariadb/protocol/response/eof.rs
+++ b/src/mariadb/protocol/response/eof.rs
@@ -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
diff --git a/src/mariadb/protocol/response/err.rs b/src/mariadb/protocol/response/err.rs
index 607a5b2b..52883660 100644
--- a/src/mariadb/protocol/response/err.rs
+++ b/src/mariadb/protocol/response/err.rs
@@ -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
diff --git a/src/mariadb/protocol/response/ok.rs b/src/mariadb/protocol/response/ok.rs
index d99248b8..5437ce11 100644
--- a/src/mariadb/protocol/response/ok.rs
+++ b/src/mariadb/protocol/response/ok.rs
@@ -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(())
     }