File tree 3 files changed +12
-5
lines changed 3 files changed +12
-5
lines changed Original file line number Diff line number Diff line change @@ -124,7 +124,7 @@ class ExamplesTest : StringSpec() {
124
124
125
125
" how-to-fix-text-provider.kts provides the expected how-to-fix text" {
126
126
val script = takeExampleFile(" how-to-fix-text-provider.kts" ).readText()
127
- val howToFixTextProvider = HowToFixTextProvider .fromKotlinScript(script)
127
+ val howToFixTextProvider = HowToFixTextProvider .fromKotlinScript(script, OrtResult . EMPTY )
128
128
val issue = OrtIssue (
129
129
message = " ERROR: Timeout after 360 seconds while scanning file 'src/res/data.json'." ,
130
130
source = " ScanCode" ,
Original file line number Diff line number Diff line change @@ -194,7 +194,7 @@ class ReporterCommand : CliktCommand(
194
194
val licenseConfiguration = licenseConfigurationFile?.readValue<LicenseConfiguration >().orEmpty()
195
195
196
196
val howToFixTextProvider =
197
- howToFixTextProviderScript?.let { HowToFixTextProvider .fromKotlinScript(it.readText()) }
197
+ howToFixTextProviderScript?.let { HowToFixTextProvider .fromKotlinScript(it.readText(), ortResult ) }
198
198
? : HowToFixTextProvider .NONE
199
199
200
200
outputDir.safeMkdirs()
Original file line number Diff line number Diff line change 20
20
package org.ossreviewtoolkit.reporter
21
21
22
22
import org.ossreviewtoolkit.model.OrtIssue
23
+ import org.ossreviewtoolkit.model.OrtResult
23
24
import org.ossreviewtoolkit.utils.ScriptRunner
24
25
25
26
/* *
@@ -37,24 +38,30 @@ interface HowToFixTextProvider {
37
38
/* *
38
39
* Return the [HowToFixTextProvider] which in-turn has to be returned by the given [script].
39
40
*/
40
- fun fromKotlinScript (script : String ): HowToFixTextProvider = HowToFixScriptRunner ().run (script)
41
+ fun fromKotlinScript (script : String , ortResult : OrtResult ): HowToFixTextProvider =
42
+ HowToFixScriptRunner (ortResult).run (script)
41
43
}
44
+
42
45
/* *
43
46
* Return a Markdown text describing how to fix the given [issue]. Non-null return values override the default
44
47
* how-to-fix texts, while a null value keeps the default.
45
48
*/
46
49
fun getHowToFixText (issue : OrtIssue ): String?
47
50
}
48
51
49
- private class HowToFixScriptRunner : ScriptRunner () {
52
+ private class HowToFixScriptRunner ( ortResult : OrtResult ) : ScriptRunner() {
50
53
override val preface = """
51
54
import org.ossreviewtoolkit.model.*
52
55
import org.ossreviewtoolkit.reporter.HowToFixTextProvider
53
-
56
+
54
57
""" .trimIndent()
55
58
56
59
override val postface = """
57
60
""" .trimIndent()
58
61
62
+ init {
63
+ engine.put(" ortResult" , ortResult)
64
+ }
65
+
59
66
override fun run (script : String ): HowToFixTextProvider = super .run (script) as HowToFixTextProvider
60
67
}
You can’t perform that action at this time.
0 commit comments