Fix deprecated assertThat import

fwcd · fwcd · commit b7bc79a4084e · 2025-01-20T19:16:26.000+01:00
diff --git a/server/src/test/kotlin/org/javacs/kt/AdditionalWorkspaceTest.kt b/server/src/test/kotlin/org/javacs/kt/AdditionalWorkspaceTest.kt
@@ -4,7 +4,7 @@ import org.eclipse.lsp4j.DidChangeWorkspaceFoldersParams
 import org.eclipse.lsp4j.WorkspaceFolder
 import org.eclipse.lsp4j.WorkspaceFoldersChangeEvent
 import org.hamcrest.Matchers.*
-import org.junit.Assert.assertThat
+import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Assert.fail
 import org.junit.Ignore
 import org.junit.Test
diff --git a/server/src/test/kotlin/org/javacs/kt/ClassPathTest.kt b/server/src/test/kotlin/org/javacs/kt/ClassPathTest.kt
@@ -2,7 +2,7 @@ package org.javacs.kt
 
 import org.hamcrest.Matchers.*
 import org.javacs.kt.classpath.*
-import org.junit.Assert.assertThat
+import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Assert.assertTrue
 import org.junit.Test
 import org.junit.BeforeClass
diff --git a/server/src/test/kotlin/org/javacs/kt/CompiledFileTest.kt b/server/src/test/kotlin/org/javacs/kt/CompiledFileTest.kt
@@ -4,7 +4,7 @@ import org.hamcrest.Matchers.equalTo
 import org.javacs.kt.compiler.Compiler
 import org.javacs.kt.database.DatabaseService
 import org.junit.AfterClass
-import org.junit.Assert.assertThat
+import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Test
 import org.junit.BeforeClass
 import java.io.File
diff --git a/server/src/test/kotlin/org/javacs/kt/CompilerTest.kt b/server/src/test/kotlin/org/javacs/kt/CompilerTest.kt
@@ -7,7 +7,7 @@ import org.jetbrains.kotlin.psi.KtReferenceExpression
 import org.jetbrains.kotlin.psi.psiUtil.parentsWithSelf
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.javacs.kt.compiler.Compiler
-import org.junit.Assert.assertThat
+import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Test
 import org.junit.AfterClass
 import org.junit.BeforeClass
diff --git a/server/src/test/kotlin/org/javacs/kt/CompletionsTest.kt b/server/src/test/kotlin/org/javacs/kt/CompletionsTest.kt
@@ -1,7 +1,7 @@
 package org.javacs.kt
 
 import org.hamcrest.Matchers.*
