move the test case to org.apache.ibatis.autoconstructor

Author: sogoagain

src/test/java/org/apache/ibatis/autoconstructor/AutoConstructorMapper.java

@@ -29,6 +29,9 @@ public interface AutoConstructorMapper {
   @Select("SELECT * FROM subject")
   List<AnnotatedSubject> getAnnotatedSubjects();
 
+  @Select("SELECT * FROM subject")
+  List<BadAnnotatedSubject> getBadAnnotatedSubjects();
+
   @Select("SELECT * FROM subject")
   List<BadSubject> getBadSubjects();
 

src/test/java/org/apache/ibatis/autoconstructor/AutoConstructorTest.java

@@ -15,14 +15,12 @@
  */
 package org.apache.ibatis.autoconstructor;
 
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
 import java.io.Reader;
 import java.util.List;
 
 import org.apache.ibatis.BaseDataTest;
 import org.apache.ibatis.exceptions.PersistenceException;
+import org.apache.ibatis.executor.ExecutorException;
 import org.apache.ibatis.io.Resources;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
@@ -31,6 +29,8 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 class AutoConstructorTest {
   private static SqlSessionFactory sqlSessionFactory;
 
@@ -71,6 +71,16 @@ void annotatedSubject() {
     }
   }
 
+  @Test
+  void badMultipleAnnotatedSubject() {
+    try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
+      final AutoConstructorMapper mapper = sqlSession.getMapper(AutoConstructorMapper.class);
+      final PersistenceException ex = assertThrows(PersistenceException.class, mapper::getBadAnnotatedSubjects);
+      final ExecutorException cause = (ExecutorException)  ex.getCause();
+      assertEquals("@AutomapConstructor should be used in only one constructor.", cause.getMessage());
+    }
+  }
+
   @Test
   void badSubject() {
     try (SqlSession sqlSession = sqlSessionFactory.openSession()) {

src/test/java/org/apache/ibatis/submitted/arg_name_baesd_constructor_automapping/User3.java renamed to src/test/java/org/apache/ibatis/autoconstructor/BadAnnotatedSubject.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2021 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.
@@ -13,45 +13,32 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package org.apache.ibatis.submitted.arg_name_baesd_constructor_automapping;
+package org.apache.ibatis.autoconstructor;
 
 import org.apache.ibatis.annotations.AutomapConstructor;
 
-public class User3 {
-
-  private Integer id;
-  private String name;
-  private Long team;
+public class BadAnnotatedSubject {
+  private final int id;
+  private final String name;
+  private final int age;
+  private final int height;
+  private final int weight;
 
   @AutomapConstructor
-  public User3(Integer id, String name, Long team) {
-    super();
+  public BadAnnotatedSubject(final int id, final String name, final int age, final int height, final int weight) {
     this.id = id;
     this.name = name;
-    this.team = team;
+    this.age = age;
+    this.height = height;
+    this.weight = weight;
   }
 
   @AutomapConstructor
-  public User3(Integer id, String name) {
-    super();
+  public BadAnnotatedSubject(final int id, final String name, final int age, final Integer height, final Integer weight) {
     this.id = id;
     this.name = name;
-    this.team = 100L;
-  }
-
-  public Integer getId() {
-    return id;
-  }
-
-  public String getName() {
-    return name;
-  }
-
-  public void setTeam(Long team) {
-    this.team = team;
-  }
-
-  public Long getTeam() {
-    return team;
+    this.age = age;
+    this.height = height == null ? 0 : height;
+    this.weight = weight == null ? 0 : weight;
   }
 }

src/test/java/org/apache/ibatis/submitted/arg_name_baesd_constructor_automapping/ArgNameBasedConstructorAutoMappingTest.java

@@ -135,17 +135,4 @@ void shouldApplyColumnPrefix() {
       assertEquals(99, task.getAssignee().getTeam());
     }
   }
-
-  @Test
-  void shouldBeOnlyOneAutomapConstructorAnnotation() {
-    // This test requires -parameters compiler option
-    try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
-      Mapper mapper = sqlSession.getMapper(Mapper.class);
-      mapper.selectNameAndIdWithAmbiguousConstructor(1);
-      fail("Exception should be thrown");
-    } catch (PersistenceException e) {
-      ExecutorException ex = (ExecutorException) e.getCause();
-      assertEquals("@AutomapConstructor should be used in only one constructor.", ex.getMessage());
-    }
-  }
 }

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

@@ -34,8 +34,5 @@ public interface Mapper {
   @Select("select name user_name, id user_id from users where id = #{id}")
   User2 selectUserIdAndUserNameUnderscore(Integer id);
 
-  @Select("select name, id from users where id = #{id}")
-  User3 selectNameAndIdWithAmbiguousConstructor(Integer id);
-
   Task selectTask(Integer id);
 }