From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 5 Apr 2021 16:47:40 +0000 (+0100)
Subject: wdt-simple: conflicts: Count conflicts, don't just check existence
X-Git-Tag: otter-0.5.0~165
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=61aa438eb1c03b06bef2f8e2b057714fe0d1c8d5;p=otter.git

wdt-simple: conflicts: Count conflicts, don't just check existence

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/wdriver/wdriver.rs b/wdriver/wdriver.rs
index 7c649475..c07d2c9f 100644
--- a/wdriver/wdriver.rs
+++ b/wdriver/wdriver.rs
@@ -447,8 +447,13 @@ impl<'g> WindowGuard<'g> {
 
 #[ext(pub)]
 impl Vec<String> {
-  fn find_conflict(&self) -> Option<&String> {
-    self.iter().find(|m| m.starts_with("Conflict!"))
+  fn find_conflicts(&self) -> Vec<String> {
+    self.iter().filter(|m| m.starts_with("Conflict!"))
+      .cloned().collect()
+  }
+
+  fn assert_no_conflicts(&self) {
+    assert_eq!(self.find_conflicts(), vec![] as Vec<String>);
   }
 }
 
diff --git a/wdriver/wdt-hand.rs b/wdriver/wdt-hand.rs
index ab567a07..9a776121 100644
--- a/wdriver/wdt-hand.rs
+++ b/wdriver/wdt-hand.rs
@@ -102,7 +102,7 @@ impl Ctx {
       let mut w = su.w(side)?;
       w.synch()?;
       let log = w.retrieve_log((&mut |_: &'_ _| false) as LogIgnoreBeforeFn)?;
-      assert_eq!(log.find_conflict(), None);
+      log.assert_no_conflicts();
     }
 
     {
diff --git a/wdriver/wdt-simple.rs b/wdriver/wdt-simple.rs
index 6f0261bb..de9d8ba2 100644
--- a/wdriver/wdt-simple.rs
+++ b/wdriver/wdt-simple.rs
@@ -245,8 +245,10 @@ impl Ctx {
       assert_eq!(n.held, y.held);
 
       for got in &gots {
-        let conflict = got.log.find_conflict().is_some();
-        assert_eq!(conflict, !got.yes);
+        let conflicts = got.log.find_conflicts();
+        assert_eq!(conflicts.len(),
+                   if got.yes { 0 } else { 1},
+                   "wrong # conflicts {:?}", &conflicts);
       }
 
       let yw = su.w(&y.window)?;