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

Changeset - e71e02fb13d4

Parent rev.

Child rev.

[Not reviewed]

v0.1.0

0 2 0

Hans-Dieter Hiep - 5 years ago 2020-02-04 17:53:20
hdh@cwi.nl

Fix test cases

2 files changed with 18 insertions and 8 deletions:

src/test/connector.rs

src/test/setup.rs

0 comments (0 inline, 0 general)

src/test/connector.rs

➞

Show inline comments

 extern crate test_generator;
 use super::*;
 use std::fs;
 use std::path::Path;
 use std::thread;
 use test_generator::test_resources;
 use crate::common::*;
 use crate::runtime::*;
 use crate::runtime::errors::*;
 #[test]
 fn incremental() {
     let timeout = Duration::from_millis(1_500);
     let addrs = ["127.0.0.1:7010".parse().unwrap(), "127.0.0.1:7011".parse().unwrap()];
     let a = thread::spawn(move || {
         let controller_id = 0;
         let mut x = Connector::Unconfigured(Unconfigured { controller_id });
         x.configure(
             b"primitive main(out a, out b) {
             synchronous {
                 msg m = create(0);
                 put(a, m);
+            }
         }",
+        )
         .unwrap();
         x.bind_port(0, PortBinding::Passive(addrs[0])).unwrap();
         x.bind_port(1, PortBinding::Passive(addrs[1])).unwrap();
         x.connect(timeout).unwrap();
         assert_eq!(0, x.sync(timeout).unwrap());
         println!("\n---------\nLOG CID={}\n{}", controller_id, x.get_mut_logger().unwrap());
     });
     let b = thread::spawn(move || {
         let controller_id = 1;
         let mut x = Connector::Unconfigured(Unconfigured { controller_id });
         x.configure(
             b"primitive main(in a, in b) {
             synchronous {
                 get(a);
+            }
         }",
+        )
         .unwrap();
         x.bind_port(0, PortBinding::Active(addrs[0])).unwrap();
         x.bind_port(1, PortBinding::Active(addrs[1])).unwrap();
         x.connect(timeout).unwrap();
         assert_eq!(0, x.sync(timeout).unwrap());
         println!("\n---------\nLOG CID={}\n{}", controller_id, x.get_mut_logger().unwrap());
     });
     handle(a.join());
     handle(b.join());
