Skip to content

Commit 0823cda

Browse files
Rejoice472Rejoice472
committed
test cases
1 parent c213b1c commit 0823cda

File tree

2 files changed

+67
-33
lines changed

2 files changed

+67
-33
lines changed

‎src/main/java/io/openliberty/tools/intellij/lsp4jakarta/lsp4ij/cdi/ManagedBeanDiagnosticsCollector.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2021, 2024 IBM Corporation.
2+
* Copyright (c) 2021, 2025 IBM Corporation.
33
*
44
* This program and the accompanying materials are made available under the
55
* terms of the Eclipse Public License v. 2.0 which is available at

‎src/test/java/io/openliberty/tools/intellij/lsp4jakarta/it/cdi/ManagedBeanTest.java‎

Lines changed: 66 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2021, 2024 IBM Corporation and others.
2+
* Copyright (c) 2021, 2025 IBM Corporation and others.
33
*
44
* This program and the accompanying materials are made available under the
55
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -301,7 +301,7 @@ public void injectAndDisposesObservesObservesAsync() throws Exception {
301301

302302
Diagnostic d8 = d(51, 18, 53,
303303
"A bean constructor or a method annotated with @Inject cannot have parameter(s) annotated with @Disposes, @Observes, @ObservesAsync.",
304-
DiagnosticSeverity.Error, "jakarta-cdi", "RemoveInjectOrConflictedAnnotations");
304+
DiagnosticSeverity.Error, "jakarta-cdi", "InvalidInjectAnnotationOnMultipleMethodParams");
305305

306306
assertJavaDiagnostics(diagnosticsParams, utils, d1, d2, d3, d4, d5, d6, d7, d8);
307307

