Skip to content

Commit 8af4fc7

Browse files
fviernaufviernau
committed
test(spdx): Make the dependency tree of TestData a bit deeper
The dependency tree contained no dependencies between packages. Signed-off-by: Frank Viernau <[email protected]>
1 parent eb9d540 commit 8af4fc7

File tree

3 files changed

+46
-40
lines changed

3 files changed

+46
-40
lines changed

‎plugins/reporters/spdx/src/funTest/resources/spdx-document-reporter-expected-output.spdx.json‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -236,32 +236,32 @@
236236
"relationshipType" : "GENERATED_FROM",
237237
"relatedSpdxElement" : "SPDXRef-Package-Maven-first-package-group-first-package-0.0.1-vcs"
238238
}, {
239-
"spdxElementId" : "SPDXRef-Package-Maven-seventh-package-group-seventh-package-0.0.1",
240-
"relationshipType" : "GENERATED_FROM",
241-
"relatedSpdxElement" : "SPDXRef-Package-Maven-seventh-package-group-seventh-package-0.0.1-source-artifact"
242-
}, {
243-
"spdxElementId" : "SPDXRef-Project-Maven-first-project-group-first-project-name-0.0.1",
239+
"spdxElementId" : "SPDXRef-Package-Maven-first-package-group-first-package-0.0.1",
244240
"relationshipType" : "DEPENDS_ON",
245-
"relatedSpdxElement" : "SPDXRef-Package-Maven-first-package-group-first-package-0.0.1"
241+
"relatedSpdxElement" : "SPDXRef-Package-Maven-second-package-group-second-package-0.0.1"
246242
}, {
247-
"spdxElementId" : "SPDXRef-Project-Maven-first-project-group-first-project-name-0.0.1",
243+
"spdxElementId" : "SPDXRef-Package-Maven-first-package-group-first-package-0.0.1",
248244
"relationshipType" : "DEPENDS_ON",
249-
"relatedSpdxElement" : "SPDXRef-Package-Maven-fourth-package-group-fourth-package-0.0.1"
245+
"relatedSpdxElement" : "SPDXRef-Package-Maven-third-package-group-third-package-0.0.1"
250246
}, {
251-
"spdxElementId" : "SPDXRef-Project-Maven-first-project-group-first-project-name-0.0.1",
247+
"spdxElementId" : "SPDXRef-Package-Maven-fourth-package-group-fourth-package-0.0.1",
252248
"relationshipType" : "DEPENDS_ON",
253-
"relatedSpdxElement" : "SPDXRef-Package-Maven-second-package-group-second-package-0.0.1"
249+
"relatedSpdxElement" : "SPDXRef-Package-Maven-seventh-package-group-seventh-package-0.0.1"
254250
}, {
255-
"spdxElementId" : "SPDXRef-Project-Maven-first-project-group-first-project-name-0.0.1",
251+
"spdxElementId" : "SPDXRef-Package-Maven-seventh-package-group-seventh-package-0.0.1",
252+
"relationshipType" : "GENERATED_FROM",
253+
"relatedSpdxElement" : "SPDXRef-Package-Maven-seventh-package-group-seventh-package-0.0.1-source-artifact"
254+
}, {
255+
"spdxElementId" : "SPDXRef-Package-Maven-third-package-group-third-package-0.0.1",
256256
"relationshipType" : "DEPENDS_ON",
257-
"relatedSpdxElement" : "SPDXRef-Package-Maven-seventh-package-group-seventh-package-0.0.1"
257+
"relatedSpdxElement" : "SPDXRef-Package-Maven-sixth-package-group-sixth-package-0.0.1"
258258
}, {
259259
"spdxElementId" : "SPDXRef-Project-Maven-first-project-group-first-project-name-0.0.1",
260260
"relationshipType" : "DEPENDS_ON",
261-
"relatedSpdxElement" : "SPDXRef-Package-Maven-sixth-package-group-sixth-package-0.0.1"
261+
"relatedSpdxElement" : "SPDXRef-Package-Maven-first-package-group-first-package-0.0.1"
262262
}, {
263263
"spdxElementId" : "SPDXRef-Project-Maven-first-project-group-first-project-name-0.0.1",
264264
"relationshipType" : "DEPENDS_ON",
265-
"relatedSpdxElement" : "SPDXRef-Package-Maven-third-package-group-third-package-0.0.1"
265+
"relatedSpdxElement" : "SPDXRef-Package-Maven-fourth-package-group-fourth-package-0.0.1"
266266
} ]
267267
}

