CSY/reowolf Changeset - d7e889432d9a · Centrum Wiskunde & Informatica (CWI)

Changeset - d7e889432d9a

Parent rev.

Child rev.

[Not reviewed]

0 3 0

Christopher Esterhuyse - 5 years ago 2020-02-06 15:26:21
christopheresterhuyse@gmail.com

cleaned up tests

3 files changed with 17 insertions and 22 deletions:

src/test/connector.rs

src/test/mod.rs

src/test/setup.rs

0 comments (0 inline, 0 general)

src/test/connector.rs

➞

Show inline comments

@@ @@ -63,7 +63,7 @@ fn connects_ok() { @@
     */
     let timeout = Duration::from_millis(1_500);
     let addrs = [next_addr()];
-    assert!(do_all(&[
+    assert!(run_connector_set(&[
         &|x| {
             // Alice
             x.configure(PDL, b"blocked").unwrap();
@@ @@ -89,7 +89,7 @@ fn connected_but_silent_natives() { @@
     */
     let timeout = Duration::from_millis(1_500);
     let addrs = [next_addr()];
-    assert!(do_all(&[
+    assert!(run_connector_set(&[
         &|x| {
             // Alice
             x.configure(PDL, b"blocked").unwrap();
@@ @@ -122,7 +122,7 @@ fn self_forward_ok() { @@
     let timeout = Duration::from_millis(1_500);
     const N: usize = 5;
     static MSG: &[u8] = b"Echo!";
-    assert!(do_all(&[
+    assert!(run_connector_set(&[
         //
         &|x| {
             // Alice
@@ @@ -148,7 +148,7 @@ fn token_spout_ok() { @@
     */
     let timeout = Duration::from_millis(1_500);
     const N: usize = 5;
-    assert!(do_all(&[
+    assert!(run_connector_set(&[
         //
         &|x| {
             // Alice
@@ @@ -172,7 +172,7 @@ fn waiter_ok() { @@
     Alice<--token_spout
     */
     let timeout = Duration::from_millis(1_500);
-    assert!(do_all(&[
+    assert!(run_connector_set(&[
         //
         &|x| {
             // Alice
@@ @@ -202,7 +202,7 @@ fn self_forward_timeout() { @@
     */
     let timeout = Duration::from_millis(500);
     static MSG: &[u8] = b"Echo!";
-    assert!(do_all(&[
+    assert!(run_connector_set(&[
         //
         &|x| {
             // Sender
@@ @@ -228,7 +228,7 @@ fn forward_det() { @@
     const N: usize = 5;
     static MSG: &[u8] = b"Hello!";
-    assert!(do_all(&[
+    assert!(run_connector_set(&[
         &|x| {
             x.configure(PDL, b"forward").unwrap();
             x.bind_port(0, Native).unwrap();
@@ @@ -264,7 +264,7 @@ fn nondet_proto_det_natives() { @@
     let addrs = [next_addr()];
     const N: usize = 5;
     static MSG: &[u8] = b"Message, here!";
-    assert!(do_all(&[
+    assert!(run_connector_set(&[
         &|x| {
             // Alice
             x.configure(PDL, b"sync").unwrap();
@@ @@ -301,7 +301,7 @@ fn putter_determines() { @@
     let addrs = [next_addr()];
     const N: usize = 3;
     static MSG: &[u8] = b"Hidey ho!";
-    assert!(do_all(&[
+    assert!(run_connector_set(&[
         //
         &|x| {
             // Alice
@@ @@ -341,7 +341,7 @@ fn getter_determines() { @@
     let addrs = [next_addr()];
     const N: usize = 5;
     static MSG: &[u8] = b"Hidey ho!";
-    assert!(do_all(&[
+    assert!(run_connector_set(&[
         //
         &|x| {
             // Alice
@@ @@ -384,7 +384,7 @@ fn alternator_2() { @@
     let addrs = [next_addr(), next_addr()];
     const N: usize = 5;
     static MSG: &[u8] = b"message";
-    assert!(do_all(&[
+    assert!(run_connector_set(&[
         //
         &|x| {
             // Sender
@@ @@ -450,7 +450,7 @@ fn composite_chain() { @@
     let addrs = [next_addr(), next_addr()];
     const N: usize = 1;
     static MSG: &[u8] = b"Hippity Hoppity";
-    assert!(do_all(&[
+    assert!(run_connector_set(&[
         //
         &|x| {
             // Alice
@@ @@ -490,7 +490,7 @@ fn exchange() { @@
     let timeout = Duration::from_millis(1_500);
     let addrs = [next_addr(), next_addr()];
     const N: usize = 1;
-    assert!(do_all(&[
+    assert!(run_connector_set(&[
         //
         &|x| {
             // Alice
@@ @@ -537,7 +537,7 @@ fn filter_messages() { @@
     let timeout = Duration::from_millis(1_500);
     let addrs = [next_addr()];
     const N: usize = 1;
-    assert!(do_all(&[
+    assert!(run_connector_set(&[
         //
         &|x| {
             // Sender

src/test/mod.rs

➞

Show inline comments

@@ @@ -31,17 +31,12 @@ impl Debug for Panicked { @@
+        }
+    }
+}
 fn handle(result: Result<(), Box<(dyn std::any::Any + Send + 'static)>>) {
     if let Err(x) = result {
         panic!("Worker panicked: {:?}", Panicked(x))
+    }
+}
 // Given a set of tasks (where each is some function that interacts with a connector)
 // run each task in in its own thread.
 // print the log and OK/PANIC result of each thread
 // then finally, return true IFF no threads panicked
-fn do_all(i: &[&(dyn Fn(&mut Connector) + Sync)]) -> bool {
+fn run_connector_set(i: &[&(dyn Fn(&mut Connector) + Sync)]) -> bool {
     let cid_iter = 0..(i.len() as ControllerId);
     let mut connectors = cid_iter
         .clone()

src/test/setup.rs

➞

Show inline comments

@@ @@ -38,7 +38,7 @@ fn bind_too_much() { @@
 fn config_and_connect_2() {
     let timeout = Duration::from_millis(1_500);
     let addrs = [next_addr(), next_addr()];
-    assert!(do_all(&[
+    assert!(run_connector_set(&[
         &|x| {
             x.configure(b"primitive main(in a, out b) {}", b"main").unwrap();
             x.bind_port(0, Passive(addrs[0])).unwrap();
@@ @@ -58,7 +58,7 @@ fn config_and_connect_2() { @@
 fn config_and_connect_chain() {
     let timeout = Duration::from_millis(1_500);
     let addrs = [next_addr(), next_addr(), next_addr()];
-    assert!(do_all(&[
+    assert!(run_connector_set(&[
         &|x| {
             // PRODUCER A->
             x.configure(b"primitive main(out a) {}", b"main").unwrap();

0 comments (0 inline, 0 general)