Skip to content

Commit

Permalink
Moving issue validation to source analysis test
Browse files Browse the repository at this point in the history
Signed-off-by: Igor Braginsky <[email protected]>
  • Loading branch information
ibragins committed Nov 15, 2023
1 parent 19d6426 commit cf6cff5
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 76 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@ import {
getRandomApplicationData,
getRandomAnalysisData,
writeMavenSettingsFile,
resetURL,
deleteByList,
checkSuccessAlert,
} from "../../../../../utils/utils";
import { CredentialsMaven } from "../../../../models/administration/credentials/credentialsMaven";
import { Analysis } from "../../../../models/migration/applicationinventory/analysis";
Expand All @@ -35,10 +33,9 @@ import {
import * as data from "../../../../../utils/data_utils";
import { CredentialsSourceControlUsername } from "../../../../models/administration/credentials/credentialsSourceControlUsername";
import { CredentialsSourceControlKey } from "../../../../models/administration/credentials/credentialsSourceControlKey";
import { infoAlertMessage } from "../../../../views/common.view";
import { Application } from "../../../../models/migration/applicationinventory/application";
let source_credential;
let maven_credential;
let source_credential: CredentialsSourceControlUsername;
let maven_credential: CredentialsMaven;
let applicationsList: Array<Analysis> = [];

describe(["@tier1"], "Source Analysis", () => {
Expand Down Expand Up @@ -79,21 +76,22 @@ describe(["@tier1"], "Source Analysis", () => {
Application.open(100, true);
});

it("Source + dependencies analysis on tackletest app", function () {
it("Source + dependencies analysis on book-server app, validating issues on single app", function () {
// Source code analysis require both source and maven credentials
const application = new Analysis(
getRandomApplicationData("tackleTestApp_Source+dependencies", {
sourceData: this.appData["tackle-testapp-git"],
getRandomApplicationData("bookserverApp", {
sourceData: this.appData["bookserver-app"],
}),
getRandomAnalysisData(this.analysisData["source+dep_analysis_on_tackletestapp"])
getRandomAnalysisData(this.analysisData["source_analysis_on_bookserverapp"])
);
application.create();
applicationsList.push(application);
cy.wait("@getApplication");
cy.wait(2000);
cy.wait(2 * SEC);
application.manageCredentials(source_credential.name, maven_credential.name);
application.analyze();
application.verifyAnalysisStatus("Completed");
application.validateIssues(this.analysisData["source_analysis_on_bookserverapp"]["issues"]);
});

it("Source + dependencies analysis on daytrader app", function () {
Expand All @@ -107,7 +105,7 @@ describe(["@tier1"], "Source Analysis", () => {
application.create();
applicationsList.push(application);
cy.wait("@getApplication");
cy.wait(2000);
cy.wait(2 * SEC);
application.analyze();
application.verifyAnalysisStatus("Completed");
});
Expand All @@ -123,7 +121,7 @@ describe(["@tier1"], "Source Analysis", () => {
application.create();
applicationsList.push(application);
cy.wait("@getApplication");
cy.wait(2000);
cy.wait(2 * SEC);
application.manageCredentials(null, maven_credential.name);
application.analyze();
application.verifyAnalysisStatus("Completed");
Expand All @@ -140,7 +138,7 @@ describe(["@tier1"], "Source Analysis", () => {
application.create();
applicationsList.push(application);
cy.wait("@getApplication");
cy.wait(2000);
cy.wait(2 * SEC);
application.manageCredentials(source_credential.name, null);
application.analyze();
application.verifyAnalysisStatus("Completed");
Expand All @@ -164,7 +162,7 @@ describe(["@tier1"], "Source Analysis", () => {
application.create();
applicationsList.push(application);
cy.wait("@getApplication");
cy.wait(2000);
cy.wait(2 * SEC);
application.manageCredentials(scCredsKey.name, null);
application.analyze();
application.verifyAnalysisStatus("Completed");
Expand All @@ -181,7 +179,7 @@ describe(["@tier1"], "Source Analysis", () => {
application.create();
applicationsList.push(application);
cy.wait("@getApplication");
cy.wait(2000);
cy.wait(2 * SEC);
application.manageCredentials(source_credential.name, null);
application.analyze();
application.verifyAnalysisStatus("Completed");
Expand All @@ -198,7 +196,7 @@ describe(["@tier1"], "Source Analysis", () => {
application.create();
applicationsList.push(application);
cy.wait("@getApplication");
cy.wait(2000);
cy.wait(2 * SEC);
application.manageCredentials(source_credential.name, maven_credential.name);
application.analyze();
application.verifyAnalysisStatus("Completed");
Expand All @@ -215,7 +213,7 @@ describe(["@tier1"], "Source Analysis", () => {
application.create();
applicationsList.push(application);
cy.wait("@getApplication");
cy.wait(2000);
cy.wait(2 * SEC);
application.manageCredentials(source_credential.name, null);
application.analyze();
application.verifyAnalysisStatus("Completed");
Expand Down Expand Up @@ -254,7 +252,7 @@ describe(["@tier1"], "Source Analysis", () => {
application.create();
applicationsList.push(application);
cy.wait("@getApplication");
cy.wait(2000);
cy.wait(2 * SEC);
application.analyze();
application.verifyAnalysisStatus(AnalysisStatuses.completed);
});
Expand Down
58 changes: 0 additions & 58 deletions cypress/e2e/tests/migration/issues/single-application.test.ts

This file was deleted.

0 comments on commit cf6cff5

Please sign in to comment.