Skip to content

test: cleanups and prep for new ecosystems #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 21, 2023
Merged

test: cleanups and prep for new ecosystems #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:

- name: Run integration tests
working-directory: integration
run: bash ./run_it.sh
run: bash ./run_its.sh

- name: Upload coverage reports
if: ${{ matrix.node == env.MAIN_NODE_VER }}
Expand Down
0 integration/expected_component → integration/langs/java/expected_component
View file
Open in desktop
File renamed without changes.
0 integration/expected_stack_html → integration/langs/java/expected_stack_html
View file
Open in desktop
File renamed without changes.
0 integration/expected_stack_json → integration/langs/java/expected_stack_json
View file
Open in desktop
File renamed without changes.
0 integration/expected_stack_json_summary → ...on/langs/java/expected_stack_json_summary
View file
Open in desktop
File renamed without changes.
0 integration/pom.xml → integration/langs/java/pom.xml
View file
Open in desktop
File renamed without changes.
45 changes: 25 additions & 20 deletions integration/run_it.sh → integration/run_its.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/usr/bin/env bash

###### DO NOT FORGET 'npm run compile' on root prior to running this script ######

# utility function takes file name and a command
# used for matching the file content and the command output
match() {
Expand Down Expand Up @@ -39,14 +41,15 @@ then
fi
echo "- SUCCESSFUL"

echo "RUNNING JavaScript integration test for Stack Analysis report in Html"
match "expected_stack_html" "node javascript/index.js stack pom.xml true"
#### JAVA MAVEN
echo "RUNNING JavaScript integration test for Stack Analysis report in Html for Java Maven"
match "langs/java/expected_stack_html" "node javascript/index.js stack langs/java/pom.xml true"

echo "RUNNING JavaScript integration test for Stack Analysis report in Json"
match "expected_stack_json" "node javascript/index.js stack pom.xml false"
echo "RUNNING JavaScript integration test for Stack Analysis report in Json for Java Maven"
match "langs/java/expected_stack_json" "node javascript/index.js stack langs/java/pom.xml false"

echo "RUNNING JavaScript integration test for Component Analysis report"
match "expected_component" "node javascript/index.js component pom.xml '$(<pom.xml)'"
echo "RUNNING JavaScript integration test for Component Analysis report for Java Maven"
match "langs/java/expected_component" "node javascript/index.js component pom.xml '$(<langs/java/pom.xml)'"

##########################################
###### TypeScript Integration Tests ######
Expand All @@ -67,14 +70,15 @@ then
exit $?
fi

echo "RUNNING TypeScript integration test for Stack Analysis report in Html"
match "expected_stack_html" "node typescript/dist/index.js stack pom.xml true"
#### JAVA MAVEN
echo "RUNNING TypeScript integration test for Stack Analysis report in Html for Java Maven"
match "langs/java/expected_stack_html" "node typescript/dist/index.js stack langs/java/pom.xml true"

echo "RUNNING TypeScript integration test for Stack Analysis report in Json"
match "expected_stack_json" "node typescript/dist/index.js stack pom.xml false"
echo "RUNNING TypeScript integration test for Stack Analysis report in Json for Java Maven"
match "langs/java/expected_stack_json" "node typescript/dist/index.js stack langs/java/pom.xml false"

echo "RUNNING TypeScript integration test for Component Analysis report"
match "expected_component" "node typescript/dist/index.js component pom.xml '$(<pom.xml)'"
echo "RUNNING TypeScript integration test for Component Analysis report for Java Maven"
match "langs/java/expected_component" "node typescript/dist/index.js component pom.xml '$(<langs/java/pom.xml)'"

##########################################
###### CMD Script Integration Tests ######
Expand All @@ -88,14 +92,15 @@ then
fi
echo "- SUCCESSFUL"

echo "RUNNING CLI Script integration test for Stack Analysis report in Html"
match "expected_stack_html" "node cli/node_modules/@RHEcosystemAppEng/crda-javascript-api/dist/src/cli.js stack pom.xml --html"
#### JAVA MAVEN
echo "RUNNING CLI Script integration test for Stack Analysis report in Html for Java Maven"
match "langs/java/expected_stack_html" "node cli/node_modules/@RHEcosystemAppEng/crda-javascript-api/dist/src/cli.js stack langs/java/pom.xml --html"

echo "RUNNING CLI Script integration test for Stack Analysis full report in Json"
match "expected_stack_json" "node cli/node_modules/@RHEcosystemAppEng/crda-javascript-api/dist/src/cli.js stack pom.xml"
echo "RUNNING CLI Script integration test for Stack Analysis full report in Json for Java Maven"
match "langs/java/expected_stack_json" "node cli/node_modules/@RHEcosystemAppEng/crda-javascript-api/dist/src/cli.js stack langs/java/pom.xml"

echo "RUNNING CLI Script integration test for Stack Analysis summary only report in Json"
match "expected_stack_json_summary" "node cli/node_modules/@RHEcosystemAppEng/crda-javascript-api/dist/src/cli.js stack pom.xml --summary"
echo "RUNNING CLI Script integration test for Stack Analysis summary only report in Json for Java Maven"
match "langs/java/expected_stack_json_summary" "node cli/node_modules/@RHEcosystemAppEng/crda-javascript-api/dist/src/cli.js stack langs/java/pom.xml --summary"

echo "RUNNING CLI Script integration test for Component Analysis report"
match "expected_component" "node cli/node_modules/@RHEcosystemAppEng/crda-javascript-api/dist/src/cli.js component pom.xml '$(<pom.xml)'"
echo "RUNNING CLI Script integration test for Component Analysis report for Java Maven"
match "langs/java/expected_component" "node cli/node_modules/@RHEcosystemAppEng/crda-javascript-api/dist/src/cli.js component pom.xml '$(<langs/java/pom.xml)'"
2 changes: 1 addition & 1 deletion test/providers/java_maven.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ suite('testing the java-maven data provider', () => {

test(`verify maven data provided for stack analysis with scenario ${scenario}`, async () => {
// load the expected graph for the scenario
let expectedGraph = fs.readFileSync(`test/providers/tst_manifests/${testCase}/expected_dot_graph`,).toString()
let expectedGraph = fs.readFileSync(`test/providers/tst_manifests/${testCase}/stack_expected_dot_graph`,).toString()
// invoke sut stack analysis for scenario manifest
let providedDataForStack = await javaMvnProvider.provideStack(`test/providers/tst_manifests/${testCase}/pom.xml`)
// verify returned data matches expectation
Expand Down
0 ...ith_ignore_on_artifact/expected_dot_graph → ...nore_on_artifact/stack_expected_dot_graph
View file
Open in desktop
File renamed without changes.
0 ...h_ignore_on_dependency/expected_dot_graph → ...re_on_dependency/stack_expected_dot_graph
View file
Open in desktop
File renamed without changes.
0 ...s_with_ignore_on_group/expected_dot_graph → ..._ignore_on_group/stack_expected_dot_graph
View file
Open in desktop
File renamed without changes.
0 ...with_ignore_on_version/expected_dot_graph → ...gnore_on_version/stack_expected_dot_graph
View file
Open in desktop
File renamed without changes.
0 ...s_with_ignore_on_wrong/expected_dot_graph → ..._ignore_on_wrong/stack_expected_dot_graph
View file
Open in desktop
File renamed without changes.
0 ...om_deps_with_no_ignore/expected_dot_graph → ...s_with_no_ignore/stack_expected_dot_graph
View file
Open in desktop
File renamed without changes.