zelo72
/
flodgatt
mirror of https://github.com/mastodon/flodgatt
1
0
Fork 0
Code Issues Releases Wiki Activity

Update tests

This commit is contained in:
Daniel Sockwell 2020-01-10 14:58:13 -05:00
parent 8334a3cbfa
commit cf86fded95
5 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/parse_client_request/sse.rs
View File

@ -74,7 +74,7 @@ pub fn extract_user_or_reject(pg_conn: PostgresPool) -> BoxedFilter<(User,)> {
#[cfg(test)]
mod test {
use super::*;
use crate::parse_client_request::user::{Filter, OauthScope, PostgresConn};
use crate::parse_client_request::user::{Filter, OauthScope, PostgresPool};
macro_rules! test_public_endpoint {
($name:ident {
@ -83,7 +83,7 @@ mod test {
}) => {
#[test]
fn $name() {
let pg_conn = PostgresConn::new();
let pg_conn = PostgresPool::new();
let user = warp::test::request()
.path($path)
.filter(&extract_user_or_reject(pg_conn))
@ -101,7 +101,7 @@ mod test {
#[test]
fn $name() {
let path = format!("{}?access_token=TEST_USER", $path);
let pg_conn = PostgresConn::new();
let pg_conn = PostgresPool::new();
$(let path = format!("{}&{}", path, $query);)*
let user = warp::test::request()
.path(&path)
@ -127,7 +127,7 @@ mod test {
fn $name() {
let path = format!("{}?access_token=INVALID", $path);
$(let path = format!("{}&{}", path, $query);)*
let pg_conn = PostgresConn::new();
let pg_conn = PostgresPool::new();
warp::test::request()
.path(&path)
.filter(&extract_user_or_reject(pg_conn))
@ -146,7 +146,7 @@ mod test {
let path = $path;
$(let path = format!("{}?{}", path, $query);)*
let pg_conn = PostgresConn::new();
let pg_conn = PostgresPool::new();
warp::test::request()
.path(&path)
.header("Authorization", "Bearer: INVALID")
@ -165,7 +165,7 @@ mod test {
fn $name() {
let path = $path;
$(let path = format!("{}?{}", path, $query);)*
let pg_conn = PostgresConn::new();
let pg_conn = PostgresPool::new();
warp::test::request()
.path(&path)
.filter(&extract_user_or_reject(pg_conn))
@ -437,7 +437,7 @@ mod test {
#[test]
#[should_panic(expected = "NotFound")]
fn nonexistant_endpoint() {
let pg_conn = PostgresConn::new();
let pg_conn = PostgresPool::new();
warp::test::request()
.path("/api/v1/streaming/DOES_NOT_EXIST")
.filter(&extract_user_or_reject(pg_conn))

12
src/parse_client_request/user/mock_postgres.rs
View File

@ -1,16 +1,16 @@
//! Mock Postgres connection (for use in unit testing)
use std::sync::{Arc, Mutex};
#[derive(Clone)]
pub struct PostgresConn(Arc<Mutex<String>>);
impl PostgresConn {
pub struct PostgresPool;
impl PostgresPool {
pub fn new() -> Self {
Self(Arc::new(Mutex::new("MOCK".to_string())))
Self
}
}
pub fn query_for_user_data(
access_token: &str,
_pg_conn: PostgresConn,
_pg_pool: PostgresPool,
) -> (i64, Option<Vec<String>>, Vec<String>) {
let (user_id, lang, scopes) = if access_token == "TEST_USER" {
(
@ -28,7 +28,7 @@ pub fn query_for_user_data(
(user_id, lang, scopes)
}
pub fn query_list_owner(list_id: i64, _pg_conn: PostgresConn) -> Option<i64> {
pub fn query_list_owner(list_id: i64, _pg_conn: PostgresPool) -> Option<i64> {
match list_id {
1 => Some(1),
_ => None,

10
src/parse_client_request/user/mod.rs
View File

@ -1,9 +1,9 @@
//! `User` struct and related functionality
//#[cfg(test)]
//mod mock_postgres;
//#[cfg(test)]
//use mock_postgres as postgres;
//#[cfg(not(test))]
#[cfg(test)]
mod mock_postgres;
#[cfg(test)]
use mock_postgres as postgres;
#[cfg(not(test))]
mod postgres;
pub use self::postgres::PostgresPool;
use super::query::Query;

7
src/parse_client_request/user/postgres.rs
View File

@ -25,7 +25,6 @@ impl PostgresPool {
}
}
#[cfg(not(test))]
pub fn query_for_user_data(
access_token: &str,
pg_pool: PostgresPool,
@ -79,7 +78,6 @@ pub fn query_for_user_data(access_token: &str) -> (i64, Option<Vec<String>>, Vec
(user_id, lang, scopes)
}
#[cfg(not(test))]
pub fn query_list_owner(list_id: i64, pg_pool: PostgresPool) -> Option<i64> {
let mut conn = pg_pool.0.get().unwrap();
// For the Postgres query, `id` = list number; `account_id` = user.id
@ -99,8 +97,3 @@ LIMIT 1",
Some(rows.get(0).unwrap().get(1))
}
}
//#[cfg(test)]
//pub fn query_list_owner(_list_id: i64) -> Option<i64> {
// Some(1)
//}

10
src/parse_client_request/ws.rs
View File

@ -52,7 +52,7 @@ mod test {
}) => {
#[test]
fn $name() {
let pg_conn = PostgresConn::new();
let pg_conn = PostgresPool::new();
let user = warp::test::request()
.path($path)
.header("connection", "upgrade")
@ -72,7 +72,7 @@ mod test {
}) => {
#[test]
fn $name() {
let pg_conn = PostgresConn::new();
let pg_conn = PostgresPool::new();
let path = format!("{}&access_token=TEST_USER", $path);
let user = warp::test::request()
.path(&path)
@ -96,7 +96,7 @@ mod test {
fn $name() {
let path = format!("{}&access_token=INVALID", $path);
let pg_conn = PostgresConn::new();
let pg_conn = PostgresPool::new();
warp::test::request()
.path(&path)
.filter(&extract_user_or_reject(pg_conn))
@ -112,7 +112,7 @@ mod test {
#[should_panic(expected = "Error: Missing access token")]
fn $name() {
let path = $path;
let pg_conn = PostgresConn::new();
let pg_conn = PostgresPool::new();
warp::test::request()
.path(&path)
.filter(&extract_user_or_reject(pg_conn))
@ -316,7 +316,7 @@ mod test {
#[test]
#[should_panic(expected = "NotFound")]
fn nonexistant_endpoint() {
let pg_conn = PostgresConn::new();
let pg_conn = PostgresPool::new();
warp::test::request()
.path("/api/v1/streaming/DOES_NOT_EXIST")
.header("connection", "upgrade")