Update test

Author: asgerf

javascript/ql/test/library-tests/PathResolution/DirnameImports/main.js

@@ -1,23 +1,15 @@
 // Test for imports using __dirname
 const path = require('path');
 
-// Using __dirname directly
-const direct = require(__dirname + '/target.js'); // $ importTarget=DirnameImports/target.js
+require(__dirname + '/target.js'); // $ importTarget=DirnameImports/target.js
+require(__dirname + '/nested/target.js'); // $ importTarget=DirnameImports/nested/target.js
+require(__dirname + '/../import-packages.ts'); // $ importTarget=import-packages.ts
+require(__dirname + '/' + 'target.js'); // $ importTarget=DirnameImports/target.js
 
-// Using __dirname with path.join
-const withPathJoin = require(path.join(__dirname, 'target.js')); // $ importTarget=DirnameImports/target.js
+require(path.join(__dirname, 'target.js')); // $ importTarget=DirnameImports/target.js
+require(path.resolve(__dirname, 'target.js')); // $ MISSING: importTarget=DirnameImports/target.js // path.resolve is not a PathExpr
 
-// Using __dirname with nested path
-const nested = require(__dirname + '/nested/target.js'); // $ importTarget=DirnameImports/nested/target.js
-
-// Using __dirname with parent directory
-const parent = require(__dirname + '/../import-packages.ts'); // $ importTarget=import-packages.ts
-
-// Using __dirname with path concat and variable
 const subdir = 'nested';
-const dynamic = require(__dirname + '/' + subdir + '/target.js'); // $ importTarget=DirnameImports/nested/target.js
-
-// Using __dirname in an AddExpr chain
-const chainedAdd = require(__dirname + '/' + 'target.js'); // $ importTarget=DirnameImports/target.js
+require(__dirname + '/' + subdir + '/target.js'); // $ importTarget=DirnameImports/nested/target.js
 
 require(`${__dirname}/target.js`); // $ MISSING: importTarget=DirnameImports/target.js // TemplateLiteral is not a PathExpr

javascript/ql/test/library-tests/PathResolution/test.expected

@@ -40,12 +40,12 @@
 | DeclarationFiles/src/main.ts:5:1:5:27 | import  ... cript"; | DeclarationFiles/lib/typescript.ts |
 | DeclarationFiles/src/main.ts:6:1:6:30 | import  ... pt.js"; | DeclarationFiles/lib/typescript.ts |
 | DeclarationFiles/src/main.ts:7:1:7:32 | import  ... .d.ts"; | DeclarationFiles/lib/typescript.d.ts |
-| DirnameImports/main.js:5:16:5:48 | require ... et.js') | DirnameImports/target.js |
-| DirnameImports/main.js:8:22:8:63 | require ... t.js')) | DirnameImports/target.js |
-| DirnameImports/main.js:11:16:11:55 | require ... et.js') | DirnameImports/nested/target.js |
-| DirnameImports/main.js:14:16:14:60 | require ... es.ts') | import-packages.ts |
-| DirnameImports/main.js:18:17:18:64 | require ... et.js') | DirnameImports/nested/target.js |
-| DirnameImports/main.js:21:20:21:57 | require ... et.js') | DirnameImports/target.js |
+| DirnameImports/main.js:4:1:4:33 | require ... et.js') | DirnameImports/target.js |
+| DirnameImports/main.js:5:1:5:40 | require ... et.js') | DirnameImports/nested/target.js |
+| DirnameImports/main.js:6:1:6:45 | require ... es.ts') | import-packages.ts |
+| DirnameImports/main.js:7:1:7:38 | require ... et.js') | DirnameImports/target.js |
+| DirnameImports/main.js:9:1:9:42 | require ... t.js')) | DirnameImports/target.js |
+| DirnameImports/main.js:13:1:13:48 | require ... et.js') | DirnameImports/nested/target.js |
 | Extended/src/main.ts:2:1:2:21 | import  ... /file"; | Extended/lib/file.ts |
 | Extended/src/main.ts:3:1:3:24 | import  ... le.ts"; | Extended/lib/file.ts |
 | Extended/src/main.ts:4:1:4:24 | import  ... le.js"; | Extended/lib/file.ts |