Simplify SPDX compound expressions #9360
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
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 |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| /* | ||
| * Copyright (C) 2017 The ORT Project Authors (see <https://github.com/oss-review-toolkit/ort/blob/main/NOTICE>) | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * License-Filename: LICENSE | ||
| */ | ||
|
|
||
| package org.ossreviewtoolkit.utils.spdx | ||
|
|
||
| import io.kotest.assertions.throwables.shouldThrow | ||
| import io.kotest.core.spec.style.WordSpec | ||
| import io.kotest.matchers.shouldBe | ||
|
|
||
| class SpdxCompoundExpressionTest : WordSpec({ | ||
|
||
| "Creating a compound expression" should { | ||
| "fail if the expression has less than two children" { | ||
| shouldThrow<IllegalArgumentException> { | ||
| SpdxCompoundExpression(SpdxOperator.AND, emptyList()) | ||
| } | ||
|
|
||
| shouldThrow<IllegalArgumentException> { | ||
| SpdxCompoundExpression(SpdxOperator.AND, listOf(SpdxLicenseIdExpression("license"))) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| "Simplifying a compound expression" should { | ||
| "inline nested children of the same operator" { | ||
| val expression = SpdxCompoundExpression( | ||
| SpdxOperator.AND, | ||
| listOf( | ||
| SpdxCompoundExpression( | ||
| SpdxOperator.AND, | ||
| listOf( | ||
| SpdxLicenseIdExpression("MIT"), | ||
| SpdxCompoundExpression( | ||
| SpdxOperator.AND, | ||
| listOf( | ||
| SpdxLicenseIdExpression("MIT"), | ||
| SpdxLicenseIdExpression("Apache-2.0") | ||
| ) | ||
| ) | ||
| ) | ||
| ), | ||
| SpdxLicenseIdExpression("Apache-2.0") | ||
| ) | ||
| ) | ||
|
|
||
| // Compare string representations to not rely on semantic equality. | ||
| expression.simplify().toString() shouldBe SpdxCompoundExpression( | ||
| SpdxOperator.AND, | ||
| listOf( | ||
| SpdxLicenseIdExpression("MIT"), | ||
| SpdxLicenseIdExpression("Apache-2.0") | ||
| ) | ||
| ).toString() | ||
| } | ||
|
|
||
| "create a single expression for equal operands" { | ||
| val expression = SpdxCompoundExpression( | ||
| SpdxOperator.AND, | ||
| listOf( | ||
| SpdxLicenseIdExpression("MIT"), | ||
| SpdxLicenseIdExpression("MIT") | ||
| ) | ||
| ) | ||
|
|
||
| expression.simplify() shouldBe SpdxLicenseIdExpression("MIT") | ||
| } | ||
| } | ||
| }) | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This will now throw an exception if the input contains only two identical licenses.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed, see my comment above.