jdk17

Author: rbri

src/test/java/org/htmlunit/HttpWebConnection3Test.java

@@ -179,7 +179,7 @@ public void acceptEncoding() throws Exception {
      * @return true when the url matches, false otherwise
      */
     public static ExpectedCondition<Boolean> currentUrlContains(final String url) {
-        return new ExpectedCondition<Boolean>() {
+        return new ExpectedCondition<>() {
             @Override
             public Boolean apply(final WebDriver driver) {
                 final String currentUrl = driver.getCurrentUrl();

src/test/java/org/htmlunit/archunit/Architecture2Test.java

@@ -194,7 +194,7 @@ else if (oneTests.size() == 0) {
         .should().dependOnClassesThat().resideInAPackage("org.hamcrest..");
 
     private static final ArchCondition<JavaMethod> haveConsistentTestAnnotations =
-            new ArchCondition<JavaMethod>("have consistent HtmlUnit test annotations") {
+            new ArchCondition<>("have consistent HtmlUnit test annotations") {
                 @Override
                 public void check(final JavaMethod method, final ConditionEvents events) {
                     try {

src/test/java/org/htmlunit/archunit/ArchitectureTest.java

@@ -232,7 +232,7 @@ public class ArchitectureTest {
             .orShould().beDeclaredInClassesThat().areAnnotatedWith(JsxClasses.class);
 
     private static final DescribedPredicate<? super JavaClass> isAssignableToScriptable =
-            new DescribedPredicate<JavaClass>("@is not assignable to Scriptable") {
+            new DescribedPredicate<>("@is not assignable to Scriptable") {
                 @Override
                 public boolean test(final JavaClass javaClass) {
                     // we have to build a more complex implemenation because
@@ -399,7 +399,7 @@ public boolean test(final JavaClass javaClass) {
             .orShould().haveNameStartingWith("is");
 
     private static final DescribedPredicate<JavaMethod> haveJsxGetterWithNonDefaultPropertyName =
-            new DescribedPredicate<JavaMethod>("@JsxGetter has a non default propertyName") {
+            new DescribedPredicate<>("@JsxGetter has a non default propertyName") {
                 @Override
                 public boolean test(final JavaMethod method) {
                     return StringUtils.isNotEmpty(method.getAnnotationOfType(JsxGetter.class).propertyName());
@@ -424,7 +424,7 @@ public boolean test(final JavaMethod method) {
             .should().haveNameStartingWith("set");
 
     private static final DescribedPredicate<JavaMethod> haveJsxSetterWithNonDefaultPropertyName =
-            new DescribedPredicate<JavaMethod>("@JsxSetter has a non default propertyName") {
+            new DescribedPredicate<>("@JsxSetter has a non default propertyName") {
                 @Override
                 public boolean test(final JavaMethod method) {
                     return StringUtils.isNotEmpty(method.getAnnotationOfType(JsxSetter.class).propertyName());
@@ -441,7 +441,7 @@ public boolean test(final JavaMethod method) {
             .should().haveNameEndingWith("_js");
 
     private static final ArchCondition<JavaMethod> hasMatchingGetter =
-            new ArchCondition<JavaMethod>("every @JsxSetter needs a matching @JsxGetter") {
+            new ArchCondition<>("every @JsxSetter needs a matching @JsxGetter") {
                 @Override
                 public void check(final JavaMethod method, final ConditionEvents events) {
                     String getterName = "g" + method.getName().substring(1);

src/test/java/org/htmlunit/libraries/dojo/DojoTestBase.java

@@ -103,11 +103,12 @@ void test(final String module, final long waitTime) throws Exception {
                         }
                     }
 
-                    String expFileName = StringUtils.replace(module, ".", "");
-                    expFileName = StringUtils.replace(expFileName, "_", "");
-                    expFileName = StringUtils.replace(expFileName, "/", "_");
+                    final String expFileName = module
+                                            .replace(".", "")
+                                            .replace("_", "")
+                                            .replace("/", "_");
                     String expected = loadExpectation(expFileName);
-                    expected = StringUtils.replace(expected, "\r\n", "\n");
+                    expected = expected.replace("\r\n", "\n");
 
                     assertEquals(normalize(expected), normalize(result.toString()));
                     // assertEquals(expected, result.toString());