File tree 3 files changed +6
-10
lines changed
model/src/test/kotlin/licenses
3 files changed +6
-10
lines changed Original file line number Diff line number Diff line change @@ -54,7 +54,6 @@ import org.ossreviewtoolkit.model.config.LicenseFindingCuration
54
54
import org.ossreviewtoolkit.model.config.LicenseFindingCurationReason
55
55
import org.ossreviewtoolkit.model.config.PathExclude
56
56
import org.ossreviewtoolkit.model.config.PathExcludeReason
57
- import org.ossreviewtoolkit.model.licenses.TestUtils.containLicensesExactly
58
57
import org.ossreviewtoolkit.model.utils.FileArchiver
59
58
import org.ossreviewtoolkit.model.utils.FileProvenanceFileStorage
60
59
import org.ossreviewtoolkit.utils.ort.DeclaredLicenseProcessor
Original file line number Diff line number Diff line change @@ -27,7 +27,6 @@ import io.mockk.mockk
27
27
28
28
import org.ossreviewtoolkit.model.Identifier
29
29
import org.ossreviewtoolkit.model.LicenseSource
30
- import org.ossreviewtoolkit.model.licenses.TestUtils.containLicensesExactly
31
30
import org.ossreviewtoolkit.utils.spdx.SpdxLicenseChoice
32
31
import org.ossreviewtoolkit.utils.spdx.SpdxSingleLicenseExpression
33
32
import org.ossreviewtoolkit.utils.spdx.toSpdx
Original file line number Diff line number Diff line change @@ -26,12 +26,10 @@ import io.kotest.matchers.neverNullMatcher
26
26
import org.ossreviewtoolkit.utils.spdx.SpdxExpression
27
27
import org.ossreviewtoolkit.utils.spdx.SpdxSingleLicenseExpression
28
28
29
- object TestUtils {
30
- fun containLicensesExactly (vararg licenses : String ): Matcher <Iterable <ResolvedLicense >? > =
31
- neverNullMatcher { value ->
32
- val expected = licenses.map { SpdxExpression .parse(it) as SpdxSingleLicenseExpression }.toSet()
33
- val actual = value.map { it.license }.toSet()
29
+ fun containLicensesExactly (vararg licenses : String ): Matcher <Iterable <ResolvedLicense >? > =
30
+ neverNullMatcher { value ->
31
+ val expected = licenses.map { SpdxExpression .parse(it) as SpdxSingleLicenseExpression }.toSet()
32
+ val actual = value.map { it.license }.toSet()
34
33
35
- containExactly(expected).test(actual)
36
- }
37
- }
34
+ containExactly(expected).test(actual)
35
+ }
You can’t perform that action at this time.
0 commit comments