rename some methods

1 files changed, 46 insertions, 46 deletions

diff --git a/tests/processing.rs b/tests/processing.rs
index 7ee651e..f390493 100644
--- a/tests/processing.rs
+++ b/tests/processing.rs
@@ -3,78 +3,78 @@
 #[test]
 fn split_escape_sequences() {
     let mut screen = vt100::Screen::new(24, 80);
-    let contents = screen.window_contents(0, 0, 23, 79);
+    let contents = screen.contents(0, 0, 23, 79);
     screen.process(b"abc");
-    assert_ne!(screen.window_contents(0, 0, 23, 79), contents);
-    let contents = screen.window_contents(0, 0, 23, 79);
+    assert_ne!(screen.contents(0, 0, 23, 79), contents);
+    let contents = screen.contents(0, 0, 23, 79);
     screen.process(b"abc\x1b[12;24Hdef");
-    assert_ne!(screen.window_contents(0, 0, 23, 79), contents);
-    let contents = screen.window_contents(0, 0, 23, 79);
+    assert_ne!(screen.contents(0, 0, 23, 79), contents);
+    let contents = screen.contents(0, 0, 23, 79);
     assert!(contents.contains("abc"));
     assert!(contents.contains("def"));
     assert_eq!(screen.cursor_position(), (11, 26));
 
     screen.process(b"\x1b");
     assert_eq!(screen.cursor_position(), (11, 26));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"[");
     assert_eq!(screen.cursor_position(), (11, 26));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"1");
     assert_eq!(screen.cursor_position(), (11, 26));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"2");
     assert_eq!(screen.cursor_position(), (11, 26));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b";");
     assert_eq!(screen.cursor_position(), (11, 26));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"2");
     assert_eq!(screen.cursor_position(), (11, 26));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"4");
     assert_eq!(screen.cursor_position(), (11, 26));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"H");
     assert_eq!(screen.cursor_position(), (11, 23));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
 
     assert_eq!(screen.mouse_protocol_mode(), vt100::MouseProtocolMode::None);
     screen.process(b"\x1b");
     assert_eq!(screen.mouse_protocol_mode(), vt100::MouseProtocolMode::None);
     assert_eq!(screen.cursor_position(), (11, 23));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"[");
     assert_eq!(screen.mouse_protocol_mode(), vt100::MouseProtocolMode::None);
     assert_eq!(screen.cursor_position(), (11, 23));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"?");
     assert_eq!(screen.mouse_protocol_mode(), vt100::MouseProtocolMode::None);
     assert_eq!(screen.cursor_position(), (11, 23));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"1");
     assert_eq!(screen.mouse_protocol_mode(), vt100::MouseProtocolMode::None);
     assert_eq!(screen.cursor_position(), (11, 23));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"0");
     assert_eq!(screen.mouse_protocol_mode(), vt100::MouseProtocolMode::None);
     assert_eq!(screen.cursor_position(), (11, 23));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"0");
     assert_eq!(screen.mouse_protocol_mode(), vt100::MouseProtocolMode::None);
     assert_eq!(screen.cursor_position(), (11, 23));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"0");
     assert_eq!(screen.mouse_protocol_mode(), vt100::MouseProtocolMode::None);
     assert_eq!(screen.cursor_position(), (11, 23));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"h");
     assert_eq!(
         screen.mouse_protocol_mode(),
         vt100::MouseProtocolMode::PressRelease
     );
     assert_eq!(screen.cursor_position(), (11, 23));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
 
     assert_eq!(screen.title(), "");
     screen.process(b"\x1b");
