test: Fix troublesome test for ui5.yaml

SAP · Apr 15, 2024 · 286b7e8 · 286b7e8
1 parent 6d42145
commit 286b7e8
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 4 deletions.
diff --git a/src/linter/linter.ts b/src/linter/linter.ts
@@ -231,6 +231,8 @@ function transformVirtualPathToFilePath(
 		return path.join(srcFsBasePath, posixPath.relative(srcVirBasePath, virtualPath));
 	} else if (testFsBasePath && testVirBasePath && virtualPath.startsWith(testVirBasePath)) {
 		return path.join(testFsBasePath, posixPath.relative(testVirBasePath, virtualPath));
+	} else if (virtualPath.startsWith("/")) {
+		return posixPath.relative("/", virtualPath);
 	} else {
 		throw new Error(
 			`Resource path ${virtualPath} is not located within the virtual source or test directories of the project`);

diff --git a/src/linter/yaml/UI5YamlLinter.ts b/src/linter/yaml/UI5YamlLinter.ts
@@ -37,7 +37,7 @@ export default class UI5YamlLinter {
 	#resourcePath = "";
 	#context: LinterContext;
 
-	constructor(content: string, resourcePath: string, context: LinterContext) {
+	constructor(resourcePath: string, content: string, context: LinterContext) {
 		this.#content = content;
 		this.#resourcePath = resourcePath;
 		this.#context = context;

diff --git a/test/lib/linter/UI5YamlLinter.ts b/test/lib/linter/UI5YamlLinter.ts
@@ -25,7 +25,7 @@ framework:
 	const context = new LinterContext({rootDir: projectPath});
 
 	// Create UI5YamlLinter instance with resource content
-	const linter = new UI5YamlLinter(resourceContent, resourcePath, context);
+	const linter = new UI5YamlLinter(resourcePath, resourceContent, context);
 	// Run UI5YamlLinter report
 	await linter.lint();
 

diff --git a/test/lib/linter/rules/snapshots/NoDeprecatedApi.ts.md b/test/lib/linter/rules/snapshots/NoDeprecatedApi.ts.md
@@ -1227,4 +1227,22 @@ Generated by [AVA](https://avajs.dev).
 
 > Snapshot 1
 
-    []
+    [
+      {
+        coverageInfo: [],
+        errorCount: 1,
+        fatalErrorCount: 0,
+        filePath: 'ui5.yaml',
+        messages: [
+          {
+            column: 7,
+            fatal: undefined,
+            line: 11,
+            message: 'Use of deprecated library \'sap.landvisz\'',
+            ruleId: 'ui5-linter-no-deprecated-api',
+            severity: 2,
+          },
+        ],
+        warningCount: 0,
+      },
+    ]
diff --git a/test/lib/linter/rules/snapshots/NoDeprecatedApi.ts.snap b/test/lib/linter/rules/snapshots/NoDeprecatedApi.ts.snap
diff --git a/test/lib/linter/snapshots/linter.ts.snap b/test/lib/linter/snapshots/linter.ts.snap
diff --git a/test/lib/linter/xmlTemplate/snapshots/transpiler.ts.md b/test/lib/linter/xmlTemplate/snapshots/transpiler.ts.md
@@ -1,4 +1,4 @@
-# Snapshot report for `test/lib/linter/xml/transpiler.ts`
+# Snapshot report for `test/lib/linter/xmlTemplate/transpiler.ts`
 
 The actual snapshot is saved in `transpiler.ts.snap`.