-import org.junit.Assert.assertThat
+import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Test
 
 class InstanceMemberTest : SingleFileTestFixture("completions", "InstanceMember.kt") {
diff --git a/server/src/test/kotlin/org/javacs/kt/DebouncerTest.kt b/server/src/test/kotlin/org/javacs/kt/DebouncerTest.kt
@@ -1,7 +1,7 @@
 package org.javacs.kt
 
 import org.hamcrest.Matchers.equalTo
-import org.junit.Assert.assertThat
+import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Test
 import org.javacs.kt.util.Debouncer
 import java.time.Duration
diff --git a/server/src/test/kotlin/org/javacs/kt/DefinitionTest.kt b/server/src/test/kotlin/org/javacs/kt/DefinitionTest.kt
@@ -6,7 +6,7 @@ import org.hamcrest.Matchers.containsString
 import org.hamcrest.Matchers.equalTo
 import org.hamcrest.Matchers.hasItem
 import org.hamcrest.Matchers.hasSize
-import org.junit.Assert.assertThat
+import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Test
 
 class DefinitionTest : SingleFileTestFixture("definition", "GoFrom.kt") {
diff --git a/server/src/test/kotlin/org/javacs/kt/DiagnosticTest.kt b/server/src/test/kotlin/org/javacs/kt/DiagnosticTest.kt
@@ -6,7 +6,7 @@ import org.eclipse.lsp4j.DiagnosticSeverity
 import org.eclipse.lsp4j.DocumentSymbolParams
 import org.eclipse.lsp4j.TextDocumentIdentifier
 import org.hamcrest.Matchers.*
-import org.junit.Assert.assertThat
+import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Test
 
 class DiagnosticTest : SingleFileTestFixture("diagnostic", "Diagnostics.kt") {
diff --git a/server/src/test/kotlin/org/javacs/kt/DocumentHighlightTest.kt b/server/src/test/kotlin/org/javacs/kt/DocumentHighlightTest.kt
@@ -6,7 +6,7 @@ import org.eclipse.lsp4j.TextDocumentIdentifier
 import org.eclipse.lsp4j.Position
 import org.hamcrest.Matchers.hasSize
 import org.hamcrest.Matchers.equalTo
-import org.junit.Assert.assertThat
+import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Test
 
 class DocumentHighlightTest : SingleFileTestFixture("highlight", "DocumentHighlight.kt") {
diff --git a/server/src/test/kotlin/org/javacs/kt/FormatTest.kt b/server/src/test/kotlin/org/javacs/kt/FormatTest.kt
@@ -4,7 +4,7 @@ import org.eclipse.lsp4j.DocumentFormattingParams
 import org.eclipse.lsp4j.TextDocumentIdentifier
 import org.eclipse.lsp4j.FormattingOptions
 import org.junit.Test
-import org.junit.Assert.assertThat
+import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
 
 class FormatTest : SingleFileTestFixture("formatting", "NonFormatted.kt") {
diff --git a/server/src/test/kotlin/org/javacs/kt/GradleDSLScriptTest.kt b/server/src/test/kotlin/org/javacs/kt/GradleDSLScriptTest.kt
@@ -1,7 +1,7 @@
 package org.javacs.kt
 
 import org.junit.Test
-import org.junit.Assert.assertThat
+import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.*
 
 class GradleDSLScriptTest : SingleFileTestFixture("kotlinDSLWorkspace", "build.gradle.kts", Configuration().apply {
diff --git a/server/src/test/kotlin/org/javacs/kt/HoverTest.kt b/server/src/test/kotlin/org/javacs/kt/HoverTest.kt
@@ -1,7 +1,7 @@
 package org.javacs.kt
 
 import org.hamcrest.Matchers.*
-import org.junit.Assert.assertThat
+import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Ignore
 import org.junit.Test
 
diff --git a/server/src/test/kotlin/org/javacs/kt/ImportsTest.kt b/server/src/test/kotlin/org/javacs/kt/ImportsTest.kt
@@ -3,7 +3,7 @@ package org.javacs.kt
 import org.javacs.kt.imports.getImportTextEditEntry
 import org.jetbrains.kotlin.name.FqName
 import org.hamcrest.Matchers.*
-import org.junit.Assert.assertThat
+import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Test
 
 class ImportTextEditTest : SingleFileTestFixture("imports", "Simple.kt") {
diff --git a/server/src/test/kotlin/org/javacs/kt/InlayHintTest.kt b/server/src/test/kotlin/org/javacs/kt/InlayHintTest.kt
@@ -7,7 +7,7 @@ import org.hamcrest.Matchers.hasSize
 import org.hamcrest.Matchers.everyItem
 import org.hamcrest.Matchers.containsString
 import org.hamcrest.Matchers.equalTo
-import org.junit.Assert.assertThat
+import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Assert.assertTrue
 import org.junit.Assert.assertEquals
 import org.junit.Test
diff --git a/server/src/test/kotlin/org/javacs/kt/JavaToKotlinTest.kt b/server/src/test/kotlin/org/javacs/kt/JavaToKotlinTest.kt
@@ -2,7 +2,7 @@ package org.javacs.kt
 
 import org.javacs.kt.j2k.convertJavaToKotlin
 import org.junit.Test
-import org.junit.Assert.assertThat
+import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Ignore
 import org.hamcrest.Matchers.equalTo
 
diff --git a/server/src/test/kotlin/org/javacs/kt/OverrideMemberTest.kt b/server/src/test/kotlin/org/javacs/kt/OverrideMemberTest.kt
@@ -8,7 +8,7 @@ import org.hamcrest.Matchers.containsInAnyOrder
 import org.hamcrest.Matchers.hasItems
 import org.hamcrest.Matchers.equalTo
 import org.hamcrest.Matchers.hasSize
-import org.junit.Assert.assertThat
+import org.hamcrest.MatcherAssert.assertThat
 
 class OverrideMemberTest : SingleFileTestFixture("overridemember", "OverrideMembers.kt") {
 
diff --git a/server/src/test/kotlin/org/javacs/kt/QuickFixesTest.kt b/server/src/test/kotlin/org/javacs/kt/QuickFixesTest.kt
@@ -5,7 +5,7 @@ import org.eclipse.lsp4j.Diagnostic
 import org.eclipse.lsp4j.jsonrpc.messages.Either
 import org.hamcrest.Matchers.equalTo
 import org.hamcrest.Matchers.hasSize
-import org.junit.Assert.assertThat
+import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Test
 
 class ImplementAbstractMembersQuickFixTest : SingleFileTestFixture("quickfixes", "SomeSubclass.kt") {
@@ -95,7 +95,7 @@ class ImplementAbstractMembersQuickFixSameFileTest : SingleFileTestFixture("quic
     fun `should find no code actions`() {
         val only = listOf(CodeActionKind.QuickFix)
         val codeActionParams = codeActionParams(file, 3, 1, 3, 22, diagnostics, only)
-    
+
         val codeActionResult = languageServer.textDocumentService.codeAction(codeActionParams).get()
 
         assertThat(codeActionResult, hasSize(0))
@@ -105,7 +105,7 @@ class ImplementAbstractMembersQuickFixSameFileTest : SingleFileTestFixture("quic
     fun `should find one abstract method to implement`() {
         val only = listOf(CodeActionKind.QuickFix)
         val codeActionParams = codeActionParams(file, 7, 1, 7, 14, diagnostics, only)
-    
+
         val codeActionResult = languageServer.textDocumentService.codeAction(codeActionParams).get()
 
         assertThat(codeActionResult, hasSize(1))
@@ -128,7 +128,7 @@ class ImplementAbstractMembersQuickFixSameFileTest : SingleFileTestFixture("quic
     fun `should find several abstract methods to implement`() {
         val only = listOf(CodeActionKind.QuickFix)
         val codeActionParams = codeActionParams(file, 15, 1, 15, 21, diagnostics, only)
-    
+
         val codeActionResult = languageServer.textDocumentService.codeAction(codeActionParams).get()
 
         assertThat(codeActionResult, hasSize(1))
@@ -144,7 +144,7 @@ class ImplementAbstractMembersQuickFixSameFileTest : SingleFileTestFixture("quic
         val firstFunctionToImplementEdit = textEdit[key]?.get(0)
         assertThat(firstFunctionToImplementEdit?.range, equalTo(range(15, 49, 15, 49)))
         assertThat(firstFunctionToImplementEdit?.newText, equalTo(System.lineSeparator() + System.lineSeparator() + "    override fun print() { }"))
-        
+
         val secondFunctionToImplementEdit = textEdit[key]?.get(1)
         assertThat(secondFunctionToImplementEdit?.range, equalTo(range(15, 49, 15, 49)))
         assertThat(secondFunctionToImplementEdit?.newText, equalTo(System.lineSeparator() + System.lineSeparator() + "    override fun test(input: String, otherInput: Int) { }"))
@@ -154,7 +154,7 @@ class ImplementAbstractMembersQuickFixSameFileTest : SingleFileTestFixture("quic
     fun `should find only one abstract method when the other one is already implemented`() {
         val only = listOf(CodeActionKind.QuickFix)
         val codeActionParams = codeActionParams(file, 17, 1, 17, 26, diagnostics, only)
-    
+
         val codeActionResult = languageServer.textDocumentService.codeAction(codeActionParams).get()
 
         assertThat(codeActionResult, hasSize(1))
@@ -166,7 +166,7 @@ class ImplementAbstractMembersQuickFixSameFileTest : SingleFileTestFixture("quic
         val key = workspaceRoot.resolve(file).toUri().toString()
         assertThat(textEdit.containsKey(key), equalTo(true))
         assertThat(textEdit[key], hasSize(1))
-        
+
         val functionToImplementEdit = textEdit[key]?.get(0)
         assertThat(functionToImplementEdit?.range, equalTo(range(18, 57, 18, 57)))
         assertThat(functionToImplementEdit?.newText, equalTo(System.lineSeparator() + System.lineSeparator() + "    override fun print() { }"))
@@ -176,7 +176,7 @@ class ImplementAbstractMembersQuickFixSameFileTest : SingleFileTestFixture("quic
     fun `should respect nullability of parameter and return value in abstract method`() {
         val only = listOf(CodeActionKind.QuickFix)
         val codeActionParams = codeActionParams(file, 25, 1, 25, 16, diagnostics, only)
-    
+
         val codeActionResult = languageServer.textDocumentService.codeAction(codeActionParams).get()
 
         assertThat(codeActionResult, hasSize(1))
@@ -278,7 +278,7 @@ class ImplementAbstractMembersQuickFixExternalLibraryTest : SingleFileTestFixtur
     fun `should find one abstract method from Runnable to implement`() {
         val only = listOf(CodeActionKind.QuickFix)
         val codeActionParams = codeActionParams(file, 5, 1, 5, 15, diagnostics, only)
-    
+
         val codeActionResult = languageServer.textDocumentService.codeAction(codeActionParams).get()
 
         assertThat(codeActionResult, hasSize(1))
@@ -300,7 +300,7 @@ class ImplementAbstractMembersQuickFixExternalLibraryTest : SingleFileTestFixtur
     fun `should find one abstract method from Comparable to implement`() {
         val only = listOf(CodeActionKind.QuickFix)
         val codeActionParams = codeActionParams(file, 7, 1, 7, 19, diagnostics, only)
-    
+
         val codeActionResult = languageServer.textDocumentService.codeAction(codeActionParams).get()
 
         assertThat(codeActionResult, hasSize(1))
diff --git a/server/src/test/kotlin/org/javacs/kt/ReferencesTest.kt b/server/src/test/kotlin/org/javacs/kt/ReferencesTest.kt
@@ -1,7 +1,7 @@
 package org.javacs.kt
 
 import org.hamcrest.Matchers.*
-import org.junit.Assert.assertThat
+import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Test
 
 class ReferencesTest : SingleFileTestFixture("references", "ReferenceTo.kt") {
diff --git a/server/src/test/kotlin/org/javacs/kt/RenameTest.kt b/server/src/test/kotlin/org/javacs/kt/RenameTest.kt
@@ -4,7 +4,7 @@ import org.eclipse.lsp4j.Position
 import org.hamcrest.Matchers.startsWith
 import org.hamcrest.Matchers.containsString
 import org.hamcrest.Matchers.equalTo
-import org.junit.Assert.assertThat
+import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Test
 
 class RenameReferenceTest : SingleFileTestFixture("rename", "SomeClass.kt") {
diff --git a/server/src/test/kotlin/org/javacs/kt/ScriptTest.kt b/server/src/test/kotlin/org/javacs/kt/ScriptTest.kt
@@ -1,7 +1,7 @@
 package org.javacs.kt
 
 import org.hamcrest.Matchers.hasItem
-import org.junit.Assert.assertThat
+import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Test
 
 class ScriptTest : LanguageServerTestFixture("script", Configuration().apply {
diff --git a/server/src/test/kotlin/org/javacs/kt/SemanticTokensTest.kt b/server/src/test/kotlin/org/javacs/kt/SemanticTokensTest.kt
@@ -1,7 +1,7 @@
 package org.javacs.kt
 
 import org.hamcrest.Matchers.*
-import org.junit.Assert.assertThat
+import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Test
 import org.javacs.kt.semantictokens.encodeTokens
 import org.javacs.kt.semantictokens.SemanticToken
diff --git a/server/src/test/kotlin/org/javacs/kt/SignatureHelpTest.kt b/server/src/test/kotlin/org/javacs/kt/SignatureHelpTest.kt
@@ -1,7 +1,7 @@
 package org.javacs.kt
 
 import org.hamcrest.Matchers.*
-import org.junit.Assert.assertThat
+import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Ignore
 import org.junit.Test
 
diff --git a/server/src/test/kotlin/org/javacs/kt/WorkspaceSymbolsTest.kt b/server/src/test/kotlin/org/javacs/kt/WorkspaceSymbolsTest.kt
@@ -4,7 +4,7 @@ import org.eclipse.lsp4j.SymbolKind
 import org.eclipse.lsp4j.WorkspaceSymbolParams
 import org.hamcrest.Matchers.hasItem
 import org.hamcrest.Matchers.not
-import org.junit.Assert.assertThat
+import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Test
 
 class WorkspaceSymbolsTest : SingleFileTestFixture("symbols", "DocumentSymbols.kt") {
diff --git a/shared/src/test/kotlin/org/javacs/kt/MavenArtifactParsingTest.kt b/shared/src/test/kotlin/org/javacs/kt/MavenArtifactParsingTest.kt
@@ -4,7 +4,7 @@ import org.hamcrest.Matchers.*
 import org.javacs.kt.classpath.parseMavenArtifact
 import org.javacs.kt.classpath.Artifact
 import org.javacs.kt.classpath.parseMavenSource
-import org.junit.Assert.assertThat
+import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Test
 
 class MavenArtifactParsingTest {
