Skip to content

Commit 114b23a

Browse files
authored
Merge branch 'master' into redis-e2e-extension
2 parents 5f6308e + 159fb51 commit 114b23a

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

  • core-tests/e2e-tests/spring

core-tests/e2e-tests/spring/spring-rest-bb/src/main/kotlin/com/foo/rest/examples/bb/flakinessdetect/FlakinessDetectRest.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.RequestParam
1010
import org.springframework.web.bind.annotation.RestController
1111
import java.time.LocalDateTime
1212
import java.time.format.DateTimeFormatter
13+
import kotlin.math.abs
1314
import kotlin.math.max
1415
import kotlin.math.min
1516

@@ -36,9 +37,8 @@ class FlakinessDetectRest {
3637
@GetMapping(path = ["/multiplelines/{num}"])
3738
open fun getMultipleLines( @PathVariable("num") num: Int) : ResponseEntity<FlakinessDetectData> {
3839

39-
val num = min(20, max(2, randomInt(num)))
40-
41-
val msg = (1..num).joinToString(System.lineSeparator()) { "LINE $it" }
40+
val num = max(2, randomInt(min(30+ abs(num), 100)))
41+
val msg = (1..num).joinToString(System.lineSeparator()) { "LINE $it:${randomInt(max(1000, num))}" }
4242
CoveredTargets.cover("MultipleLines")
4343
return ResponseEntity.ok(FlakinessDetectData(msg, num))
4444
}

core-tests/e2e-tests/spring/spring-rest-openapi-v3/src/main/kotlin/com/foo/rest/examples/spring/openapi/v3/flakinessdetect/FlakinessDetectRest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RequestParam
99
import org.springframework.web.bind.annotation.RestController
1010
import java.time.LocalDateTime
1111
import java.time.format.DateTimeFormatter
12+
import kotlin.math.abs
1213
import kotlin.math.max
1314
import kotlin.math.min
1415

@@ -35,8 +36,7 @@ class FlakinessDetectRest {
3536
@GetMapping(path = ["/multiplelines/{num}"])
3637
open fun getMultipleLines( @PathVariable("num") num: Int) : ResponseEntity<FlakinessDetectData> {
3738

38-
val num = min(20, max(2, randomInt(num)))
39-
39+
val num = max(2, randomInt(min(30 + abs(num), 100)))
4040
val msg = (1..num).joinToString(System.lineSeparator()) { "LINE $it:${randomInt(max(1000, num))}" }
4141
return ResponseEntity.ok(FlakinessDetectData(msg, num))
4242
}

0 commit comments

Comments
 (0)