@@ -84,7 +84,7 @@ fn split_escape_sequences() {
         vt100::MouseProtocolMode::PressRelease
     );
     assert_eq!(screen.cursor_position(), (11, 23));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"]");
     assert_eq!(screen.title(), "");
     assert_eq!(
@@ -92,7 +92,7 @@ fn split_escape_sequences() {
         vt100::MouseProtocolMode::PressRelease
     );
     assert_eq!(screen.cursor_position(), (11, 23));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"0");
     assert_eq!(screen.title(), "");
     assert_eq!(
@@ -100,7 +100,7 @@ fn split_escape_sequences() {
         vt100::MouseProtocolMode::PressRelease
     );
     assert_eq!(screen.cursor_position(), (11, 23));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b";");
     assert_eq!(screen.title(), "");
     assert_eq!(
@@ -108,7 +108,7 @@ fn split_escape_sequences() {
         vt100::MouseProtocolMode::PressRelease
     );
     assert_eq!(screen.cursor_position(), (11, 23));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"a");
     assert_eq!(screen.title(), "");
     assert_eq!(
@@ -116,7 +116,7 @@ fn split_escape_sequences() {
         vt100::MouseProtocolMode::PressRelease
     );
     assert_eq!(screen.cursor_position(), (11, 23));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b" ");
     assert_eq!(screen.title(), "");
     assert_eq!(
@@ -124,7 +124,7 @@ fn split_escape_sequences() {
         vt100::MouseProtocolMode::PressRelease
     );
     assert_eq!(screen.cursor_position(), (11, 23));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"'");
     assert_eq!(screen.title(), "");
     assert_eq!(
@@ -132,7 +132,7 @@ fn split_escape_sequences() {
         vt100::MouseProtocolMode::PressRelease
     );
     assert_eq!(screen.cursor_position(), (11, 23));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"[");
     assert_eq!(screen.title(), "");
     assert_eq!(
@@ -140,7 +140,7 @@ fn split_escape_sequences() {
         vt100::MouseProtocolMode::PressRelease
     );
     assert_eq!(screen.cursor_position(), (11, 23));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"]");
     assert_eq!(screen.title(), "");
     assert_eq!(
@@ -148,7 +148,7 @@ fn split_escape_sequences() {
         vt100::MouseProtocolMode::PressRelease
     );
     assert_eq!(screen.cursor_position(), (11, 23));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"_");
     assert_eq!(screen.title(), "");
     assert_eq!(
@@ -156,7 +156,7 @@ fn split_escape_sequences() {
         vt100::MouseProtocolMode::PressRelease
     );
     assert_eq!(screen.cursor_position(), (11, 23));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"\x07");
     assert_eq!(screen.title(), "a '[]_");
     assert_eq!(
@@ -164,37 +164,37 @@ fn split_escape_sequences() {
         vt100::MouseProtocolMode::PressRelease
     );
     assert_eq!(screen.cursor_position(), (11, 23));
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
 }
 
 #[test]
 fn split_utf8() {
     let mut screen = vt100::Screen::new(24, 80);
-    let contents = screen.window_contents(0, 0, 23, 79);
+    let contents = screen.contents(0, 0, 23, 79);
     screen.process(b"a");
-    assert_ne!(screen.window_contents(0, 0, 23, 79), contents);
-    let contents = screen.window_contents(0, 0, 23, 79);
+    assert_ne!(screen.contents(0, 0, 23, 79), contents);
+    let contents = screen.contents(0, 0, 23, 79);
 
     screen.process(b"\xc3");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"\xa1");
-    assert_ne!(screen.window_contents(0, 0, 23, 79), contents);
-    let contents = screen.window_contents(0, 0, 23, 79);
+    assert_ne!(screen.contents(0, 0, 23, 79), contents);
+    let contents = screen.contents(0, 0, 23, 79);
 
     screen.process(b"\xe3");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"\x82");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"\xad");
-    assert_ne!(screen.window_contents(0, 0, 23, 79), contents);
-    let contents = screen.window_contents(0, 0, 23, 79);
+    assert_ne!(screen.contents(0, 0, 23, 79), contents);
+    let contents = screen.contents(0, 0, 23, 79);
 
     screen.process(b"\xf0");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"\x9f");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"\x92");
-    assert_eq!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_eq!(screen.contents(0, 0, 23, 79), contents);
     screen.process(b"\xa9");
-    assert_ne!(screen.window_contents(0, 0, 23, 79), contents);
+    assert_ne!(screen.contents(0, 0, 23, 79), contents);
 }