@@ -357,24 +357,25 @@ public void methodConstraintValidation() throws Exception {
357357 assertJavaDiagnostics (diagnosticsParams , utils , d1 , d2 , d3 , d4 );
358358
359359 // Test quickfix codeAction
360- String newText1 = "package io.openliberty.sample.jakarta.beanvalidation;\n \n " +
361- "import jakarta.validation.constraints.AssertFalse ;\n import jakarta.validation.constraints.AssertTrue; \n " +
362- "import jakarta.validation.constraints.Size; \n \n public class MethodConstraintValidation { \n \n " +
363- " // valid cases \n @AssertFalse \n private boolean falseMethod() {\n return false;\n }\n \n " +
364- " @AssertTrue \n public boolean trueMethod() {\n return true;\n }\n \n // invalid cases\n " +
365- " public static boolean anotherTruth() { // static\n return true;\n }\n \n @AssertTrue\n " +
366- " public String notBoolean() { // invalid type\n return \" aha!\" ;\n }\n \n @AssertFalse\n " +
367- " private static int notBoolTwo(int x) { // invalid type, static\n return x;\n }\n \n @Size\n " +
368- " private double getSalary(double x) {\n return x;\n }\n }" ;
360+ String newText1 = "package io.openliberty.sample.jakarta.beanvalidation;\n \n import jakarta.validation.constraints.AssertFalse; \ n " +
361+ "import jakarta.validation.constraints.AssertTrue ;\n import jakarta.validation.constraints.Size; \n \n " +
362+ "public class MethodConstraintValidation { \n \n // valid cases \n @AssertFalse \n " +
363+ "private boolean falseMethod() {\n return false;\n }\n \n @AssertTrue \n " +
364+ "public boolean trueMethod() {\n return true;\n }\n \n // invalid cases\n " +
365+ "public static boolean anotherTruth() { // static\n return true;\n }\n \n @AssertTrue\n " +
366+ "public String notBoolean() { // invalid type\n return \" aha!\" ;\n }\n \n @AssertFalse\n " +
367+ "private static int notBoolTwo(int x) { // invalid type, static\n return x;\n }\n \n @Size\n " +
368+ "private double getSalary(double x) {\n return x;\n }\n }" ;
369369
370370 String newText2 = "package io.openliberty.sample.jakarta.beanvalidation;\n \n import jakarta.validation.constraints.AssertFalse;\n " +
371371 "import jakarta.validation.constraints.AssertTrue;\n import jakarta.validation.constraints.Size;\n \n " +
372- "public class MethodConstraintValidation {\n \n // valid cases\n @AssertFalse\n private boolean falseMethod() {\n " +
373- " return false;\n }\n \n @AssertTrue\n public boolean trueMethod() {\n return true;\n }\n \n " +
374- " // invalid cases\n @AssertTrue\n public boolean anotherTruth() { // static\n return true;\n }\n \n " +
375- " @AssertTrue\n public String notBoolean() { // invalid type\n return \" aha!\" ;\n }\n \n " +
376- " @AssertFalse\n private static int notBoolTwo(int x) { // invalid type, static\n return x;\n }\n \n " +
377- " @Size\n private double getSalary(double x) {\n return x;\n }\n }" ;
372+ "public class MethodConstraintValidation {\n \n // valid cases\n @AssertFalse\n " +
373+ "private boolean falseMethod() {\n return false;\n }\n \n @AssertTrue\n " +
374+ "public boolean trueMethod() {\n return true;\n }\n \n // invalid cases\n @AssertTrue\n " +
375+ "public boolean anotherTruth() { // static\n return true;\n }\n \n @AssertTrue\n " +
376+ "public String notBoolean() { // invalid type\n return \" aha!\" ;\n }\n \n @AssertFalse\n " +
377+ "private static int notBoolTwo(int x) { // invalid type, static\n return x;\n }\n \n @Size\n " +
378+ "private double getSalary(double x) {\n return x;\n }\n }" ;
378379
379380 JakartaJavaCodeActionParams codeActionParams = createCodeActionParams (uri , d1 );
380381 TextEdit te = te (0 , 0 , 39 , 1 , newText1 );
@@ -386,12 +387,13 @@ public void methodConstraintValidation() throws Exception {
386387
387388 String newText3 = "package io.openliberty.sample.jakarta.beanvalidation;\n \n import jakarta.validation.constraints.AssertFalse;\n " +
388389 "import jakarta.validation.constraints.AssertTrue;\n import jakarta.validation.constraints.Size;\n \n " +
389- "public class MethodConstraintValidation {\n \n // valid cases\n @AssertFalse\n private boolean falseMethod() {\n " +
390- " return false;\n }\n \n @AssertTrue\n public boolean trueMethod() {\n return true;\n }\n \n " +
391- " // invalid cases\n @AssertTrue\n public static boolean anotherTruth() { // static\n return true;\n " +
392- " }\n \n public String notBoolean() { // invalid type\n return \" aha!\" ;\n }\n \n @AssertFalse\n " +
393- " private static int notBoolTwo(int x) { // invalid type, static\n return x;\n }\n \n @Size\n " +
394- " private double getSalary(double x) {\n return x;\n }\n }" ;
390+ "public class MethodConstraintValidation {\n \n // valid cases\n @AssertFalse\n " +
391+ "private boolean falseMethod() {\n return false;\n }\n \n @AssertTrue\n " +
392+ "public boolean trueMethod() {\n return true;\n }\n \n // invalid cases\n @AssertTrue\n " +
393+ "public static boolean anotherTruth() { // static\n return true;\n }\n \n " +
394+ "public String notBoolean() { // invalid type\n return \" aha!\" ;\n }\n \n @AssertFalse\n " +
395+ "private static int notBoolTwo(int x) { // invalid type, static\n return x;\n }\n \n @Size\n " +
396+ "private double getSalary(double x) {\n return x;\n }\n }" ;
395397
396398 codeActionParams = createCodeActionParams (uri , d2 );
397399 te = te (0 , 0 , 39 , 1 , newText3 );
@@ -401,20 +403,22 @@ public void methodConstraintValidation() throws Exception {
401403
402404 String newText4 = "package io.openliberty.sample.jakarta.beanvalidation;\n \n import jakarta.validation.constraints.AssertFalse;\n " +
403405 "import jakarta.validation.constraints.AssertTrue;\n import jakarta.validation.constraints.Size;\n \n " +
404- "public class MethodConstraintValidation {\n \n // valid cases\n @AssertFalse\n private boolean falseMethod() {\n " +
405- " return false;\n }\n \n @AssertTrue\n public boolean trueMethod() {\n return true;\n }\n \n " +
406- " // invalid cases\n @AssertTrue\n public static boolean anotherTruth() { // static\n return true;\n }\n \n " +
407- " @AssertTrue\n public String notBoolean() { // invalid type\n return \" aha!\" ;\n }\n \n " +
408- " private static int notBoolTwo(int x) { // invalid type, static\n return x;\n }\n \n @Size\n " +
409- " private double getSalary(double x) {\n return x;\n }\n }" ;
406+ "public class MethodConstraintValidation {\n \n // valid cases\n @AssertFalse\n " +
407+ "private boolean falseMethod() {\n return false;\n }\n \n @AssertTrue\n " +
408+ "public boolean trueMethod() {\n return true;\n }\n \n // invalid cases\n @AssertTrue\n " +
409+ "public static boolean anotherTruth() { // static\n return true;\n }\n \n @AssertTrue\n " +
410+ "public String notBoolean() { // invalid type\n return \" aha!\" ;\n }\n \n " +
411+ "private static int notBoolTwo(int x) { // invalid type, static\n return x;\n }\n \n @Size\n " +
412+ "private double getSalary(double x) {\n return x;\n }\n }" ;
410413 String newText5 = "package io.openliberty.sample.jakarta.beanvalidation;\n \n import jakarta.validation.constraints.AssertFalse;\n " +
411414 "import jakarta.validation.constraints.AssertTrue;\n import jakarta.validation.constraints.Size;\n \n " +
412- "public class MethodConstraintValidation {\n \n // valid cases\n @AssertFalse\n private boolean falseMethod() {\n " +
413- " return false;\n }\n \n @AssertTrue\n public boolean trueMethod() {\n return true;\n }\n \n " +
414- " // invalid cases\n @AssertTrue\n public static boolean anotherTruth() { // static\n return true;\n " +
415- " }\n \n @AssertTrue\n public String notBoolean() { // invalid type\n return \" aha!\" ;\n }\n \n " +
416- " @AssertFalse\n private int notBoolTwo(int x) { // invalid type, static\n return x;\n }\n \n @Size\n " +
417- " private double getSalary(double x) {\n return x;\n }\n }" ;
415+ "public class MethodConstraintValidation {\n \n // valid cases\n @AssertFalse\n " +
416+ "private boolean falseMethod() {\n return false;\n }\n \n @AssertTrue\n " +
417+ "public boolean trueMethod() {\n return true;\n }\n \n // invalid cases\n @AssertTrue\n " +
418+ "public static boolean anotherTruth() { // static\n return true;\n }\n \n @AssertTrue\n " +
419+ "public String notBoolean() { // invalid type\n return \" aha!\" ;\n }\n \n @AssertFalse\n " +
420+ "private int notBoolTwo(int x) { // invalid type, static\n return x;\n }\n \n @Size\n " +
421+ "private double getSalary(double x) {\n return x;\n }\n }" ;
418422 codeActionParams = createCodeActionParams (uri , d3 );
419423 te = te (0 , 0 , 39 , 1 , newText4 );
420424 te2 = te (0 , 0 , 39 , 1 , newText5 );
@@ -425,12 +429,13 @@ public void methodConstraintValidation() throws Exception {
425429
426430 String newText6 = "package io.openliberty.sample.jakarta.beanvalidation;\n \n import jakarta.validation.constraints.AssertFalse;\n " +
427431 "import jakarta.validation.constraints.AssertTrue;\n import jakarta.validation.constraints.Size;\n \n " +
428- "public class MethodConstraintValidation {\n \n // valid cases\n @AssertFalse\n private boolean falseMethod() {\n " +
429- " return false;\n }\n \n @AssertTrue\n public boolean trueMethod() {\n return true;\n }\n \n " +
430- " // invalid cases\n @AssertTrue\n public static boolean anotherTruth() { // static\n return true;\n }\n \n " +
431- " @AssertTrue\n public String notBoolean() { // invalid type\n return \" aha!\" ;\n }\n \n @AssertFalse\n " +
432- " private static int notBoolTwo(int x) { // invalid type, static\n return x;\n }\n \n " +
433- " private double getSalary(double x) {\n return x;\n }\n }" ;
432+ "public class MethodConstraintValidation {\n \n // valid cases\n @AssertFalse\n " +
433+ "private boolean falseMethod() {\n return false;\n }\n \n @AssertTrue\n " +
434+ "public boolean trueMethod() {\n return true;\n }\n \n // invalid cases\n @AssertTrue\n " +
435+ "public static boolean anotherTruth() { // static\n return true;\n }\n \n @AssertTrue\n " +
436+ "public String notBoolean() { // invalid type\n return \" aha!\" ;\n }\n \n @AssertFalse\n " +
437+ "private static int notBoolTwo(int x) { // invalid type, static\n return x;\n }\n \n " +
438+ "private double getSalary(double x) {\n return x;\n }\n }" ;
434439 codeActionParams = createCodeActionParams (uri , d4 );
435440 te = te (0 , 0 , 39 , 1 , newText6 );
436441 ca = ca (uri , "Remove constraint annotation Size from element" , d4 , te );
0 commit comments