‎plugins/reporters/spdx/src/funTest/resources/spdx-document-reporter-expected-output.spdx.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -243,24 +243,24 @@ relationships:
243243
- spdxElementId: "SPDXRef-Package-Maven-first-package-group-first-package-0.0.1"
244244
relationshipType: "GENERATED_FROM"
245245
relatedSpdxElement: "SPDXRef-Package-Maven-first-package-group-first-package-0.0.1-vcs"
246+
- spdxElementId: "SPDXRef-Package-Maven-first-package-group-first-package-0.0.1"
247+
relationshipType: "DEPENDS_ON"
248+
relatedSpdxElement: "SPDXRef-Package-Maven-second-package-group-second-package-0.0.1"
249+
- spdxElementId: "SPDXRef-Package-Maven-first-package-group-first-package-0.0.1"
250+
relationshipType: "DEPENDS_ON"
251+
relatedSpdxElement: "SPDXRef-Package-Maven-third-package-group-third-package-0.0.1"
252+
- spdxElementId: "SPDXRef-Package-Maven-fourth-package-group-fourth-package-0.0.1"
253+
relationshipType: "DEPENDS_ON"
254+
relatedSpdxElement: "SPDXRef-Package-Maven-seventh-package-group-seventh-package-0.0.1"
246255
- spdxElementId: "SPDXRef-Package-Maven-seventh-package-group-seventh-package-0.0.1"
247256
relationshipType: "GENERATED_FROM"
248257
relatedSpdxElement: "SPDXRef-Package-Maven-seventh-package-group-seventh-package-0.0.1-source-artifact"
258+
- spdxElementId: "SPDXRef-Package-Maven-third-package-group-third-package-0.0.1"
259+
relationshipType: "DEPENDS_ON"
260+
relatedSpdxElement: "SPDXRef-Package-Maven-sixth-package-group-sixth-package-0.0.1"
249261
- spdxElementId: "SPDXRef-Project-Maven-first-project-group-first-project-name-0.0.1"
250262
relationshipType: "DEPENDS_ON"
251263
relatedSpdxElement: "SPDXRef-Package-Maven-first-package-group-first-package-0.0.1"
252264
- spdxElementId: "SPDXRef-Project-Maven-first-project-group-first-project-name-0.0.1"
253265
relationshipType: "DEPENDS_ON"
254266
relatedSpdxElement: "SPDXRef-Package-Maven-fourth-package-group-fourth-package-0.0.1"
255-
- spdxElementId: "SPDXRef-Project-Maven-first-project-group-first-project-name-0.0.1"
256-
relationshipType: "DEPENDS_ON"
257-
relatedSpdxElement: "SPDXRef-Package-Maven-second-package-group-second-package-0.0.1"
258-
- spdxElementId: "SPDXRef-Project-Maven-first-project-group-first-project-name-0.0.1"
259-
relationshipType: "DEPENDS_ON"
260-
relatedSpdxElement: "SPDXRef-Package-Maven-seventh-package-group-seventh-package-0.0.1"
261-
- spdxElementId: "SPDXRef-Project-Maven-first-project-group-first-project-name-0.0.1"
262-
relationshipType: "DEPENDS_ON"
263-
relatedSpdxElement: "SPDXRef-Package-Maven-sixth-package-group-sixth-package-0.0.1"
264-
- spdxElementId: "SPDXRef-Project-Maven-first-project-group-first-project-name-0.0.1"
265-
relationshipType: "DEPENDS_ON"
266-
relatedSpdxElement: "SPDXRef-Package-Maven-third-package-group-third-package-0.0.1"

‎plugins/reporters/spdx/src/testFixtures/kotlin/TestData.kt‎

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -82,22 +82,28 @@ val ORT_RESULT = OrtResult(
8282
name = "compile",
8383
dependencies = setOf(
8484
PackageReference(
85-
id = Identifier("Maven:first-package-group:first-package:0.0.1")
85+
id = Identifier("Maven:first-package-group:first-package:0.0.1"),
86+
dependencies = setOf(
87+
PackageReference(
88+
id = Identifier("Maven:second-package-group:second-package:0.0.1")
89+
),
90+
PackageReference(
91+
id = Identifier("Maven:third-package-group:third-package:0.0.1"),
92+
dependencies = setOf(
93+
PackageReference(
94+
id = Identifier("Maven:sixth-package-group:sixth-package:0.0.1")
95+
)
96+
)
97+
)
98+
)
8699
),
87100
PackageReference(
88-
id = Identifier("Maven:second-package-group:second-package:0.0.1")
89-
),
90-
PackageReference(
91-
id = Identifier("Maven:third-package-group:third-package:0.0.1")
92-
),
93-
PackageReference(
94-
id = Identifier("Maven:fourth-package-group:fourth-package:0.0.1")
95-
),
96-
PackageReference(
97-
id = Identifier("Maven:sixth-package-group:sixth-package:0.0.1")
98-
),
99-
PackageReference(
100-
id = Identifier("Maven:seventh-package-group:seventh-package:0.0.1")
101+
id = Identifier("Maven:fourth-package-group:fourth-package:0.0.1"),
102+
dependencies = setOf(
103+
PackageReference(
104+
id = Identifier("Maven:seventh-package-group:seventh-package:0.0.1")
105+
)
106+
)
101107
)
102108
)
103109
),

0 commit comments

Comments
 (0)