expose the screen separately from the parser

1 files changed, 31 insertions, 31 deletions

diff --git a/tests/osc.rs b/tests/osc.rs
index 4a02592..8cf90dd 100644
--- a/tests/osc.rs
+++ b/tests/osc.rs
@@ -1,46 +1,46 @@
 #[test]
 fn title() {
-    let mut screen = vt100::Screen::new(24, 80);
-    assert_eq!(screen.title(), "");
-    assert_eq!(screen.icon_name(), "");
-    screen.process(b"\x1b]2;it's a title\x07");
-    assert_eq!(screen.title(), "it's a title");
-    assert_eq!(screen.icon_name(), "");
-    screen.process(b"\x1b]2;\x07");
-    assert_eq!(screen.title(), "");
-    assert_eq!(screen.icon_name(), "");
+    let mut parser = vt100::Parser::new(24, 80);
+    assert_eq!(parser.screen().title(), "");
+    assert_eq!(parser.screen().icon_name(), "");
+    parser.process(b"\x1b]2;it's a title\x07");
+    assert_eq!(parser.screen().title(), "it's a title");
+    assert_eq!(parser.screen().icon_name(), "");
+    parser.process(b"\x1b]2;\x07");
+    assert_eq!(parser.screen().title(), "");
+    assert_eq!(parser.screen().icon_name(), "");
 }
 
 #[test]
 fn icon_name() {
-    let mut screen = vt100::Screen::new(24, 80);
-    assert_eq!(screen.title(), "");
-    assert_eq!(screen.icon_name(), "");
-    screen.process(b"\x1b]1;it's an icon name\x07");
-    assert_eq!(screen.title(), "");
-    assert_eq!(screen.icon_name(), "it's an icon name");
-    screen.process(b"\x1b]1;\x07");
-    assert_eq!(screen.title(), "");
-    assert_eq!(screen.icon_name(), "");
+    let mut parser = vt100::Parser::new(24, 80);
+    assert_eq!(parser.screen().title(), "");
+    assert_eq!(parser.screen().icon_name(), "");
+    parser.process(b"\x1b]1;it's an icon name\x07");
+    assert_eq!(parser.screen().title(), "");
+    assert_eq!(parser.screen().icon_name(), "it's an icon name");
+    parser.process(b"\x1b]1;\x07");
+    assert_eq!(parser.screen().title(), "");
+    assert_eq!(parser.screen().icon_name(), "");
 }
 
 #[test]
 fn title_icon_name() {
-    let mut screen = vt100::Screen::new(24, 80);
-    assert_eq!(screen.title(), "");
-    assert_eq!(screen.icon_name(), "");
-    screen.process(b"\x1b]0;it's both\x07");
-    assert_eq!(screen.title(), "it's both");
-    assert_eq!(screen.icon_name(), "it's both");
-    screen.process(b"\x1b]0;\x07");
-    assert_eq!(screen.title(), "");
-    assert_eq!(screen.icon_name(), "");
+    let mut parser = vt100::Parser::new(24, 80);
+    assert_eq!(parser.screen().title(), "");
+    assert_eq!(parser.screen().icon_name(), "");
+    parser.process(b"\x1b]0;it's both\x07");
+    assert_eq!(parser.screen().title(), "it's both");
+    assert_eq!(parser.screen().icon_name(), "it's both");
+    parser.process(b"\x1b]0;\x07");
+    assert_eq!(parser.screen().title(), "");
+    assert_eq!(parser.screen().icon_name(), "");
 }
 
 #[test]
 fn unknown_sequence() {
-    let mut screen = vt100::Screen::new(24, 80);
-    assert_eq!(screen.cell(0, 0).unwrap().contents(), "");
-    screen.process(b"\x1b]499;some long, long string?\x07");
-    assert_eq!(screen.cell(0, 0).unwrap().contents(), "");
+    let mut parser = vt100::Parser::new(24, 80);
+    assert_eq!(parser.screen().cell(0, 0).unwrap().contents(), "");
+    parser.process(b"\x1b]499;some long, long string?\x07");
+    assert_eq!(parser.screen().cell(0, 0).unwrap().contents(), "");
 }