@@ -707,31 +707,45 @@ public void injectAndDisposesObservesObservesAsync() throws Exception {
707707

708708
JakartaJavaCodeActionParams codeActionParams8 = createCodeActionParams(uri, d8);
709709

710-
String newText17 = "package io.openliberty.sample.jakarta.cdi;\n\n" +
711-
"import jakarta.inject.Inject;\nimport jakarta.enterprise.inject.Disposes;\n" +
712-
"import jakarta.enterprise.event.Observes;\nimport jakarta.enterprise.event.ObservesAsync;\n\n" +
713-
"public class InjectAndDisposesObservesObservesAsync {\n \n @Inject\n" +
714-
" public String greetDisposes(@Disposes String name) {\n return \"Hi \" + name + \"!\";\n" +
715-
" }\n \n \n @Inject\n public String greetObserves(@Observes String name) {\n" +
716-
" return \"Hi \" + name + \"!\";\n }\n \n \n @Inject\n" +
717-
" public String greetObservesAsync(@ObservesAsync String name) {\n" +
718-
" return \"Hi \" + name + \"!\";\n }\n \n \n @Inject\n" +
719-
" public String greetDisposesObserves(@Disposes String name1, @Observes String name2) {\n" +
720-
" return \"Hi \" + name1 + \" and \" + name2 + \"!\";\n }\n \n \n @Inject\n" +
721-
" public String greetObservesObservesAsync(@Observes String name1, @ObservesAsync String name2) {\n" +
722-
" return \"Hi \" + name1 + \" and \" + name2 + \"!\";\n }\n \n \n @Inject\n" +
723-
" public String greetDisposesObservesAsync(@Disposes String name1, @ObservesAsync String name2) {\n" +
724-
" return \"Hi \" + name1 + \" and \" + name2 + \"!\";\n }\n \n \n @Inject\n" +
725-
" public String greetDisposesObservesObservesAsync(@Disposes String name1, @Observes String name2, @ObservesAsync String name3) {\n" +
726-
" return \"Hi \" + name1 + \", \" + name2 + \" and \" + name3 + \"!\";\n }\n \n" +
727-
" public String greetDisposesObservesObservesAsync2(@Disposes @Observes @ObservesAsync String name) {\n" +
728-
" return \"Hi \" + name + \"!\";\n }\n}\n";
729-
String newText18 = "package io.openliberty.sample.jakarta.cdi;\n\nimport jakarta.inject.Inject;\nimport jakarta.enterprise.inject.Disposes;\n" +
730-
"import jakarta.enterprise.event.Observes;\nimport jakarta.enterprise.event.ObservesAsync;\n\npublic class InjectAndDisposesObservesObservesAsync {\n\n " +
731-
"@Inject\n public String greetDisposes(@Disposes String name) {\n return \"Hi \" + name + \"!\";\n }\n\n\n @Inject\n " +
732-
"public String greetObserves(@Observes String name) {\n return \"Hi \" + name + \"!\";\n }\n\n\n @Inject\n " +
733-
"public String greetObservesAsync(@ObservesAsync String name) {\n return \"Hi \" + name + \"!\";\n }\n\n\n @Inject\n " +
734-
"public String greetDisposesObserves(@Disposes String name1, @Observes String name2) {\n " +
710+
String newText200 = "package io.openliberty.sample.jakarta.cdi;\n\nimport jakarta.inject.Inject;\n" +
711+
"import jakarta.enterprise.inject.Disposes;\nimport jakarta.enterprise.event.Observes;\n" +
712+
"import jakarta.enterprise.event.ObservesAsync;\n\npublic class InjectAndDisposesObservesObservesAsync {\n \n " +
713+
"@Inject\n public String greetDisposes(@Disposes String name) {\n return \"Hi \" + name + \"!\";\n }\n \n \n " +
714+
"@Inject\n public String greetObserves(@Observes String name) {\n return \"Hi \" + name + \"!\";\n }\n \n \n " +
715+
"@Inject\n public String greetObservesAsync(@ObservesAsync String name) {\n return \"Hi \" + name + \"!\";\n }\n \n \n " +
716+
"@Inject\n public String greetDisposesObserves(@Disposes String name1, @Observes String name2) {\n " +
717+
"return \"Hi \" + name1 + \" and \" + name2 + \"!\";\n }\n \n \n @Inject\n " +
718+
"public String greetObservesObservesAsync(@Observes String name1, @ObservesAsync String name2) {\n " +
719+
"return \"Hi \" + name1 + \" and \" + name2 + \"!\";\n }\n \n \n @Inject\n " +
720+
"public String greetDisposesObservesAsync(@Disposes String name1, @ObservesAsync String name2) {\n " +
721+
"return \"Hi \" + name1 + \" and \" + name2 + \"!\";\n }\n \n \n @Inject\n " +
722+
"public String greetDisposesObservesObservesAsync(@Disposes String name1, @Observes String name2, @ObservesAsync String name3) {\n " +
723+
"return \"Hi \" + name1 + \", \" + name2 + \" and \" + name3 + \"!\";\n }\n \n " +
724+
"public String greetDisposesObservesObservesAsync2(@Disposes @Observes @ObservesAsync String name) {\n " +
725+
"return \"Hi \" + name + \"!\";\n }\n}\n";
726+
String newText201 = "package io.openliberty.sample.jakarta.cdi;\n\nimport jakarta.inject.Inject;\n" +
727+
"import jakarta.enterprise.inject.Disposes;\nimport jakarta.enterprise.event.Observes;\n" +
728+
"import jakarta.enterprise.event.ObservesAsync;\n\npublic class InjectAndDisposesObservesObservesAsync {\n\n " +
729+
"@Inject\n public String greetDisposes(@Disposes String name) {\n return \"Hi \" + name + \"!\";\n }\n\n\n " +
730+
"@Inject\n public String greetObserves(@Observes String name) {\n return \"Hi \" + name + \"!\";\n }\n\n\n " +
731+
"@Inject\n public String greetObservesAsync(@ObservesAsync String name) {\n return \"Hi \" + name + \"!\";\n }\n\n\n " +
732+
"@Inject\n public String greetDisposesObserves(@Disposes String name1, @Observes String name2) {\n " +
733+
"return \"Hi \" + name1 + \" and \" + name2 + \"!\";\n }\n\n\n @Inject\n " +
734+
"public String greetObservesObservesAsync(@Observes String name1, @ObservesAsync String name2) {\n " +
735+
"return \"Hi \" + name1 + \" and \" + name2 + \"!\";\n }\n\n\n @Inject\n " +
736+
"public String greetDisposesObservesAsync(@Disposes String name1, @ObservesAsync String name2) {\n " +
737+
"return \"Hi \" + name1 + \" and \" + name2 + \"!\";\n }\n\n\n @Inject\n " +
738+
"public String greetDisposesObservesObservesAsync(@Disposes String name1, @Observes String name2, @ObservesAsync String name3) {\n " +
739+
"return \"Hi \" + name1 + \", \" + name2 + \" and \" + name3 + \"!\";\n }\n\n @Inject\n " +
740+
"public String greetDisposesObservesObservesAsync2(@Observes @ObservesAsync String name) {\n " +
741+
"return \"Hi \" + name + \"!\";\n }\n}\n";
742+
String newText202 = "package io.openliberty.sample.jakarta.cdi;\n\nimport jakarta.inject.Inject;\n" +
743+
"import jakarta.enterprise.inject.Disposes;\nimport jakarta.enterprise.event.Observes;\n" +
744+
"import jakarta.enterprise.event.ObservesAsync;\n\npublic class InjectAndDisposesObservesObservesAsync {\n\n " +
745+
"@Inject\n public String greetDisposes(@Disposes String name) {\n return \"Hi \" + name + \"!\";\n }\n\n\n " +
746+
"@Inject\n public String greetObserves(@Observes String name) {\n return \"Hi \" + name + \"!\";\n }\n\n\n " +
747+
"@Inject\n public String greetObservesAsync(@ObservesAsync String name) {\n return \"Hi \" + name + \"!\";\n }\n\n\n " +
748+
"@Inject\n public String greetDisposesObserves(@Disposes String name1, @Observes String name2) {\n " +
735749
"return \"Hi \" + name1 + \" and \" + name2 + \"!\";\n }\n\n\n @Inject\n " +
736750
"public String greetObservesObservesAsync(@Observes String name1, @ObservesAsync String name2) {\n " +
737751
"return \"Hi \" + name1 + \" and \" + name2 + \"!\";\n }\n\n\n @Inject\n " +
@@ -740,13 +754,33 @@ public void injectAndDisposesObservesObservesAsync() throws Exception {
740754
"public String greetDisposesObservesObservesAsync(@Disposes String name1, @Observes String name2, @ObservesAsync String name3) {\n " +
741755
"return \"Hi \" + name1 + \", \" + name2 + \" and \" + name3 + \"!\";\n }\n\n @Inject\n " +
742756
"public String greetDisposesObservesObservesAsync2(String name) {\n return \"Hi \" + name + \"!\";\n }\n}\n";
757+
String newText203 = "package io.openliberty.sample.jakarta.cdi;\n\nimport jakarta.inject.Inject;\n" +
758+
"import jakarta.enterprise.inject.Disposes;\nimport jakarta.enterprise.event.Observes;\n" +
759+
"import jakarta.enterprise.event.ObservesAsync;\n\npublic class InjectAndDisposesObservesObservesAsync {\n\n " +
760+
"@Inject\n public String greetDisposes(@Disposes String name) {\n return \"Hi \" + name + \"!\";\n }\n\n\n " +
761+
"@Inject\n public String greetObserves(@Observes String name) {\n return \"Hi \" + name + \"!\";\n }\n\n\n " +
762+
"@Inject\n public String greetObservesAsync(@ObservesAsync String name) {\n return \"Hi \" + name + \"!\";\n }\n\n\n " +
763+
"@Inject\n public String greetDisposesObserves(@Disposes String name1, @Observes String name2) {\n " +
764+
"return \"Hi \" + name1 + \" and \" + name2 + \"!\";\n }\n\n\n @Inject\n " +
765+
"public String greetObservesObservesAsync(@Observes String name1, @ObservesAsync String name2) {\n " +
766+
"return \"Hi \" + name1 + \" and \" + name2 + \"!\";\n }\n\n\n @Inject\n " +
767+
"public String greetDisposesObservesAsync(@Disposes String name1, @ObservesAsync String name2) {\n " +
768+
"return \"Hi \" + name1 + \" and \" + name2 + \"!\";\n }\n\n\n @Inject\n " +
769+
"public String greetDisposesObservesObservesAsync(@Disposes String name1, @Observes String name2, @ObservesAsync String name3) {\n " +
770+
"return \"Hi \" + name1 + \", \" + name2 + \" and \" + name3 + \"!\";\n }\n\n @Inject\n " +
771+
"public String greetDisposesObservesObservesAsync2(@Disposes String name) {\n return \"Hi \" + name + \"!\";\n }\n}\n";
743772

744-
TextEdit te20 = te(0, 0, 55, 0, newText17);
745-
TextEdit te21 = te(0, 0, 55, 0, newText18);
746-
CodeAction ca20 = ca(uri, "Remove @Inject", d8, te20);
747-
CodeAction ca21 = ca(uri, "Remove the @Disposes, @Observes, @ObservesAsync modifier from parameter name", d8, te21);
748773

749-
assertJavaCodeAction(codeActionParams8, utils, ca20, ca21);
774+
TextEdit te200 = te(0, 0, 55, 0, newText200);
775+
TextEdit te201 = te(0, 0, 55, 0, newText201);
776+
TextEdit te202 = te(0, 0, 55, 0, newText202);
777+
TextEdit te203 = te(0, 0, 55, 0, newText203);
778+
CodeAction ca200 = ca(uri, "Remove @Inject", d7, te200);
779+
CodeAction ca201 = ca(uri, "Remove the @Disposes modifier from parameter name", d7, te201);
780+
CodeAction ca202 = ca(uri, "Remove the @Disposes, @Observes, @ObservesAsync modifier from parameter name", d7, te202);
781+
CodeAction ca203 = ca(uri, "Remove the @Observes, @ObservesAsync modifier from parameter name", d7, te203);
782+
783+
assertJavaCodeAction(codeActionParams8, utils, ca200, ca201, ca202, ca203);
750784
}
751785

752786
@Test

0 commit comments

Comments
 (0)