Make intervalDebugger testdata sourcemapped

microsoft · Dec 31, 2016 · c63e5d3 · c63e5d3
1 parent ff55b4e
commit c63e5d3
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,12 @@
 .DS_Store
-node_modules/
-out/
-lib/
-*.vsix
+.browse.VC.db
 vscode-chrome-debug.txt
+npm-debug.log
+*.vsix
+
+lib/
+node_modules/
+/out/
 typings/
-.browse.VC.db
 testapp/.vscode/chrome
-npm-debug.log
+testapp/**/out/
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -24,7 +24,8 @@
             "args": [
                 "-u", "tdd",
 				"--colors",
-				"out/test/**/*.test.js"
+				"out/test/**/*.test.js",
+                "--timeout", "1800000"
             ],
             "sourceMaps": true,
             "outFiles": ["${workspaceRoot}/out/**/*.js"]

diff --git a/test/int/adapter.test.ts b/test/int/adapter.test.ts
@@ -8,13 +8,11 @@ import * as path from 'path';
 const {createServer} = require('http-server');
 
 import {DebugClient} from 'vscode-debugadapter-testsupport';
-import {DebugProtocol} from 'vscode-debugprotocol';
 
 import * as testUtils from './intTestUtils';
 import * as testSetup from './testSetup';
 
 const DATA_ROOT = testSetup.DATA_ROOT;
-const THREAD_ID = testUtils.THREAD_ID;
 
 suite('Chrome Debug Adapter etc', () => {
     let dc: DebugClient;
@@ -49,7 +47,7 @@ suite('Chrome Debug Adapter etc', () => {
         test('should stop on debugger statement in file:///', () => {
             const testProjectRoot = path.join(DATA_ROOT, 'intervalDebugger');
             const launchFile = path.join(testProjectRoot, 'index.html');
-            const breakFile = path.join(testProjectRoot, 'app.js');
+            const breakFile = path.join(testProjectRoot, 'out/app.js');
             const DEBUGGER_LINE = 2;
 
             return Promise.all([
@@ -61,18 +59,23 @@ suite('Chrome Debug Adapter etc', () => {
 
         test('should stop on debugger statement in http://localhost', () => {
             const testProjectRoot = path.join(DATA_ROOT, 'intervalDebugger');
-            const breakFile = path.join(testProjectRoot, 'app.js');
+            const breakFile = path.join(testProjectRoot, 'out/app.js');
             const DEBUGGER_LINE = 2;
 
-            const server = createServer({ root: testProjectRoot })
-                .listen(7890);
+            const server = createServer({ root: testProjectRoot });
+            server.listen(7890);
 
             return Promise.all([
                 dc.configurationSequence(),
-                dc.launch({ url: 'http://localhost:7890' }),
+                dc.launch({ url: 'http://localhost:7890', webRoot: testProjectRoot }),
                 dc.assertStoppedLocation('debugger statement', { path: breakFile, line: DEBUGGER_LINE } )
             ])
-            .then(() => server.close());
+            .then(
+                () => server.close(),
+                e => {
+                    server.close();
+                    throw e;
+                });
         });
     });
 });
diff --git a/testdata/intervalDebugger/index.html b/testdata/intervalDebugger/index.html
@@ -1,8 +1,8 @@
 <!doctype html>
 <html>
   <head>
-    <script src="app.js"></script>
+    <script src="out/app.js"></script>
   <body>
-    <h1>Hello, world!</h1>
+    <h1>testdata/intervalDebugger</h1>
   </body>
 </html>
diff --git a/testdata/intervalDebugger/out/app.js b/testdata/intervalDebugger/out/app.js
diff --git a/testdata/intervalDebugger/out/app.js.map b/testdata/intervalDebugger/out/app.js.map
diff --git a/testdata/intervalDebugger/app.js → testdata/intervalDebugger/src/app.ts b/testdata/intervalDebugger/app.js → testdata/intervalDebugger/src/app.ts
diff --git a/testdata/intervalDebugger/tsconfig.json b/testdata/intervalDebugger/tsconfig.json
@@ -0,0 +1,6 @@
+{
+    "compilerOptions": {
+        "sourceMap": true,
+        "outDir": "out"
+    }
+}