From 2214492792aff5e5e2b507b441c885d6e1c48ab9 Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Sun, 15 Jul 2018 18:53:02 +0600
Subject: [PATCH] use assert and restore test case

---
 .travis.yml   |  2 +-
 src/router.rs | 16 ++++++++++------
 src/scope.rs  |  6 +++---
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 67cd9d38a..54a86aa7a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,7 +36,7 @@ script:
     fi
   - |
     if [[ "$TRAVIS_RUST_VERSION" == "stable" ]]; then
-    RUSTFLAGS="--cfg procmacro2_semver_exempt" cargo install cargo-tarpaulin
+    RUSTFLAGS="--cfg procmacro2_semver_exempt" cargo install -f cargo-tarpaulin
     cargo tarpaulin --features="alpn,tls" --out Xml --no-count
     bash <(curl -s https://codecov.io/bash)
     echo "Uploaded code coverage"
diff --git a/src/router.rs b/src/router.rs
index 468cc236f..fbdcbc08a 100644
--- a/src/router.rs
+++ b/src/router.rs
@@ -211,9 +211,11 @@ impl<S: 'static> Router<S> {
 
             let name = resource.get_name();
             if !name.is_empty() {
-                if inner.named.contains_key(name) {
-                    panic!("Named resource {:?} is registered.", name);
-                }
+                assert!(
+                    !inner.named.contains_key(name),
+                    "Named resource {:?} is registered.",
+                    name
+                );
                 inner.named.insert(name.to_owned(), resource.rdef().clone());
             }
             inner.patterns.push(resource.rdef().clone());
@@ -279,9 +281,11 @@ impl<S: 'static> Router<S> {
 
     pub(crate) fn register_external(&mut self, name: &str, rdef: ResourceDef) {
         let inner = Rc::get_mut(&mut self.defs).unwrap();
-        if inner.named.contains_key(name) {
-            panic!("Named resource {:?} is registered.", name);
-        }
+        assert!(
+            !inner.named.contains_key(name),
+            "Named resource {:?} is registered.",
+            name
+        );
         inner.named.insert(name.to_owned(), rdef);
     }
 
diff --git a/src/scope.rs b/src/scope.rs
index d9502c944..a12bcafa2 100644
--- a/src/scope.rs
+++ b/src/scope.rs
@@ -910,9 +910,9 @@ mod tests {
             })
             .finish();
 
-        //let req = TestRequest::with_uri("/app/t1").request();
-        //let resp = app.run(req);
-        //assert_eq!(resp.as_msg().status(), StatusCode::NOT_FOUND);
+        let req = TestRequest::with_uri("/app/t1").request();
+        let resp = app.run(req);
+        assert_eq!(resp.as_msg().status(), StatusCode::NOT_FOUND);
 
         let req = TestRequest::with_uri("/app/t1/").request();
         let resp = app.run(req);