Skip to content

Commit 33fdcdc

Browse files
committed
fix: align providers
Signed-off-by: Ruben Romero Montes <rromerom@redhat.com>
1 parent 407ba2e commit 33fdcdc

1 file changed

Lines changed: 7 additions & 5 deletions

File tree

test/it/end-to-end.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@ function getParsedKeyFromHtml(html, key,keyLength) {
2222
}
2323

2424
function extractTotalsGeneralOrFromProvider(providedDataForStack, provider) {
25-
if(providedDataForStack.providers[provider].sources.length > 0) {
26-
return providedDataForStack.providers[provider].sources[provider].summary.total;
25+
if(providedDataForStack.providers[provider].sources && Object.keys(providedDataForStack.providers[provider].sources).length > 0) {
26+
// Get the first source (e.g., "osv") and return its summary total
27+
const firstSource = Object.keys(providedDataForStack.providers[provider].sources)[0];
28+
return providedDataForStack.providers[provider].sources[firstSource].summary.total;
2729
} else {
2830
return providedDataForStack.scanned.total;
2931
}
@@ -53,7 +55,7 @@ suite('Integration Tests', () => {
5355
let pomPath = `test/it/test_manifests/${packageManager}/${manifestName}`
5456
let providedDataForStack = await index.stackAnalysis(pomPath)
5557
console.log(JSON.stringify(providedDataForStack,null , 4))
56-
let providers = ["trustify"]
58+
let providers = ["rhtpa"]
5759
providers.forEach(provider => expect(extractTotalsGeneralOrFromProvider(providedDataForStack, provider)).greaterThan(0))
5860
// TODO: if sources doesn't exist, add "scanned" instead
5961
// python transitive count for stack analysis is awaiting fix in exhort backend
@@ -85,7 +87,7 @@ suite('Integration Tests', () => {
8587
reportParsedFromHtml = JSON.parse("{" + startOfJson.substring(0,startOfJson.indexOf("};") + 1))
8688
reportParsedFromHtml = reportParsedFromHtml.report
8789
} finally {
88-
parsedStatusFromProvider = reportParsedFromHtml.providers["trustify"].status
90+
parsedStatusFromProvider = reportParsedFromHtml.providers["rhtpa"].status
8991
expect(parsedStatusFromProvider.code).equals(200)
9092
parsedScannedFromHtml = reportParsedFromHtml.scanned
9193
expect( typeof html).equals("string")
@@ -102,7 +104,7 @@ suite('Integration Tests', () => {
102104

103105
expect(analysisReport.scanned.total).greaterThan(0)
104106
expect(analysisReport.scanned.transitive).equal(0)
105-
let providers = ["trustify"]
107+
let providers = ["rhtpa"]
106108
providers.forEach(provider => expect(extractTotalsGeneralOrFromProvider(analysisReport, provider)).greaterThan(0))
107109
providers.forEach(provider => expect(analysisReport.providers[provider].status.code).equals(200))
108110
}).timeout(20000);

0 commit comments

Comments
 (0)