Skip to content

Commit 8152462

Browse files
committed
Remove setUncaughtExceptionHandler from test
Its parameter has been renamed from 'eh' to 'ueh' in Java 21 and matching against both cases would require introducing a more complex matching mechanism (e.g. regex).
1 parent 2a48aab commit 8152462

File tree

1 file changed

+34
-32
lines changed

1 file changed

+34
-32
lines changed

server/src/test/kotlin/org/javacs/kt/OverrideMemberTest.kt

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -107,40 +107,42 @@ class OverrideMemberTest : SingleFileTestFixture("overridemember", "OverrideMemb
107107
val newTexts = edits.map { it.newText }
108108
val ranges = edits.map { it.range }
109109

110-
assertThat(titles, hasItems("override fun equals(other: Any?): Boolean { }",
111-
"override fun hashCode(): Int { }",
112-
"override fun toString(): String { }",
113-
"override fun run() { }",
114-
"override fun clone(): Any { }",
115-
"override fun start() { }",
116-
"override fun interrupt() { }",
117-
"override fun isInterrupted(): Boolean { }",
118-
"override fun countStackFrames(): Int { }",
119-
"override fun getContextClassLoader(): ClassLoader { }",
120-
"override fun setContextClassLoader(cl: ClassLoader) { }",
121-
"override fun getStackTrace(): (Array<(StackTraceElement..StackTraceElement?)>..Array<out (StackTraceElement..StackTraceElement?)>) { }",
122-
"override fun getId(): Long { }",
123-
"override fun getState(): State { }",
124-
"override fun getUncaughtExceptionHandler(): UncaughtExceptionHandler { }",
125-
"override fun setUncaughtExceptionHandler(eh: UncaughtExceptionHandler) { }"))
110+
assertThat(titles, hasItems(
111+
"override fun equals(other: Any?): Boolean { }",
112+
"override fun hashCode(): Int { }",
113+
"override fun toString(): String { }",
114+
"override fun run() { }",
115+
"override fun clone(): Any { }",
116+
"override fun start() { }",
117+
"override fun interrupt() { }",
118+
"override fun isInterrupted(): Boolean { }",
119+
"override fun countStackFrames(): Int { }",
120+
"override fun getContextClassLoader(): ClassLoader { }",
121+
"override fun setContextClassLoader(cl: ClassLoader) { }",
122+
"override fun getStackTrace(): (Array<(StackTraceElement..StackTraceElement?)>..Array<out (StackTraceElement..StackTraceElement?)>) { }",
123+
"override fun getId(): Long { }",
124+
"override fun getState(): State { }",
125+
"override fun getUncaughtExceptionHandler(): UncaughtExceptionHandler { }",
126+
))
126127

127128
val padding = System.lineSeparator() + System.lineSeparator() + " "
128-
assertThat(newTexts, hasItems(padding + "override fun equals(other: Any?): Boolean { }",
129-
padding + "override fun hashCode(): Int { }",
130-
padding + "override fun toString(): String { }",
131-
padding + "override fun run() { }",
132-
padding + "override fun clone(): Any { }",
133-
padding + "override fun start() { }",
134-
padding + "override fun interrupt() { }",
135-
padding + "override fun isInterrupted(): Boolean { }",
136-
padding + "override fun countStackFrames(): Int { }",
137-
padding + "override fun getContextClassLoader(): ClassLoader { }",
138-
padding + "override fun setContextClassLoader(cl: ClassLoader) { }",
139-
padding + "override fun getStackTrace(): (Array<(StackTraceElement..StackTraceElement?)>..Array<out (StackTraceElement..StackTraceElement?)>) { }",
140-
padding + "override fun getId(): Long { }",
141-
padding + "override fun getState(): State { }",
142-
padding + "override fun getUncaughtExceptionHandler(): UncaughtExceptionHandler { }",
143-
padding + "override fun setUncaughtExceptionHandler(eh: UncaughtExceptionHandler) { }"))
129+
assertThat(newTexts, hasItems(
130+
padding + "override fun equals(other: Any?): Boolean { }",
131+
padding + "override fun hashCode(): Int { }",
132+
padding + "override fun toString(): String { }",
133+
padding + "override fun run() { }",
134+
padding + "override fun clone(): Any { }",
135+
padding + "override fun start() { }",
136+
padding + "override fun interrupt() { }",
137+
padding + "override fun isInterrupted(): Boolean { }",
138+
padding + "override fun countStackFrames(): Int { }",
139+
padding + "override fun getContextClassLoader(): ClassLoader { }",
140+
padding + "override fun setContextClassLoader(cl: ClassLoader) { }",
141+
padding + "override fun getStackTrace(): (Array<(StackTraceElement..StackTraceElement?)>..Array<out (StackTraceElement..StackTraceElement?)>) { }",
142+
padding + "override fun getId(): Long { }",
143+
padding + "override fun getState(): State { }",
144+
padding + "override fun getUncaughtExceptionHandler(): UncaughtExceptionHandler { }",
145+
))
144146

145147
assertThat(ranges, everyItem(equalTo(range(39, 25, 39, 25))))
146148
}

0 commit comments

Comments
 (0)