From fb7fcdb4651ece93ab245c9f7200db1d804c0cf2 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 4 Jan 2021 00:09:11 +0000 Subject: [PATCH] wip links, new test fails Signed-off-by: Ian Jackson --- wdriver.rs | 4 ++++ wdriver/wdt-altergame.rs | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/wdriver.rs b/wdriver.rs index 30b6ef90..2ba265b2 100644 --- a/wdriver.rs +++ b/wdriver.rs @@ -728,6 +728,10 @@ pub struct Window { instance: InstanceName, } +impl Window { + pub fn table(&self) -> String { self.instance.to_string() } +} + type ScreenCTM = ndarray::Array2::; pub struct WindowGuard<'g> { diff --git a/wdriver/wdt-altergame.rs b/wdriver/wdt-altergame.rs index 33198561..7826d887 100644 --- a/wdriver/wdt-altergame.rs +++ b/wdriver/wdt-altergame.rs @@ -36,13 +36,15 @@ impl Context { #[throws(AE)] fn test_link(&mut self, kind: LinkKind, desc: &str, url: &str) { - self.su.ds.otter(&["set-link", &kind.to_string(), url])?; + self.su.ds.otter(&["set-link", &self.alice.table(), + &kind.to_string(), url])?; self.check_link(desc, Some(url))?; } #[throws(AE)] fn test_remove_link(&mut self, kind: LinkKind, desc: &str) { - self.su.ds.otter(&["remove-link", &kind.to_string()])?; + self.su.ds.otter(&["remove-link", &self.alice.table(), + &kind.to_string()])?; self.check_link(desc, None)?; } } -- 2.30.2