Skip to content

Commit 624fdec

Browse files
Update test for annotations NotBlank, Pattern, Past, PastOrPresent
1 parent d6bd5e7 commit 624fdec

File tree

1 file changed

+81
-0
lines changed

1 file changed

+81
-0
lines changed

src/test/java/io/openliberty/tools/intellij/lsp4jakarta/it/beanvalidation/BeanValidationTest.java

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -494,6 +494,87 @@ public void fieldConstraintValidation() throws Exception {
494494
CodeAction ca16 = ca(uri, "Remove constraint annotation NegativeOrZero from element", d12, te16);
495495

496496
assertJavaCodeAction(codeActionParams16, utils, ca16);
497+
498+
String newText17 = "package io.openliberty.sample.jakarta.beanvalidation;\n\nimport java.util.Calendar;\n" +
499+
"import java.util.List;\n\nimport jakarta.validation.constraints.*;\n\n" +
500+
"public class FieldConstraintValidation {\n\n @AssertTrue\n private int isHappy; // invalid types\n\n" +
501+
" @AssertFalse\n private Double isSad;\n\n @DecimalMax(\"30.0\")\n @DecimalMin(\"10.0\")\n" +
502+
" private String bigDecimal;\n\n @Digits(fraction = 0, integer = 0)\n private boolean digits;\n\n" +
503+
" @Email\n private Integer emailAddress;\n\n @FutureOrPresent\n private boolean graduationDate;\n\n" +
504+
" @Future\n private double fergiesYear;\n\n @Min(value = 50)\n @Max(value = 100)\n private boolean gpa;\n\n" +
505+
" @Negative\n private boolean subZero;\n\n @NegativeOrZero\n private String notPos;\n\n" +
506+
" private boolean saysomething;\n\n @Pattern(regexp = \"\")\n private Calendar thisIsUsed;\n\n @Past\n" +
507+
" private double theGoodOldDays;\n\n @PastOrPresent\n private char[] aGoodFieldName;\n\n @Positive\n" +
508+
" private String[] area;\n\n @PositiveOrZero\n private List<String> maybeZero;\n\n" +
509+
" @AssertTrue\n private static boolean typeValid; // static\n\n @Past\n" +
510+
" private static boolean doubleBad; // static and invalid type\n}";
511+
512+
JakartaJavaCodeActionParams codeActionParams17 = createCodeActionParams(uri, d13);
513+
TextEdit te17 = te(0, 0, 64, 1, newText17);
514+
CodeAction ca17 = ca(uri, "Remove constraint annotation NotBlank from element", d13, te17);
515+
516+
assertJavaCodeAction(codeActionParams17, utils, ca17);
517+
518+
String newText18 = "package io.openliberty.sample.jakarta.beanvalidation;\n\nimport java.util.Calendar;\n" +
519+
"import java.util.List;\n\nimport jakarta.validation.constraints.*;\n\n" +
520+
"public class FieldConstraintValidation {\n\n @AssertTrue\n private int isHappy; // invalid types\n\n" +
521+
" @AssertFalse\n private Double isSad;\n\n @DecimalMax(\"30.0\")\n @DecimalMin(\"10.0\")\n" +
522+
" private String bigDecimal;\n\n @Digits(fraction = 0, integer = 0)\n private boolean digits;\n\n" +
523+
" @Email\n private Integer emailAddress;\n\n @FutureOrPresent\n private boolean graduationDate;\n\n" +
524+
" @Future\n private double fergiesYear;\n\n @Min(value = 50)\n @Max(value = 100)\n private boolean gpa;\n\n" +
525+
" @Negative\n private boolean subZero;\n\n @NegativeOrZero\n private String notPos;\n\n @NotBlank\n" +
526+
" private boolean saysomething;\n\n private Calendar thisIsUsed;\n\n @Past\n" +
527+
" private double theGoodOldDays;\n\n @PastOrPresent\n private char[] aGoodFieldName;\n\n @Positive\n" +
528+
" private String[] area;\n\n @PositiveOrZero\n private List<String> maybeZero;\n\n" +
529+
" @AssertTrue\n private static boolean typeValid; // static\n\n @Past\n" +
530+
" private static boolean doubleBad; // static and invalid type\n}";
531+
532+
JakartaJavaCodeActionParams codeActionParams18 = createCodeActionParams(uri, d14);
533+
TextEdit te18 = te(0, 0, 64, 1, newText18);
534+
CodeAction ca18 = ca(uri, "Remove constraint annotation Pattern from element", d14, te18);
535+
536+
assertJavaCodeAction(codeActionParams18, utils, ca18);
537+
538+
String newText19 = "package io.openliberty.sample.jakarta.beanvalidation;\n\nimport java.util.Calendar;\n" +
539+
"import java.util.List;\n\nimport jakarta.validation.constraints.*;\n\n" +
540+
"public class FieldConstraintValidation {\n\n @AssertTrue\n private int isHappy; // invalid types\n\n" +
541+
" @AssertFalse\n private Double isSad;\n\n @DecimalMax(\"30.0\")\n @DecimalMin(\"10.0\")\n" +
542+
" private String bigDecimal;\n\n @Digits(fraction = 0, integer = 0)\n private boolean digits;\n\n" +
543+
" @Email\n private Integer emailAddress;\n\n @FutureOrPresent\n private boolean graduationDate;\n\n" +
544+
" @Future\n private double fergiesYear;\n\n @Min(value = 50)\n @Max(value = 100)\n private boolean gpa;\n\n" +
545+
" @Negative\n private boolean subZero;\n\n @NegativeOrZero\n private String notPos;\n\n @NotBlank\n" +
546+
" private boolean saysomething;\n\n @Pattern(regexp = \"\")\n private Calendar thisIsUsed;\n\n" +
547+
" private double theGoodOldDays;\n\n @PastOrPresent\n private char[] aGoodFieldName;\n\n @Positive\n" +
548+
" private String[] area;\n\n @PositiveOrZero\n private List<String> maybeZero;\n\n" +
549+
" @AssertTrue\n private static boolean typeValid; // static\n\n @Past\n" +
550+
" private static boolean doubleBad; // static and invalid type\n}";
551+
552+
JakartaJavaCodeActionParams codeActionParams19 = createCodeActionParams(uri, d15);
553+
TextEdit te19 = te(0, 0, 64, 1, newText19);
554+
CodeAction ca19 = ca(uri, "Remove constraint annotation Past from element", d15, te19);
555+
556+
assertJavaCodeAction(codeActionParams19, utils, ca19);
557+
558+
String newText20 = "package io.openliberty.sample.jakarta.beanvalidation;\n\nimport java.util.Calendar;\n" +
559+
"import java.util.List;\n\nimport jakarta.validation.constraints.*;\n\n" +
560+
"public class FieldConstraintValidation {\n\n @AssertTrue\n private int isHappy; // invalid types\n\n" +
561+
" @AssertFalse\n private Double isSad;\n\n @DecimalMax(\"30.0\")\n @DecimalMin(\"10.0\")\n" +
562+
" private String bigDecimal;\n\n @Digits(fraction = 0, integer = 0)\n private boolean digits;\n\n" +
563+
" @Email\n private Integer emailAddress;\n\n @FutureOrPresent\n private boolean graduationDate;\n\n" +
564+
" @Future\n private double fergiesYear;\n\n @Min(value = 50)\n @Max(value = 100)\n private boolean gpa;\n\n" +
565+
" @Negative\n private boolean subZero;\n\n @NegativeOrZero\n private String notPos;\n\n @NotBlank\n" +
566+
" private boolean saysomething;\n\n @Pattern(regexp = \"\")\n private Calendar thisIsUsed;\n\n @Past\n" +
567+
" private double theGoodOldDays;\n\n private char[] aGoodFieldName;\n\n @Positive\n" +
568+
" private String[] area;\n\n @PositiveOrZero\n private List<String> maybeZero;\n\n" +
569+
" @AssertTrue\n private static boolean typeValid; // static\n\n @Past\n" +
570+
" private static boolean doubleBad; // static and invalid type\n}";
571+
572+
JakartaJavaCodeActionParams codeActionParams20 = createCodeActionParams(uri, d16);
573+
TextEdit te20 = te(0, 0, 64, 1, newText20);
574+
CodeAction ca20 = ca(uri, "Remove constraint annotation PastOrPresent from element", d16, te20);
575+
576+
assertJavaCodeAction(codeActionParams20, utils, ca20);
577+
497578
}
498579

499580
@Test

0 commit comments

Comments
 (0)