From 583d56685fe79d71c8eb83f9848259adeb2bbaf2 Mon Sep 17 00:00:00 2001
From: Aaron Munger <aamunger@microsoft.com>
Date: Fri, 13 Oct 2023 14:50:34 -0700
Subject: [PATCH] use test extension to test extensions

---
 .vscode-test.js              | 10 ++++++++++
 scripts/test-integration.bat |  8 ++------
 scripts/test-integration.sh  |  4 ++--
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.vscode-test.js b/.vscode-test.js
index 3741ea0eb44..069cd0ac6c0 100644
--- a/.vscode-test.js
+++ b/.vscode-test.js
@@ -20,6 +20,16 @@ const extensions = [
 		workspaceFolder: `extensions/markdown-language-features/test-workspace`,
 		mocha: { timeout: 60_000 }
 	},
+	{
+		label: 'ipynb',
+		workspaceFolder: '%TEMPDIR%/ipynb-%RANDOM%',
+		mocha: { timeout: 60_000 }
+	},
+	{
+		label: 'notebook-renderers',
+		workspaceFolder: '%TEMPDIR%/nbout-%RANDOM%',
+		mocha: { timeout: 60_000 }
+	},
 ];
 
 
diff --git a/scripts/test-integration.bat b/scripts/test-integration.bat
index 16efa750a49..1834f26162d 100644
--- a/scripts/test-integration.bat
+++ b/scripts/test-integration.bat
@@ -77,16 +77,12 @@ if %errorlevel% neq 0 exit /b %errorlevel%
 
 echo.
 echo ### Ipynb tests
-set IPYNBWORKSPACE=%TEMPDIR%\ipynb-%RANDOM%
-mkdir %IPYNBWORKSPACE%
-call "%INTEGRATION_TEST_ELECTRON_PATH%" %IPYNBWORKSPACE% --extensionDevelopmentPath=%~dp0\..\extensions\ipynb --extensionTestsPath=%~dp0\..\extensions\ipynb\out\test %API_TESTS_EXTRA_ARGS%
+call yarn test-extension -l ipynb
 if %errorlevel% neq 0 exit /b %errorlevel%
 
 echo.
 echo ### Notebook Output tests
-set NBOUTWORKSPACE=%TEMPDIR%\nbout-%RANDOM%
-mkdir %NBOUTWORKSPACE%
-call "%INTEGRATION_TEST_ELECTRON_PATH%" %NBOUTWORKSPACE% --extensionDevelopmentPath=%~dp0\..\extensions\notebook-renderers --extensionTestsPath=%~dp0\..\extensions\notebook-renderers\out\test %API_TESTS_EXTRA_ARGS%
+call yarn test-extension -l notebook-renderers
 if %errorlevel% neq 0 exit /b %errorlevel%
 
 echo.
diff --git a/scripts/test-integration.sh b/scripts/test-integration.sh
index 35b97b58e59..6a7a1fe4a75 100755
--- a/scripts/test-integration.sh
+++ b/scripts/test-integration.sh
@@ -97,13 +97,13 @@ kill_app
 echo
 echo "### Ipynb tests"
 echo
-"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS $(mktemp -d 2>/dev/null) --extensionDevelopmentPath=$ROOT/extensions/ipynb --extensionTestsPath=$ROOT/extensions/ipynb/out/test $API_TESTS_EXTRA_ARGS
+yarn test-extension -l ipynb
 kill_app
 
 echo
 echo "### Notebook Output tests"
 echo
-"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS $(mktemp -d 2>/dev/null) --extensionDevelopmentPath=$ROOT/extensions/notebook-renderers --extensionTestsPath=$ROOT/extensions/notebook-renderers/out/test $API_TESTS_EXTRA_ARGS
+yarn test-extension -l notebook-renderers
 kill_app
 
 echo