From 2196aa375e9c95b22038c1160da7e68b361b096b Mon Sep 17 00:00:00 2001 From: Igor Braginsky Date: Tue, 10 Dec 2024 11:33:25 +0200 Subject: [PATCH] Fixed wrong analysis parameter in issues test and fixed json file Signed-off-by: Igor Braginsky --- .../issues/filter.sorting.pagination.test.ts | 2 +- cypress/fixtures/analysis.json | 52 +++++-------------- 2 files changed, 14 insertions(+), 40 deletions(-) diff --git a/cypress/e2e/tests/migration/dynamic-report/issues/filter.sorting.pagination.test.ts b/cypress/e2e/tests/migration/dynamic-report/issues/filter.sorting.pagination.test.ts index 036b638b4..727f28304 100644 --- a/cypress/e2e/tests/migration/dynamic-report/issues/filter.sorting.pagination.test.ts +++ b/cypress/e2e/tests/migration/dynamic-report/issues/filter.sorting.pagination.test.ts @@ -81,7 +81,7 @@ describe(["@tier3"], "Filtering, sorting and pagination in Issues", function () getRandomApplicationData("IssuesFilteringApp1_" + i, { sourceData: appData["bookserver-app"], }), - getRandomAnalysisData(analysisData["analysis_for_openSourceLibraries"]) + getRandomAnalysisData(analysisData["source_analysis_on_bookserverapp"]) ); bookServerApp.business = businessServiceList[0].name; applicationsList.push(bookServerApp); diff --git a/cypress/fixtures/analysis.json b/cypress/fixtures/analysis.json index 106d7fabd..1929bfe61 100644 --- a/cypress/fixtures/analysis.json +++ b/cypress/fixtures/analysis.json @@ -10,19 +10,6 @@ "appName": "bookserver-app", "tags": ["EJB XML", "Java EE Batch", "EJB XML"], "issues": [ - { - "name": "File system - Java IO", - "category": "mandatory", - "sources": ["None"], - "targets": ["cloud-readiness"], - "effort": 1, - "totalEffort": 6, - "incidents": 6, - "affectedFiles": 1, - "ruleSet": "cloud-readiness", - "rule": "local-storage-00001", - "labels": ["konveyor.io/source", "storage"] - }, { "name": "Add Maven profile to run the Quarkus native build", "category": "mandatory", @@ -101,6 +88,19 @@ "rule": "javaee-pom-to-quarkus-00020", "labels": ["None"] }, + { + "name": "File system - Java IO", + "category": "mandatory", + "sources": ["None"], + "targets": ["cloud-readiness"], + "effort": 1, + "totalEffort": 6, + "incidents": 6, + "affectedFiles": 1, + "ruleSet": "cloud-readiness", + "rule": "local-storage-00001", + "labels": ["konveyor.io/source", "storage"] + }, { "name": "Remove the SpringBoot @SpringBootApplication annotation", "category": "mandatory", @@ -165,32 +165,6 @@ "ruleSet": "quarkus/springboot", "rule": "springboot-di-to-quarkus-00000", "labels": ["None"] - }, - { - "name": "Version of Spring Boot not compatible with Jakarta EE 9+", - "category": "mandatory", - "sources": ["None"], - "targets": ["jakarta-ee", "jakarta-ee9+", "jws", "jws6+"], - "effort": 3, - "totalEffort": 1, - "incidents": 1, - "affectedFiles": 1, - "ruleSet": "jakarta-ee9", - "rule": "spring-components-00001", - "labels": ["konveyor.io/source"] - }, - { - "name": "Version of Spring not compatible with Jakarta EE 9+", - "category": "mandatory", - "sources": ["None"], - "targets": ["jakarta-ee", "jakarta-ee9+", "jws", "jws6+"], - "effort": 3, - "totalEffort": 1, - "incidents": 1, - "affectedFiles": 1, - "ruleSet": "quarkus/springboot", - "rule": "spring-components-00002", - "labels": ["konveyor.io/source"] } ], "dependencies": [