test: update unit tests

Signed-off-by: Ilona Shishov <[email protected]>

package.json

@@ -24,7 +24,7 @@
     "dist"
   ],
   "dependencies": {
-    "@RHEcosystemAppEng/exhort-javascript-api": "^0.0.2-ea.49",
+    "@RHEcosystemAppEng/exhort-javascript-api": "^0.1.0",
     "@xml-tools/ast": "^5.0.5",
     "@xml-tools/parser": "^1.0.11",
     "json-to-ast": "^2.1.0",
@@ -43,6 +43,7 @@
     "fake-exec": "^1.1.0",
     "mocha": "^10.2.0",
     "nyc": "^15.1.0",
+    "sinon": "^17.0.1",
     "ts-node": "^10.9.1",
     "typedoc": "^0.25.3",
     "typescript": "^5.2.2"

src/codeActionHandler.ts

@@ -5,42 +5,22 @@
 'use strict';
 
 import { CodeAction, CodeActionKind, Diagnostic } from 'vscode-languageserver/node';
-import { codeActionsMap } from './diagnosticsHandler';
 import { globalConfig } from './config';
 import { RHDA_DIAGNOSTIC_SOURCE } from './constants';
 
 /**
  * Retrieves code actions based on diagnostics and file type.
  * @param diagnostics - An array of available diagnostics.
- * @param fileType - The type of the file based on ecosystem (e.g., 'pom.xml').
  * @returns An array of CodeAction objects to be made available to the user.
  */
-function getDiagnosticsCodeActions( diagnostics: Diagnostic[], fileType: string ): CodeAction[] {
+function getDiagnosticsCodeActions(diagnostics: Diagnostic[]): CodeAction[] {
+    const hasRhdaDiagonostic = diagnostics.some(diagnostic => diagnostic.source === RHDA_DIAGNOSTIC_SOURCE);
     const codeActions: CodeAction[] = [];
-    let hasRhdaDiagonostic: boolean = false;
-
-    for (const diagnostic of diagnostics) {
-        const codeAction = codeActionsMap[diagnostic.range.start.line + '|' + diagnostic.range.start.character];
-        if (codeAction) {
-
-            if (fileType === 'pom.xml') {
-                // add Red Hat repository recommendation command to action
-                codeAction.command = {
-                title: 'RedHat repository recommendation',
-                command: globalConfig.triggerRHRepositoryRecommendationNotification,
-                };   
-            }
 
-            codeActions.push(codeAction);
-
-        }
-        if (!hasRhdaDiagonostic) {
-            hasRhdaDiagonostic = diagnostic.source === RHDA_DIAGNOSTIC_SOURCE;
-        }
-    }
     if (globalConfig.triggerFullStackAnalysis && hasRhdaDiagonostic) {
         codeActions.push(generateFullStackAnalysisAction());
     }
+
     return codeActions;
 }
 

src/collector.ts

@@ -5,6 +5,7 @@
 'use strict';
 
 import { Range } from 'vscode-languageserver';
+import { isDefined } from './utils';
 
 /**
  * Represents a position inside the manifest file with line and column information.
@@ -43,10 +44,11 @@ export interface IDependency {
  * Represents a dependency and implements the IDependency interface.
  */
 export class Dependency implements IDependency {
+  public version: IPositionedString
+  public context: IPositionedContext
+
   constructor(
-    public name: IPositionedString,
-    public version: IPositionedString = {} as IPositionedString,
-    public context: IPositionedContext = {} as IPositionedContext,
+    public name: IPositionedString
   ) {}
 }
 
@@ -56,8 +58,9 @@ export class Dependency implements IDependency {
  * @returns The range within the text document that represents the dependency.
  */
 export function getRange (dep: IDependency): Range {
-  const pos: IPosition = dep.version.position;
-  if (pos.line !== 0) {
+
+  if (isDefined(dep, 'version', 'position')) {
+    const pos: IPosition = dep.version.position;
     const length = dep.version.value.length;
     return {
       start: {
@@ -123,7 +126,7 @@ export class EcosystemDependencyResolver {
   }
 
   /**
-   * RResolves a dependency reference to its actual name in the specified ecosystem.
+   * Resolves a dependency reference in a specified ecosystem to its name and version string.
    * @param ref - The reference string to resolve.
    * @returns The resolved name of the dependency.
    */

src/componentAnalysis.ts

@@ -86,7 +86,7 @@ class AnalysisResponse implements IAnalysisResponse {
             sources.forEach(source => {
                 source.dependencies.forEach(d => {
                     if (isDefined(d, 'ref') && isDefined(d, 'issues')) {
-                        const dd = new DependencyData(source.id, d.issues.length, isDefined(d, 'highestVulnerability', 'severity') ? d.highestVulnerability.severity : 'UNKNOWN');
+                        const dd = new DependencyData(source.id, d.issues.length, isDefined(d, 'highestVulnerability', 'severity') ? d.highestVulnerability.severity : 'NONE');
                         if (this.dependencies[d.ref] === undefined) {
                             this.dependencies[d.ref] = [];
                         }

src/config.ts

@@ -11,7 +11,6 @@
 export class Config
 {
     triggerFullStackAnalysis:  string;
-    triggerRHRepositoryRecommendationNotification:  string;
     telemetryId:             string;
     utmSource:               string;
     exhortDevMode:           string;
@@ -30,7 +29,6 @@ export class Config
      */
     constructor() {
         this.triggerFullStackAnalysis = process.env.VSCEXT_TRIGGER_FULL_STACK_ANALYSIS || '';
-        this.triggerRHRepositoryRecommendationNotification = process.env.VSCEXT_TRIGGER_REDHAT_REPOSITORY_RECOMMENDATION_NOTIFICATION || '';
         this.telemetryId = process.env.VSCEXT_TELEMETRY_ID || '';
         this.utmSource = process.env.VSCEXT_UTM_SOURCE || '';
         this.exhortDevMode = process.env.VSCEXT_EXHORT_DEV_MODE || 'false';

src/diagnosticsHandler.ts

@@ -130,9 +130,4 @@ async function performDiagnostics(diagnosticFilePath: string, contents: string,
     diagnosticsPipeline.reportDiagnostics();
 }
 
-/**
- * Map of code actions.
- */
-const codeActionsMap = new Map<string, CodeAction>();
-
-export { performDiagnostics, codeActionsMap };
+export { performDiagnostics };