Merge pull request #2823 from hazendaz/copyright

[tests] More test modernization cleanups

Author: hazendaz

src/test/java/org/apache/ibatis/builder/xml/dynamic/ExpressionEvaluatorTest.java

@@ -92,7 +92,8 @@ void shouldIterateOverIterable() {
     final Iterable<?> iterable = evaluator.evaluateIterable("array", parameterObject);
     int i = 0;
     for (Object o : iterable) {
-      assertEquals(String.valueOf(++i), o);
+      i++;
+      assertEquals(String.valueOf(i), o);
     }
   }
 

src/test/java/org/apache/ibatis/executor/BaseExecutorTest.java

@@ -326,12 +326,11 @@ void shouldSelectAuthorViaOutParams() throws Exception {
       assertEquals("[email protected]", author.getEmail());
       assertNull(author.getBio());
     } catch (ExecutorException e) {
-      if (executor instanceof CachingExecutor) {
-        // TODO see issue #464. Fail is OK.
-        assertTrue(e.getMessage().contains("OUT params is not supported"));
-      } else {
+      if (!(executor instanceof CachingExecutor)) {
         throw e;
       }
+      // TODO see issue #464. Fail is OK.
+      assertTrue(e.getMessage().contains("OUT params is not supported"));
     } finally {
       executor.rollback(true);
       executor.close(false);

src/test/java/org/apache/ibatis/io/VFSTest.java

@@ -97,7 +97,7 @@ void invoke() throws IOException, NoSuchMethodException {
 
   }
 
-  private class InstanceGetterProcedure implements Runnable {
+  private static class InstanceGetterProcedure implements Runnable {
 
     volatile VFS instanceGot;
 

src/test/java/org/apache/ibatis/scripting/xmltags/OgnlCacheTest.java

@@ -42,9 +42,7 @@ class DataClass {
     context.put("data", new DataClass());
     ExecutorService executor = Executors.newCachedThreadPool();
     IntStream.range(0, run).forEach(i -> {
-      futures.add(executor.submit(() -> {
-        return OgnlCache.getValue("data.id", context);
-      }));
+      futures.add(executor.submit(() -> OgnlCache.getValue("data.id", context)));
     });
     for (int i = 0; i < run; i++) {
       assertNotNull(futures.get(i).get());

src/test/java/org/apache/ibatis/submitted/default_method/Mapper.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@ default User defaultGetUser(Object... args) {
   }
 
   interface SubMapper extends Mapper {
+    @Override
     default User defaultGetUser(Object... args) {
       return getUserByIdAndName((String) args[0], (Integer) args[1]);
     }

src/test/java/org/apache/ibatis/submitted/enum_interface_type_handler/Color.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -17,16 +17,19 @@
 
 public enum Color implements HasValue {
   WHITE {
+    @Override
     public int getValue() {
       return 1;
     }
   },
   RED {
+    @Override
     public int getValue() {
       return 2;
     }
   },
   BLUE {
+    @Override
     public int getValue() {
       return 3;
     }

src/test/java/org/apache/ibatis/submitted/nestedresulthandler/Item.java

@@ -19,6 +19,7 @@ public class Item {
   private Integer id;
   private String name;
 
+  @Override
   public String toString() {
     return new StringBuilder().append("Item(").append(id).append(", ").append(name).append(" )").toString();
   }

src/test/java/org/apache/ibatis/submitted/nestedresulthandler/Person.java

@@ -24,6 +24,7 @@ public class Person {
   private String name;
   private final List<Item> items = new ArrayList<>();
 
+  @Override
   public String toString() {
     return new StringBuilder().append("Person(").append(id).append(", ").append(name).append(", ").append(items)
         .append(" )").toString();

src/test/java/org/apache/ibatis/submitted/nestedresulthandler/PersonItemPair.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@ public class PersonItemPair {
   private Person person;
   private Item item;
 
+  @Override
   public String toString() {
     return new StringBuilder().append("PersonItemPair(").append(person).append(", ").append(item).append(" )")
         .toString();

src/test/java/org/apache/ibatis/type/TypeHandlerRegistryTest.java

@@ -238,11 +238,11 @@ void shouldAutoRegisterEnumTypeInMultiThreadEnvironment() throws Exception {
     try {
       for (int iteration = 0; iteration < 2000; iteration++) {
         TypeHandlerRegistry typeHandlerRegistry = new TypeHandlerRegistry();
-        List<Future<Boolean>> taskResults = IntStream.range(0, 2).mapToObj(taskIndex -> executorService.submit(() -> {
-          return typeHandlerRegistry.hasTypeHandler(TestEnum.class, JdbcType.VARCHAR);
-        })).collect(Collectors.toList());
-        for (int i = 0; i < taskResults.size(); i++) {
-          Future<Boolean> future = taskResults.get(i);
+        List<Future<Boolean>> taskResults = IntStream.range(0, 2)
+            .mapToObj(taskIndex -> executorService
+                .submit(() -> typeHandlerRegistry.hasTypeHandler(TestEnum.class, JdbcType.VARCHAR)))
+            .collect(Collectors.toList());
+        for (Future<Boolean> future : taskResults) {
           assertTrue(future.get(), "false is returned at round " + iteration);
         }
       }