test: Use realistic RemoteArtifact placeholder values

This avoids an error with upcoming hash sanity checks. Signed-off-by: Sebastian Schuberth <sebastian@doubleopen.org>
oss-review-toolkit · Jul 19, 2024 · 636411b · 636411b
1 parent 1ba1116
commit 636411b
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 deletions.
diff --git a/model/src/funTest/kotlin/utils/PostgresProvenanceFileStorageFunTest.kt b/model/src/funTest/kotlin/utils/PostgresProvenanceFileStorageFunTest.kt
@@ -35,7 +35,7 @@ import org.ossreviewtoolkit.model.VcsType
 import org.ossreviewtoolkit.model.config.FileArchiverConfiguration
 import org.ossreviewtoolkit.utils.test.PostgresListener
 
-private val SOURCE_ARTIFACT_PROVENANCE = ArtifactProvenance(sourceArtifact = RemoteArtifact("url", Hash.create("hash")))
+private val SOURCE_ARTIFACT_PROVENANCE = ArtifactProvenance(RemoteArtifact("https://example.com/", Hash.NONE))
 private val VCS_PROVENANCE = RepositoryProvenance(
     vcsInfo = VcsInfo(
         type = VcsType.GIT,

diff --git a/model/src/test/kotlin/licenses/LicenseInfoResolverTest.kt b/model/src/test/kotlin/licenses/LicenseInfoResolverTest.kt
@@ -39,7 +39,6 @@ import java.lang.IllegalArgumentException
 import org.ossreviewtoolkit.model.ArtifactProvenance
 import org.ossreviewtoolkit.model.CopyrightFinding
 import org.ossreviewtoolkit.model.Hash
-import org.ossreviewtoolkit.model.HashAlgorithm
 import org.ossreviewtoolkit.model.Identifier
 import org.ossreviewtoolkit.model.LicenseFinding
 import org.ossreviewtoolkit.model.LicenseSource
@@ -338,7 +337,7 @@ class LicenseInfoResolverTest : WordSpec({
         "apply path excludes" {
             val sourceArtifact = RemoteArtifact(
                 url = "https://example.com/",
-                hash = Hash("", HashAlgorithm.NONE)
+                hash = Hash.NONE
             )
             val sourceArtifactProvenance = ArtifactProvenance(
                 sourceArtifact = sourceArtifact

diff --git a/plugins/package-managers/pub/src/funTest/kotlin/PubFunTest.kt b/plugins/package-managers/pub/src/funTest/kotlin/PubFunTest.kt
@@ -31,7 +31,6 @@ import org.ossreviewtoolkit.analyzer.create
 import org.ossreviewtoolkit.analyzer.resolveSingleProject
 import org.ossreviewtoolkit.model.AnalyzerResult
 import org.ossreviewtoolkit.model.Hash
-import org.ossreviewtoolkit.model.HashAlgorithm
 import org.ossreviewtoolkit.model.toYaml
 import org.ossreviewtoolkit.utils.test.getAssetFile
 import org.ossreviewtoolkit.utils.test.matchExpectedResult
@@ -122,8 +121,8 @@ private fun AnalyzerResult.patchPackages(): AnalyzerResult {
         pkg.takeUnless { it.id.toCoordinates().startsWith("Maven:com.android.tools.build:aapt2:") }
             ?: pkg.copy(
                 binaryArtifact = pkg.binaryArtifact.copy(
-                    url = "***",
-                    hash = Hash("***", HashAlgorithm.SHA1)
+                    url = "https://example.com/",
+                    hash = Hash.NONE
                 )
             )
     }

diff --git a/reporter/src/testFixtures/kotlin/TestData.kt b/reporter/src/testFixtures/kotlin/TestData.kt
@@ -272,7 +272,7 @@ val ORT_RESULT = OrtResult(
                 provenance = ArtifactProvenance(
                     sourceArtifact = RemoteArtifact(
                         url = "https://example.com/license-file-1.0.tgz",
-                        hash = Hash(value = "", algorithm = HashAlgorithm.SHA1)
+                        hash = Hash.NONE
                     )
                 ),
                 scanner = ScannerDetails(name = "scanner", version = "1.0", configuration = ""),
@@ -305,7 +305,7 @@ val ORT_RESULT = OrtResult(
                 provenance = ArtifactProvenance(
                     sourceArtifact = RemoteArtifact(
                         url = "https://example.com/license-file-and-additional-licenses-1.0.tgz",
-                        hash = Hash(value = "", algorithm = HashAlgorithm.SHA1)
+                        hash = Hash.NONE
                     )
                 ),
                 scanner = ScannerDetails(name = "scanner", version = "1.0", configuration = ""),
@@ -346,7 +346,7 @@ val ORT_RESULT = OrtResult(
                 provenance = ArtifactProvenance(
                     sourceArtifact = RemoteArtifact(
                         url = "https://example.com/concluded-license-1.0.tgz",
-                        hash = Hash(value = "", algorithm = HashAlgorithm.SHA1)
+                        hash = Hash.NONE
                     )
                 ),
                 scanner = ScannerDetails(name = "scanner", version = "1.0", configuration = ""),
@@ -379,7 +379,7 @@ val ORT_RESULT = OrtResult(
                 provenance = ArtifactProvenance(
                     sourceArtifact = RemoteArtifact(
                         url = "https://example.com/declared-license-1.0.tgz",
-                        hash = Hash(value = "", algorithm = HashAlgorithm.SHA1)
+                        hash = Hash.NONE
                     )
                 ),
                 scanner = ScannerDetails(name = "scanner", version = "1.0", configuration = ""),

diff --git a/utils/test/src/main/kotlin/Utils.kt b/utils/test/src/main/kotlin/Utils.kt
@@ -156,7 +156,7 @@ fun scannerRunOf(vararg pkgScanResults: Pair<Identifier, List<ScanResult>>): Sca
                 provenance = ArtifactProvenance(
                     sourceArtifact = RemoteArtifact(
                         url = id.toPurl(),
-                        hash = Hash(value = "", algorithm = HashAlgorithm.NONE)
+                        hash = Hash.NONE
                     )
                 )
             )