concepts: Rewrite Cacher tests using RefCell

[learn-rust.git] / concepts / tests / test_lib.rs

diff --git a/concepts/tests/test_lib.rs b/concepts/tests/test_lib.rs
index af9bbe25b980e3372f1232e43ccea731b0536da2..402f187690b301397b42d29404b87bd43fe05b23 100644 (file)
--- a/concepts/tests/test_lib.rs
+++ b/concepts/tests/test_lib.rs
@@ -1,5 +1,4 @@
-#[macro_use]
-extern crate global_counter;
+use std::cell::RefCell;

 
 use learning::*;
 
 
 use learning::*;
 


@@ -12,40 +11,40 @@ fn test_longest() {
 
 #[test]
 fn test_cacher_int_int() {
 
 #[test]
 fn test_cacher_int_int() {

-    global_default_counter!(CALLED, u32);
+    let called = RefCell::new(0);

     let mut cacher = Cacher::new(|x| {
     let mut cacher = Cacher::new(|x| {

-        CALLED.inc();
+        *(called.borrow_mut()) += 1;

         2 * x
     });
     assert_eq!(cacher.value(1), 2);
         2 * x
     });
     assert_eq!(cacher.value(1), 2);

-    assert_eq!(CALLED.get_cloned(), 1);
+    assert_eq!(*called.borrow(), 1);

     // second time cached
     assert_eq!(cacher.value(1), 2);
     // second time cached
     assert_eq!(cacher.value(1), 2);

-    assert_eq!(CALLED.get_cloned(), 1);
+    assert_eq!(*called.borrow(), 1);

     // re-evaluated for new value
     assert_eq!(cacher.value(-2), -4);
     // re-evaluated for new value
     assert_eq!(cacher.value(-2), -4);

-    assert_eq!(CALLED.get_cloned(), 2);
+    assert_eq!(*called.borrow(), 2);

     // old arg still cached
     assert_eq!(cacher.value(1), 2);
     // old arg still cached
     assert_eq!(cacher.value(1), 2);

-    assert_eq!(CALLED.get_cloned(), 2);
+    assert_eq!(*called.borrow(), 2);

 }
 
 #[test]
 fn test_cacher_str_usize() {
 }
 
 #[test]
 fn test_cacher_str_usize() {

-    global_default_counter!(CALLED, u32);
+    let called = RefCell::new(0);

     let mut cacher = Cacher::new(|x: &str| {
     let mut cacher = Cacher::new(|x: &str| {

-        CALLED.inc();
+        *(called.borrow_mut()) += 1;

         x.len()
     });
     assert_eq!(cacher.value("abc"), 3);
         x.len()
     });
     assert_eq!(cacher.value("abc"), 3);

-    assert_eq!(CALLED.get_cloned(), 1);
+    assert_eq!(*called.borrow(), 1);

     // second time cached
     assert_eq!(cacher.value("abc"), 3);
     // second time cached
     assert_eq!(cacher.value("abc"), 3);

-    assert_eq!(CALLED.get_cloned(), 1);
+    assert_eq!(*called.borrow(), 1);

     // re-evaluated for new value
     assert_eq!(cacher.value("defg"), 4);
     // re-evaluated for new value
     assert_eq!(cacher.value("defg"), 4);

-    assert_eq!(CALLED.get_cloned(), 2);
+    assert_eq!(*called.borrow(), 2);

     // old arg still cached
     assert_eq!(cacher.value("abc"), 3);
     // old arg still cached
     assert_eq!(cacher.value("abc"), 3);

-    assert_eq!(CALLED.get_cloned(), 2);
+    assert_eq!(*called.borrow(), 2);

 }
 }