refactor terminal writing

1 files changed, 7 insertions, 10 deletions

diff --git a/tests/window_contents.rs b/tests/window_contents.rs
index 851b128..6c0e7db 100644
--- a/tests/window_contents.rs
+++ b/tests/window_contents.rs
@@ -87,7 +87,7 @@ fn cursor_positioning() {
         parser.screen().contents_formatted(),
         b"\x1b[?25h\x1b[m\x1b[H\x1b[J:"
     );
-    assert_eq!(parser.screen().contents_diff(&screen1), b"\x1b[m\x1b[1;1H:");
+    assert_eq!(parser.screen().contents_diff(&screen1), b"\x1b[m\x1b[H:");
 
     parser.process(b"a");
     let screen3 = parser.screen().clone();
@@ -98,7 +98,7 @@ fn cursor_positioning() {
     );
     assert_eq!(
         parser.screen().contents_diff(&screen2),
-        b"\x1b[m\x1b[1;1H\x1b[1Ca"
+        b"\x1b[m\x1b[H\x1b[Ca"
     );
 
     parser.process(b"\x1b[1;2H\x1b[K");
@@ -109,7 +109,7 @@ fn cursor_positioning() {
     );
     assert_eq!(
         parser.screen().contents_diff(&screen3),
-        b"\x1b[m\x1b[1;1H\x1b[1C\x1b[X\x1b[C\x1b[1;2H"
+        b"\x1b[m\x1b[H\x1b[C\x1b[X\x1b[C\x1b[1;2H"
     );
 }
 
@@ -429,23 +429,20 @@ fn diff() {
     let screen2 = parser.screen().clone();
     assert_eq!(
         screen2.contents_diff(&screen1),
-        b"\x1b[m\x1b[1;1H\x1b[5C\x1b[32m bar"
+        b"\x1b[m\x1b[H\x1b[5C\x1b[32m bar"
     );
     compare_diff(&screen1, &screen2, b"");
 
     parser.process(b"\x1b[H\x1b[31mfoo");
     let screen3 = parser.screen().clone();
-    assert_eq!(
-        screen3.contents_diff(&screen2),
-        b"\x1b[m\x1b[1;1H\x1b[31mfoo"
-    );
+    assert_eq!(screen3.contents_diff(&screen2), b"\x1b[m\x1b[H\x1b[31mfoo");
     compare_diff(&screen2, &screen3, b"\x1b[5C\x1b[32m bar");
 
     parser.process(b"\x1b[1;7H\x1b[32mbaz");
     let screen4 = parser.screen().clone();
     assert_eq!(
         screen4.contents_diff(&screen3),
-        b"\x1b[m\x1b[1;1H\x1b[8C\x1b[32mz"
+        b"\x1b[m\x1b[H\x1b[8C\x1b[32mz"
     );
     compare_diff(&screen3, &screen4, b"\x1b[5C\x1b[32m bar\x1b[H\x1b[31mfoo");
 
@@ -453,7 +450,7 @@ fn diff() {
     let screen5 = parser.screen().clone();
     assert_eq!(
         screen5.contents_diff(&screen4),
-        b"\x1b[m\x1b[1;1H\x1b[7C\x1b[X\x1b[C\x1b[1;8H"
+        b"\x1b[m\x1b[H\x1b[7C\x1b[X\x1b[C\x1b[1;8H"
     );
     compare_diff(
         &screen4,