From 6e6f48a34ce4e4c1cf05177084455f7c6d8e0315 Mon Sep 17 00:00:00 2001 From: shockrah Date: Wed, 12 Aug 2020 20:46:45 -0700 Subject: [PATCH] Moved test::create_channel_good to rust unit tests --- server/src/channels.rs | 21 +++++++++++++++++++++ server/tests/verify_basic_cases.sh | 7 ------- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/server/src/channels.rs b/server/src/channels.rs index 11eb2ad..14c5f2c 100644 --- a/server/src/channels.rs +++ b/server/src/channels.rs @@ -206,6 +206,7 @@ pub async fn delete_channel(pool: &Pool, response: &mut Response, params: #[cfg(test)] mod channels_tests { use crate::testing::{get_pool, hyper_resp}; + use serde_json::Value; use hyper::StatusCode; #[tokio::test] @@ -220,6 +221,26 @@ mod channels_tests { // Analysis assert_eq!(StatusCode::OK, resp.status()); println!("list_all_channels_good : \t{:?}", resp.body()); + let _ = p.disconnect().await; } + #[tokio::test] + async fn create_channel_good() { + let p = get_pool(); + let mut resp = hyper_resp(); + // @params: name + kind + [description] + let params: Value = serde_json::from_str(r#" + { + "name": "sample channel", + "kind": 2, + "description": "some random bs" + } + "#).unwrap(); + + super::create_channel(&p, &mut resp, params).await; + + // hopefully we 200 + assert_eq!(StatusCode::OK, resp.status()); + let _ = p.disconnect().await; + } } diff --git a/server/tests/verify_basic_cases.sh b/server/tests/verify_basic_cases.sh index b128564..302d941 100644 --- a/server/tests/verify_basic_cases.sh +++ b/server/tests/verify_basic_cases.sh @@ -6,13 +6,6 @@ active_tests='list_all_channels create_channel delete_channel send_message ' -create_channel() { - kv="{\"id\":$id,\"secret\":\"$secret\", \"name\":\"sample\", \"kind\":2, \"description\":\"some bs description\"}" - result=$($crl $POST $url/channels/create -d "$kv") - code=$(echo "$result" | grep HTTP\/1.1 | awk '{print $2}') - log_result good_create_channel 200 $code "$result" -} - delete_channel() { kv="{\"id\":$id,\"secret\":\"$secret\", \"name\":\"sample\"}" result=$($crl $POST $url/channels/delete -d "$kv")