Adding testing scripts

dotnetcore-acquisition-extension/.vscode/launch.json

@@ -18,17 +18,18 @@
 			"preLaunchTask": "npm: watch"
 		},
 		{
-			"name": "Extension Acquisition Tests",
+			"name": "Extension Acquisition Functional Tests",
 			"type": "extensionHost",
 			"request": "launch",
 			"runtimeExecutable": "${execPath}",
 			"args": [
 				"--extensionDevelopmentPath=${workspaceFolder}",
-				"--extensionTestsPath=${workspaceFolder}/out/test"
+				"--extensionTestsPath=${workspaceFolder}/out/test/functional"
 			],
 			"outFiles": [
 				"${workspaceFolder}/out/test/**/*.js"
 			],
+			"internalConsoleOptions": "openOnSessionStart",
 			"preLaunchTask": "npm: watch"
 		}
 	]

dotnetcore-acquisition-extension/package.json

@@ -2,7 +2,7 @@
 	"name": "dotnetcore-acquisition",
 	"repository": {
 		"type": "git",
-		"url": "https://github.com/NTaylorMullen/vscode-dotnetcore-acquisition-extension.git"
+		"url": "https://github.com/dotnet/vscode-dotnetcore-acquisition-extension.git"
 	},
 	"displayName": "DotnetCoreAcquisition",
 	"description": "An extension to acquire .NET Core tooling to run .NET Core applications in Visual Studio Code extensions.",
@@ -26,20 +26,23 @@
 		"vscode:prepublish": "npm run compile",
 		"compile": "npm run clean && tsc -p ./",
 		"watch": "npm run compile && tsc -watch -p ./",
-		"postinstall": "node ./node_modules/vscode/bin/install",
-		"test": "npm run compile && node ./node_modules/vscode/bin/test",
+		"test": "npm run compile --silent && node ./out/test/functional/runTest.js",
 		"clean": "rimraf out"
 	},
 	"dependencies": {
 		"dotnetcore-acquisition-library": "file:../dotnetcore-acquisition-library"
 	},
 	"devDependencies": {
+		"@types/mocha": "5.2.6",
+		"@types/node": "12.0.0",
+		"@types/rimraf": "2.0.2",
+		"@types/vscode": "^1.33.0",
+		"chai": "^4.2.0",
+		"glob": "^7.1.5",
+		"mocha": "^4.1.0",
 		"rimraf": "2.6.3",
-		"typescript": "3.4.5",
-		"vscode": "1.1.34",
 		"tslint": "5.16.0",
-		"@types/node": "12.0.0",
-		"@types/mocha": "5.2.6",
-		"@types/rimraf": "2.0.2"
+		"typescript": "3.4.5",
+		"vscode-test": "^1.2.2"
 	}
 }

dotnetcore-acquisition-library/src/test/functional/extension.test.ts → dotnetcore-acquisition-extension/src/test/functional/extension.test.ts

@@ -8,7 +8,7 @@ suite('Extension End to End', () => {
     // const context: vscode.ExtensionContext = {
     //   subscriptions: [],
     // } as any;
-    // extension.activate(context, "");
+    // extension.activate(context);
     // assert.equals(context.subscriptions.length, 1);
   });
 });

dotnetcore-acquisition-library/.vscode/launch.json

@@ -8,17 +8,17 @@
 		{
 			"type": "node",
 			"request": "launch",
-			"name": "Acquisistion Worker Tests",
+			"name": "Acquisistion Worker Unit Tests",
 			"program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
 			"args": [
 				"-u",
 				"tdd",
 				"--no-timeout",
 				"--colors",
-				"${workspaceFolder}/dist/test/**.test.js"
+				"${workspaceFolder}/dist/test/unit/**.test.js"
 			],
 			"internalConsoleOptions": "openOnSessionStart",
-			"preLaunchTask": "compile"
+			"preLaunchTask": "npm: watch"
 		}
 	]
 }

dotnetcore-acquisition-library/.vscode/tasks.json

@@ -4,13 +4,17 @@
 	"version": "2.0.0",
 	"tasks": [
 		{
-			"label": "compile",
 			"type": "npm",
-			"script": "compile",
+			"script": "watch",
+			"problemMatcher": "$tsc-watch",
+			"isBackground": true,
+			"presentation": {
+				"reveal": "never"
+			},
 			"group": {
 				"kind": "build",
 				"isDefault": true
 			}
 		}
 	]
-}
+}

dotnetcore-acquisition-library/package.json

@@ -11,8 +11,7 @@
 		"vscode:prepublish": "npm run compile",
 		"compile": "npm run clean && tsc -p ./",
 		"watch": "npm run clean && tsc -watch -p ./",