+}
 #[test]
 fn duo_positive() {
     let timeout = Duration::from_millis(1_500);
     let addrs = ["127.0.0.1:7012".parse().unwrap(), "127.0.0.1:7013".parse().unwrap()];
     let a = thread::spawn(move || {
         let mut x = Connector::Unconfigured(Unconfigured { controller_id: 0 });
         let controller_id = 0;
         let mut x = Connector::Unconfigured(Unconfigured { controller_id });
         x.configure(
             b"
         primitive main(out a, out b) {
             synchronous {}
             synchronous {}
             synchronous {
                 msg m = create(0);
                 put(a, m);
+            }
             synchronous {
                 msg m = create(0);
                 put(b, m);
+            }
         }",
+        )
         .unwrap();
         x.bind_port(0, PortBinding::Passive(addrs[0])).unwrap();
         x.bind_port(1, PortBinding::Passive(addrs[1])).unwrap();
         x.connect(timeout).unwrap();
         assert_eq!(0, x.sync(timeout).unwrap());
         assert_eq!(0, x.sync(timeout).unwrap());
         assert_eq!(0, x.sync(timeout).unwrap());
         assert_eq!(0, x.sync(timeout).unwrap());
         println!("\n---------\nLOG CID={}\n{}", controller_id, x.get_mut_logger().unwrap());
     });
     let b = thread::spawn(move || {
         let mut x = Connector::Unconfigured(Unconfigured { controller_id: 1 });
         let controller_id = 1;
         let mut x = Connector::Unconfigured(Unconfigured { controller_id });
         x.configure(
             b"
         primitive main(in a, in b) {
             while (true) {
                 synchronous {
                     if (fires(a)) {
                         get(a);
+                    }
+                }
                 synchronous {
                     if (fires(b)) {
                         get(b);
+                    }
+                }
+            }
         }",
+        )
         .unwrap();
         x.bind_port(0, PortBinding::Active(addrs[0])).unwrap();
         x.bind_port(1, PortBinding::Active(addrs[1])).unwrap();
         x.connect(timeout).unwrap();
         assert_eq!(0, x.sync(timeout).unwrap());
         assert_eq!(0, x.sync(timeout).unwrap());
         assert_eq!(0, x.sync(timeout).unwrap());
         assert_eq!(0, x.sync(timeout).unwrap());
         println!("\n---------\nLOG CID={}\n{}", controller_id, x.get_mut_logger().unwrap());
     });
     handle(a.join());
     handle(b.join());
+}
 #[test]
 fn duo_negative() {
     let timeout = Duration::from_millis(500);
-    let addrs = ["127.0.0.1:7012".parse().unwrap(), "127.0.0.1:7013".parse().unwrap()];
+    let addrs = ["127.0.0.1:7014".parse().unwrap(), "127.0.0.1:7015".parse().unwrap()];
     let a = thread::spawn(move || {
         let mut x = Connector::Unconfigured(Unconfigured { controller_id: 0 });
         let controller_id = 0;
         let mut x = Connector::Unconfigured(Unconfigured { controller_id });
         x.configure(b"
         primitive main(out a, out b) {
             synchronous {}
             synchronous {
                 msg m = create(0);
                 put(a, m); // fires a on second round
+            }
         }").unwrap();
         x.bind_port(0, PortBinding::Passive(addrs[0])).unwrap();
         x.bind_port(1, PortBinding::Passive(addrs[1])).unwrap();
         x.connect(timeout).unwrap();
         assert_eq!(0, x.sync(timeout).unwrap());
         match x.sync(timeout) {
         let r = x.sync(timeout);
         println!("\n---------\nLOG CID={}\n{}", controller_id, x.get_mut_logger().unwrap());
         match r {
             Err(SyncErr::Timeout) => {}
             x => unreachable!("{:?}", x)
+        }
     });
     let b = thread::spawn(move || {
         let mut x = Connector::Unconfigured(Unconfigured { controller_id: 1 });
         let controller_id = 1;
         let mut x = Connector::Unconfigured(Unconfigured { controller_id });
         x.configure(b"
         primitive main(in a, in b) {
             while (true) {
                 synchronous {
                     if (fires(a)) {
                         get(a);
+                    }
+                }
                 synchronous {
                     if (fires(b)) { // never fire a on even round
                         get(b);
+                    }
+                }
+            }
         }").unwrap();
         x.bind_port(0, PortBinding::Active(addrs[0])).unwrap();
         x.bind_port(1, PortBinding::Active(addrs[1])).unwrap();
         x.connect(timeout).unwrap();
         assert_eq!(0, x.sync(timeout).unwrap());
         match x.sync(timeout) {
         let r = x.sync(timeout);
         println!("\n---------\nLOG CID={}\n{}", controller_id, x.get_mut_logger().unwrap());
         match r {
             Err(SyncErr::Timeout) => {}
             x => unreachable!("{:?}", x)
+        }
     });
     handle(a.join());
     handle(b.join());
+}

src/test/setup.rs

➞

Show inline comments

 use crate::common::*;
 use crate::runtime::*;
 use PortBinding::*;
 use super::*;
 #[test]
 fn config_ok_0() {
     let pdl = b"primitive main() {}";
     let d = ProtocolD::parse(pdl).unwrap();
     let pol = d.main_interface_polarities();
     assert_eq!(&pol[..], &[]);
+}
 #[test]
 fn config_ok_2() {
     let pdl = b"primitive main(in x, out y) {}";
     let d = ProtocolD::parse(pdl).unwrap();
     let pol = d.main_interface_polarities();
     assert_eq!(&pol[..], &[Polarity::Getter, Polarity::Putter]);
+}
 #[test]
 #[should_panic]
 fn config_non_port() {
     let pdl = b"primitive main(in q, int q) {}";
     ProtocolD::parse(pdl).unwrap();
+}
 #[test]
 fn config_and_connect_2() {
     let timeout = Duration::from_millis(1_500);
     let addrs = ["127.0.0.1:9000".parse().unwrap(), "127.0.0.1:9001".parse().unwrap()];
     use std::thread;
     let handles = vec![
         //
         thread::spawn(move || {
             let mut x = Connector::Unconfigured(Unconfigured { controller_id: 0 });
             x.configure(b"primitive main(in a, out b) {}").unwrap();
             x.bind_port(0, Passive(addrs[0])).unwrap();
             x.bind_port(1, Passive(addrs[1])).unwrap();
             x.connect(timeout).unwrap();
         }),
         thread::spawn(move || {
             let mut x = Connector::Unconfigured(Unconfigured { controller_id: 1 });
             x.configure(b"primitive main(out a, in b) {}").unwrap();
             x.bind_port(0, Active(addrs[0])).unwrap();
             x.bind_port(1, Active(addrs[1])).unwrap();
             x.connect(timeout).unwrap();
         }),
     ];
     for h in handles {
         handle(h.join())
+    }
+}
 #[test]
 fn bind_too_much() {
     let mut x = Connector::Unconfigured(Unconfigured { controller_id: 0 });
     x.configure(b"primitive main(in a) {}").unwrap();
     x.bind_port(0, Native).unwrap();
     assert!(x.bind_port(1, Native).is_err());
+}
 #[test]
 fn config_and_connect_chain() {
     let timeout = Duration::from_millis(1_500);
     let addrs = [
         "127.0.0.1:9002".parse().unwrap(),
         "127.0.0.1:9003".parse().unwrap(),
         "127.0.0.1:9004".parse().unwrap(),
     ];
     use std::thread;
     let handles = vec![
         //
         thread::spawn(move || {
             // PRODUCER A->
             let mut x = Connector::Unconfigured(Unconfigured { controller_id: 0 });
             x.configure(b"primitive main(out a) {}").unwrap();
             x.bind_port(0, Active(addrs[0])).unwrap();
             x.connect(timeout).unwrap();
         }),
         thread::spawn(move || {
             // FORWARDER ->B->
-            let mut x = Connector::Unconfigured(Unconfigured { controller_id: 0 });
+            let mut x = Connector::Unconfigured(Unconfigured { controller_id: 1 });
             x.configure(b"primitive main(in a, out b) {}").unwrap();
             x.bind_port(0, Passive(addrs[0])).unwrap();
             x.bind_port(1, Active(addrs[1])).unwrap();
             x.connect(timeout).unwrap();
         }),
         thread::spawn(move || {
             // FORWARDER ->C->
             let mut x = Connector::Unconfigured(Unconfigured { controller_id: 2 });
             x.configure(b"primitive main(in a, out b) {}").unwrap();
             x.bind_port(0, Passive(addrs[1])).unwrap();
             x.bind_port(1, Active(addrs[2])).unwrap();
             x.connect(timeout).unwrap();
         }),
         thread::spawn(move || {
             // CONSUMER ->D
             let mut x = Connector::Unconfigured(Unconfigured { controller_id: 3 });
             x.configure(b"primitive main(in a) {}").unwrap();
             x.bind_port(0, Passive(addrs[2])).unwrap();
             x.connect(timeout).unwrap();
         }),
     ];
     for h in handles {
         handle(h.join())
+    }
+}

0 comments (0 inline, 0 general)