Skip to content

Commit 143dc91

Browse files
committed
Merge branch 'public-release/v1.2.0-223' into public-release/v1.2.0-231
2 parents 178d8e7 + 1cc6e62 commit 143dc91

File tree

2 files changed

+3
-31
lines changed

2 files changed

+3
-31
lines changed

.github/actions/sonar/action.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ runs:
1717
run: >
1818
./gradlew --info sonar
1919
-Dorg.gradle.jvmargs="-XX:MaxMetaspaceSize=512m"
20-
-Dresults="build/reports/tests/test,build/test-results/test,build/reports/jacoco/test/html"
21-
-Psonar.host.url=$SONAR_HOST_URL -Dsonar.login=$SONAR_TOKEN
22-
-Dsonar.coverage.jacoco.xmlReportPaths="build/reports/jacoco.xml"
20+
-Dresults="build/reports/tests/test,build/test-results/test,build/reports/kover/html"
21+
-Psonar.host.url=$SONAR_HOST_URL -Dsonar.token=$SONAR_TOKEN
22+
-Dsonar.coverage.jacoco.xmlReportPaths="build/reports/kover/xml/report.xml"

src/test/kotlin/eu/ibagroup/formainframe/editor/EditorTestSpec.kt

-28
Original file line numberDiff line numberDiff line change
@@ -511,34 +511,6 @@ class EditorTestSpec : WithApplicationShouldSpec({
511511

512512
assertSoftly { descriptors?.isEmpty() shouldBe true }
513513
}
514-
should("check file when getting decoder error") {
515-
516-
text = "qwe��rty"
517-
518-
var decoderResultIsError = false
519-
var pointer = 0
520-
every { decoderMock.decode(any(), any(), any()) } answers {
521-
val back = secondArg<CharBuffer>()
522-
val str = text.substring(pointer)
523-
val pos = str.indexOfFirst { it !in 'A'..'z' }
524-
if (pos != -1) {
525-
decoderResultIsError = true
526-
pointer += pos
527-
back.position(pointer)
528-
pointer++
529-
} else {
530-
decoderResultIsError = false
531-
back.put(str)
532-
}
533-
decoderResultMock
534-
}
535-
every { decoderResultMock.isError } answers { decoderResultIsError }
536-
537-
val descriptors = lossyEncodingInspection.checkFile(psiFileMock, inspectionManagerMock, isOnTheFly)
538-
539-
assertSoftly { descriptors?.size shouldBe 1 }
540-
assertSoftly { descriptors?.get(0)?.textRangeInElement shouldBe TextRange(3, 5) }
541-
}
542514
should("check file where not all characters are decoded back") {
543515

544516
text = "qwerty."

0 commit comments

Comments
 (0)