Add coverage for unit tests and functional tests (microsoft#3651)

DonJayamanne · web-flow · commit 422dc2d772bb · 2018-12-12T09:29:03.000-08:00
* Add coverage for unit tests and functional tests
* Fix anonymous methods
* Fixed tests and linter issues
* News entries
* Remove redundant code
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@ node_modules
 **/.vscode/.ropeproject/**
 **/testFiles/**/.cache/**
 *.noseids
+.nyc_output
 .vscode-test
 __pycache__
 npm-debug.log
diff --git a/.travis.yml b/.travis.yml
@@ -39,6 +39,10 @@ matrix:
         - os: linux
           python: "3.7-dev"
           env: BUNDLE=true
+    allow_failures:
+        - os: linux
+          python: "3.7-dev"
+          env: FUNCTIONAL_TEST=true
 before_install: |
   if [ $TRAVIS_OS_NAME == "linux" ]; then
     export CXX="g++-4.9" CC="gcc-4.9" DISPLAY=:99.0;
@@ -65,7 +69,7 @@ install:
 script:
   - if [ $UNIT_TEST == "true" ]; then
         npm run cover:enable;
-        npm run test:unittests;
+        npm run test:unittests:cover;
     fi
   - if [ $DEBUGGER_TEST_RELEASE == "true" ]; then
         npm run cover:enable;
@@ -74,7 +78,7 @@ script:
   - npm run debugger-coverage
   - if [ $FUNCTIONAL_TEST == "true" ]; then
         python -m pip install --upgrade -r ./build/functional-test-requirements.txt;
-        npm run test:functional;
+        npm run test:functional:cover;
     fi
   - if [ $SINGLE_WORKSPACE_TEST == "true" ]; then
         npm run cover:enable;
@@ -107,3 +111,4 @@ script:
         npm run testSmoke;
         azure storage blob upload python*.vsix $AZURE_STORAGE_CONTAINER ms-python-$TRAVIS_BRANCH.vsix --account-name $AZURE_STORAGE_ACCOUNT --account-key $AZURE_STORAGE_ACCESS_KEY --quiet;
     fi
+  - bash <(curl -s https://codecov.io/bash)
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -119,12 +119,17 @@
             "name": "Unit Tests (without VS Code, *.unit.test.ts)",
             "type": "node",
             "request": "launch",
-            "program": "${workspaceFolder}/out/test/unittests.js",
+            "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
             "stopOnEntry": false,
             "sourceMaps": true,
             "args": [
+                "./out/test/**/*.unit.test.js",
+                "--require=out/test/unittests.js",
+                "--ui=tdd",
+                "--recursive",
+                "--colors",
                 "timeout=300000",
-                "grep="
+                "--grep="
             ],
             "outFiles": [
                 "${workspaceFolder}/out/**/*.js"
@@ -135,12 +140,17 @@
             "name": "Functional Tests (without VS Code, *.functional.test.ts)",
             "type": "node",
             "request": "launch",
-            "program": "${workspaceFolder}/out/test/functionalTests.js",
+            "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
             "stopOnEntry": false,
             "sourceMaps": true,
             "args": [
+                "./out/test/**/*.functional.test.js",
+                "--require=out/test/unittests.js",
+                "--ui=tdd",
+                "--recursive",
+                "--colors",
                 "timeout=300000",
-                "grep="
+                "--grep="
             ],
             "outFiles": [
                 "${workspaceFolder}/out/**/*.js"
@@ -166,4 +176,4 @@
             ]
         }
     ]
