aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/basic.rs14
-rw-r--r--tests/control.rs11
-rw-r--r--tests/escape.rs24
-rw-r--r--tests/init.rs6
-rw-r--r--tests/scroll.rs20
5 files changed, 42 insertions, 33 deletions
diff --git a/tests/basic.rs b/tests/basic.rs
index 0f2da75..33a272d 100644
--- a/tests/basic.rs
+++ b/tests/basic.rs
@@ -20,18 +20,18 @@ fn set_size() {
assert_eq!(parser.screen().size(), (24, 80));
assert_eq!(parser.screen().cursor_position(), (0, 0));
- parser.screen_mut().set_size(34, 8);
+ parser.set_size(34, 8);
assert_eq!(parser.screen().size(), (34, 8));
assert_eq!(parser.screen().cursor_position(), (0, 0));
parser.process(b"\x1b[30;5H");
assert_eq!(parser.screen().cursor_position(), (29, 4));
- parser.screen_mut().set_size(24, 80);
+ parser.set_size(24, 80);
assert_eq!(parser.screen().size(), (24, 80));
assert_eq!(parser.screen().cursor_position(), (23, 4));
- parser.screen_mut().set_size(34, 8);
+ parser.set_size(34, 8);
assert_eq!(parser.screen().size(), (34, 8));
assert_eq!(parser.screen().cursor_position(), (23, 4));
@@ -39,7 +39,7 @@ fn set_size() {
assert_eq!(parser.screen().size(), (34, 8));
assert_eq!(parser.screen().cursor_position(), (0, 0));
- parser.screen_mut().set_size(24, 80);
+ parser.set_size(24, 80);
assert_eq!(parser.screen().size(), (24, 80));
assert_eq!(parser.screen().cursor_position(), (0, 0));
@@ -47,14 +47,14 @@ fn set_size() {
assert_eq!(parser.screen().size(), (24, 80));
assert_eq!(parser.screen().cursor_position(), (23, 4));
- parser.screen_mut().set_size(34, 8);
+ parser.set_size(34, 8);
parser.process(b"\x1bc01234567890123456789");
assert_eq!(parser.screen().contents(), "01234567890123456789");
- parser.screen_mut().set_size(24, 80);
+ parser.set_size(24, 80);
assert_eq!(parser.screen().contents(), "01234567\n89012345\n6789");
- parser.screen_mut().set_size(34, 8);
+ parser.set_size(34, 8);
assert_eq!(parser.screen().contents(), "01234567\n89012345\n6789");
}
diff --git a/tests/control.rs b/tests/control.rs
index 9392b5e..aba6915 100644
--- a/tests/control.rs
+++ b/tests/control.rs
@@ -3,12 +3,17 @@
#[test]
fn bel() {
let mut parser = vt100::Parser::default();
+ assert_eq!(parser.screen().audible_bell_count(), 0);
- assert!(!parser.screen_mut().check_audible_bell());
+ parser.process(b"\x07");
+ assert_eq!(parser.screen().audible_bell_count(), 1);
+ assert_eq!(parser.screen().audible_bell_count(), 1);
parser.process(b"\x07");
- assert!(parser.screen_mut().check_audible_bell());
- assert!(!parser.screen_mut().check_audible_bell());
+ assert_eq!(parser.screen().audible_bell_count(), 2);
+
+ parser.process(b"\x07\x07\x07");
+ assert_eq!(parser.screen().audible_bell_count(), 5);
}
#[test]
diff --git a/tests/escape.rs b/tests/escape.rs
index 43eb666..e08a402 100644
--- a/tests/escape.rs
+++ b/tests/escape.rs
@@ -40,8 +40,8 @@ fn ris() {
assert_eq!(parser.screen().title(), "");
assert_eq!(parser.screen().icon_name(), "");
- assert!(!parser.screen_mut().check_visual_bell());
- assert!(!parser.screen_mut().check_audible_bell());
+ assert_eq!(parser.screen().audible_bell_count(), 0);
+ assert_eq!(parser.screen().visual_bell_count(), 0);
assert!(!parser.screen().application_keypad());
assert!(!parser.screen().application_cursor());
assert!(!parser.screen().hide_cursor());
@@ -72,8 +72,8 @@ fn ris() {
assert_eq!(parser.screen().title(), "window title");
assert_eq!(parser.screen().icon_name(), "window icon name");
- assert!(parser.screen_mut().check_visual_bell());
- assert!(parser.screen_mut().check_audible_bell());
+ assert_eq!(parser.screen().audible_bell_count(), 1);
+ assert_eq!(parser.screen().visual_bell_count(), 1);
assert!(parser.screen().application_keypad());
assert!(parser.screen().application_cursor());
assert!(parser.screen().hide_cursor());
@@ -87,7 +87,7 @@ fn ris() {
vt100::MouseProtocolEncoding::Sgr
);
- parser.process(b"\x07\x1bg\x1bc");
+ parser.process(b"\x1bc");
assert_eq!(parser.screen().cursor_position(), (0, 0));
let cell = parser.screen().cell(0, 0).unwrap();
@@ -104,8 +104,8 @@ fn ris() {
assert_eq!(parser.screen().icon_name(), "window icon name");
// bell states don't change with reset
- assert!(parser.screen_mut().check_visual_bell());
- assert!(parser.screen_mut().check_audible_bell());
+ assert_eq!(parser.screen().audible_bell_count(), 1);
+ assert_eq!(parser.screen().visual_bell_count(), 1);
assert!(!parser.screen().application_keypad());
assert!(!parser.screen().application_cursor());
@@ -124,10 +124,14 @@ fn ris() {
#[test]
fn vb() {
let mut parser = vt100::Parser::default();
- assert!(!parser.screen_mut().check_visual_bell());
+ assert_eq!(parser.screen().visual_bell_count(), 0);
parser.process(b"\x1bg");
- assert!(parser.screen_mut().check_visual_bell());
- assert!(!parser.screen_mut().check_visual_bell());
+ assert_eq!(parser.screen().visual_bell_count(), 1);
+ assert_eq!(parser.screen().visual_bell_count(), 1);
+ parser.process(b"\x1bg");
+ assert_eq!(parser.screen().visual_bell_count(), 2);
+ parser.process(b"\x1bg\x1bg\x1bg");
+ assert_eq!(parser.screen().visual_bell_count(), 5);
}
#[test]
diff --git a/tests/init.rs b/tests/init.rs
index ccb1c70..4e0cd66 100644
--- a/tests/init.rs
+++ b/tests/init.rs
@@ -2,7 +2,7 @@
#[test]
fn init() {
- let mut parser = vt100::Parser::default();
+ let parser = vt100::Parser::default();
assert_eq!(parser.screen().size(), (24, 80));
assert_eq!(parser.screen().cursor_position(), (0, 0));
@@ -24,8 +24,8 @@ fn init() {
assert_eq!(parser.screen().title(), "");
assert_eq!(parser.screen().icon_name(), "");
- assert!(!parser.screen_mut().check_visual_bell());
- assert!(!parser.screen_mut().check_audible_bell());
+ assert_eq!(parser.screen().audible_bell_count(), 0);
+ assert_eq!(parser.screen().visual_bell_count(), 0);
assert!(!parser.screen().application_keypad());
assert!(!parser.screen().application_cursor());
assert!(!parser.screen().hide_cursor());
diff --git a/tests/scroll.rs b/tests/scroll.rs
index 32b7488..2b1117e 100644
--- a/tests/scroll.rs
+++ b/tests/scroll.rs
@@ -82,31 +82,31 @@ fn scrollback() {
parser.process(b"\r\n25\r\n26\r\n27\r\n28\r\n29\r\n30");
assert_eq!(parser.screen().contents(), "7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n25\n26\n27\n28\n29\n30");
- parser.screen_mut().set_scrollback(0);
+ parser.set_scrollback(0);
assert_eq!(parser.screen().scrollback(), 0);
assert_eq!(parser.screen().contents(), "7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n25\n26\n27\n28\n29\n30");
- parser.screen_mut().set_scrollback(1);
+ parser.set_scrollback(1);
assert_eq!(parser.screen().scrollback(), 1);
assert_eq!(parser.screen().contents(), "6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n25\n26\n27\n28\n29");
- parser.screen_mut().set_scrollback(3);
+ parser.set_scrollback(3);
assert_eq!(parser.screen().scrollback(), 3);
assert_eq!(parser.screen().contents(), "4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n25\n26\n27");
- parser.screen_mut().set_scrollback(6);
+ parser.set_scrollback(6);
assert_eq!(parser.screen().scrollback(), 6);
assert_eq!(parser.screen().contents(), "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24");
- parser.screen_mut().set_scrollback(7);
+ parser.set_scrollback(7);
assert_eq!(parser.screen().scrollback(), 6);
assert_eq!(parser.screen().contents(), "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24");
- parser.screen_mut().set_scrollback(0);
+ parser.set_scrollback(0);
assert_eq!(parser.screen().scrollback(), 0);
assert_eq!(parser.screen().contents(), "7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n25\n26\n27\n28\n29\n30");
- parser.screen_mut().set_scrollback(7);
+ parser.set_scrollback(7);
assert_eq!(parser.screen().scrollback(), 6);
assert_eq!(parser.screen().contents(), "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24");
@@ -134,11 +134,11 @@ fn scrollback() {
assert_eq!(parser.screen().scrollback(), 10);
assert_eq!(parser.screen().contents(), "3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n25\n26");
- parser.screen_mut().set_scrollback(12);
+ parser.set_scrollback(12);
assert_eq!(parser.screen().scrollback(), 10);
assert_eq!(parser.screen().contents(), "3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n25\n26");
- parser.screen_mut().set_scrollback(0);
+ parser.set_scrollback(0);
assert_eq!(parser.screen().scrollback(), 0);
assert_eq!(parser.screen().contents(), "13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n25\n26\n27\n28\n29\n30\n31\n32\n33\n34\n35\n36");
@@ -146,7 +146,7 @@ fn scrollback() {
assert_eq!(parser.screen().scrollback(), 0);
assert_eq!(parser.screen().contents(), "15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n25\n26\n27\n28\n29\n30\n31\n32\n33\n34\n35\n36\n37\n38");
- parser.screen_mut().set_scrollback(5);
+ parser.set_scrollback(5);
assert_eq!(parser.screen().scrollback(), 5);
assert_eq!(parser.screen().contents(), "10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n25\n26\n27\n28\n29\n30\n31\n32\n33");
generated by cgit v1.2.3-54-g00ecf (git 2.45.0) at 2024-05-18 16:26:56 +0000