-
-
Notifications
You must be signed in to change notification settings - Fork 157
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: Ignore parent component for types with empty components (#1399)
* Bug fix Signed-off-by: Prabhu Subramanian <[email protected]> * Add tests Signed-off-by: Prabhu Subramanian <[email protected]> --------- Signed-off-by: Prabhu Subramanian <[email protected]>
- Loading branch information
Showing
7 changed files
with
319 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -819,6 +819,56 @@ test("parse maven tree", () => { | |
| "pkg:maven/example.group/[email protected]?type=p2-installable-unit", | ||
| ], | ||
| }); | ||
| parsedList = parseMavenTree( | ||
| readFileSync("./test/data/mvn-metrics-tree.txt", { | ||
| encoding: "utf-8", | ||
| }), | ||
| ); | ||
| expect(parsedList.pkgList.length).toEqual(58); | ||
| expect(parsedList.parentComponent["bom-ref"]).toEqual( | ||
| "pkg:maven/org.apache.dubbo/[email protected]?type=pom", | ||
| ); | ||
| expect(parsedList.dependenciesList.length).toEqual(58); | ||
| expect(parsedList.dependenciesList[0]).toEqual({ | ||
| ref: "pkg:maven/org.apache.dubbo/[email protected]?type=pom", | ||
| dependsOn: [ | ||
| "pkg:maven/org.apache.dubbo/[email protected]?type=jar", | ||
| "pkg:maven/org.junit.jupiter/[email protected]?type=jar", | ||
| "pkg:maven/org.junit.jupiter/[email protected]?type=jar", | ||
| "pkg:maven/org.awaitility/[email protected]?type=jar", | ||
| "pkg:maven/org.hamcrest/[email protected]?type=jar", | ||
| "pkg:maven/org.mockito/[email protected]?type=jar", | ||
| "pkg:maven/org.mockito/[email protected]?type=jar", | ||
| ], | ||
| }); | ||
| parsedList = parseMavenTree( | ||
| readFileSync("./test/data/mvn-sbstarter-tree.txt", { | ||
| encoding: "utf-8", | ||
| }), | ||
| ); | ||
| expect(parsedList.pkgList.length).toEqual(90); | ||
| expect(parsedList.parentComponent["bom-ref"]).toEqual( | ||
| "pkg:maven/org.apache.dubbo/[email protected]?type=jar", | ||
| ); | ||
| expect(parsedList.dependenciesList.length).toEqual(90); | ||
| expect(parsedList.dependenciesList[0]).toEqual({ | ||
| ref: "pkg:maven/org.apache.dubbo/[email protected]?type=jar", | ||
| dependsOn: [ | ||
| "pkg:maven/org.yaml/[email protected]?type=jar", | ||
| "pkg:maven/org.apache.dubbo/[email protected]?type=jar", | ||
| "pkg:maven/org.junit.vintage/[email protected]?type=jar", | ||
| "pkg:maven/net.bytebuddy/[email protected]?type=jar", | ||
| "pkg:maven/net.bytebuddy/[email protected]?type=jar", | ||
| "pkg:maven/org.apache.dubbo/[email protected]?type=jar", | ||
| "pkg:maven/org.apache.logging.log4j/[email protected]?type=jar", | ||
| "pkg:maven/org.junit.jupiter/[email protected]?type=jar", | ||
| "pkg:maven/org.junit.jupiter/[email protected]?type=jar", | ||
| "pkg:maven/org.awaitility/[email protected]?type=jar", | ||
| "pkg:maven/org.hamcrest/[email protected]?type=jar", | ||
| "pkg:maven/org.mockito/[email protected]?type=jar", | ||
| "pkg:maven/org.mockito/[email protected]?type=jar", | ||
| ], | ||
| }); | ||
| }); | ||
|
|
||
| // Slow test | ||
|
|
@@ -4917,4 +4967,50 @@ test("hasAnyProjectType tests", () => { | |
| excludeType: ["js"], | ||
| }), | ||
| ).toBeFalsy(); | ||
| expect( | ||
| hasAnyProjectType(["universal"], { | ||
| projectType: undefined, | ||
| excludeType: ["github"], | ||
| }), | ||
| ).toBeTruthy(); | ||
| expect( | ||
| hasAnyProjectType(["oci"], { | ||
| projectType: undefined, | ||
| excludeType: ["github"], | ||
| }), | ||
| ).toBeFalsy(); | ||
| expect( | ||
| hasAnyProjectType(["os"], { | ||
| projectType: undefined, | ||
| excludeType: ["jar"], | ||
| }), | ||
| ).toBeFalsy(); | ||
| expect( | ||
| hasAnyProjectType(["docker"], { | ||
| projectType: undefined, | ||
| excludeType: ["jar"], | ||
| }), | ||
| ).toBeFalsy(); | ||
| expect( | ||
| hasAnyProjectType(["oci", "java"], { | ||
| projectType: undefined, | ||
| excludeType: ["jar"], | ||
| }), | ||
| ).toBeTruthy(); | ||
| expect( | ||
| hasAnyProjectType(["oci", "ear"], { | ||
| projectType: undefined, | ||
| excludeType: ["jar"], | ||
| }), | ||
| ).toBeFalsy(); | ||
| expect( | ||
| hasAnyProjectType( | ||
| ["docker", "oci", "container", "os"], | ||
| { | ||
| projectType: undefined, | ||
| excludeType: ["github"], | ||
| }, | ||
| false, | ||
| ), | ||
| ).toBeFalsy(); | ||
| }); | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| org.apache.dubbo:dubbo-metrics:pom:3.3.0 | ||
| +- org.apache.dubbo:dubbo-test-check:jar:3.3.0:test | ||
| | +- org.apache.dubbo:dubbo-common:jar:3.3.0:test | ||
| | | +- org.javassist:javassist:jar:3.30.2-GA:test | ||
| | | +- com.alibaba.fastjson2:fastjson2:jar:2.0.52:test | ||
| | | +- commons-io:commons-io:jar:2.16.1:test | ||
| | | \- javax.annotation:javax.annotation-api:jar:1.3.2:test | ||
| | +- org.junit.platform:junit-platform-launcher:jar:1.9.3:test | ||
| | +- org.apache.commons:commons-lang3:jar:3.17.0:test | ||
| | +- org.apache.zookeeper:zookeeper:jar:3.7.2:test | ||
| | | +- org.apache.zookeeper:zookeeper-jute:jar:3.7.2:test | ||
| | | \- org.slf4j:slf4j-api:jar:1.7.36:test | ||
| | +- org.apache.curator:curator-framework:jar:5.1.0:test | ||
| | | \- org.apache.curator:curator-client:jar:5.1.0:test | ||
| | | \- com.google.guava:guava:jar:27.0.1-jre:test | ||
| | | +- com.google.guava:failureaccess:jar:1.0.1:test | ||
| | | +- com.google.guava:listenablefuture:jar:9999.0-empty-to-avoid-conflict-with-guava:test | ||
| | | +- com.google.code.findbugs:jsr305:jar:3.0.2:test | ||
| | | +- org.checkerframework:checker-qual:jar:2.5.2:test | ||
| | | +- com.google.errorprone:error_prone_annotations:jar:2.2.0:test | ||
| | | +- com.google.j2objc:j2objc-annotations:jar:1.1:test | ||
| | | \- org.codehaus.mojo:animal-sniffer-annotations:jar:1.17:test | ||
| | +- org.apache.commons:commons-compress:jar:1.27.1:test | ||
| | | \- commons-codec:commons-codec:jar:1.16.0:test | ||
| | +- org.apache.commons:commons-exec:jar:1.4.0:test | ||
| | \- org.asynchttpclient:async-http-client:jar:2.12.3:test | ||
| | +- org.asynchttpclient:async-http-client-netty-utils:jar:2.12.3:test | ||
| | | \- io.netty:netty-buffer:jar:4.1.112.Final:test | ||
| | +- io.netty:netty-codec-http:jar:4.1.112.Final:test | ||
| | | +- io.netty:netty-common:jar:4.1.112.Final:test | ||
| | | +- io.netty:netty-transport:jar:4.1.112.Final:test | ||
| | | \- io.netty:netty-codec:jar:4.1.112.Final:test | ||
| | +- io.netty:netty-handler:jar:4.1.112.Final:test | ||
| | | +- io.netty:netty-resolver:jar:4.1.112.Final:test | ||
| | | \- io.netty:netty-transport-native-unix-common:jar:4.1.112.Final:test | ||
| | +- io.netty:netty-codec-socks:jar:4.1.112.Final:test | ||
| | +- io.netty:netty-handler-proxy:jar:4.1.112.Final:test | ||
| | +- io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.112.Final:test | ||
| | | \- io.netty:netty-transport-classes-epoll:jar:4.1.112.Final:test | ||
| | +- io.netty:netty-transport-native-kqueue:jar:osx-x86_64:4.1.112.Final:test | ||
| | | \- io.netty:netty-transport-classes-kqueue:jar:4.1.112.Final:test | ||
| | +- org.reactivestreams:reactive-streams:jar:1.0.4:test | ||
| | +- com.typesafe.netty:netty-reactive-streams:jar:2.0.4:test | ||
| | \- com.sun.activation:jakarta.activation:jar:1.2.2:test | ||
| +- org.junit.jupiter:junit-jupiter-engine:jar:5.9.3:test | ||
| | +- org.junit.platform:junit-platform-engine:jar:1.9.3:test | ||
| | | +- org.opentest4j:opentest4j:jar:1.2.0:test | ||
| | | \- org.junit.platform:junit-platform-commons:jar:1.9.3:test | ||
| | +- org.junit.jupiter:junit-jupiter-api:jar:5.9.3:test | ||
| | \- org.apiguardian:apiguardian-api:jar:1.1.2:test | ||
| +- org.junit.jupiter:junit-jupiter-params:jar:5.9.3:test | ||
| +- org.awaitility:awaitility:jar:4.2.0:test | ||
| +- org.hamcrest:hamcrest:jar:2.2:test | ||
| +- org.mockito:mockito-core:jar:4.11.0:test | ||
| | +- net.bytebuddy:byte-buddy:jar:1.15.1:test | ||
| | +- net.bytebuddy:byte-buddy-agent:jar:1.15.1:test | ||
| | \- org.objenesis:objenesis:jar:3.3:test | ||
| \- org.mockito:mockito-inline:jar:4.11.0:test |
Oops, something went wrong.