-}
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -3,6 +3,7 @@
     "files.exclude": {
         "out": true, // set this to true to hide the "out" folder with the compiled JS files
         "**/*.pyc": true,
+        ".nyc_output": true,
         "obj": true,
         "bin": true,
         "**/__pycache__": true,
@@ -13,7 +14,8 @@
     },
     "search.exclude": {
         "out": true, // set this to false to include "out" folder in search results
-        "coverage": true
+        "coverage": true,
+        "languageServer*/**": true
     },
     "typescript.tsdk": "./node_modules/typescript/lib", // we want to use the TS server from our node_modules folder to control its version
     "tslint.enable": true,
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -38,7 +38,7 @@
         {
             "label": "Run Unit Tests",
             "type": "npm",
-            "script": "test:unittests",
+            "script": "test:unittests:cover",
             "group": {
                 "kind": "test",
                 "isDefault": true
diff --git a/.vscodeignore b/.vscodeignore
@@ -33,6 +33,7 @@ webpack.datascience-ui.config.js
 .github/**
 .mocha-reporter/**
 .nvm/**
+.nyc_output
 .venv/**
 .vscode/**
 .vscode-test/**
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -77,7 +77,7 @@ You can also run them from the command-line (after compiling):
 
 ```shell
 npm run test:unittests  # runs all unit tests
-npm run test:unittests grep='<NAME-OF-SUITE>'
+npm run test:unittests -- --grep='<NAME-OF-SUITE>'
 ```
 
 *To run only a specific test suite for unit tests:*
@@ -86,7 +86,7 @@ Alter the `launch.json` file in the `"Debug Unit Tests"` section by setting the
 ```js
     "args": [
         "timeout=60000",
-        "grep=[The suite name of your unit test file]"
+        "--grep=[The suite name of your unit test file]"
     ],
 ```
 ...this will only run the suite with the tests you care about during a test run (be sure to set the debugger to run the `Debug Unit Tests` launcher).
diff --git a/build/.mocha.functional.opts b/build/.mocha.functional.opts
@@ -0,0 +1,7 @@
+./out/test/**/*.functional.test.js
+--require out/test/unittests.js
+--exclude out/**/*.jsx
+--ui tdd
+--recursive
+--colors
+--timeout 120000
diff --git a/build/.mocha.unittests.opts b/build/.mocha.unittests.opts
@@ -0,0 +1,5 @@
+./out/test/**/*.unit.test.js
+--require out/test/unittests.js
+--ui tdd
+--recursive
+--colors
diff --git a/build/.nycrc  b/build/.nycrc 
@@ -0,0 +1,20 @@
+{
+    "check-coverage": false,
+    "per-file": true,
+    "include": [
+        "out/client/**/*.js"
+    ],
+    "exclude": [
+        "out/test/*.js",
+        "out/**/*.jsx"
+    ],
+    "reporter": [
+        "lcov",
+        "html"
+    ],
+    "extension": [
+        ".js"
+    ],
+    "cache": true,
+    "all": true
+}
diff --git a/build/ci/mocha-vsts-reporter.js b/build/ci/mocha-vsts-reporter.js
@@ -44,9 +44,8 @@ function MochaVstsReporter(runner, options) {
   });
 
   runner.on('pending', function(test){
-    skipped++;
-    console.log('%s- %s', indenter, test.title);
-    console.log('##vso[task.logissue type=warning;sourcepath=%s;]SKIPPED TEST %s :: %s', test.file, test.parent.title, test.title);
+      skipped++;
+      console.log('%s- %s', indenter, test.title);
   });
 
   runner.on('fail', function(test, err){
diff --git a/build/ci/templates/compile-and-validate.yml b/build/ci/templates/compile-and-validate.yml
@@ -138,7 +138,7 @@ jobs:
 
         verbose: false
 
-        customCommand: 'run test:unittests'
+        customCommand: 'run test:unittests:cover'
 
 
     - bash: 'bash <(curl -s https://codecov.io/bash) -t $(COV_UUID)'
diff --git a/news/2 Fixes/3649.md b/news/2 Fixes/3649.md
@@ -0,0 +1 @@
+Add missing imports and enable functional tests, and allowing it to fail.
diff --git a/news/2 Fixes/3650.md b/news/2 Fixes/3650.md
@@ -0,0 +1 @@
+Enable code coverage for unit tests and functional tests.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
diff --git a/src/client/datascience/jupyterExecution.ts b/src/client/datascience/jupyterExecution.ts
diff --git a/src/client/datascience/jupyterImporter.ts b/src/client/datascience/jupyterImporter.ts
diff --git a/src/test/functionalTests.ts b/src/test/functionalTests.ts
diff --git a/src/test/nonUiTests.ts b/src/test/nonUiTests.ts
diff --git a/src/test/unittests.ts b/src/test/unittests.ts

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@`
`38`	`38`	`{`
`39`	`39`	`"label": "Run Unit Tests",`
`40`	`40`	`"type": "npm",`
`41`		`- "script": "test:unittests",`
	`41`	`+ "script": "test:unittests:cover",`
`42`	`42`	`"group": {`
`43`	`43`	`"kind": "test",`
`44`	`44`	`"isDefault": true`