From b3cd0e5b37d763e8ebad13894203447f276c19c8 Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Tue, 2 Jul 2019 18:09:33 -0700
Subject: [PATCH] Move renderer tests into a suite

---
 .../src/singlefolder-tests/terminal.test.ts   | 102 +++++++++---------
 1 file changed, 52 insertions(+), 50 deletions(-)

diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts
index b8d10e1ee5d..fe8e70130fa 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts
@@ -52,56 +52,6 @@ suite('window namespace tests', () => {
 			const terminal = window.createTerminal('b');
 		});
 
-		test('createTerminalRenderer should fire onDidOpenTerminal and onDidCloseTerminal', (done) => {
-			const reg1 = window.onDidOpenTerminal(term => {
-				equal(term.name, 'c');
-				reg1.dispose();
-				const reg2 = window.onDidCloseTerminal(() => {
-					reg2.dispose();
-					done();
-				});
-				term.dispose();
-			});
-			window.createTerminalRenderer('c');
-		});
-
-		test('terminal renderers should get maximum dimensions set when shown', (done) => {
-			let terminal: Terminal;
-			const reg1 = window.onDidOpenTerminal(term => {
-				reg1.dispose();
-				term.show();
-				terminal = term;
-			});
-			const renderer = window.createTerminalRenderer('foo');
-			const reg2 = renderer.onDidChangeMaximumDimensions(dimensions => {
-				ok(dimensions.columns > 0);
-				ok(dimensions.rows > 0);
-				reg2.dispose();
-				const reg3 = window.onDidCloseTerminal(() => {
-					reg3.dispose();
-					done();
-				});
-				terminal.dispose();
-			});
-		});
-
-		test('TerminalRenderer.write should fire Terminal.onData', (done) => {
-			const reg1 = window.onDidOpenTerminal(terminal => {
-				reg1.dispose();
-				const reg2 = terminal.onDidWriteData(data => {
-					equal(data, 'bar');
-					reg2.dispose();
-					const reg3 = window.onDidCloseTerminal(() => {
-						reg3.dispose();
-						done();
-					});
-					terminal.dispose();
-				});
-				renderer.write('bar');
-			});
-			const renderer = window.createTerminalRenderer('foo');
-		});
-
 		test('Terminal.sendText should fire Terminal.onInput', (done) => {
 			const reg1 = window.onDidOpenTerminal(terminal => {
 				reg1.dispose();
@@ -199,6 +149,58 @@ suite('window namespace tests', () => {
 			});
 		});
 
+		suite('Terminal renderers (deprecated)', () => {
+			test('should fire onDidOpenTerminal and onDidCloseTerminal from createTerminalRenderer terminal', (done) => {
+				const reg1 = window.onDidOpenTerminal(term => {
+					equal(term.name, 'c');
+					reg1.dispose();
+					const reg2 = window.onDidCloseTerminal(() => {
+						reg2.dispose();
+						done();
+					});
+					term.dispose();
+				});
+				window.createTerminalRenderer('c');
+			});
+
+			test('should get maximum dimensions set when shown', (done) => {
+				let terminal: Terminal;
+				const reg1 = window.onDidOpenTerminal(term => {
+					reg1.dispose();
+					term.show();
+					terminal = term;
+				});
+				const renderer = window.createTerminalRenderer('foo');
+				const reg2 = renderer.onDidChangeMaximumDimensions(dimensions => {
+					ok(dimensions.columns > 0);
+					ok(dimensions.rows > 0);
+					reg2.dispose();
+					const reg3 = window.onDidCloseTerminal(() => {
+						reg3.dispose();
+						done();
+					});
+					terminal.dispose();
+				});
+			});
+
+			test('should fire Terminal.onData on write', (done) => {
+				const reg1 = window.onDidOpenTerminal(terminal => {
+					reg1.dispose();
+					const reg2 = terminal.onDidWriteData(data => {
+						equal(data, 'bar');
+						reg2.dispose();
+						const reg3 = window.onDidCloseTerminal(() => {
+							reg3.dispose();
+							done();
+						});
+						terminal.dispose();
+					});
+					renderer.write('bar');
+				});
+				const renderer = window.createTerminalRenderer('foo');
+			});
+		})
+
 		suite('Virtual process terminals', () => {
 			test('should fire onDidOpenTerminal and onDidCloseTerminal', (done) => {
 				const reg1 = window.onDidOpenTerminal(term => {
-- 
GitLab