fix: failing test and clean up

SAP · Aug 7, 2024 · 7d30ae9 · 7d30ae9
1 parent 151616f
commit 7d30ae9
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 9 deletions.
diff --git a/packages/context/package.json b/packages/context/package.json
@@ -28,7 +28,9 @@
     "lodash": "4.17.21",
     "semver": "7.3.7",
     "vscode-languageserver": "8.0.2",
-    "vscode-uri": "2.1.2"
+    "vscode-uri": "2.1.2",
+    "@xml-tools/ast": "5.0.0",
+    "@xml-tools/parser": "1.0.7"
   },
   "devDependencies": {
     "@sap-ux/vocabularies-types": "0.10.14",

diff --git a/packages/context/src/utils/view-files.ts b/packages/context/src/utils/view-files.ts
@@ -48,11 +48,10 @@ async function processViewFiles(
 export async function getViewFiles(
   webappPath: string
 ): Promise<Record<DocPath, XMLDocument>> {
-  let files = cache.getViewFiles(webappPath);
-  if (Object.keys(files).length > 0) {
-    return files;
+  if (Object.keys(cache.getViewFiles(webappPath)).length > 0) {
+    return cache.getViewFiles(webappPath);
   }
-  files = await processViewFiles(webappPath);
+  const files = await processViewFiles(webappPath);
   cache.setViewFiles(webappPath, files);
   return files;
 }
diff --git a/packages/context/test/unit/utils/view-files.test.ts b/packages/context/test/unit/utils/view-files.test.ts
@@ -31,18 +31,22 @@ describe("view-files", () => {
     const getViewFilesStub = jest
       .spyOn(cache, "getViewFiles")
       .mockReturnValue({ documentPath: {} as XMLDocument });
+
     const projectRoot = testFramework.getProjectRoot();
     const webapp = join(projectRoot, "app", "manage_travels", "webapp");
     // act
     const viewFiles = await getViewFiles(webapp);
     // assert
-    expect(getViewFilesStub).toHaveBeenCalledOnce();
+    expect(getViewFilesStub).toHaveBeenCalledTimes(2);
     expect(Object.keys(viewFiles).length).toBeGreaterThan(0);
   });
 
   it("get view files", async () => {
     // arrange
     cache.reset();
+    const getViewFilesStub = jest
+      .spyOn(cache, "getViewFiles")
+      .mockReturnValue({});
     const projectRoot = testFramework.getProjectRoot();
     const webapp = join(projectRoot, "app", "manage_travels", "webapp");
     const documentPath = join(
@@ -57,6 +61,7 @@ describe("view-files", () => {
     // act
     const viewFiles = await getViewFiles(webapp);
     // assert
+    expect(getViewFilesStub).toHaveBeenCalledTimes(1);
     expect(Object.keys(viewFiles).length).toBeGreaterThan(1);
     expect(viewFiles[documentPath]).toBeDefined();
   });

diff --git a/packages/language-server/src/server.ts b/packages/language-server/src/server.ts
@@ -301,8 +301,9 @@ connection.onDidChangeWatchedFiles(async (changeEvent): Promise<void> => {
     } else if (uri.endsWith(".xml")) {
       await reactOnXmlFileChange(uri, change.type);
       if (
-        change.type === FileChangeType.Created ||
-        change.type === FileChangeType.Deleted
+        isXMLView(uri) &&
+        (change.type === FileChangeType.Created ||
+          change.type === FileChangeType.Deleted)
       ) {
         // revalidate - needed to assure unique ID
         validateOpenDocuments();

diff --git a/packages/xml-views-definition/test/unit/controller/index.test.ts b/packages/xml-views-definition/test/unit/controller/index.test.ts
@@ -17,6 +17,7 @@ describe("index", () => {
   let uri = "";
   const pathSegments = ["src", "view", "App.view.xml"];
   beforeEach(function () {
+    context.cache.reset();
     const useConfig: Config = {
       projectInfo: {
         name: ProjectName.tsFreeStyle,
@@ -35,7 +36,7 @@ describe("index", () => {
       // arrange
       const param: DefinitionParams = {
         position: {} as Position,
-        textDocument: { uri: "file:\\dummy" },
+        textDocument: { uri },
       };
       jest.spyOn(fs.promises, "readFile").mockResolvedValue("");
       // act

diff --git a/packages/xml-views-validation/package.json b/packages/xml-views-validation/package.json
@@ -34,6 +34,7 @@
     "@ui5-language-assistant/semantic-model": "4.0.17",
     "@ui5-language-assistant/test-utils": "4.0.14",
     "@xml-tools/parser": "1.0.7",
+    "chevrotain": "10.4.2",
     "@ui5-language-assistant/test-framework": "4.0.12"
   },
   "scripts": {