diff --git a/evaluator/src/test/kotlin/ProjectSourceRuleTest.kt b/evaluator/src/test/kotlin/ProjectSourceRuleTest.kt index b9bc6cdde78a8..2182be2bc634c 100644 --- a/evaluator/src/test/kotlin/ProjectSourceRuleTest.kt +++ b/evaluator/src/test/kotlin/ProjectSourceRuleTest.kt @@ -23,7 +23,6 @@ import io.kotest.core.spec.style.WordSpec import io.kotest.matchers.shouldBe import java.io.File -import java.time.Instant import org.ossreviewtoolkit.model.AccessStatistics import org.ossreviewtoolkit.model.AnalyzerResult @@ -227,11 +226,8 @@ private fun createOrtResult( ScanResult( provenance = RepositoryProvenance(vcsInfo, vcsInfo.revision), scanner = ScannerDetails.EMPTY, - summary = ScanSummary( + summary = ScanSummary.EMPTY.copy( licenseFindings = licenseFindings, - copyrightFindings = sortedSetOf(), - startTime = Instant.EPOCH, - endTime = Instant.EPOCH, packageVerificationCode = "0000000000000000000000000000000000000000" ) ) diff --git a/evaluator/src/test/kotlin/TestData.kt b/evaluator/src/test/kotlin/TestData.kt index 772b3e930c2bf..0103621b89418 100644 --- a/evaluator/src/test/kotlin/TestData.kt +++ b/evaluator/src/test/kotlin/TestData.kt @@ -265,15 +265,11 @@ val ortResult = OrtResult( ScanResult( provenance = UnknownProvenance, scanner = ScannerDetails.EMPTY, - summary = ScanSummary( - startTime = Instant.EPOCH, - endTime = Instant.EPOCH, - packageVerificationCode = "", + summary = ScanSummary.EMPTY.copy( licenseFindings = sortedSetOf( LicenseFinding("LicenseRef-a", TextLocation("LICENSE", 1)), LicenseFinding("LicenseRef-b", TextLocation("LICENSE", 2)) - ), - copyrightFindings = sortedSetOf() + ) ) ) ) diff --git a/model/src/test/kotlin/licenses/TestData.kt b/model/src/test/kotlin/licenses/TestData.kt index 543feec336174..41230bf5b3445 100644 --- a/model/src/test/kotlin/licenses/TestData.kt +++ b/model/src/test/kotlin/licenses/TestData.kt @@ -19,8 +19,6 @@ package org.ossreviewtoolkit.model.licenses -import java.time.Instant - import org.ossreviewtoolkit.model.AccessStatistics import org.ossreviewtoolkit.model.AnalyzerResult import org.ossreviewtoolkit.model.AnalyzerRun @@ -149,12 +147,8 @@ val scanResults = listOf( ScanResult( provenance = provenance, scanner = ScannerDetails.EMPTY, - summary = ScanSummary( - startTime = Instant.EPOCH, - endTime = Instant.EPOCH, - packageVerificationCode = "", + summary = ScanSummary.EMPTY.copy( licenseFindings = licenseFindings, - copyrightFindings = sortedSetOf() ) ) ) diff --git a/reporter/src/funTest/kotlin/TestData.kt b/reporter/src/funTest/kotlin/TestData.kt index d51874f5bf808..0cc8a890f2611 100644 --- a/reporter/src/funTest/kotlin/TestData.kt +++ b/reporter/src/funTest/kotlin/TestData.kt @@ -240,10 +240,7 @@ val ORT_RESULT = OrtResult( ScanResult( provenance = UnknownProvenance, scanner = ScannerDetails(name = "scanner", version = "1.0", configuration = ""), - summary = ScanSummary( - startTime = Instant.EPOCH, - endTime = Instant.EPOCH, - packageVerificationCode = "", + summary = ScanSummary.EMPTY.copy( licenseFindings = sortedSetOf( LicenseFinding( license = "MIT", @@ -263,23 +260,14 @@ val ORT_RESULT = OrtResult( ScanResult( provenance = UnknownProvenance, scanner = ScannerDetails(name = "scanner", version = "1.0", configuration = ""), - summary = ScanSummary( - startTime = Instant.EPOCH, - endTime = Instant.EPOCH, - packageVerificationCode = "", - licenseFindings = sortedSetOf(), - copyrightFindings = sortedSetOf() - ) + summary = ScanSummary.EMPTY ) ), Identifier("NPM:@ort:no-license-file:1.0") to listOf( ScanResult( provenance = UnknownProvenance, scanner = ScannerDetails(name = "scanner", version = "1.0", configuration = ""), - summary = ScanSummary( - startTime = Instant.EPOCH, - endTime = Instant.EPOCH, - packageVerificationCode = "", + summary = ScanSummary.EMPTY.copy( licenseFindings = sortedSetOf( LicenseFinding( license = "MIT", @@ -304,10 +292,7 @@ val ORT_RESULT = OrtResult( ) ), scanner = ScannerDetails(name = "scanner", version = "1.0", configuration = ""), - summary = ScanSummary( - startTime = Instant.EPOCH, - endTime = Instant.EPOCH, - packageVerificationCode = "", + summary = ScanSummary.EMPTY.copy( licenseFindings = sortedSetOf( LicenseFinding( license = "MIT", @@ -340,10 +325,7 @@ val ORT_RESULT = OrtResult( ) ), scanner = ScannerDetails(name = "scanner", version = "1.0", configuration = ""), - summary = ScanSummary( - startTime = Instant.EPOCH, - endTime = Instant.EPOCH, - packageVerificationCode = "", + summary = ScanSummary.EMPTY.copy( licenseFindings = sortedSetOf( LicenseFinding( license = "MIT", @@ -384,10 +366,7 @@ val ORT_RESULT = OrtResult( ) ), scanner = ScannerDetails(name = "scanner", version = "1.0", configuration = ""), - summary = ScanSummary( - startTime = Instant.EPOCH, - endTime = Instant.EPOCH, - packageVerificationCode = "", + summary = ScanSummary.EMPTY.copy( licenseFindings = sortedSetOf( LicenseFinding( license = "MIT", @@ -420,10 +399,7 @@ val ORT_RESULT = OrtResult( ) ), scanner = ScannerDetails(name = "scanner", version = "1.0", configuration = ""), - summary = ScanSummary( - startTime = Instant.EPOCH, - endTime = Instant.EPOCH, - packageVerificationCode = "", + summary = ScanSummary.EMPTY.copy( licenseFindings = sortedSetOf( LicenseFinding( license = "BSD-3-Clause", diff --git a/reporter/src/funTest/kotlin/reporters/spdx/SpdxDocumentReporterFunTest.kt b/reporter/src/funTest/kotlin/reporters/spdx/SpdxDocumentReporterFunTest.kt index d3c4cd0048e56..10aaf49879e65 100644 --- a/reporter/src/funTest/kotlin/reporters/spdx/SpdxDocumentReporterFunTest.kt +++ b/reporter/src/funTest/kotlin/reporters/spdx/SpdxDocumentReporterFunTest.kt @@ -29,7 +29,6 @@ import io.kotest.matchers.should import io.kotest.matchers.shouldBe import java.io.File -import java.time.Instant import org.ossreviewtoolkit.model.AccessStatistics import org.ossreviewtoolkit.model.AnalyzerResult @@ -298,9 +297,7 @@ private val ortResult = OrtResult( ) ), scanner = ScannerDetails.EMPTY, - summary = ScanSummary( - startTime = Instant.EPOCH, - endTime = Instant.EPOCH, + summary = ScanSummary.EMPTY.copy( packageVerificationCode = "0000000000000000000000000000000000000000", licenseFindings = sortedSetOf( LicenseFinding( @@ -331,9 +328,7 @@ private val ortResult = OrtResult( resolvedRevision = "deadbeef" ), scanner = ScannerDetails.EMPTY, - summary = ScanSummary( - startTime = Instant.EPOCH, - endTime = Instant.EPOCH, + summary = ScanSummary.EMPTY.copy( packageVerificationCode = "0000000000000000000000000000000000000000", licenseFindings = sortedSetOf( LicenseFinding( diff --git a/reporter/src/test/kotlin/reporters/OpossumReporterTest.kt b/reporter/src/test/kotlin/reporters/OpossumReporterTest.kt index a2bb286a7f752..7cc542eba2c70 100644 --- a/reporter/src/test/kotlin/reporters/OpossumReporterTest.kt +++ b/reporter/src/test/kotlin/reporters/OpossumReporterTest.kt @@ -482,9 +482,7 @@ private fun createOrtResult(): OrtResult { version = "1.2.3", configuration = "configuration" ), - summary = ScanSummary( - startTime = Instant.EPOCH, - endTime = Instant.EPOCH, + summary = ScanSummary.EMPTY.copy( packageVerificationCode = "0000000000000000000000000000000000000000", licenseFindings = sortedSetOf( LicenseFinding( @@ -519,7 +517,7 @@ private fun createOrtResult(): OrtResult { version = "1.2.3", configuration = "otherConfiguration" ), - summary = ScanSummary( + summary = ScanSummary.EMPTY.copy( startTime = Instant.EPOCH, endTime = Instant.EPOCH, packageVerificationCode = "0000000000000000000000000000000000000000", diff --git a/reporter/src/test/kotlin/reporters/fossid/FossIdReporterTest.kt b/reporter/src/test/kotlin/reporters/fossid/FossIdReporterTest.kt index 338a442501354..b4d2cdb9f5618 100644 --- a/reporter/src/test/kotlin/reporters/fossid/FossIdReporterTest.kt +++ b/reporter/src/test/kotlin/reporters/fossid/FossIdReporterTest.kt @@ -35,7 +35,6 @@ import io.mockk.mockkStatic import io.mockk.spyk import java.io.File -import java.time.Instant import org.ossreviewtoolkit.clients.fossid.FossIdRestService import org.ossreviewtoolkit.clients.fossid.FossIdServiceWithVersion @@ -290,8 +289,6 @@ private fun createScanResult(scanCode: String): ScanResult = ScanResult( provenance = UnknownProvenance, scanner = ScannerDetails.EMPTY, - summary = ScanSummary( - Instant.now(), Instant.now(), "", sortedSetOf(), sortedSetOf() - ), + summary = ScanSummary.EMPTY, additionalData = mapOf(FossIdReporter.SCAN_CODE_KEY to scanCode) ) diff --git a/reporter/src/test/kotlin/reporters/freemarker/FreeMarkerTemplateProcessorTest.kt b/reporter/src/test/kotlin/reporters/freemarker/FreeMarkerTemplateProcessorTest.kt index ffa027877a0cc..3102d98352006 100644 --- a/reporter/src/test/kotlin/reporters/freemarker/FreeMarkerTemplateProcessorTest.kt +++ b/reporter/src/test/kotlin/reporters/freemarker/FreeMarkerTemplateProcessorTest.kt @@ -93,10 +93,7 @@ private fun scanResults( ScanResult( provenance = RepositoryProvenance(vcsInfo = vcsInfo, resolvedRevision = vcsInfo.revision), scanner = ScannerDetails(name = "scanner", version = "1.0", configuration = ""), - summary = ScanSummary( - startTime = Instant.EPOCH, - endTime = Instant.EPOCH, - packageVerificationCode = "", + summary = ScanSummary.EMPTY.copy( licenseFindings = licenseFindings, copyrightFindings = copyrightFindings, ) diff --git a/scanner/src/funTest/kotlin/scanners/ScannerIntegrationFunTest.kt b/scanner/src/funTest/kotlin/scanners/ScannerIntegrationFunTest.kt index fab4be0059c2b..35905c8798ee1 100644 --- a/scanner/src/funTest/kotlin/scanners/ScannerIntegrationFunTest.kt +++ b/scanner/src/funTest/kotlin/scanners/ScannerIntegrationFunTest.kt @@ -23,7 +23,6 @@ import io.kotest.core.spec.style.StringSpec import io.kotest.matchers.shouldBe import java.io.File -import java.time.Instant import org.ossreviewtoolkit.model.LicenseFinding import org.ossreviewtoolkit.model.PackageType @@ -104,13 +103,8 @@ class ScannerIntegrationFunTest : StringSpec() { ) } - return ScanSummary( - startTime = Instant.EPOCH, - endTime = Instant.EPOCH, - packageVerificationCode = "", - licenseFindings = licenseFindings, - copyrightFindings = sortedSetOf(), - issues = mutableListOf() + return ScanSummary.EMPTY.copy( + licenseFindings = licenseFindings ) } } diff --git a/scanner/src/funTest/kotlin/storages/AbstractProvenanceBasedStorageFunTest.kt b/scanner/src/funTest/kotlin/storages/AbstractProvenanceBasedStorageFunTest.kt index 22b2529213119..1b56e912ebc1c 100644 --- a/scanner/src/funTest/kotlin/storages/AbstractProvenanceBasedStorageFunTest.kt +++ b/scanner/src/funTest/kotlin/storages/AbstractProvenanceBasedStorageFunTest.kt @@ -28,8 +28,6 @@ import io.kotest.matchers.collections.containExactly import io.kotest.matchers.collections.containExactlyInAnyOrder import io.kotest.matchers.should -import java.time.Instant - import org.ossreviewtoolkit.model.ArtifactProvenance import org.ossreviewtoolkit.model.Hash import org.ossreviewtoolkit.model.HashAlgorithm @@ -226,13 +224,9 @@ private fun createScanResult( ScanResult( provenance, scannerDetails, - ScanSummary( - startTime = Instant.EPOCH, - endTime = Instant.EPOCH, - packageVerificationCode = "", + ScanSummary.EMPTY.copy( licenseFindings = sortedSetOf( LicenseFinding(license, TextLocation("file.txt", 1, 2)) - ), - copyrightFindings = sortedSetOf() + ) ) ) diff --git a/scanner/src/funTest/kotlin/storages/AbstractStorageFunTest.kt b/scanner/src/funTest/kotlin/storages/AbstractStorageFunTest.kt index b9c7bbf387267..dea2c15569ebc 100644 --- a/scanner/src/funTest/kotlin/storages/AbstractStorageFunTest.kt +++ b/scanner/src/funTest/kotlin/storages/AbstractStorageFunTest.kt @@ -99,7 +99,7 @@ abstract class AbstractStorageFunTest(vararg listeners: TestListener) : WordSpec private val scannerCriteriaForDetails1 = ScannerCriteria.forDetails(scannerDetails1, Semver.VersionDiff.PATCH) - private val scanSummaryWithFiles = ScanSummary( + private val scanSummaryWithFiles = ScanSummary.EMPTY.copy( startTime = Instant.EPOCH + Duration.ofMinutes(1), endTime = Instant.EPOCH + Duration.ofMinutes(2), packageVerificationCode = "packageVerificationCode", @@ -107,7 +107,6 @@ abstract class AbstractStorageFunTest(vararg listeners: TestListener) : WordSpec LicenseFinding("license-1.1", DUMMY_TEXT_LOCATION), LicenseFinding("license-1.2", DUMMY_TEXT_LOCATION) ), - copyrightFindings = sortedSetOf(), issues = mutableListOf( OrtIssue(source = "source-1", message = "error-1"), OrtIssue(source = "source-2", message = "error-2") diff --git a/scanner/src/funTest/kotlin/storages/ClearlyDefinedStorageFunTest.kt b/scanner/src/funTest/kotlin/storages/ClearlyDefinedStorageFunTest.kt index 32813548a6bef..3c8038b02898c 100644 --- a/scanner/src/funTest/kotlin/storages/ClearlyDefinedStorageFunTest.kt +++ b/scanner/src/funTest/kotlin/storages/ClearlyDefinedStorageFunTest.kt @@ -70,7 +70,7 @@ class ClearlyDefinedStorageFunTest : StringSpec({ "--package true --processes 2 --strip-root true --summary true --summary-key-files true " + "--timeout 1000.0 --url true" ), - summary = ScanSummary( + summary = ScanSummary.EMPTY.copy( startTime = Instant.parse("2020-02-14T00:36:14.000335513Z"), endTime = Instant.parse("2020-02-14T00:36:37.000492119Z"), packageVerificationCode = SpdxConstants.NONE, @@ -84,9 +84,7 @@ class ClearlyDefinedStorageFunTest : StringSpec({ ), score = 60.87f ) - ), - copyrightFindings = sortedSetOf(), - issues = emptyList() + ) ) ) } @@ -115,13 +113,10 @@ class ClearlyDefinedStorageFunTest : StringSpec({ "--license-text-diagnostics true --package true --processes 2 --strip-root true " + "--summary true --summary-key-files true --timeout 1000.0 --url true" ), - summary = ScanSummary( + summary = ScanSummary.EMPTY.copy( startTime = Instant.parse("2022-05-02T07:34:28.000784295Z"), endTime = Instant.parse("2022-05-02T07:34:59.000958218Z"), - packageVerificationCode = SpdxConstants.NONE, - licenseFindings = sortedSetOf(), - copyrightFindings = sortedSetOf(), - issues = emptyList() + packageVerificationCode = SpdxConstants.NONE ) ) } diff --git a/scanner/src/test/kotlin/ScannerTest.kt b/scanner/src/test/kotlin/ScannerTest.kt index 45744b25a28fa..a04f8d908e7d0 100644 --- a/scanner/src/test/kotlin/ScannerTest.kt +++ b/scanner/src/test/kotlin/ScannerTest.kt @@ -35,7 +35,6 @@ import io.mockk.verify import java.io.File import java.io.IOException -import java.time.Instant import java.util.SortedSet import org.ossreviewtoolkit.model.ArtifactProvenance @@ -824,7 +823,7 @@ private class FakePathScannerWrapper : PathScannerWrapper { LicenseFinding("Apache-2.0", TextLocation(file.relativeTo(path).path, 1, 2)) }.toSortedSet() - return createScanSummary(licenseFindings = licenseFindings) + return ScanSummary.EMPTY.copy(licenseFindings = licenseFindings) } } @@ -963,9 +962,6 @@ private fun VcsInfo.Companion.valid() = revision = "f42e41a8fedc1e0acd78fab147e91fa047cb2853" ) -private fun createScanSummary(licenseFindings: Set = emptySet()) = - ScanSummary(Instant.EPOCH, Instant.EPOCH, "", licenseFindings.toSortedSet(), sortedSetOf()) - private fun createScanResult( provenance: Provenance, scannerDetails: ScannerDetails, @@ -976,7 +972,7 @@ private fun createScanResult( ScanResult( provenance, scannerDetails, - createScanSummary(licenseFindings) + ScanSummary.EMPTY.copy(licenseFindings = licenseFindings) ) private fun createNestedScanResult( @@ -995,7 +991,7 @@ private fun createStoredScanResult(provenance: Provenance, scannerDetails: Scann ScanResult( provenance, scannerDetails, - createScanSummary( + ScanSummary.EMPTY.copy( licenseFindings = sortedSetOf( LicenseFinding("Apache-2.0", TextLocation("storage.txt", 1, 2)) ) diff --git a/scanner/src/test/kotlin/provenance/NestedProvenanceScanResultTest.kt b/scanner/src/test/kotlin/provenance/NestedProvenanceScanResultTest.kt index ff231d030ca2a..729814184dd31 100644 --- a/scanner/src/test/kotlin/provenance/NestedProvenanceScanResultTest.kt +++ b/scanner/src/test/kotlin/provenance/NestedProvenanceScanResultTest.kt @@ -25,8 +25,6 @@ import io.kotest.matchers.collections.shouldContainExactlyInAnyOrder import io.kotest.matchers.collections.shouldNotContain import io.kotest.matchers.shouldBe -import java.time.Instant - import org.ossreviewtoolkit.model.CopyrightFinding import org.ossreviewtoolkit.model.LicenseFinding import org.ossreviewtoolkit.model.RepositoryProvenance @@ -118,12 +116,12 @@ private val scannerDetails = ScannerDetails(name = "scanner", version = "1.0.0", private val scanResultRoot = ScanResult( provenance = provenanceRoot, scanner = scannerDetails, - summary = createScanSummary( - licenseFindings = listOf( + summary = ScanSummary.EMPTY.copy( + licenseFindings = sortedSetOf( LicenseFinding("Apache-2.0", TextLocation("file", 1)), LicenseFinding("Apache-2.0", TextLocation("submodules/file", 1)) ), - copyrightFindings = listOf( + copyrightFindings = sortedSetOf( CopyrightFinding("Copyright", TextLocation("file", 1)), CopyrightFinding("Copyright", TextLocation("submodules/file", 1)) ) @@ -133,12 +131,12 @@ private val scanResultRoot = ScanResult( private val scanResultSubmoduleA = ScanResult( provenance = provenanceSubmoduleA, scanner = scannerDetails, - summary = createScanSummary( - licenseFindings = listOf( + summary = ScanSummary.EMPTY.copy( + licenseFindings = sortedSetOf( LicenseFinding("Apache-2.0", TextLocation("fileA", 1)), LicenseFinding("Apache-2.0", TextLocation("dir/fileA", 1)) ), - copyrightFindings = listOf( + copyrightFindings = sortedSetOf( CopyrightFinding("Copyright", TextLocation("fileA", 1)), CopyrightFinding("Copyright", TextLocation("dir/fileA", 1)) ) @@ -148,12 +146,12 @@ private val scanResultSubmoduleA = ScanResult( private val scanResultSubmoduleB = ScanResult( provenance = provenanceSubmoduleA, scanner = scannerDetails, - summary = createScanSummary( - licenseFindings = listOf( + summary = ScanSummary.EMPTY.copy( + licenseFindings = sortedSetOf( LicenseFinding("Apache-2.0", TextLocation("fileB", 1)), LicenseFinding("Apache-2.0", TextLocation("dir/fileB", 1)) ), - copyrightFindings = listOf( + copyrightFindings = sortedSetOf( CopyrightFinding("Copyright", TextLocation("fileB", 1)), CopyrightFinding("Copyright", TextLocation("dir/fileB", 1)) ) @@ -169,13 +167,4 @@ private val nestedProvenanceScanResult = NestedProvenanceScanResult( ) ) -private fun createScanSummary(licenseFindings: List, copyrightFindings: List) = - ScanSummary( - startTime = Instant.now(), - endTime = Instant.now(), - packageVerificationCode = "", - licenseFindings = licenseFindings.toSortedSet(), - copyrightFindings = copyrightFindings.toSortedSet() - ) - private fun NestedProvenance.getRepositoryUrls() = getProvenances().map { (it as RepositoryProvenance).vcsInfo.url } diff --git a/scanner/src/test/kotlin/storages/CompositeStorageTest.kt b/scanner/src/test/kotlin/storages/CompositeStorageTest.kt index 5f02a2e51d39f..45e82d5ee6ae8 100644 --- a/scanner/src/test/kotlin/storages/CompositeStorageTest.kt +++ b/scanner/src/test/kotlin/storages/CompositeStorageTest.kt @@ -32,8 +32,6 @@ import io.mockk.every import io.mockk.mockk import io.mockk.verify -import java.time.Instant - import org.ossreviewtoolkit.model.ArtifactProvenance import org.ossreviewtoolkit.model.Identifier import org.ossreviewtoolkit.model.LicenseFinding @@ -81,12 +79,9 @@ private fun licenseFinding(index: Int): LicenseFinding = */ private fun createScanResult(resultCount: Int): ScanResult { val licenseFindings = List(resultCount) { licenseFinding(it) } - val summary = ScanSummary( - startTime = Instant.now(), - endTime = Instant.now(), + val summary = ScanSummary.EMPTY.copy( packageVerificationCode = "test$resultCount", - licenseFindings = licenseFindings.toSortedSet(), - copyrightFindings = sortedSetOf() + licenseFindings = licenseFindings.toSortedSet() ) val provenance = ArtifactProvenance(sourceArtifact = RemoteArtifact.EMPTY) val scanner = ScannerDetails("scanner$resultCount", "v$resultCount", "testConfig")