CandyCorvid/gemini - Change 7LBPQ2M6XAXS3PMAA7W54KLH4J4YE6KCLIEHX6QW4C2QDQBYZORAC

Use fake connection in tests

Created by CandyCorvid on July 13, 2023

7LBPQ2M6XAXS3PMAA7W54KLH4J4YE6KCLIEHX6QW4C2QDQBYZORAC

Dependencies

In channels

main

Change contents

Replacement in src/network.rs at line 13 [4.34]

B:BD[3.144] → [3.144:212]

    fn connect(url: &Url) -> Result<Self::Connection, Self::Error>;

[3.144]

[3.212]

    fn connect(&mut self, url: &Url) -> Result<Self::Connection, Self::Error>;

Replacement in src/network.rs at line 17 [4.34]
B:BD[5.27] → [5.27:44]
```
    verifier: V,
```
[5.27]
[5.44]
```
    _verifier: V,
```
Replacement in src/network.rs at line 22 [4.34]
B:BD[5.104] → [5.104:135]
```
        Self { verifier: ver }
```
[5.104]
[5.135]
```
        Self { _verifier: ver }
```

Replacement in src/network.rs at line 30 [4.34]

B:BD[3.417] → [3.417:486]

    fn connect(url: &Url) -> Result<Self::Connection, Self::Error> {

[3.417]

[3.486]

    fn connect(&mut self, url: &Url) -> Result<Self::Connection, Self::Error> {

Deletion in src/main.rs at line 39 [6.3665]

B:BD[5.2344] → [2.779:1847]

∅:D[7.1468] → [5.2456:2462]

∅:D[2.1847] → [5.2456:2462]

B:BD[5.2456] → [5.2456:2462]

∅:D[5.2678] → [8.319:321]

B:BD[8.319] → [8.319:321]

B:BD[6.3924] → [9.5052:5115]

/// User interface that records method calls and returns canned inputs
#[cfg(test)]
#[derive(Default)]
struct FakeUi {
    inputs: Vec<String>,
    events: Vec<FUIEvent>,
}
#[cfg(test)]
enum FUIEvent {
    //TODO figure out how to solve lifetime issues
    // and store Media in this variant
    // Or just convert it to a string? idk
    Show,
    Warn(String),
    Read(String),
    ReadSecret(String),
}
#[cfg(test)]
impl FakeUi {
    pub fn new() -> Self {
        Default::default()
    }
}
#[cfg(test)]
impl Ui for FakeUi {
    fn show(&mut self, _content: media::Media) {
        self.events.push(FUIEvent::Show)
    }
    fn warn<D: Display>(&mut self, warning: D) {
        self.events.push(FUIEvent::Warn(warning.to_string()))
    }
    fn read(&mut self, prompt: impl Display) -> Option<String> {
        self.events.push(FUIEvent::Read(prompt.to_string()));
        self.inputs.pop()
    }
    fn read_secret(&mut self, prompt: impl Display) -> Option<String> {
        self.events.push(FUIEvent::ReadSecret(prompt.to_string()));
        self.inputs.pop()
    }
}
// TODO make tests using a fake connection to a local buffer

Insertion in src/main.rs at line 57 [6.3665]

[9.6189]

[7.1536]

    use std::{
        cell::RefCell,
        fmt::Display,
        io::{Read, Write},
        rc::Rc,
    };

Replacement in src/main.rs at line 67 [6.3665]
B:BD[5.6483] → [2.1848:1870]
```
    use crate::NopUi;
```
[5.6483]
[2.1870]
```
    use crate::{media, network::Network, NopUi, Ui};
```

Replacement in src/main.rs at line 73 [6.3665]

B:BD[7.1716] → [2.1872:1971]

        crate::core::run_url::<crate::network::TcpNetwork<crate::danger::Naive>>(&mut NopUi, url);

[7.1716]

[9.7125]

        let mut net = crate::network::TcpNetwork::new(crate::danger::Naive);
        crate::core::run_url(&mut net, &mut NopUi, url);

Replacement in src/main.rs at line 79 [6.3665]

B:BD[5.7103] → [5.7103:7147]

        let body: &[u8] = b"some text\r\n";

[5.7103]

[5.7147]

        let url: Url = "gemini://gemini.circumlunar.space".parse().unwrap();
        let response = "20 \r\nsome text\r\n";
        let body = "some text\r\n";
        let mut fui = FakeUi::new();
        let mut net = FakeNet::new(FakeConn::new(response.into()));
        crate::core::run_url(&mut net, &mut fui, url.clone());
        let net_sink = Rc::try_unwrap(net.conn.0).unwrap().into_inner().sink;
        let net_sink = String::from_utf8(net_sink).unwrap();
        assert_eq!(net_sink, format!("{}\r\n", url));
        let ui_sink = fui.sink;
        assert_eq!(ui_sink.as_ref(), [FUIEvent::Show]);
    }
    /// User interface that records method calls and returns canned inputs
    #[derive(Default)]
    struct FakeUi {
        source: Vec<String>,
        sink: Vec<FUIEvent>,
    }
    #[derive(Debug, PartialEq, PartialOrd, Ord, Eq)]
    enum FUIEvent {
        //TODO figure out how to solve lifetime issues
        // and store Media in this variant
        // Or just convert it to a string? idk
        Show,
        Warn(String),
        Read(String),
        ReadSecret(String),
    }
    impl FakeUi {
        pub fn new() -> Self {
            Default::default()
        }
    }
    impl Ui for FakeUi {
        fn show(&mut self, content: media::Media) {
            self.sink.push(FUIEvent::Show)
        }
        fn warn<D: Display>(&mut self, warning: D) {
            self.sink.push(FUIEvent::Warn(warning.to_string()))
        }
        fn read(&mut self, prompt: impl Display) -> Option<String> {
            self.sink.push(FUIEvent::Read(prompt.to_string()));
            self.source.pop()
        }
        fn read_secret(&mut self, prompt: impl Display) -> Option<String> {
            self.sink.push(FUIEvent::ReadSecret(prompt.to_string()));
            self.source.pop()
        }
    }
    #[derive(Debug)]
    struct FakeNet {
        conn: SharedFakeConn,
    }
    impl FakeNet {
        fn new(conn: FakeConn) -> Self {
            Self {
                conn: SharedFakeConn(Rc::new(RefCell::new(conn))),
            }
        }
    }
    #[derive(Clone, Debug)]
    struct SharedFakeConn(Rc<RefCell<FakeConn>>);
    #[derive(Debug)]
    struct FakeConn {
        sink: Vec<u8>,
        source: Vec<u8>,
    }
    impl FakeConn {
        fn new(source: String) -> Self {
            Self {
                sink: Vec::new(),
                source: source.into_bytes(),
            }
        }
    }
    impl Read for SharedFakeConn {
        fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
            self.0.borrow_mut().read(buf)
        }
    }
    impl Write for SharedFakeConn {
        fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
            self.0.borrow_mut().write(buf)
        }
        fn flush(&mut self) -> std::io::Result<()> {
            self.0.borrow_mut().flush()
        }
    }
    impl Read for FakeConn {
        fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
            (&*self.source).read(buf)
        }
    }
    impl Write for FakeConn {
        fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
            self.sink.write(buf)
        }
        fn flush(&mut self) -> std::io::Result<()> {
            self.sink.flush()
        }
    }
    impl Network for FakeNet {
        type Error = &'static str;
        type Connection = SharedFakeConn;
        fn connect(&mut self, _: &Url) -> Result<Self::Connection, Self::Error> {
            Ok(self.conn.clone())
        }

Insertion in src/main.rs at line 199 [6.3665]

[5.7153]

[9.7131]


    // TODO make tests using a fake connection to a local buffer

Replacement in src/core.rs at line 8 [7.1896]

B:BD[7.2080] → [7.2080:2135]

pub fn run<N: Network>(ui: &mut impl Ui, mut url: Url)

[7.2080]

[7.2135]

pub fn run<N: Network>(net: &mut N, ui: &mut impl Ui, mut url: Url)

Replacement in src/core.rs at line 12 [7.1896]

B:BD[7.2187] → [7.2187:2241]

    while let Some(new_url) = run_url::<N>(ui, url) {

[7.2187]

[7.2241]

    while let Some(new_url) = run_url(net, ui, url) {

Replacement in src/core.rs at line 17 [7.1896]

B:BD[7.2273] → [7.2273:2350]

pub(crate) fn run_url<N: Network>(ui: &mut impl Ui, url: Url) -> Option<Url>

[7.2273]

[7.2350]

pub(crate) fn run_url<N: Network>(net: &mut N, ui: &mut impl Ui, url: Url) -> Option<Url>

Replacement in src/core.rs at line 22 [7.1896]

B:BD[7.2448] → [7.2448:2515]

    let mut stream = N::connect(&url).expect("Failed to connect");

[7.2448]

[7.2515]

    let mut stream = net.connect(&url).expect("Failed to connect");

Replacement in src/core.rs at line 122 [7.1896]
B:BD[7.5510] → [7.5510:5529]
```
        .unwrap();
```
[7.5510]
[7.5529]
```
        .expect("failed to read input from ui");
```

Replacement in src/cli.rs at line 39 [7.8676]

B:BD[7.9479] → [7.9479:9540]

            run::<TcpNetwork<danger::Naive>>(&mut cli, url);

[7.9479]

[7.9540]

            let mut net = TcpNetwork::new(danger::Naive);
            run(&mut net, &mut cli, url);

Insertion in Cargo.toml at line 19 [6.41929]
[6.42262]
[6.42262]
```
thiserror = "1.0.43"
```
Replacement in Cargo.lock at line 141 [6.42312]
B:BD[6.45404] → [6.45404:45419]
```
 "syn 2.0.13",
```
[6.45404]
[6.45419]
```
 "syn 2.0.23",
```
Replacement in Cargo.lock at line 251 [6.42312]
B:BD[10.1702] → [10.1702:1717]
```
 "syn 2.0.13",
```
[10.1702]
[10.1717]
```
 "syn 2.0.23",
```
Insertion in Cargo.lock at line 304 [6.42312]
[6.46877]
[6.46877]
```
 "thiserror",
```
Replacement in Cargo.lock at line 430 [6.42312]
B:BD[4.11664] → [4.11664:11679]
```
 "syn 2.0.13",
```
[4.11664]
[4.11679]
```
 "syn 2.0.23",
```
Replacement in Cargo.lock at line 469 [6.42312]
B:BD[6.49497] → [6.49497:49516]
```
version = "1.0.56"
```
[6.49497]
[6.49516]
```
version = "1.0.63"
```

Replacement in Cargo.lock at line 471 [6.42312]

B:BD[6.49581] → [6.49581:49659]

checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"

[6.49581]

[6.49659]

checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb"

Replacement in Cargo.lock at line 478 [6.42312]
B:BD[6.49724] → [6.49724:49743]
```
version = "1.0.26"
```
[6.49724]
[6.49743]
```
version = "1.0.29"
```

Replacement in Cargo.lock at line 480 [6.42312]

B:BD[6.49808] → [6.49808:49886]

checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"

[6.49808]

[6.49886]

checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105"

Replacement in Cargo.lock at line 654 [6.42312]
B:BD[6.52269] → [6.52269:52288]
```
version = "2.0.13"
```
[6.52269]
[6.52288]
```
version = "2.0.23"
```

Replacement in Cargo.lock at line 656 [6.42312]

B:BD[6.52353] → [6.52353:52431]

checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec"

[6.52353]

[6.52431]

checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737"

Insertion in Cargo.lock at line 664 [6.42312]

[6.52507]

name = "thiserror"
version = "1.0.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42"
dependencies = [
 "thiserror-impl",
]
[[package]]
name = "thiserror-impl"
version = "1.0.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f"
dependencies = [
 "proc-macro2",
 "quote",
 "syn 2.0.23",
]
[[package]]

Use fake connection in tests

Dependencies

In channels

Change contents

Replacement in src/network.rs at line 13 [4.34]

Replacement in src/network.rs at line 17 [4.34]

Replacement in src/network.rs at line 22 [4.34]

Replacement in src/network.rs at line 30 [4.34]

Deletion in src/main.rs at line 39 [6.3665]

Insertion in src/main.rs at line 57 [6.3665]

Replacement in src/main.rs at line 67 [6.3665]

Replacement in src/main.rs at line 73 [6.3665]

Replacement in src/main.rs at line 79 [6.3665]

Insertion in src/main.rs at line 199 [6.3665]

Replacement in src/core.rs at line 8 [7.1896]

Replacement in src/core.rs at line 12 [7.1896]

Replacement in src/core.rs at line 17 [7.1896]

Replacement in src/core.rs at line 22 [7.1896]

Replacement in src/core.rs at line 122 [7.1896]

Replacement in src/cli.rs at line 39 [7.8676]

Insertion in Cargo.toml at line 19 [6.41929]

Replacement in Cargo.lock at line 141 [6.42312]

Replacement in Cargo.lock at line 251 [6.42312]

Insertion in Cargo.lock at line 304 [6.42312]

Replacement in Cargo.lock at line 430 [6.42312]

Replacement in Cargo.lock at line 469 [6.42312]

Replacement in Cargo.lock at line 471 [6.42312]

Replacement in Cargo.lock at line 478 [6.42312]

Replacement in Cargo.lock at line 480 [6.42312]

Replacement in Cargo.lock at line 654 [6.42312]

Replacement in Cargo.lock at line 656 [6.42312]

Insertion in Cargo.lock at line 664 [6.42312]