More tsserver tests refactoring

Author: sheetalkamat

src/testRunner/tsconfig.json

@@ -61,7 +61,6 @@
         "unittests/tsbuild.ts",
         "unittests/tsbuildWatchMode.ts",
         "unittests/tscWatchMode.ts",
-        "unittests/tsserverProjectSystem.ts",
         "unittests/config/commandLineParsing.ts",
         "unittests/config/configurationExtension.ts",
         "unittests/config/convertCompilerOptionsFromJson.ts",
@@ -98,15 +97,19 @@
         "unittests/tsserver/compileOnSave.ts",
         "unittests/tsserver/completions.ts",
         "unittests/tsserver/configFileSearch.ts",
+        "unittests/tsserver/configuredProjects.ts",
         "unittests/tsserver/declarationFileMaps.ts",
         "unittests/tsserver/documentRegistry.ts",
         "unittests/tsserver/duplicatePackages.ts",
         "unittests/tsserver/events/largeFileReferenced.ts",
+        "unittests/tsserver/events/projectLanguageServiceState.ts",
         "unittests/tsserver/events/projectLoading.ts",
         "unittests/tsserver/events/projectUpdatedInBackground.ts",
+        "unittests/tsserver/events/surveyReady.ts",
         "unittests/tsserver/externalProjects.ts",
         "unittests/tsserver/forceConsistentCasingInFileNames.ts",
         "unittests/tsserver/formatSettings.ts",
+        "unittests/tsserver/getApplicableRefactors.ts",
         "unittests/tsserver/getEditsForFileRename.ts",
         "unittests/tsserver/importHelpers.ts",
         "unittests/tsserver/inferredProjects.ts",
@@ -118,6 +121,7 @@
         "unittests/tsserver/openFile.ts",
         "unittests/tsserver/projectErrors.ts",
         "unittests/tsserver/projectReferences.ts",
+        "unittests/tsserver/projects.ts",
         "unittests/tsserver/refactors.ts",
         "unittests/tsserver/reload.ts",
         "unittests/tsserver/rename.ts",

src/testRunner/unittests/tsserver/compileOnSave.ts

@@ -695,4 +695,99 @@ namespace ts.projectSystem {
         });
     });
 
+    describe("unittests:: tsserver:: compileOnSave:: CompileOnSaveAffectedFileListRequest with and without projectFileName in request", () => {
+        const projectRoot = "/user/username/projects/myproject";
+        const core: File = {
+            path: `${projectRoot}/core/core.ts`,
+            content: "let z = 10;"
+        };
+        const app1: File = {
+            path: `${projectRoot}/app1/app.ts`,
+            content: "let x = 10;"
+        };
+        const app2: File = {
+            path: `${projectRoot}/app2/app.ts`,
+            content: "let y = 10;"
+        };
+        const app1Config: File = {
+            path: `${projectRoot}/app1/tsconfig.json`,
+            content: JSON.stringify({
+                files: ["app.ts", "../core/core.ts"],
+                compilerOptions: { outFile: "build/output.js" },
+                compileOnSave: true
+            })
+        };
+        const app2Config: File = {
+            path: `${projectRoot}/app2/tsconfig.json`,
+            content: JSON.stringify({
+                files: ["app.ts", "../core/core.ts"],
+                compilerOptions: { outFile: "build/output.js" },
+                compileOnSave: true
+            })
+        };
+        const files = [libFile, core, app1, app2, app1Config, app2Config];
+
+        function insertString(session: TestSession, file: File) {
+            session.executeCommandSeq<protocol.ChangeRequest>({
+                command: protocol.CommandTypes.Change,
+                arguments: {
+                    file: file.path,
+                    line: 1,
+                    offset: 1,
+                    endLine: 1,
+                    endOffset: 1,
+                    insertString: "let k = 1"
+                }
+            });
+        }
+
+        function getSession() {
+            const host = createServerHost(files);
+            const session = createSession(host);
+            openFilesForSession([app1, app2, core], session);
+            const service = session.getProjectService();
+            checkNumberOfProjects(session.getProjectService(), { configuredProjects: 2 });
+            const project1 = service.configuredProjects.get(app1Config.path)!;
+            const project2 = service.configuredProjects.get(app2Config.path)!;
+            checkProjectActualFiles(project1, [libFile.path, app1.path, core.path, app1Config.path]);
+            checkProjectActualFiles(project2, [libFile.path, app2.path, core.path, app2Config.path]);
+            insertString(session, app1);
+            insertString(session, app2);
+            assert.equal(project1.dirty, true);
+            assert.equal(project2.dirty, true);
+            return session;
+        }
+
+        it("when projectFile is specified", () => {
+            const session = getSession();
+            const response = session.executeCommandSeq<protocol.CompileOnSaveAffectedFileListRequest>({
+                command: protocol.CommandTypes.CompileOnSaveAffectedFileList,
+                arguments: {
+                    file: core.path,
+                    projectFileName: app1Config.path
+                }
+            }).response;
+            assert.deepEqual(response, [
+                { projectFileName: app1Config.path, fileNames: [core.path, app1.path], projectUsesOutFile: true }
+            ]);
+            assert.equal(session.getProjectService().configuredProjects.get(app1Config.path)!.dirty, false);
+            assert.equal(session.getProjectService().configuredProjects.get(app2Config.path)!.dirty, true);
+        });
+
+        it("when projectFile is not specified", () => {
+            const session = getSession();
+            const response = session.executeCommandSeq<protocol.CompileOnSaveAffectedFileListRequest>({
+                command: protocol.CommandTypes.CompileOnSaveAffectedFileList,
+                arguments: {
+                    file: core.path
+                }
+            }).response;
+            assert.deepEqual(response, [
+                { projectFileName: app1Config.path, fileNames: [core.path, app1.path], projectUsesOutFile: true },
+                { projectFileName: app2Config.path, fileNames: [core.path, app2.path], projectUsesOutFile: true }
+            ]);
+            assert.equal(session.getProjectService().configuredProjects.get(app1Config.path)!.dirty, false);
+            assert.equal(session.getProjectService().configuredProjects.get(app2Config.path)!.dirty, false);
+        });
+    });
 }