Unified · Split
| @@ -4,9 +4,8 @@ use bstr::BString; · 3 unmodified lines | ||
| 4 | 4 | |
| 5 | 5 | use git_packetline::PacketLine; |
| 6 | 6 | |
| 7 | −use crate::client::capabilities; | |
| 8 | 7 | use crate::{ |
| 9 | − client::{self, SetServiceResponse}, | |
| 8 | + client::{self, capabilities, Capabilities, SetServiceResponse}, | |
| 10 | 9 | Protocol, Service, |
| 11 | 10 | }; |
| 12 | 11 | |
| @@ -46,6 +45,49 @@ pub(crate) mod message { · 33 unmodified lines | ||
| 46 | 45 | } |
| 47 | 46 | out |
| 48 | 47 | } |
| 48 | + #[cfg(test)] | |
| 49 | + mod tests { | |
| 50 | + use crate::{client::blocking_io::git, Protocol, Service}; | |
| 51 | + | |
| 52 | + #[test] | |
| 53 | + fn version_1_without_host_and_version() { | |
| 54 | + assert_eq!( | |
| 55 | + git::message::connect(Service::UploadPack, Protocol::V1, b"hello/world", None), | |
| 56 | + "git-upload-pack hello/world\0" | |
| 57 | + ) | |
| 58 | + } | |
| 59 | + #[test] | |
| 60 | + fn version_2_without_host_and_version() { | |
| 61 | + assert_eq!( | |
| 62 | + git::message::connect(Service::UploadPack, Protocol::V2, b"hello\\world", None), | |
| 63 | + "git-upload-pack hello\\world\0\0version=2\0" | |
| 64 | + ) | |
| 65 | + } | |
| 66 | + #[test] | |
| 67 | + fn with_host_without_port() { | |
| 68 | + assert_eq!( | |
| 69 | + git::message::connect( | |
| 70 | + Service::UploadPack, | |
| 71 | + Protocol::V1, | |
| 72 | + b"hello\\world", | |
| 73 | + Some(&("host".into(), None)) | |
| 74 | + ), | |
| 75 | + "git-upload-pack hello\\world\0host=host\0" | |
| 76 | + ) | |
| 77 | + } | |
| 78 | + #[test] | |
| 79 | + fn with_host_with_port() { | |
| 80 | + assert_eq!( | |
| 81 | + git::message::connect( | |
| 82 | + Service::UploadPack, | |
| 83 | + Protocol::V1, | |
| 84 | + b"hello\\world", | |
| 85 | + Some(&("host".into(), Some(404))) | |
| 86 | + ), | |
| 87 | + "git-upload-pack hello\\world\0host=host:404\0" | |
| 88 | + ) | |
| 89 | + } | |
| 90 | + } | |
| 49 | 91 | } |
| 50 | 92 | |
| 51 | 93 | /// The way to connect to a process speaking the `git` protocol. |
| @@ -91,7 +133,7 @@ where · 39 unmodified lines | ||
| 91 | 133 | capabilities, |
| 92 | 134 | refs, |
| 93 | 135 | protocol: actual_protocol, |
| 94 | − } = capabilities::Capabilities::from_lines_with_version_detection(&mut self.line_provider)?; | |
| 136 | + } = Capabilities::from_lines_with_version_detection(&mut self.line_provider)?; | |
| 95 | 137 | Ok(SetServiceResponse { |
| 96 | 138 | actual_protocol, |
| 97 | 139 | capabilities, |
| @@ -251,6 +293,3 @@ pub mod connect { · 153 unmodified lines | ||
| 251 | 293 | } |
| 252 | 294 | } |
| 253 | 295 | pub use connect::connect; |
| 254 | − | |
| 255 | −#[cfg(test)] | |
| 256 | −mod tests; | |
| @@ -1,43 +0,0 @@ | ||
| 1 | −mod message { | |
| 2 | − use crate::client::blocking_io::git; | |
| 3 | − use crate::{Protocol, Service}; | |
| 4 | − | |
| 5 | − #[test] | |
| 6 | − fn version_1_without_host_and_version() { | |
| 7 | − assert_eq!( | |
| 8 | − git::message::connect(Service::UploadPack, Protocol::V1, b"hello/world", None), | |
| 9 | − "git-upload-pack hello/world\0" | |
| 10 | − ) | |
| 11 | − } | |
| 12 | − #[test] | |
| 13 | − fn version_2_without_host_and_version() { | |
| 14 | − assert_eq!( | |
| 15 | − git::message::connect(Service::UploadPack, Protocol::V2, b"hello\\world", None), | |
| 16 | − "git-upload-pack hello\\world\0\0version=2\0" | |
| 17 | − ) | |
| 18 | − } | |
| 19 | − #[test] | |
| 20 | − fn with_host_without_port() { | |
| 21 | − assert_eq!( | |
| 22 | − git::message::connect( | |
| 23 | − Service::UploadPack, | |
| 24 | − Protocol::V1, | |
| 25 | − b"hello\\world", | |
| 26 | − Some(&("host".into(), None)) | |
| 27 | − ), | |
| 28 | − "git-upload-pack hello\\world\0host=host\0" | |
| 29 | − ) | |
| 30 | − } | |
| 31 | − #[test] | |
| 32 | − fn with_host_with_port() { | |
| 33 | − assert_eq!( | |
| 34 | − git::message::connect( | |
| 35 | − Service::UploadPack, | |
| 36 | − Protocol::V1, | |
| 37 | − b"hello\\world", | |
| 38 | − Some(&("host".into(), Some(404))) | |
| 39 | − ), | |
| 40 | − "git-upload-pack hello\\world\0host=host:404\0" | |
| 41 | − ) | |
| 42 | − } | |
| 43 | −} | |
| @@ -8,7 +8,7 @@ use git_packetline::PacketLine; · 7 unmodified lines | ||
| 8 | 8 | pub use traits::{Error, GetResponse, Http, PostResponse}; |
| 9 | 9 | |
| 10 | 10 | use crate::{ |
| 11 | − client::{self, capabilities, ExtendedBufRead, HandleProgress, MessageKind, RequestWriter}, | |
| 11 | + client::{self, capabilities, Capabilities, ExtendedBufRead, HandleProgress, MessageKind, RequestWriter}, | |
| 12 | 12 | Protocol, Service, |
| 13 | 13 | }; |
| 14 | 14 | |
| @@ -131,7 +131,7 @@ impl<H: Http> client::Transport for Transport<H> { · 116 unmodified lines | ||
| 131 | 131 | capabilities, |
| 132 | 132 | refs, |
| 133 | 133 | protocol: actual_protocol, |
| 134 | − } = capabilities::Capabilities::from_lines_with_version_detection(line_reader)?; | |
| 134 | + } = Capabilities::from_lines_with_version_detection(line_reader)?; | |
| 135 | 135 | self.actual_version = actual_protocol; |
| 136 | 136 | self.service = Some(service); |
| 137 | 137 | Ok(client::SetServiceResponse { |