Skip to content

Commit e5d18c8

Browse files
fwcdfwcd
authored
Merge pull request #538 from fwcd/java-21-ci
Add Java 21 CI
2 parents 9ae4ede + 8152462 commit e5d18c8

File tree

2 files changed

+43
-40
lines changed

2 files changed

+43
-40
lines changed

‎.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
matrix:
1515
os: [ubuntu-latest, macos-latest, windows-latest]
16-
java: [ '11', '17' ]
16+
java: ['11', '17', '21']
1717
steps:
1818
- uses: actions/checkout@v4
1919
- name: Setup JDK

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

Lines changed: 42 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,43 @@ 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(
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+
))
125127

126128
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-
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+
))
146+
144147
assertThat(ranges, everyItem(equalTo(range(39, 25, 39, 25))))
145148
}
146149
}

0 commit comments

Comments
 (0)