From 3415a7e429d74812489c0d87a3ee4a51220f30ed Mon Sep 17 00:00:00 2001
From: Niko Matsakis <niko@alum.mit.edu>
Date: Fri, 4 May 2012 09:07:10 -0700
Subject: [PATCH] rewrite test to be more concise but also more in depth

---
 src/rust-azure       |  2 +-
 src/servo/dom/rcu.rs | 20 ++++----------------
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/rust-azure b/src/rust-azure
index 370d322af92..0e8a08bf861 160000
--- a/src/rust-azure
+++ b/src/rust-azure
@@ -1 +1 @@
-Subproject commit 370d322af925fce23a2797c67499268d1cb5385e
+Subproject commit 0e8a08bf861ae4d6271920e16bfd0022bd2aad77
diff --git a/src/servo/dom/rcu.rs b/src/servo/dom/rcu.rs
index 05b5fcee0bf..73196026248 100644
--- a/src/servo/dom/rcu.rs
+++ b/src/servo/dom/rcu.rs
@@ -170,15 +170,6 @@ mod test {
         s.handle({name:"ferdinand", species:bull(~{mut horns:3u})});
     }
 
-    fn describe(a: animal) -> str {
-        let s = alt a.species {
-          chicken(c) { #fmt["chicken who lays %u eggs per day",
-                            c.eggs_per_day] }
-          bull(c) { #fmt["bull with %u horns", c.horns] }
-        };
-        #fmt["%s, the %s", a.name, s]
-    }
-
     fn mutate(a: animal) {
         alt a.species {
           chicken(c) { c.eggs_per_day += 1u; }
@@ -213,8 +204,8 @@ mod test {
             s.reader_forked();
             let wait_chan = task::spawn_listener {|wait_port|
                 uint::range(0u, iter2) { |_i|
-                    comm::send(read_chan, henrietta.rd(describe));
-                    comm::send(read_chan, ferdinand.rd(describe));
+                    comm::send(read_chan, henrietta.rd(read_characteristic));
+                    comm::send(read_chan, ferdinand.rd(read_characteristic));
                     comm::recv(wait_port);
                 }
             };
@@ -225,13 +216,10 @@ mod test {
             let frc = ferdinand.rd(read_characteristic);
             assert frc == i * iter2;
 
-            let exp1 = henrietta.rd(describe);
-            let exp2 = ferdinand.rd(describe);
-
             uint::range(0u, iter2) { |_i|
-                assert exp1 == comm::recv(read_port);
+                assert hrc == comm::recv(read_port);
                 s.wr(henrietta, mutate);
-                assert exp2 == comm::recv(read_port);
+                assert frc == comm::recv(read_port);
                 s.wr(ferdinand, mutate);
                 comm::send(wait_chan, ());
             }