Skip to content

Commit 2a48aab

Browse files
fwcdfwcd
committed
Use hasItems for override JDK member test
This should fix the Java 21 CI issues and make the test more robust against new members in Thread.
1 parent 54935f3 commit 2a48aab

File tree

1 file changed

+40
-39
lines changed

1 file changed

+40
-39
lines changed

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

Lines changed: 40 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import org.eclipse.lsp4j.TextDocumentPositionParams
99
import org.junit.Test
1010
import org.hamcrest.core.Every.everyItem
1111
import org.hamcrest.Matchers.containsInAnyOrder
12+
import org.hamcrest.Matchers.hasItems
1213
import org.hamcrest.Matchers.equalTo
1314
import org.hamcrest.Matchers.hasSize
1415
import org.junit.Assert.assertThat
@@ -17,7 +18,7 @@ class OverrideMemberTest : SingleFileTestFixture("overridemember", "OverrideMemb
1718

1819
val root = testResourcesRoot().resolve(workspaceRoot)
1920
val fileUri = root.resolve(file).toUri().toString()
20-
21+
2122
@Test
2223
fun `should show all overrides for class`() {
2324
val result = languageServer.getProtocolExtensionService().overrideMember(TextDocumentPositionParams(TextDocumentIdentifier(fileUri), position(9, 8))).get()
@@ -39,7 +40,7 @@ class OverrideMemberTest : SingleFileTestFixture("overridemember", "OverrideMemb
3940
padding + "override fun equals(other: Any?): Boolean { }",
4041
padding + "override fun hashCode(): Int { }",
4142
padding + "override fun toString(): String { }"))
42-
43+
4344

4445
assertThat(ranges, everyItem(equalTo(range(9, 31, 9, 31))))
4546
}
@@ -63,14 +64,14 @@ class OverrideMemberTest : SingleFileTestFixture("overridemember", "OverrideMemb
6364
padding + "override fun equals(other: Any?): Boolean { }",
6465
padding + "override fun hashCode(): Int { }",
6566
padding + "override fun toString(): String { }"))
66-
67+
6768
assertThat(ranges, everyItem(equalTo(range(12, 56, 12, 56))))
6869
}
6970

7071
@Test
7172
fun `should show NO overrides for class where all other alternatives are already implemented`() {
7273
val result = languageServer.getProtocolExtensionService().overrideMember(TextDocumentPositionParams(TextDocumentIdentifier(fileUri), position(15, 8))).get()
73-
74+
7475
assertThat(result, hasSize(0))
7576
}
7677

@@ -93,10 +94,10 @@ class OverrideMemberTest : SingleFileTestFixture("overridemember", "OverrideMemb
9394
padding + "override fun equals(other: Any?): Boolean { }",
9495
padding + "override fun hashCode(): Int { }",
9596
padding + "override fun toString(): String { }"))
96-
97+
9798
assertThat(ranges, everyItem(equalTo(range(37, 25, 37, 25))))
9899
}
99-
100+
100101
@Test
101102
fun `should find members in jdk object`() {
102103
val result = languageServer.getProtocolExtensionService().overrideMember(TextDocumentPositionParams(TextDocumentIdentifier(fileUri), position(39, 9))).get()
@@ -106,41 +107,41 @@ class OverrideMemberTest : SingleFileTestFixture("overridemember", "OverrideMemb
106107
val newTexts = edits.map { it.newText }
107108
val ranges = edits.map { it.range }
108109

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

126127
val padding = System.lineSeparator() + System.lineSeparator() + " "
127-
assertThat(newTexts, containsInAnyOrder(padding + "override fun equals(other: Any?): Boolean { }",
128-
padding + "override fun hashCode(): Int { }",
129-
padding + "override fun toString(): String { }",
130-
padding + "override fun run() { }",
131-
padding + "override fun clone(): Any { }",
132-
padding + "override fun start() { }",
133-
padding + "override fun interrupt() { }",
134-
padding + "override fun isInterrupted(): Boolean { }",
135-
padding + "override fun countStackFrames(): Int { }",
136-
padding + "override fun getContextClassLoader(): ClassLoader { }",
137-
padding + "override fun setContextClassLoader(cl: ClassLoader) { }",
138-
padding + "override fun getStackTrace(): (Array<(StackTraceElement..StackTraceElement?)>..Array<out (StackTraceElement..StackTraceElement?)>) { }",
139-
padding + "override fun getId(): Long { }",
140-
padding + "override fun getState(): State { }",
141-
padding + "override fun getUncaughtExceptionHandler(): UncaughtExceptionHandler { }",
142-
padding + "override fun setUncaughtExceptionHandler(eh: UncaughtExceptionHandler) { }"))
143-
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) { }"))
144+
144145
assertThat(ranges, everyItem(equalTo(range(39, 25, 39, 25))))
145146
}
146147
}

0 commit comments

Comments
 (0)