chore: fix merge conflicts

syntest-framework · Dec 11, 2023 · bd24408 · bd24408
2 parents 6061473 + 287b621
commit bd24408
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 34 deletions.
diff --git a/libraries/analysis-javascript/package.json b/libraries/analysis-javascript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@syntest/analysis-javascript",
-  "version": "0.2.0-beta.9",
+  "version": "0.2.0-beta.10",
   "description": "SynTest Analysis JavaScript is a library for doing analysis of the JavaScript language",
   "keywords": [
     "syntest",

diff --git a/libraries/instrumentation-javascript/package.json b/libraries/instrumentation-javascript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@syntest/instrumentation-javascript",
-  "version": "0.2.0-beta.1",
+  "version": "0.2.0-beta.2",
   "description": "SynTest Instrumentation JavaScript is a library for instrumenting JavaScript code",
   "keywords": [
     "syntest",
@@ -51,7 +51,7 @@
     "@babel/core": "7.20.12",
     "@babel/traverse": "7.20.12",
     "@istanbuljs/schema": "^0.1.3",
-    "@syntest/analysis-javascript": "^0.2.0-beta.9",
+    "@syntest/analysis-javascript": "^0.2.0-beta.10",
     "@syntest/ast-visitor-javascript": "^0.2.0-beta.4",
     "@syntest/diagnostics": "^0.1.0-beta.0",
     "@syntest/storage": "^0.3.0-beta.2",

diff --git a/libraries/search-javascript/package.json b/libraries/search-javascript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@syntest/search-javascript",
-  "version": "0.2.0-beta.10",
+  "version": "0.2.0-beta.11",
   "description": "SynTest JavaScript is a tool for automatically generating test cases for the JavaScript language",
   "keywords": [
     "syntest",
@@ -53,11 +53,11 @@
     "@babel/preset-env": "7.19.1",
     "@babel/register": "7.18.9",
     "@syntest/analysis": "^0.3.0-beta.1",
-    "@syntest/analysis-javascript": "^0.2.0-beta.9",
+    "@syntest/analysis-javascript": "^0.2.0-beta.10",
     "@syntest/ast-visitor-javascript": "^0.2.0-beta.4",
     "@syntest/cfg": "^0.5.0-beta.0",
     "@syntest/diagnostics": "^0.1.0-beta.0",
-    "@syntest/instrumentation-javascript": "^0.2.0-beta.1",
+    "@syntest/instrumentation-javascript": "^0.2.0-beta.2",
     "@syntest/logging": "^0.2.0-beta.2",
     "@syntest/prng": "^0.2.0-beta.2",
     "@syntest/search": "^0.5.0-beta.10",

diff --git a/package-lock.json b/package-lock.json
diff --git a/plugins/plugin-javascript-event-listener-state-storage/package.json b/plugins/plugin-javascript-event-listener-state-storage/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@syntest/plugin-javascript-event-listener-state-storage",
-  "version": "0.2.0-beta.5",
+  "version": "0.2.0-beta.6",
   "description": "A listener plugin for SynTest JavaScript containing state storage functionalities",
   "keywords": [
     "syntest",
@@ -49,7 +49,7 @@
   },
   "dependencies": {
     "@syntest/analysis": "^0.3.0-beta.1",
-    "@syntest/analysis-javascript": "^0.2.0-beta.9",
+    "@syntest/analysis-javascript": "^0.2.0-beta.10",
     "@syntest/base-language": "^0.3.0-beta.11",
     "@syntest/cfg": "^0.5.0-beta.0",
     "@syntest/diagnostics": "^0.1.0-beta.0",

diff --git a/tools/javascript/lib/JavaScriptLauncher.ts b/tools/javascript/lib/JavaScriptLauncher.ts
@@ -480,6 +480,7 @@ export class JavaScriptLauncher extends Launcher<JavaScriptArguments> {
 
       // this.metricManager.recordProperty(PropertyName., `${timeInMs}`); // TODO new metric
     }
+
     if (this.arguments_.testMinimization) {
       const start = Date.now();
       JavaScriptLauncher.LOGGER.info("Minimization started");

diff --git a/tools/javascript/lib/workflows/DeDuplicator.ts b/tools/javascript/lib/workflows/DeDuplicator.ts
@@ -28,8 +28,9 @@ import { JavaScriptTestCase } from "@syntest/search-javascript";
 
 import { Workflow } from "./Workflow";
 
-export class DeDuplicator extends Workflow {
+export class DeDuplicator implements Workflow {
   protected static LOGGER: Logger;
+
   protected userInterface: UserInterface;
   protected secondaryObjectives: SecondaryObjectiveComparator<JavaScriptTestCase>[];
   protected objectivesMap: Map<Target, ObjectiveFunction<JavaScriptTestCase>[]>;
@@ -39,13 +40,13 @@ export class DeDuplicator extends Workflow {
     secondaryObjectives: SecondaryObjectiveComparator<JavaScriptTestCase>[],
     objectivesMap: Map<Target, ObjectiveFunction<JavaScriptTestCase>[]>
   ) {
-    super();
     DeDuplicator.LOGGER = getLogger(DeDuplicator.name);
     this.userInterface = userInterface;
     this.secondaryObjectives = secondaryObjectives;
     this.objectivesMap = objectivesMap;
   }
 
+  // eslint-disable-next-line sonarjs/cognitive-complexity
   execute(
     encodingsMap: Map<Target, JavaScriptTestCase[]>
   ): Promise<Map<Target, JavaScriptTestCase[]>> {

diff --git a/tools/javascript/lib/workflows/MetaCommenter.ts b/tools/javascript/lib/workflows/MetaCommenter.ts
@@ -30,7 +30,7 @@ import { JavaScriptTestCase } from "@syntest/search-javascript";
 
 import { Workflow } from "./Workflow";
 
-export class MetaCommenter extends Workflow {
+export class MetaCommenter implements Workflow {
   protected static LOGGER: Logger;
   protected userInterface: UserInterface;
   protected secondaryObjectives: SecondaryObjectiveComparator<JavaScriptTestCase>[];
@@ -41,14 +41,14 @@ export class MetaCommenter extends Workflow {
     secondaryObjectives: SecondaryObjectiveComparator<JavaScriptTestCase>[],
     objectivesMap: Map<Target, ObjectiveFunction<JavaScriptTestCase>[]>
   ) {
-    super();
     MetaCommenter.LOGGER = getLogger(MetaCommenter.name);
     this.userInterface = userInterface;
     this.secondaryObjectives = secondaryObjectives;
     this.objectivesMap = objectivesMap;
   }
 
-  override execute(
+  // eslint-disable-next-line sonarjs/cognitive-complexity
+  execute(
     encodingsMap: Map<Target, JavaScriptTestCase[]>
   ): Promise<Map<Target, JavaScriptTestCase[]>> {
     const totalEncodings = [...encodingsMap.values()].reduce(

diff --git a/tools/javascript/lib/workflows/TestSplitter.ts b/tools/javascript/lib/workflows/TestSplitter.ts
@@ -29,14 +29,14 @@ import {
 
 import { Workflow } from "./Workflow";
 
-export class TestSplitting extends Workflow {
+export class TestSplitting implements Workflow {
   protected static LOGGER: Logger;
   protected userInterface: UserInterface;
   protected runner: JavaScriptRunner;
 
   constructor(userInterface: UserInterface, runner: JavaScriptRunner) {
-    super();
-    TestSplitting.LOGGER = getLogger("TestSplitting");
+    TestSplitting.LOGGER = getLogger(TestSplitting.name);
+    this.userInterface = userInterface;
     this.runner = runner;
     this.userInterface = userInterface;
   }

diff --git a/tools/javascript/lib/workflows/Workflow.ts b/tools/javascript/lib/workflows/Workflow.ts
@@ -19,8 +19,8 @@
 import { Target } from "@syntest/analysis-javascript";
 import { JavaScriptTestCase } from "@syntest/search-javascript";
 
-export abstract class Workflow {
-  abstract execute(
+export interface Workflow {
+  execute(
     encodingMap: Map<Target, JavaScriptTestCase[]>
   ): Promise<Map<Target, JavaScriptTestCase[]>>;
 }
diff --git a/tools/javascript/package.json b/tools/javascript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@syntest/javascript",
-  "version": "0.2.0-beta.10",
+  "version": "0.2.0-beta.12",
   "description": "SynTest JavaScript is a tool for automatically generating test cases for the JavaScript language",
   "keywords": [
     "syntest",
@@ -48,16 +48,16 @@
     "test:watch": "mocha --config ../../.mocharc.json --watch"
   },
   "dependencies": {
-    "@syntest/analysis-javascript": "^0.2.0-beta.9",
+    "@syntest/analysis-javascript": "^0.2.0-beta.10",
     "@syntest/base-language": "^0.3.0-beta.11",
     "@syntest/cli-graphics": "^0.3.0-beta.1",
     "@syntest/diagnostics": "^0.1.0-beta.0",
-    "@syntest/instrumentation-javascript": "^0.2.0-beta.1",
+    "@syntest/instrumentation-javascript": "^0.2.0-beta.2",
     "@syntest/logging": "^0.2.0-beta.2",
     "@syntest/metric": "^0.2.0-beta.0",
     "@syntest/module": "^0.2.0-beta.4",
     "@syntest/search": "^0.5.0-beta.10",
-    "@syntest/search-javascript": "^0.2.0-beta.10",
+    "@syntest/search-javascript": "^0.2.0-beta.11",
     "@syntest/storage": "^0.3.0-beta.2",
     "yargs": "^17.7.2"
   },