-		"test": "npm run compile && npm run unit-test && npm run functional-test",
-		"functional-test": "node ./dist/test/functional/runTest.js",
+		"test": "npm run compile --silent && npm run unit-test",
 		"unit-test": "mocha -u tdd -- dist/test/unit/**.test.js",
 		"clean": "rimraf dist"
 	},

dotnetcore-acquisition-library/src/test/unit/DotnetCoreAcquisitionWorker.test.ts

@@ -97,7 +97,7 @@ suite("DotnetCoreAcquisitionWorker Unit Tests", function () {
         assert.isEmpty(fs.readdirSync(TestUtils.testStorage));
     }).timeout(20000);
 
-    after(function() {
+    this.afterAll(function() {
         // Clean up temp storage
         rimraf.sync(TestUtils.testStorage);
     });

sample/package.json

@@ -51,7 +51,6 @@
 		"vscode:prepublish": "npm run compile",
 		"compile": "npm run clean && tsc -p ./",
 		"watch": "npm run clean && tsc -watch -p ./",
-		"postinstall": "node ./node_modules/vscode/bin/install",
 		"test": "npm run compile && node ./node_modules/vscode/bin/test",
 		"clean": "rimraf out"
 	},
@@ -61,10 +60,10 @@
 	"devDependencies": {
 		"rimraf": "2.6.3",
 		"typescript": "3.4.5",
-		"vscode": "1.1.34",
 		"tslint": "5.16.0",
 		"@types/node": "12.0.0",
 		"@types/mocha": "5.2.6",
-		"@types/rimraf": "2.0.2"
+		"@types/rimraf": "2.0.2",
+		"@types/vscode": "^1.33.0"
 	}
 }

test.cmd

@@ -0,0 +1,2 @@
+@ECHO OFF
+PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';& '%~dp0test.ps1' default-build %*; exit $LASTEXITCODE"

test.ps1

@@ -0,0 +1,46 @@
+$result = 0
+$errorColor = "Red"
+$successColor = "Green"
+
+pushd dotnetcore-acquisition-library
+if (Test-Path node_modules) { rm -r -force node_modules }
+npm install --silent
+npm run test
+
+if (! $?)
+{
+    Write-Host "`nAcquisition Library Tests Failed.`n" -ForegroundColor $errorColor
+    $result = 1
+}
+else 
+{
+    Write-Host "`nAcquisition Library Tests Succeeded.`n" -ForegroundColor $successColor
+}
+popd
+
+pushd dotnetcore-acquisition-extension
+if (Test-Path node_modules) { rm -r -force node_modules }
+npm install --silent
+npm run test
+
+if (! $?)
+{
+    Write-Host "`nAcquisition Extension Tests Failed.`n" -ForegroundColor $errorColor
+    $result = 1
+}
+else 
+{
+    Write-Host "`nAcquisition Extension Tests Succeeded.`n" -ForegroundColor $successColor
+}
+popd
+
+if ($result -ne 0) 
+{
+    Write-Host "`n`nTests Failed.`n" -ForegroundColor $errorColor
+    exit $result
+}
+else 
+{
+    Write-Host "`n`nAll Tests Succeeded.`n" -ForegroundColor $successColor 
+    exit $result
+}

test.sh

@@ -0,0 +1,61 @@
+RESULT=0
+RED=`tput setaf 1`
+GREEN=`tput setaf 2`
+NC=`tput sgr0`
+
+echo ""
+echo "----------- Testing dotnetcore-acquisition-library -----------"
+echo ""
+pushd dotnetcore-acquisition-library
+rm -rf node_modules
+npm install
+npm run test
+
+if [ $? -ne 0 ];
+then
+    echo ""
+    echo "${RED}Acquisition Library Tests Failed.${NC}"
+    echo ""
+    RESULT=1
+else
+    echo ""
+    echo "${GREEN}Acquisition Library Tests Succeeded.${NC}"
+    echo ""
+fi
+popd
+
+echo ""
+echo "----------- Testing dotnetcore-acquisition-extension -----------"
+echo ""
+pushd dotnetcore-acquisition-extension
+rm -rf node_modules
+npm install
+npm run test
+
+if [ $? -ne 0 ];
+then
+    echo ""
+    echo "${RED}Acquisition Extension Tests Failed.${NC}"
+    echo ""
+    RESULT=1
+else
+    echo ""
+    echo "${GREEN}Acquisition Extension Tests Succeeded.${NC}"
+    echo ""
+fi
+popd
+
+if [ $RESULT -ne 0 ];
+then
+    echo ""
+    echo ""
+    echo "${RED}Tests Failed.${NC}"
+    echo ""
+    exit $RESULT
+else
+    echo ""
+    echo ""
+    echo "${GREEN}All Tests Succeeded.${NC}"
+    echo ""
+    exit $RESULT
+fi