Skip to content

Commit e3c9571

Browse files
committed
Split tests into units with helpers.
1 parent b6d3275 commit e3c9571

File tree

1 file changed

+18
-6
lines changed

1 file changed

+18
-6
lines changed

src/conduit-router.rs

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -152,28 +152,40 @@ mod tests {
152152
}
153153

154154
#[test]
155-
fn as_conduit_handler() {
156-
let mut router = RouteBuilder::new();
157-
router.post("/posts/:id", handler1);
158-
router.get("/posts/:id", handler1);
159-
155+
fn basic_get() {
156+
let router = test_router();
160157
let mut req = RequestSentinel::new(conduit::Get, "/posts/1");
161158
let mut res = router.call(&mut req).ok().expect("No response");
162159

163160
assert_eq!(res.status, (200, "OK"));
164161
assert_eq!(res.body.read_to_str().unwrap(), "1, Get".to_str());
162+
}
165163

164+
#[test]
165+
fn basic_post() {
166+
let router = test_router();
166167
let mut req = RequestSentinel::new(conduit::Post, "/posts/10");
167168
let mut res = router.call(&mut req).ok().expect("No response");
168169

169170
assert_eq!(res.status, (200, "OK"));
170171
assert_eq!(res.body.read_to_str().unwrap(), "10, Post".to_str());
172+
}
171173

174+
#[test]
175+
fn nonexistent_route() {
176+
let router = test_router();
172177
let mut req = RequestSentinel::new(conduit::Post, "/nonexistent");
173178
router.call(&mut req).err().expect("No response");
174179
}
175180

176-
fn handler1(req: &mut conduit::Request) -> Result<conduit::Response, ()> {
181+
fn test_router() -> RouteBuilder {
182+
let mut router = RouteBuilder::new();
183+
router.post("/posts/:id", test_handler);
184+
router.get("/posts/:id", test_handler);
185+
router
186+
}
187+
188+
fn test_handler(req: &mut conduit::Request) -> Result<conduit::Response, ()> {
177189
let mut res = vec!();
178190
res.push(req.params()["id"]);
179191
res.push(format!("{}", req.method()));

0 commit comments

Comments
 (0)