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

@@ @@ -56,13 +56,14 @@ fn incremental() { @@
 #[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 {
@@ @@ -80,15 +81,17 @@ fn duo_positive() { @@
         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)) {
@@ @@ -108,42 +111,47 @@ fn duo_positive() { @@
         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);
@@ @@ -157,13 +165,15 @@ fn duo_negative() { @@
+            }
         }").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

@@ @@ -80,13 +80,13 @@ fn config_and_connect_chain() { @@
             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 || {

0 comments (0 inline, 0 general)