~gbmor/clinte

53f2d63e53dccbfae435e01305327f2fcf84a0d4 — Ben Morrison 1 year, 2 months ago c5ea653
using in-memory db for tests, passing path to logging::init() instead of assuming
4 files changed, 10 insertions(+), 9 deletions(-)

M src/db.rs
M src/logging.rs
M src/main.rs
M src/posts.rs
M src/db.rs => src/db.rs +1 -1
@@ 59,7 59,7 @@ mod tests {

    #[test]
    fn test_new() {
        let conn = Conn::init("/tmp/clinte-test.db");
        let conn = Conn::init(":memory:");
        let mut stmt = conn.prepare("SELECT * FROM POSTS").unwrap();

        stmt.query_map(rusqlite::NO_PARAMS, |_| Ok(())).unwrap();

M src/logging.rs => src/logging.rs +6 -6
@@ 3,11 3,9 @@ use std::fs::OpenOptions;
use simplelog::*;

use crate::error;
use crate::user;

pub fn init() -> error::Result<()> {
    let file = format!("/tmp/clinte_{}.log", *user::NAME);
    let logfile = match OpenOptions::new().append(true).create(true).open(file) {
pub fn init(path: &str) -> error::Result<()> {
    let logfile = match OpenOptions::new().append(true).create(true).open(path) {
        Err(e) => {
            panic!("Could not open log file: {}", e);
        }


@@ 29,13 27,15 @@ mod tests {

    #[test]
    fn init_logs() {
        let file = format!("/tmp/clinte_{}.log", *user::NAME);
        let file = "clinte_test.log";
        let blank = " ".bytes().collect::<Vec<u8>>();
        fs::write(&file, &blank).unwrap();
        init().unwrap();
        init("clinte_test.log").unwrap();

        log::info!("TEST LOG MESSAGE");
        let logfile = fs::read_to_string(&file).unwrap();
        assert!(logfile.contains("TEST LOG MESSAGE"));

        fs::remove_file("clinte_test.log").unwrap();
    }
}

M src/main.rs => src/main.rs +2 -1
@@ 23,7 23,8 @@ fn main() -> error::Result<()> {
        .get_matches();

    let start = time::Instant::now();
    logging::init()?;
    let file = format!("/tmp/clinte_{}.log", *user::NAME);
    logging::init(&file)?;
    log::info!("clinte starting up!");
    println!("clinte v{}", clap::crate_version!());
    println!("a community notices system");

M src/posts.rs => src/posts.rs +1 -1
@@ 207,7 207,7 @@ mod tests {

    #[test]
    fn post_new() {
        let db = db::Conn::init("/tmp/clinte.db");
        let db = db::Conn::init(":memory:");
        let db = db::Conn { conn: db };
        let mut stmt = db
            .conn