diff --git a/advisor/src/test/kotlin/AdvisorTest.kt b/advisor/src/test/kotlin/AdvisorTest.kt index 5b433a987f8ae..50b2e389fcfb5 100644 --- a/advisor/src/test/kotlin/AdvisorTest.kt +++ b/advisor/src/test/kotlin/AdvisorTest.kt @@ -21,6 +21,7 @@ package org.ossreviewtoolkit.advisor import io.kotest.core.spec.style.WordSpec import io.kotest.matchers.maps.beEmpty +import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.should import io.kotest.matchers.shouldBe import io.kotest.matchers.types.beTheSameInstanceAs @@ -38,7 +39,6 @@ import org.ossreviewtoolkit.model.OrtResult import org.ossreviewtoolkit.model.Package import org.ossreviewtoolkit.model.Project import org.ossreviewtoolkit.model.config.AdvisorConfiguration -import org.ossreviewtoolkit.utils.test.shouldNotBeNull class AdvisorTest : WordSpec({ "retrieveFindings" should { diff --git a/analyzer/src/test/kotlin/AnalyzerResultBuilderTest.kt b/analyzer/src/test/kotlin/AnalyzerResultBuilderTest.kt index 441aa16c34729..a7428a769b365 100644 --- a/analyzer/src/test/kotlin/AnalyzerResultBuilderTest.kt +++ b/analyzer/src/test/kotlin/AnalyzerResultBuilderTest.kt @@ -27,6 +27,7 @@ import io.kotest.matchers.collections.containExactlyInAnyOrder import io.kotest.matchers.collections.shouldHaveSize import io.kotest.matchers.collections.shouldNotContain import io.kotest.matchers.maps.containExactly +import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.should import io.kotest.matchers.shouldBe import io.kotest.matchers.types.beTheSameInstanceAs @@ -52,7 +53,6 @@ import org.ossreviewtoolkit.model.config.ScopeExcludeReason import org.ossreviewtoolkit.model.fromYaml import org.ossreviewtoolkit.model.toYaml import org.ossreviewtoolkit.model.yamlMapper -import org.ossreviewtoolkit.utils.test.shouldNotBeNull class AnalyzerResultBuilderTest : WordSpec() { private val issue1 = Issue(timestamp = Instant.EPOCH, source = "source-1", message = "message-1") diff --git a/analyzer/src/testFixtures/kotlin/TestUtils.kt b/analyzer/src/testFixtures/kotlin/TestUtils.kt index eff844c25bc22..102c84c1d99e4 100644 --- a/analyzer/src/testFixtures/kotlin/TestUtils.kt +++ b/analyzer/src/testFixtures/kotlin/TestUtils.kt @@ -43,7 +43,6 @@ import org.ossreviewtoolkit.model.config.RepositoryConfiguration import org.ossreviewtoolkit.model.config.ScopeExclude import org.ossreviewtoolkit.model.config.ScopeExcludeReason import org.ossreviewtoolkit.utils.test.USER_DIR -import org.ossreviewtoolkit.utils.test.shouldNotBeNull fun PackageManager.resolveSingleProject(definitionFile: File, resolveScopes: Boolean = false): ProjectAnalyzerResult { val managerResult = resolveDependencies(listOf(definitionFile), emptyMap()) @@ -69,7 +68,7 @@ fun PackageManager.collateMultipleProjects(vararg definitionFiles: File): Analyz builder.addDependencyGraph(managerName, it).addPackages(managerResult.sharedPackages) } definitionFiles.forAll { definitionFile -> - managerResult.projectResults[definitionFile].shouldNotBeNull { + managerResult.projectResults[definitionFile] shouldNotBeNull { this shouldHaveAtLeastSize 1 forEach { builder.addResult(it) } } diff --git a/cli/src/funTest/kotlin/ExamplesFunTest.kt b/cli/src/funTest/kotlin/ExamplesFunTest.kt index 1d9055fc86f89..054fa0d980ba4 100644 --- a/cli/src/funTest/kotlin/ExamplesFunTest.kt +++ b/cli/src/funTest/kotlin/ExamplesFunTest.kt @@ -31,6 +31,7 @@ import io.kotest.matchers.collections.beEmpty import io.kotest.matchers.collections.shouldContain import io.kotest.matchers.collections.shouldContainExactlyInAnyOrder import io.kotest.matchers.collections.shouldHaveSize +import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.should import io.kotest.matchers.shouldBe import io.kotest.matchers.shouldNot @@ -65,7 +66,6 @@ import org.ossreviewtoolkit.utils.ort.ORT_REPO_CONFIG_FILENAME import org.ossreviewtoolkit.utils.ort.ORT_RESOLUTIONS_FILENAME import org.ossreviewtoolkit.utils.spdx.toSpdx import org.ossreviewtoolkit.utils.test.getAssetFile -import org.ossreviewtoolkit.utils.test.shouldNotBeNull class ExamplesFunTest : StringSpec({ val examplesDir = File("../examples") diff --git a/cli/src/funTest/kotlin/OrtMainFunTest.kt b/cli/src/funTest/kotlin/OrtMainFunTest.kt index 290f30367cb53..61d169e464eac 100644 --- a/cli/src/funTest/kotlin/OrtMainFunTest.kt +++ b/cli/src/funTest/kotlin/OrtMainFunTest.kt @@ -29,6 +29,7 @@ import io.kotest.engine.spec.tempdir import io.kotest.engine.spec.tempfile import io.kotest.matchers.collections.beEmpty import io.kotest.matchers.collections.haveSize +import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.should import io.kotest.matchers.shouldBe @@ -47,7 +48,6 @@ import org.ossreviewtoolkit.utils.ort.ORT_REFERENCE_CONFIG_FILENAME import org.ossreviewtoolkit.utils.test.getAssetFile import org.ossreviewtoolkit.utils.test.matchExpectedResult import org.ossreviewtoolkit.utils.test.patchActualResult -import org.ossreviewtoolkit.utils.test.shouldNotBeNull /** * A test for the main entry point of the application. diff --git a/clients/scanoss/src/test/kotlin/ScanOssDetailsTest.kt b/clients/scanoss/src/test/kotlin/ScanOssDetailsTest.kt index d4ea0900617df..8eb6d95fcbf1f 100644 --- a/clients/scanoss/src/test/kotlin/ScanOssDetailsTest.kt +++ b/clients/scanoss/src/test/kotlin/ScanOssDetailsTest.kt @@ -26,6 +26,7 @@ import io.kotest.core.spec.style.StringSpec import io.kotest.matchers.collections.beEmpty import io.kotest.matchers.collections.shouldHaveSize import io.kotest.matchers.maps.shouldHaveKey +import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.should import io.kotest.matchers.shouldBe import io.kotest.matchers.shouldNot @@ -37,7 +38,6 @@ import okhttp3.MultipartBody import okhttp3.RequestBody.Companion.asRequestBody import org.ossreviewtoolkit.clients.scanoss.model.Source -import org.ossreviewtoolkit.utils.test.shouldNotBeNull private const val SCANOSS_DETAILS_RESPONSE_FILENAME = "osskb.c" diff --git a/clients/scanoss/src/test/kotlin/ScanOssServiceTest.kt b/clients/scanoss/src/test/kotlin/ScanOssServiceTest.kt index c7342337b2512..c76b0cc16aa5f 100644 --- a/clients/scanoss/src/test/kotlin/ScanOssServiceTest.kt +++ b/clients/scanoss/src/test/kotlin/ScanOssServiceTest.kt @@ -26,6 +26,7 @@ import io.kotest.core.spec.style.StringSpec import io.kotest.matchers.collections.beEmpty import io.kotest.matchers.collections.shouldHaveSize import io.kotest.matchers.maps.shouldHaveKey +import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.shouldBe import io.kotest.matchers.shouldNot @@ -36,7 +37,6 @@ import okhttp3.MultipartBody import okhttp3.RequestBody.Companion.asRequestBody import org.ossreviewtoolkit.clients.scanoss.model.IdentificationType -import org.ossreviewtoolkit.utils.test.shouldNotBeNull /** * The default filename in a SCANOSS response. diff --git a/downloader/src/funTest/kotlin/DownloaderFunTest.kt b/downloader/src/funTest/kotlin/DownloaderFunTest.kt index 032b20304de66..558bf5058454c 100644 --- a/downloader/src/funTest/kotlin/DownloaderFunTest.kt +++ b/downloader/src/funTest/kotlin/DownloaderFunTest.kt @@ -24,6 +24,7 @@ import io.kotest.core.spec.style.WordSpec import io.kotest.engine.spec.tempdir import io.kotest.matchers.collections.shouldHaveSize import io.kotest.matchers.file.aFile +import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.should import io.kotest.matchers.shouldBe import io.kotest.matchers.string.endWith @@ -44,7 +45,6 @@ import org.ossreviewtoolkit.model.VcsType import org.ossreviewtoolkit.model.config.DownloaderConfiguration import org.ossreviewtoolkit.utils.common.VCS_DIRECTORIES import org.ossreviewtoolkit.utils.ort.normalizeVcsUrl -import org.ossreviewtoolkit.utils.test.shouldNotBeNull class DownloaderFunTest : WordSpec({ lateinit var outputDir: File diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1e94cafaa1e10..83cfcb3cbba58 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -32,7 +32,7 @@ jiraRestClient = "5.2.7" jruby = "9.4.7.0" jslt = "0.1.14" jsonSchemaValidator = "1.4.0" -kotest = "5.9.0" +kotest = "5.9.1" kotlinxCoroutines = "1.8.1" kotlinxHtml = "0.11.0" kotlinxSerialization = "1.6.3" diff --git a/model/src/funTest/kotlin/utils/PostgresProvenanceFileStorageFunTest.kt b/model/src/funTest/kotlin/utils/PostgresProvenanceFileStorageFunTest.kt index 2ebc2e72790d0..01ca43cc064ed 100644 --- a/model/src/funTest/kotlin/utils/PostgresProvenanceFileStorageFunTest.kt +++ b/model/src/funTest/kotlin/utils/PostgresProvenanceFileStorageFunTest.kt @@ -20,6 +20,7 @@ package org.ossreviewtoolkit.model.utils import io.kotest.core.spec.style.WordSpec +import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.shouldBe import java.io.ByteArrayInputStream @@ -33,7 +34,6 @@ import org.ossreviewtoolkit.model.VcsInfo import org.ossreviewtoolkit.model.VcsType import org.ossreviewtoolkit.model.config.FileArchiverConfiguration import org.ossreviewtoolkit.utils.test.PostgresListener -import org.ossreviewtoolkit.utils.test.shouldNotBeNull private val SOURCE_ARTIFACT_PROVENANCE = ArtifactProvenance(sourceArtifact = RemoteArtifact("url", Hash.create("hash"))) private val VCS_PROVENANCE = RepositoryProvenance( diff --git a/model/src/test/kotlin/AbstractDependencyNavigatorTest.kt b/model/src/test/kotlin/AbstractDependencyNavigatorTest.kt index 018d892351c61..d09cb03fae350 100644 --- a/model/src/test/kotlin/AbstractDependencyNavigatorTest.kt +++ b/model/src/test/kotlin/AbstractDependencyNavigatorTest.kt @@ -28,6 +28,7 @@ import io.kotest.matchers.collections.containExactlyInAnyOrder import io.kotest.matchers.collections.haveSize import io.kotest.matchers.collections.shouldContainExactlyInAnyOrder import io.kotest.matchers.maps.containExactly as containExactlyEntries +import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.sequences.beEmpty as beEmptySequence import io.kotest.matchers.sequences.containAllInAnyOrder import io.kotest.matchers.should @@ -39,7 +40,6 @@ import java.io.File import java.time.Instant import org.ossreviewtoolkit.utils.test.readOrtResult -import org.ossreviewtoolkit.utils.test.shouldNotBeNull /** * A base class for tests of concrete [DependencyNavigator] implementations. diff --git a/model/src/test/kotlin/ScannerRunTest.kt b/model/src/test/kotlin/ScannerRunTest.kt index ce85d3843c85d..56d113aa546a6 100644 --- a/model/src/test/kotlin/ScannerRunTest.kt +++ b/model/src/test/kotlin/ScannerRunTest.kt @@ -21,11 +21,11 @@ package org.ossreviewtoolkit.model import io.kotest.core.spec.style.WordSpec import io.kotest.matchers.collections.shouldContainExactlyInAnyOrder +import io.kotest.matchers.nulls.shouldNotBeNull import org.ossreviewtoolkit.model.FileList.Entry import org.ossreviewtoolkit.model.utils.alignRevisions import org.ossreviewtoolkit.model.utils.clearVcsPath -import org.ossreviewtoolkit.utils.test.shouldNotBeNull class ScannerRunTest : WordSpec({ "getFileList()" should { @@ -89,7 +89,7 @@ class ScannerRunTest : WordSpec({ ) ) - run.getFileList(id).shouldNotBeNull { + run.getFileList(id) shouldNotBeNull { files shouldContainExactlyInAnyOrder listOf( Entry("vcs/path/file1.txt", "1111111111111111111111111111111111111111"), Entry("vcs/path/sub/repository/some/dir/file4.txt", "4444444444444444444444444444444444444444") diff --git a/model/src/test/kotlin/config/AnalyzerConfigurationTest.kt b/model/src/test/kotlin/config/AnalyzerConfigurationTest.kt index 4142539c7d082..6de4068cba2d2 100644 --- a/model/src/test/kotlin/config/AnalyzerConfigurationTest.kt +++ b/model/src/test/kotlin/config/AnalyzerConfigurationTest.kt @@ -24,12 +24,11 @@ import io.kotest.core.spec.style.WordSpec import io.kotest.matchers.collections.containExactly import io.kotest.matchers.maps.containExactly as containExactlyEntries import io.kotest.matchers.nulls.beNull +import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.should import io.kotest.matchers.shouldBe import io.kotest.matchers.shouldNot -import org.ossreviewtoolkit.utils.test.shouldNotBeNull - class AnalyzerConfigurationTest : WordSpec({ "AnalyzerConfiguration()" should { "throw an exception on duplicate package manager configuration" { diff --git a/model/src/test/kotlin/config/OrtConfigurationTest.kt b/model/src/test/kotlin/config/OrtConfigurationTest.kt index 07a23b7e25377..4894392956372 100644 --- a/model/src/test/kotlin/config/OrtConfigurationTest.kt +++ b/model/src/test/kotlin/config/OrtConfigurationTest.kt @@ -31,6 +31,7 @@ import io.kotest.matchers.collections.shouldContainExactlyInAnyOrder import io.kotest.matchers.maps.containExactly as containExactlyEntries import io.kotest.matchers.maps.shouldContainExactly import io.kotest.matchers.nulls.beNull +import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.should import io.kotest.matchers.shouldBe import io.kotest.matchers.types.shouldBeInstanceOf @@ -42,7 +43,6 @@ import org.ossreviewtoolkit.model.Severity import org.ossreviewtoolkit.model.SourceCodeOrigin import org.ossreviewtoolkit.utils.common.EnvironmentVariableFilter import org.ossreviewtoolkit.utils.ort.ORT_REFERENCE_CONFIG_FILENAME -import org.ossreviewtoolkit.utils.test.shouldNotBeNull class OrtConfigurationTest : WordSpec({ "OrtConfiguration" should { diff --git a/model/src/test/kotlin/config/PackageManagerConfigurationTest.kt b/model/src/test/kotlin/config/PackageManagerConfigurationTest.kt index 14afa6a3e590a..8cfcb092d10c6 100644 --- a/model/src/test/kotlin/config/PackageManagerConfigurationTest.kt +++ b/model/src/test/kotlin/config/PackageManagerConfigurationTest.kt @@ -22,10 +22,9 @@ package org.ossreviewtoolkit.model.config import io.kotest.core.spec.style.WordSpec import io.kotest.matchers.collections.containExactly import io.kotest.matchers.maps.containExactly as containExactlyEntries +import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.should -import org.ossreviewtoolkit.utils.test.shouldNotBeNull - class PackageManagerConfigurationTest : WordSpec({ "merge" should { "prioritize mustRunAfter from other" { diff --git a/model/src/test/kotlin/config/ReporterConfigurationTest.kt b/model/src/test/kotlin/config/ReporterConfigurationTest.kt index 526ea37e34edb..244a948650bfd 100644 --- a/model/src/test/kotlin/config/ReporterConfigurationTest.kt +++ b/model/src/test/kotlin/config/ReporterConfigurationTest.kt @@ -20,6 +20,7 @@ package org.ossreviewtoolkit.model.config import io.kotest.core.spec.style.WordSpec +import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.shouldBe import java.io.File @@ -27,12 +28,11 @@ import java.io.File import org.ossreviewtoolkit.model.fromYaml import org.ossreviewtoolkit.model.toYaml import org.ossreviewtoolkit.utils.ort.ORT_REFERENCE_CONFIG_FILENAME -import org.ossreviewtoolkit.utils.test.shouldNotBeNull class ReporterConfigurationTest : WordSpec({ "Reporter secrets" should { "not be serialized as they contain sensitive information" { - rereadReporterConfig(loadReporterConfig()).config?.get("FossId").shouldNotBeNull { + rereadReporterConfig(loadReporterConfig()).config?.get("FossId") shouldNotBeNull { secrets shouldBe emptyMap() } } diff --git a/model/src/test/kotlin/config/RepositoryConfigurationTest.kt b/model/src/test/kotlin/config/RepositoryConfigurationTest.kt index d786e434031dd..16095f86d7e7f 100644 --- a/model/src/test/kotlin/config/RepositoryConfigurationTest.kt +++ b/model/src/test/kotlin/config/RepositoryConfigurationTest.kt @@ -25,6 +25,7 @@ import io.kotest.assertions.throwables.shouldThrow import io.kotest.core.spec.style.WordSpec import io.kotest.matchers.collections.haveSize import io.kotest.matchers.nulls.beNull +import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.should import io.kotest.matchers.shouldBe import io.kotest.matchers.string.shouldContain @@ -35,7 +36,6 @@ import org.ossreviewtoolkit.model.TextLocation import org.ossreviewtoolkit.model.config.snippet.SnippetChoiceReason import org.ossreviewtoolkit.model.fromYaml import org.ossreviewtoolkit.utils.spdx.toSpdx -import org.ossreviewtoolkit.utils.test.shouldNotBeNull class RepositoryConfigurationTest : WordSpec({ "RepositoryConfiguration" should { diff --git a/model/src/test/kotlin/licenses/LicenseClassificationsTest.kt b/model/src/test/kotlin/licenses/LicenseClassificationsTest.kt index 2f3c372c0c965..1704ea75e271f 100644 --- a/model/src/test/kotlin/licenses/LicenseClassificationsTest.kt +++ b/model/src/test/kotlin/licenses/LicenseClassificationsTest.kt @@ -25,13 +25,13 @@ import io.kotest.matchers.collections.containExactlyInAnyOrder import io.kotest.matchers.collections.shouldBeEmpty import io.kotest.matchers.collections.shouldContainExactlyInAnyOrder import io.kotest.matchers.nulls.beNull +import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.should import io.kotest.matchers.shouldBe import io.kotest.matchers.string.shouldContain import io.kotest.matchers.string.shouldNotContain import org.ossreviewtoolkit.utils.spdx.SpdxSingleLicenseExpression -import org.ossreviewtoolkit.utils.test.shouldNotBeNull class LicenseClassificationsTest : WordSpec({ "init()" should { diff --git a/model/src/test/kotlin/licenses/LicenseInfoResolverTest.kt b/model/src/test/kotlin/licenses/LicenseInfoResolverTest.kt index 04f80eed93af6..f3b7ce429828e 100644 --- a/model/src/test/kotlin/licenses/LicenseInfoResolverTest.kt +++ b/model/src/test/kotlin/licenses/LicenseInfoResolverTest.kt @@ -29,6 +29,7 @@ import io.kotest.matchers.collections.containExactlyInAnyOrder import io.kotest.matchers.collections.haveSize import io.kotest.matchers.collections.shouldContainExactlyInAnyOrder import io.kotest.matchers.neverNullMatcher +import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.should import io.kotest.matchers.shouldBe @@ -65,7 +66,6 @@ import org.ossreviewtoolkit.utils.spdx.SpdxSingleLicenseExpression import org.ossreviewtoolkit.utils.spdx.getLicenseText import org.ossreviewtoolkit.utils.spdx.toSpdx import org.ossreviewtoolkit.utils.test.createDefault -import org.ossreviewtoolkit.utils.test.shouldNotBeNull import org.ossreviewtoolkit.utils.test.transformingCollectionEmptyMatcher import org.ossreviewtoolkit.utils.test.transformingCollectionMatcher diff --git a/model/src/test/kotlin/utils/DependencyGraphBuilderTest.kt b/model/src/test/kotlin/utils/DependencyGraphBuilderTest.kt index 7bd4c17aabe7a..625d599779d3c 100644 --- a/model/src/test/kotlin/utils/DependencyGraphBuilderTest.kt +++ b/model/src/test/kotlin/utils/DependencyGraphBuilderTest.kt @@ -27,6 +27,7 @@ import io.kotest.matchers.collections.containExactlyInAnyOrder import io.kotest.matchers.collections.shouldContainExactly import io.kotest.matchers.collections.shouldContainExactlyInAnyOrder import io.kotest.matchers.collections.shouldHaveSize +import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.should import io.kotest.matchers.shouldBe import io.kotest.matchers.string.shouldContain @@ -40,7 +41,6 @@ import org.ossreviewtoolkit.model.PackageLinkage import org.ossreviewtoolkit.model.PackageReference import org.ossreviewtoolkit.model.RootDependencyIndex import org.ossreviewtoolkit.model.Scope -import org.ossreviewtoolkit.utils.test.shouldNotBeNull class DependencyGraphBuilderTest : WordSpec({ "DependencyGraphBuilder" should { @@ -217,7 +217,7 @@ class DependencyGraphBuilderTest : WordSpec({ scopeDependencies(scopes, scope) shouldContainExactly listOf(depCyc2) - graph.nodes.shouldNotBeNull { + graph.nodes shouldNotBeNull { this shouldHaveSize 3 } } diff --git a/model/src/test/kotlin/utils/DependencyGraphConverterTest.kt b/model/src/test/kotlin/utils/DependencyGraphConverterTest.kt index 42857df5dc8a3..f3cff153f4cf6 100644 --- a/model/src/test/kotlin/utils/DependencyGraphConverterTest.kt +++ b/model/src/test/kotlin/utils/DependencyGraphConverterTest.kt @@ -28,6 +28,7 @@ import io.kotest.matchers.collections.shouldContainExactlyInAnyOrder import io.kotest.matchers.collections.shouldContainOnly import io.kotest.matchers.ints.shouldBeLessThan import io.kotest.matchers.nulls.beNull +import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.should import io.kotest.matchers.shouldBe import io.kotest.matchers.shouldNot @@ -49,7 +50,6 @@ import org.ossreviewtoolkit.model.config.Excludes import org.ossreviewtoolkit.model.config.ScopeExclude import org.ossreviewtoolkit.model.config.ScopeExcludeReason import org.ossreviewtoolkit.model.readValue -import org.ossreviewtoolkit.utils.test.shouldNotBeNull class DependencyGraphConverterTest : WordSpec({ "convertToDependencyGraphs" should { diff --git a/model/src/test/kotlin/utils/FindingCurationMatcherTest.kt b/model/src/test/kotlin/utils/FindingCurationMatcherTest.kt index e26f30054de79..1852766a8a799 100644 --- a/model/src/test/kotlin/utils/FindingCurationMatcherTest.kt +++ b/model/src/test/kotlin/utils/FindingCurationMatcherTest.kt @@ -23,6 +23,7 @@ import io.kotest.core.spec.IsolationMode import io.kotest.core.spec.style.WordSpec import io.kotest.matchers.collections.containExactlyInAnyOrder import io.kotest.matchers.nulls.beNull +import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.should import io.kotest.matchers.shouldBe @@ -35,7 +36,6 @@ import org.ossreviewtoolkit.model.config.LicenseFindingCurationReason.INCORRECT import org.ossreviewtoolkit.model.licenses.LicenseFindingCurationResult import org.ossreviewtoolkit.utils.spdx.SpdxConstants import org.ossreviewtoolkit.utils.spdx.toSpdx -import org.ossreviewtoolkit.utils.test.shouldNotBeNull class FindingCurationMatcherTest : WordSpec() { private val matcher = FindingCurationMatcher() diff --git a/plugins/advisors/oss-index/src/test/kotlin/OssIndexTest.kt b/plugins/advisors/oss-index/src/test/kotlin/OssIndexTest.kt index d0a43871e756c..44302d0ad5330 100644 --- a/plugins/advisors/oss-index/src/test/kotlin/OssIndexTest.kt +++ b/plugins/advisors/oss-index/src/test/kotlin/OssIndexTest.kt @@ -32,6 +32,7 @@ import io.kotest.inspectors.forAll import io.kotest.matchers.collections.beEmpty import io.kotest.matchers.collections.containExactly import io.kotest.matchers.collections.shouldHaveSingleElement +import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.should import io.kotest.matchers.shouldBe @@ -46,7 +47,6 @@ import org.ossreviewtoolkit.model.utils.toPurl import org.ossreviewtoolkit.model.vulnerabilities.Vulnerability import org.ossreviewtoolkit.model.vulnerabilities.VulnerabilityReference import org.ossreviewtoolkit.utils.common.enumSetOf -import org.ossreviewtoolkit.utils.test.shouldNotBeNull class OssIndexTest : WordSpec({ val server = WireMockServer( diff --git a/plugins/advisors/vulnerable-code/src/funTest/kotlin/VulnerableCodeFunTest.kt b/plugins/advisors/vulnerable-code/src/funTest/kotlin/VulnerableCodeFunTest.kt index 6f8fba0dba9a7..9ac91db07ced4 100644 --- a/plugins/advisors/vulnerable-code/src/funTest/kotlin/VulnerableCodeFunTest.kt +++ b/plugins/advisors/vulnerable-code/src/funTest/kotlin/VulnerableCodeFunTest.kt @@ -22,13 +22,13 @@ package org.ossreviewtoolkit.plugins.advisors.vulnerablecode import io.kotest.core.spec.style.WordSpec import io.kotest.matchers.collections.beEmpty import io.kotest.matchers.collections.shouldContainAll +import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.should import io.kotest.matchers.shouldBe import org.ossreviewtoolkit.model.Identifier import org.ossreviewtoolkit.model.Package import org.ossreviewtoolkit.model.utils.toPurl -import org.ossreviewtoolkit.utils.test.shouldNotBeNull class VulnerableCodeFunTest : WordSpec({ "Vulnerable Maven packages" should { diff --git a/plugins/advisors/vulnerable-code/src/test/kotlin/VulnerableCodeTest.kt b/plugins/advisors/vulnerable-code/src/test/kotlin/VulnerableCodeTest.kt index f1387c428748f..c870d30006bba 100644 --- a/plugins/advisors/vulnerable-code/src/test/kotlin/VulnerableCodeTest.kt +++ b/plugins/advisors/vulnerable-code/src/test/kotlin/VulnerableCodeTest.kt @@ -33,6 +33,7 @@ import io.kotest.matchers.collections.containExactly import io.kotest.matchers.collections.containExactlyInAnyOrder import io.kotest.matchers.collections.shouldHaveSize import io.kotest.matchers.maps.shouldNotBeEmpty +import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.should import io.kotest.matchers.shouldBe @@ -50,7 +51,6 @@ import org.ossreviewtoolkit.model.utils.toPurl import org.ossreviewtoolkit.model.vulnerabilities.Vulnerability import org.ossreviewtoolkit.model.vulnerabilities.VulnerabilityReference import org.ossreviewtoolkit.utils.common.enumSetOf -import org.ossreviewtoolkit.utils.test.shouldNotBeNull class VulnerableCodeTest : WordSpec({ val server = WireMockServer( diff --git a/plugins/package-managers/bazel/src/test/kotlin/StarlarkParserTest.kt b/plugins/package-managers/bazel/src/test/kotlin/StarlarkParserTest.kt index 52bc4862a313d..ebdb17634a590 100644 --- a/plugins/package-managers/bazel/src/test/kotlin/StarlarkParserTest.kt +++ b/plugins/package-managers/bazel/src/test/kotlin/StarlarkParserTest.kt @@ -22,10 +22,9 @@ package org.ossreviewtoolkit.plugins.packagemanagers.bazel import io.kotest.core.spec.style.WordSpec import io.kotest.matchers.collections.shouldContainExactly import io.kotest.matchers.collections.shouldHaveSize +import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.shouldBe -import org.ossreviewtoolkit.utils.test.shouldNotBeNull - class StarlarkParserTest : WordSpec({ "Lexer" should { "produce tokens" { diff --git a/plugins/package-managers/gradle/src/test/kotlin/GradleDependencyHandlerTest.kt b/plugins/package-managers/gradle/src/test/kotlin/GradleDependencyHandlerTest.kt index d078003edadf4..b12914b2c36e7 100644 --- a/plugins/package-managers/gradle/src/test/kotlin/GradleDependencyHandlerTest.kt +++ b/plugins/package-managers/gradle/src/test/kotlin/GradleDependencyHandlerTest.kt @@ -29,6 +29,7 @@ import io.kotest.matchers.collections.haveSize import io.kotest.matchers.collections.shouldContainExactlyInAnyOrder import io.kotest.matchers.collections.shouldHaveSize import io.kotest.matchers.nulls.beNull +import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.should import io.kotest.matchers.shouldBe import io.kotest.matchers.string.contain @@ -57,7 +58,6 @@ import org.ossreviewtoolkit.model.Severity import org.ossreviewtoolkit.model.VcsInfo import org.ossreviewtoolkit.model.utils.DependencyGraphBuilder import org.ossreviewtoolkit.plugins.packagemanagers.maven.utils.MavenSupport -import org.ossreviewtoolkit.utils.test.shouldNotBeNull /** * A test class to test the integration of the [Gradle] package manager with [DependencyGraphBuilder]. This class diff --git a/plugins/package-managers/node/src/test/kotlin/utils/NpmDependencyHandlerTest.kt b/plugins/package-managers/node/src/test/kotlin/utils/NpmDependencyHandlerTest.kt index c8a180b8edbd5..934f3849c0066 100644 --- a/plugins/package-managers/node/src/test/kotlin/utils/NpmDependencyHandlerTest.kt +++ b/plugins/package-managers/node/src/test/kotlin/utils/NpmDependencyHandlerTest.kt @@ -21,6 +21,7 @@ package org.ossreviewtoolkit.plugins.packagemanagers.node.utils import io.kotest.core.spec.style.StringSpec import io.kotest.matchers.collections.containExactly +import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.should import io.kotest.matchers.shouldBe @@ -32,7 +33,6 @@ import org.ossreviewtoolkit.model.config.AnalyzerConfiguration import org.ossreviewtoolkit.model.config.RepositoryConfiguration import org.ossreviewtoolkit.plugins.packagemanagers.node.Npm import org.ossreviewtoolkit.utils.test.USER_DIR -import org.ossreviewtoolkit.utils.test.shouldNotBeNull class NpmDependencyHandlerTest : StringSpec({ "identifierFor extracts the correct identifier" { diff --git a/plugins/package-managers/node/src/test/kotlin/utils/NpmDetectionTest.kt b/plugins/package-managers/node/src/test/kotlin/utils/NpmDetectionTest.kt index 8e0f57889d53a..30bd763ded088 100644 --- a/plugins/package-managers/node/src/test/kotlin/utils/NpmDetectionTest.kt +++ b/plugins/package-managers/node/src/test/kotlin/utils/NpmDetectionTest.kt @@ -25,6 +25,7 @@ import io.kotest.inspectors.forAll import io.kotest.matchers.collections.shouldContainExactly import io.kotest.matchers.collections.shouldContainExactlyInAnyOrder import io.kotest.matchers.nulls.beNull +import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.should import io.kotest.matchers.shouldBe @@ -35,7 +36,6 @@ import org.ossreviewtoolkit.plugins.packagemanagers.node.utils.NodePackageManage import org.ossreviewtoolkit.plugins.packagemanagers.node.utils.NodePackageManager.YARN2 import org.ossreviewtoolkit.utils.common.withoutPrefix import org.ossreviewtoolkit.utils.test.getAssetFile -import org.ossreviewtoolkit.utils.test.shouldNotBeNull class NpmDetectionTest : WordSpec({ "All Node package manager detections" should { diff --git a/plugins/package-managers/pub/src/funTest/kotlin/PubFunTest.kt b/plugins/package-managers/pub/src/funTest/kotlin/PubFunTest.kt index b7b6f8236c5d3..f647479da9cca 100644 --- a/plugins/package-managers/pub/src/funTest/kotlin/PubFunTest.kt +++ b/plugins/package-managers/pub/src/funTest/kotlin/PubFunTest.kt @@ -22,6 +22,7 @@ package org.ossreviewtoolkit.plugins.packagemanagers.pub import io.kotest.core.spec.style.WordSpec import io.kotest.matchers.collections.beEmpty import io.kotest.matchers.collections.shouldHaveSize +import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.should import io.kotest.matchers.string.haveSubstring @@ -34,7 +35,6 @@ import org.ossreviewtoolkit.model.HashAlgorithm import org.ossreviewtoolkit.model.toYaml import org.ossreviewtoolkit.utils.test.getAssetFile import org.ossreviewtoolkit.utils.test.matchExpectedResult -import org.ossreviewtoolkit.utils.test.shouldNotBeNull class PubFunTest : WordSpec({ "Pub" should { @@ -69,7 +69,7 @@ class PubFunTest : WordSpec({ val ortResult = analyze(definitionFile.parentFile) - ortResult.analyzer.shouldNotBeNull { + ortResult.analyzer shouldNotBeNull { result.toYaml() should matchExpectedResult(expectedResultFile, definitionFile) } } @@ -84,7 +84,7 @@ class PubFunTest : WordSpec({ val ortResult = analyze(definitionFile.parentFile) - ortResult.analyzer.shouldNotBeNull { + ortResult.analyzer shouldNotBeNull { result.patchPackages().reduceToPubProjects().toYaml() should matchExpectedResult(expectedResultFile, definitionFile) } diff --git a/plugins/package-managers/spdx/src/funTest/kotlin/SpdxDocumentFileFunTest.kt b/plugins/package-managers/spdx/src/funTest/kotlin/SpdxDocumentFileFunTest.kt index af4529b3deb8f..8c2a44f3ba7fc 100644 --- a/plugins/package-managers/spdx/src/funTest/kotlin/SpdxDocumentFileFunTest.kt +++ b/plugins/package-managers/spdx/src/funTest/kotlin/SpdxDocumentFileFunTest.kt @@ -25,6 +25,7 @@ import io.kotest.matchers.collections.containExactlyInAnyOrder import io.kotest.matchers.collections.shouldContainExactlyInAnyOrder import io.kotest.matchers.collections.shouldHaveSize import io.kotest.matchers.maps.haveSize +import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.should import io.kotest.matchers.shouldBe @@ -42,7 +43,6 @@ import org.ossreviewtoolkit.model.toYaml import org.ossreviewtoolkit.utils.ort.normalizeVcsUrl import org.ossreviewtoolkit.utils.test.getAssetFile import org.ossreviewtoolkit.utils.test.matchExpectedResult -import org.ossreviewtoolkit.utils.test.shouldNotBeNull class SpdxDocumentFileFunTest : WordSpec({ "resolveDependencies()" should { @@ -202,7 +202,7 @@ class SpdxDocumentFileFunTest : WordSpec({ val ortResult = analyze(definitionFile.parentFile, allowDynamicVersions = true) - ortResult.analyzer.shouldNotBeNull { + ortResult.analyzer shouldNotBeNull { result.toYaml() should matchExpectedResult(expectedResultFile, definitionFile) } } diff --git a/plugins/package-managers/spdx/src/test/kotlin/utils/SpdxResolvedDocumentTest.kt b/plugins/package-managers/spdx/src/test/kotlin/utils/SpdxResolvedDocumentTest.kt index ab621fe88ebaf..9f92d897074e5 100644 --- a/plugins/package-managers/spdx/src/test/kotlin/utils/SpdxResolvedDocumentTest.kt +++ b/plugins/package-managers/spdx/src/test/kotlin/utils/SpdxResolvedDocumentTest.kt @@ -37,6 +37,7 @@ import io.kotest.matchers.collections.beEmpty import io.kotest.matchers.collections.containExactly import io.kotest.matchers.collections.containExactlyInAnyOrder import io.kotest.matchers.nulls.beNull +import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.should import io.kotest.matchers.shouldBe import io.kotest.matchers.string.contain @@ -55,7 +56,6 @@ import org.ossreviewtoolkit.utils.spdx.model.SpdxDocument import org.ossreviewtoolkit.utils.spdx.model.SpdxExternalDocumentReference import org.ossreviewtoolkit.utils.spdx.model.SpdxPackage import org.ossreviewtoolkit.utils.spdx.model.SpdxRelationship -import org.ossreviewtoolkit.utils.test.shouldNotBeNull class SpdxResolvedDocumentTest : WordSpec() { private lateinit var tempDir: File diff --git a/plugins/reporters/ctrlx/src/funTest/kotlin/CtrlXAutomationReporterFunTest.kt b/plugins/reporters/ctrlx/src/funTest/kotlin/CtrlXAutomationReporterFunTest.kt index 1108ca03da4ca..6bc320ed2029e 100644 --- a/plugins/reporters/ctrlx/src/funTest/kotlin/CtrlXAutomationReporterFunTest.kt +++ b/plugins/reporters/ctrlx/src/funTest/kotlin/CtrlXAutomationReporterFunTest.kt @@ -23,6 +23,7 @@ import io.kotest.core.spec.style.StringSpec import io.kotest.engine.spec.tempdir import io.kotest.matchers.collections.containExactly import io.kotest.matchers.collections.haveSize +import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.should import kotlinx.serialization.json.decodeFromStream @@ -31,7 +32,6 @@ import org.ossreviewtoolkit.plugins.reporters.ctrlx.CtrlXAutomationReporter.Comp import org.ossreviewtoolkit.reporter.ORT_RESULT import org.ossreviewtoolkit.reporter.ReporterInput import org.ossreviewtoolkit.utils.test.getAssetFile -import org.ossreviewtoolkit.utils.test.shouldNotBeNull class CtrlXAutomationReporterFunTest : StringSpec({ "The official sample file can be deserialized" { diff --git a/plugins/reporters/opossum/src/test/kotlin/OpossumReporterTest.kt b/plugins/reporters/opossum/src/test/kotlin/OpossumReporterTest.kt index 5ed74a07d5d46..2ef18843f3596 100644 --- a/plugins/reporters/opossum/src/test/kotlin/OpossumReporterTest.kt +++ b/plugins/reporters/opossum/src/test/kotlin/OpossumReporterTest.kt @@ -26,6 +26,7 @@ import io.kotest.matchers.collections.shouldContain import io.kotest.matchers.collections.shouldHaveSize import io.kotest.matchers.collections.shouldNotContain import io.kotest.matchers.nulls.beNull +import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.should import io.kotest.matchers.shouldBe import io.kotest.matchers.shouldNot @@ -60,7 +61,6 @@ import org.ossreviewtoolkit.model.config.ScopeExcludeReason import org.ossreviewtoolkit.reporter.ReporterInput import org.ossreviewtoolkit.utils.spdx.toSpdx import org.ossreviewtoolkit.utils.test.scannerRunOf -import org.ossreviewtoolkit.utils.test.shouldNotBeNull class OpossumReporterTest : WordSpec({ "resolvePath()" should { diff --git a/plugins/scanners/fossid/src/test/kotlin/FossIdLicenseMappingTest.kt b/plugins/scanners/fossid/src/test/kotlin/FossIdLicenseMappingTest.kt index f2d05dd10df5f..fad2efd29080a 100644 --- a/plugins/scanners/fossid/src/test/kotlin/FossIdLicenseMappingTest.kt +++ b/plugins/scanners/fossid/src/test/kotlin/FossIdLicenseMappingTest.kt @@ -22,6 +22,7 @@ package org.ossreviewtoolkit.plugins.scanners.fossid import io.kotest.core.spec.style.WordSpec import io.kotest.matchers.collections.beEmpty import io.kotest.matchers.collections.haveSize +import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.should import io.kotest.matchers.shouldBe import io.kotest.matchers.string.shouldStartWith @@ -35,7 +36,6 @@ import org.ossreviewtoolkit.model.Issue import org.ossreviewtoolkit.model.Severity import org.ossreviewtoolkit.utils.spdx.SpdxConstants import org.ossreviewtoolkit.utils.spdx.toSpdx -import org.ossreviewtoolkit.utils.test.shouldNotBeNull private const val FILE_PATH = "filePath" private const val FILE_PATH_SNIPPET = "filePathSnippet" diff --git a/plugins/scanners/fossid/src/test/kotlin/FossIdSnippetMappingTest.kt b/plugins/scanners/fossid/src/test/kotlin/FossIdSnippetMappingTest.kt index c4361f44707fe..eaf0a956ebd19 100644 --- a/plugins/scanners/fossid/src/test/kotlin/FossIdSnippetMappingTest.kt +++ b/plugins/scanners/fossid/src/test/kotlin/FossIdSnippetMappingTest.kt @@ -23,6 +23,7 @@ import io.kotest.core.spec.style.WordSpec import io.kotest.matchers.collections.beEmpty import io.kotest.matchers.collections.containExactly import io.kotest.matchers.collections.shouldHaveSize +import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.should import io.kotest.matchers.shouldBe @@ -34,7 +35,6 @@ import org.ossreviewtoolkit.clients.fossid.model.result.MatchedLines import org.ossreviewtoolkit.clients.fossid.model.result.Snippet import org.ossreviewtoolkit.model.Issue import org.ossreviewtoolkit.model.TextLocation -import org.ossreviewtoolkit.utils.test.shouldNotBeNull class FossIdSnippetMappingTest : WordSpec({ "mapSnippetFindings" should { diff --git a/plugins/scanners/fossid/src/test/kotlin/LegacyRulesTest.kt b/plugins/scanners/fossid/src/test/kotlin/LegacyRulesTest.kt index abc703ec9224c..b086b8405021a 100644 --- a/plugins/scanners/fossid/src/test/kotlin/LegacyRulesTest.kt +++ b/plugins/scanners/fossid/src/test/kotlin/LegacyRulesTest.kt @@ -22,6 +22,7 @@ package org.ossreviewtoolkit.plugins.scanners.fossid import io.kotest.core.spec.style.WordSpec import io.kotest.matchers.collections.beEmpty import io.kotest.matchers.collections.shouldHaveSize +import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.should import io.kotest.matchers.shouldBe @@ -29,7 +30,6 @@ import org.ossreviewtoolkit.clients.fossid.model.rules.IgnoreRule import org.ossreviewtoolkit.clients.fossid.model.rules.RuleType import org.ossreviewtoolkit.model.Issue import org.ossreviewtoolkit.model.Severity -import org.ossreviewtoolkit.utils.test.shouldNotBeNull class LegacyRulesTest : WordSpec({ "compareRules" should { @@ -46,7 +46,7 @@ class LegacyRulesTest : WordSpec({ val legacyRules = referenceRules.filterLegacyRules(rulesToTest, issues) issues shouldHaveSize 1 - issues.first().shouldNotBeNull { + issues.first() shouldNotBeNull { message shouldBe "Rule '.pdf' with type '${RuleType.EXTENSION}' is not present in the .ort.yml path" + " excludes. Add it to the .ort.yml file or remove it from the FossID scan." severity shouldBe Severity.HINT diff --git a/plugins/scanners/fossid/src/test/kotlin/MapIgnoreRulesTest.kt b/plugins/scanners/fossid/src/test/kotlin/MapIgnoreRulesTest.kt index bf0306aad3671..ed02f44f2ccf2 100644 --- a/plugins/scanners/fossid/src/test/kotlin/MapIgnoreRulesTest.kt +++ b/plugins/scanners/fossid/src/test/kotlin/MapIgnoreRulesTest.kt @@ -22,6 +22,7 @@ package org.ossreviewtoolkit.plugins.scanners.fossid import io.kotest.core.spec.style.WordSpec import io.kotest.matchers.collections.beEmpty import io.kotest.matchers.collections.shouldHaveSize +import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.should import io.kotest.matchers.shouldBe @@ -31,7 +32,6 @@ import org.ossreviewtoolkit.model.Severity import org.ossreviewtoolkit.model.config.Excludes import org.ossreviewtoolkit.model.config.PathExclude import org.ossreviewtoolkit.model.config.PathExcludeReason -import org.ossreviewtoolkit.utils.test.shouldNotBeNull class MapIgnoreRulesTest : WordSpec({ "convertRules" should { @@ -42,7 +42,7 @@ class MapIgnoreRulesTest : WordSpec({ val ignoreRules = convertRules(exclude, issues) ignoreRules shouldHaveSize 1 - ignoreRules.first().shouldNotBeNull { + ignoreRules.first() shouldNotBeNull { value shouldBe "directory/**" type shouldBe RuleType.DIRECTORY } @@ -57,7 +57,7 @@ class MapIgnoreRulesTest : WordSpec({ val ignoreRules = convertRules(exclude, issues) ignoreRules shouldHaveSize 1 - ignoreRules.first().shouldNotBeNull { + ignoreRules.first() shouldNotBeNull { value shouldBe "directory/sub1/sub2/**" type shouldBe RuleType.DIRECTORY } @@ -72,7 +72,7 @@ class MapIgnoreRulesTest : WordSpec({ val ignoreRules = convertRules(exclude, issues) ignoreRules shouldHaveSize 1 - ignoreRules.first().shouldNotBeNull { + ignoreRules.first() shouldNotBeNull { value shouldBe ".git" type shouldBe RuleType.DIRECTORY } @@ -85,7 +85,7 @@ class MapIgnoreRulesTest : WordSpec({ val ignoreRules = convertRules(exclude, issues) ignoreRules shouldHaveSize 1 - ignoreRules.first().shouldNotBeNull { + ignoreRules.first() shouldNotBeNull { value shouldBe "src/example.test/templates" type shouldBe RuleType.DIRECTORY } @@ -100,7 +100,7 @@ class MapIgnoreRulesTest : WordSpec({ val ignoreRules = convertRules(exclude, issues) ignoreRules shouldHaveSize 1 - ignoreRules.first().shouldNotBeNull { + ignoreRules.first() shouldNotBeNull { value shouldBe "test-prod" type shouldBe RuleType.DIRECTORY } @@ -113,7 +113,7 @@ class MapIgnoreRulesTest : WordSpec({ val ignoreRules = convertRules(exclude, issues) ignoreRules shouldHaveSize 1 - ignoreRules.first().shouldNotBeNull { + ignoreRules.first() shouldNotBeNull { value shouldBe "src/test-prod/templates" type shouldBe RuleType.DIRECTORY } @@ -128,7 +128,7 @@ class MapIgnoreRulesTest : WordSpec({ val ignoreRules = convertRules(exclude, issues) ignoreRules shouldHaveSize 1 - ignoreRules.first().shouldNotBeNull { + ignoreRules.first() shouldNotBeNull { value shouldBe "directory" type shouldBe RuleType.DIRECTORY } @@ -143,7 +143,7 @@ class MapIgnoreRulesTest : WordSpec({ val ignoreRules = convertRules(exclude, issues) ignoreRules shouldHaveSize 1 - ignoreRules.first().shouldNotBeNull { + ignoreRules.first() shouldNotBeNull { value shouldBe "directory/sub1/sub2" type shouldBe RuleType.DIRECTORY } @@ -158,7 +158,7 @@ class MapIgnoreRulesTest : WordSpec({ val ignoreRules = convertRules(exclude, issues) ignoreRules shouldHaveSize 1 - ignoreRules.first().shouldNotBeNull { + ignoreRules.first() shouldNotBeNull { value shouldBe ".pdf" type shouldBe RuleType.EXTENSION } @@ -173,7 +173,7 @@ class MapIgnoreRulesTest : WordSpec({ val ignoreRules = convertRules(exclude, issues) ignoreRules shouldHaveSize 1 - ignoreRules.first().shouldNotBeNull { + ignoreRules.first() shouldNotBeNull { value shouldBe "file.txt" type shouldBe RuleType.FILE } @@ -188,7 +188,7 @@ class MapIgnoreRulesTest : WordSpec({ val ignoreRules = convertRules(exclude, issues) ignoreRules shouldHaveSize 1 - ignoreRules.first().shouldNotBeNull { + ignoreRules.first() shouldNotBeNull { value shouldBe "file.old.txt" type shouldBe RuleType.FILE } @@ -203,7 +203,7 @@ class MapIgnoreRulesTest : WordSpec({ val ignoreRules = convertRules(exclude, issues) ignoreRules shouldHaveSize 1 - ignoreRules.first().shouldNotBeNull { + ignoreRules.first() shouldNotBeNull { value shouldBe "package-lock.json" type shouldBe RuleType.FILE } @@ -220,7 +220,7 @@ class MapIgnoreRulesTest : WordSpec({ ignoreRules should beEmpty() issues shouldHaveSize 1 - issues.first().shouldNotBeNull { + issues.first() shouldNotBeNull { message shouldBe "Path exclude 'directory/**/test/*' cannot be converted to an ignore rule." severity shouldBe Severity.HINT } diff --git a/scanner/src/funTest/kotlin/scanners/MultipleScannersTest.kt b/scanner/src/funTest/kotlin/scanners/MultipleScannersTest.kt index 97af0a9753655..9ce557cd9a22c 100644 --- a/scanner/src/funTest/kotlin/scanners/MultipleScannersTest.kt +++ b/scanner/src/funTest/kotlin/scanners/MultipleScannersTest.kt @@ -21,6 +21,7 @@ package org.ossreviewtoolkit.scanner.scanners import io.kotest.core.spec.style.WordSpec import io.kotest.matchers.collections.containExactly +import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.should import org.ossreviewtoolkit.model.AnalyzerResult @@ -32,7 +33,6 @@ import org.ossreviewtoolkit.model.PackageType import org.ossreviewtoolkit.model.Project import org.ossreviewtoolkit.model.VcsInfo import org.ossreviewtoolkit.model.VcsType -import org.ossreviewtoolkit.utils.test.shouldNotBeNull private val PROJECT_ID = Identifier("Dummy", "", "project", "1.0.0") private val PACKAGE_ID = Identifier("Dummy", "", "pkg1", "1.0.0") @@ -48,7 +48,7 @@ class MultipleScannersTest : WordSpec({ val ortResult = createScanner(scannerWrappers).scan(analyzerResult, skipExcluded = false, emptyMap()) "return scan results with non-overlapping scanners" { - ortResult.scanner.shouldNotBeNull { + ortResult.scanner shouldNotBeNull { val results = getScanResults(PROJECT_ID) results.map { it.scanner.name }.toSet() should containExactly("Dummy2") val results2 = getScanResults(PACKAGE_ID) diff --git a/scanner/src/test/kotlin/ScannerTest.kt b/scanner/src/test/kotlin/ScannerTest.kt index 89c8becd9bca0..6b22bbbf50f43 100644 --- a/scanner/src/test/kotlin/ScannerTest.kt +++ b/scanner/src/test/kotlin/ScannerTest.kt @@ -24,6 +24,7 @@ import io.kotest.core.spec.style.WordSpec import io.kotest.matchers.collections.beEmpty import io.kotest.matchers.maps.beEmpty as beEmptyMap import io.kotest.matchers.maps.containExactly +import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.should import io.kotest.matchers.shouldBe import io.kotest.matchers.shouldNot @@ -65,7 +66,6 @@ import org.ossreviewtoolkit.scanner.provenance.NestedProvenanceScanResult import org.ossreviewtoolkit.scanner.provenance.PackageProvenanceResolver import org.ossreviewtoolkit.scanner.provenance.ProvenanceDownloader import org.ossreviewtoolkit.utils.ort.createOrtTempDir -import org.ossreviewtoolkit.utils.test.shouldNotBeNull @Suppress("LargeClass") class ScannerTest : WordSpec({ diff --git a/utils/common/src/test/kotlin/ExtensionsTest.kt b/utils/common/src/test/kotlin/ExtensionsTest.kt index d0fc507dd70ba..3be8997099b7a 100644 --- a/utils/common/src/test/kotlin/ExtensionsTest.kt +++ b/utils/common/src/test/kotlin/ExtensionsTest.kt @@ -32,6 +32,7 @@ import io.kotest.matchers.file.aDirectory import io.kotest.matchers.file.aFile import io.kotest.matchers.file.exist import io.kotest.matchers.maps.containExactly +import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.should import io.kotest.matchers.shouldBe import io.kotest.matchers.shouldNot @@ -44,8 +45,6 @@ import java.net.URLDecoder import java.time.DayOfWeek import java.util.Locale -import org.ossreviewtoolkit.utils.test.shouldNotBeNull - class ExtensionsTest : WordSpec({ "ByteArray.toHexString()" should { "correctly convert a byte array to a string of hexadecimal digits" { diff --git a/utils/common/src/test/kotlin/OsTest.kt b/utils/common/src/test/kotlin/OsTest.kt index b5178d0ec8eac..a9fbf679aafb2 100644 --- a/utils/common/src/test/kotlin/OsTest.kt +++ b/utils/common/src/test/kotlin/OsTest.kt @@ -22,6 +22,7 @@ package org.ossreviewtoolkit.utils.common import io.kotest.core.spec.style.WordSpec import io.kotest.matchers.collections.shouldBeIn import io.kotest.matchers.nulls.beNull +import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.should import io.kotest.matchers.shouldBe import io.kotest.matchers.shouldNot @@ -29,7 +30,6 @@ import io.kotest.matchers.shouldNot import java.io.File import org.ossreviewtoolkit.utils.common.Os.getPathFromEnvironment -import org.ossreviewtoolkit.utils.test.shouldNotBeNull class OsTest : WordSpec({ "getPathFromEnvironment" should { diff --git a/utils/ort/src/test/kotlin/DeclaredLicenseProcessorTest.kt b/utils/ort/src/test/kotlin/DeclaredLicenseProcessorTest.kt index a787f80e8caa4..bd980b4501d66 100644 --- a/utils/ort/src/test/kotlin/DeclaredLicenseProcessorTest.kt +++ b/utils/ort/src/test/kotlin/DeclaredLicenseProcessorTest.kt @@ -29,6 +29,7 @@ import io.kotest.matchers.maps.beEmpty as beEmptyMap import io.kotest.matchers.maps.containExactly as containExactlyEntries import io.kotest.matchers.maps.shouldContainExactly import io.kotest.matchers.nulls.beNull +import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.should import io.kotest.matchers.shouldBe import io.kotest.matchers.shouldNotBe @@ -42,7 +43,6 @@ import org.ossreviewtoolkit.utils.spdx.SpdxLicenseIdExpression import org.ossreviewtoolkit.utils.spdx.SpdxSimpleLicenseMapping import org.ossreviewtoolkit.utils.spdx.toExpression import org.ossreviewtoolkit.utils.spdx.toSpdx -import org.ossreviewtoolkit.utils.test.shouldNotBeNull class DeclaredLicenseProcessorTest : StringSpec() { /** diff --git a/utils/ort/src/test/kotlin/EnvVarAuthenticatorTest.kt b/utils/ort/src/test/kotlin/EnvVarAuthenticatorTest.kt index 5da1fb4375f78..0c9c18b9b5e15 100644 --- a/utils/ort/src/test/kotlin/EnvVarAuthenticatorTest.kt +++ b/utils/ort/src/test/kotlin/EnvVarAuthenticatorTest.kt @@ -21,12 +21,12 @@ package org.ossreviewtoolkit.utils.ort import io.kotest.core.spec.style.StringSpec import io.kotest.matchers.nulls.beNull +import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.should import io.kotest.matchers.shouldBe import org.ossreviewtoolkit.utils.ort.EnvVarAuthenticator.Companion.ORT_HTTP_PASSWORD_ENV_NAME import org.ossreviewtoolkit.utils.ort.EnvVarAuthenticator.Companion.ORT_HTTP_USERNAME_ENV_NAME -import org.ossreviewtoolkit.utils.test.shouldNotBeNull class EnvVarAuthenticatorTest : StringSpec({ "Setting the username alone does not return authentication" { diff --git a/utils/ort/src/test/kotlin/NetRcAuthenticatorTest.kt b/utils/ort/src/test/kotlin/NetRcAuthenticatorTest.kt index 6a973ca2d9811..589d45d82069e 100644 --- a/utils/ort/src/test/kotlin/NetRcAuthenticatorTest.kt +++ b/utils/ort/src/test/kotlin/NetRcAuthenticatorTest.kt @@ -21,11 +21,10 @@ package org.ossreviewtoolkit.utils.ort import io.kotest.core.spec.style.WordSpec import io.kotest.matchers.nulls.beNull +import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.should import io.kotest.matchers.shouldBe -import org.ossreviewtoolkit.utils.test.shouldNotBeNull - class NetRcAuthenticatorTest : WordSpec({ "getNetrcAuthentication()" should { "correctly parse single-line contents" { diff --git a/utils/ort/src/test/kotlin/UtilsTest.kt b/utils/ort/src/test/kotlin/UtilsTest.kt index 223ad6047b252..e76a97ea0c1eb 100644 --- a/utils/ort/src/test/kotlin/UtilsTest.kt +++ b/utils/ort/src/test/kotlin/UtilsTest.kt @@ -24,6 +24,7 @@ import io.kotest.inspectors.forAll import io.kotest.matchers.collections.beEmpty import io.kotest.matchers.collections.shouldContainExactly import io.kotest.matchers.collections.shouldHaveSingleElement +import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.should import io.kotest.matchers.shouldBe @@ -39,8 +40,6 @@ import java.net.PasswordAuthentication import java.net.URI import java.nio.file.Paths -import org.ossreviewtoolkit.utils.test.shouldNotBeNull - class UtilsTest : WordSpec({ "filterVersionNames" should { "return an empty list for a blank version" { diff --git a/utils/spdx/src/test/kotlin/SpdxLicenseTest.kt b/utils/spdx/src/test/kotlin/SpdxLicenseTest.kt index c19d6631f63e4..95089af176f4a 100644 --- a/utils/spdx/src/test/kotlin/SpdxLicenseTest.kt +++ b/utils/spdx/src/test/kotlin/SpdxLicenseTest.kt @@ -20,13 +20,12 @@ package org.ossreviewtoolkit.utils.spdx import io.kotest.core.spec.style.WordSpec +import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.shouldBe import io.kotest.matchers.string.shouldContain import io.kotest.matchers.string.shouldEndWith import io.kotest.matchers.string.shouldStartWith -import org.ossreviewtoolkit.utils.test.shouldNotBeNull - class SpdxLicenseTest : WordSpec({ "The license lookup" should { "work by SPDX id" { diff --git a/utils/test/src/main/kotlin/Extensions.kt b/utils/test/src/main/kotlin/Extensions.kt index d6a8ea7bfd4df..8e6d1f7cf11e8 100644 --- a/utils/test/src/main/kotlin/Extensions.kt +++ b/utils/test/src/main/kotlin/Extensions.kt @@ -19,19 +19,12 @@ package org.ossreviewtoolkit.utils.test -import io.kotest.matchers.nulls.shouldNotBeNull - import org.ossreviewtoolkit.model.config.FileArchiverConfiguration import org.ossreviewtoolkit.model.config.LicenseFilePatterns import org.ossreviewtoolkit.model.utils.FileArchiver import org.ossreviewtoolkit.model.utils.FileProvenanceFileStorage import org.ossreviewtoolkit.utils.ort.storage.LocalFileStorage -infix fun T?.shouldNotBeNull(block: T.() -> Unit) { - this.shouldNotBeNull() - block() -} - fun FileArchiver.Companion.createDefault() = FileArchiver( patterns = LicenseFilePatterns.DEFAULT.allLicenseFilenames.map { "**/$it" },