Skip to content

Commit 637627e

Browse files
committed
fix TS test generator
1 parent 8947c2a commit 637627e

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

languages/typescript/src/main/kotlin/io/vrap/codegen/languages/typescript/test/TypescriptRequestTestRenderer.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import io.vrap.rmf.raml.model.resources.Method
1616
import io.vrap.rmf.raml.model.resources.Resource
1717
import io.vrap.rmf.raml.model.types.*
1818
import io.vrap.rmf.raml.model.util.StringCaseFormat
19+
import java.net.URLEncoder
1920
import java.util.regex.Pattern
2021
import kotlin.random.Random
2122

@@ -91,7 +92,7 @@ class TypescriptRequestTestRenderer constructor(override val vrapTypeProvider: V
9192
var methodValue = parameter.template()
9293
var requiredParams = method.queryParameters.toMutableList().filter { p -> p.name != parameter.name && p.required }
9394
var requiredParamsStr: String = requiredParams.map { r -> "${r.name}:${queryParamValueString(r.name, r.type, Random(r.name.hashCode()))}" }.joinToString(", ")
94-
var requiredParamsStrUrl: String = requiredParams.map { r -> "${r.name}:${queryParamValueString(r.name, r.type, Random(r.name.hashCode())).toString().replace("\"","")}" }.joinToString("&")
95+
var requiredParamsStrUrl: String = requiredParams.map { r -> "${r.name}:${URLEncoder.encode(queryParamValueString(r.name, r.type, Random(r.name.hashCode())).toString().replace("\"",""), "UTF-8")}" }.joinToString("&")
9596

9697
if (anno != null) {
9798
val o = anno.value as ObjectInstance
@@ -111,7 +112,7 @@ class TypescriptRequestTestRenderer constructor(override val vrapTypeProvider: V
111112
return """
112113
|{
113114
| method: '${method.method}',
114-
| uri: '/${resource.fullUri.expand(resource.fullUriParameters.map { it.name to "test_${it.name}" }.toMap()).trimStart('/')}?${paramName.replace("\"", "")}=${queryParamValueString(paramName, parameter.type, Random(paramName.hashCode())).toString().replace("\"","")}${ if(requiredParamsStrUrl!="") "&${requiredParamsStrUrl.replace(":","=")}" else ""}',
115+
| uri: '/${resource.fullUri.expand(resource.fullUriParameters.map { it.name to "test_${it.name}" }.toMap()).trimStart('/')}?${URLEncoder.encode(paramName.replace("\"", ""), "UTF-8")}=${URLEncoder.encode(queryParamValueString(paramName, parameter.type, Random(paramName.hashCode())).toString().replace("\"",""), "UTF-8")}${ if(requiredParamsStrUrl!="") "&${requiredParamsStrUrl.replace(":","=")}" else ""}',
115116
| request: apiRoot
116117
| <<${builderChain.joinToString("\n.", ".")}>>,
117118
|}

0 commit comments

Comments
 (0)