Skip to content

Commit a2d55d2

Browse files
committed
Test removing parameterType with generated keys
1 parent a793ad4 commit a2d55d2

File tree

2 files changed

+54
-63
lines changed

2 files changed

+54
-63
lines changed

src/test/java/org/apache/ibatis/submitted/awful_table/AwfulTableMapper.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
delete from "awful table"
5151
where "CuStOmEr iD" = #{customerId,jdbcType=INTEGER}
5252
</delete>
53-
<insert id="insert" parameterType="org.apache.ibatis.submitted.awful_table.AwfulTable" useGeneratedKeys="true" keyProperty="customerId" >
53+
<insert id="insert" useGeneratedKeys="true" keyProperty="customerId" >
5454
insert into "awful table" ("first name", FIRST_NAME,
5555
FIRSTNAME, "last name", E_MAIL,
5656
"_id1", "$id2", "id5_", "id6$",
@@ -62,7 +62,7 @@
6262
#{id7,jdbcType=INTEGER}, #{emailaddress,jdbcType=VARCHAR}, #{from,jdbcType=VARCHAR},
6363
#{active,jdbcType=BIT})
6464
</insert>
65-
<insert id="insertSelective" parameterType="org.apache.ibatis.submitted.awful_table.AwfulTable" useGeneratedKeys="true" keyProperty="customerId" >
65+
<insert id="insertSelective" useGeneratedKeys="true" keyProperty="customerId" >
6666
insert into "awful table"
6767
<trim prefix="(" suffix=")" suffixOverrides="," >
6868
<if test="firstFirstName != null" >

src/test/java/org/apache/ibatis/submitted/awful_table/AwfulTableTest.java

Lines changed: 52 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -30,76 +30,67 @@
3030
import org.junit.Test;
3131

3232
public class AwfulTableTest {
33-
protected SqlSessionFactory sqlSessionFactory;
33+
protected SqlSessionFactory sqlSessionFactory;
3434

35-
@Before
36-
public void setUp() throws Exception {
37-
Class.forName("org.hsqldb.jdbcDriver");
38-
Connection conn = DriverManager.getConnection("jdbc:hsqldb:mem:attest",
39-
"sa", "");
35+
@Before
36+
public void setUp() throws Exception {
37+
Class.forName("org.hsqldb.jdbcDriver");
38+
Connection conn = DriverManager.getConnection("jdbc:hsqldb:mem:attest", "sa", "");
4039

41-
Reader reader = Resources
42-
.getResourceAsReader("org/apache/ibatis/submitted/awful_table/CreateDB.sql");
40+
Reader reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/awful_table/CreateDB.sql");
4341

44-
ScriptRunner runner = new ScriptRunner(conn);
45-
runner.setLogWriter(null);
46-
runner.setErrorLogWriter(null);
47-
runner.runScript(reader);
48-
conn.commit();
49-
reader.close();
42+
ScriptRunner runner = new ScriptRunner(conn);
43+
runner.setLogWriter(null);
44+
runner.setErrorLogWriter(null);
45+
runner.runScript(reader);
46+
conn.commit();
47+
reader.close();
5048

51-
reader = Resources
52-
.getResourceAsReader("org/apache/ibatis/submitted/awful_table/MapperConfig.xml");
53-
sqlSessionFactory = new SqlSessionFactoryBuilder().build(reader);
54-
reader.close();
55-
}
49+
reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/awful_table/MapperConfig.xml");
50+
sqlSessionFactory = new SqlSessionFactoryBuilder().build(reader);
51+
reader.close();
52+
}
5653

57-
@Test
58-
public void testAwfulTableInsert() {
59-
SqlSession sqlSession = sqlSessionFactory.openSession();
54+
@Test
55+
public void testAwfulTableInsert() {
56+
SqlSession sqlSession = sqlSessionFactory.openSession();
6057

61-
try {
62-
AwfulTableMapper mapper = sqlSession
63-
.getMapper(AwfulTableMapper.class);
64-
AwfulTable record = new AwfulTable();
65-
record.seteMail("[email protected]");
66-
record.setEmailaddress("[email protected]");
67-
record.setFirstFirstName("fred1");
68-
record.setFrom("from field");
69-
record.setId1(1);
70-
record.setId2(2);
71-
record.setId5(5);
72-
record.setId6(6);
73-
record.setId7(7);
74-
record.setSecondFirstName("fred2");
75-
record.setThirdFirstName("fred3");
58+
try {
59+
AwfulTableMapper mapper = sqlSession.getMapper(AwfulTableMapper.class);
60+
AwfulTable record = new AwfulTable();
61+
record.seteMail("[email protected]");
62+
record.setEmailaddress("[email protected]");
63+
record.setFirstFirstName("fred1");
64+
record.setFrom("from field");
65+
record.setId1(1);
66+
record.setId2(2);
67+
record.setId5(5);
68+
record.setId6(6);
69+
record.setId7(7);
70+
record.setSecondFirstName("fred2");
71+
record.setThirdFirstName("fred3");
7672

77-
mapper.insert(record);
78-
Integer generatedCustomerId = record.getCustomerId();
79-
assertEquals(57, generatedCustomerId.intValue());
73+
mapper.insert(record);
74+
Integer generatedCustomerId = record.getCustomerId();
75+
assertEquals(57, generatedCustomerId.intValue());
8076

81-
AwfulTable returnedRecord = mapper
82-
.selectByPrimaryKey(generatedCustomerId);
77+
AwfulTable returnedRecord = mapper.selectByPrimaryKey(generatedCustomerId);
8378

84-
assertEquals(generatedCustomerId, returnedRecord.getCustomerId());
85-
assertEquals(record.geteMail(), returnedRecord.geteMail());
86-
assertEquals(record.getEmailaddress(),
87-
returnedRecord.getEmailaddress());
88-
assertEquals(record.getFirstFirstName(),
89-
returnedRecord.getFirstFirstName());
90-
assertEquals(record.getFrom(), returnedRecord.getFrom());
91-
assertEquals(record.getId1(), returnedRecord.getId1());
92-
assertEquals(record.getId2(), returnedRecord.getId2());
93-
assertEquals(record.getId5(), returnedRecord.getId5());
94-
assertEquals(record.getId6(), returnedRecord.getId6());
95-
assertEquals(record.getId7(), returnedRecord.getId7());
96-
assertEquals(record.getSecondFirstName(),
97-
returnedRecord.getSecondFirstName());
98-
assertEquals(record.getThirdFirstName(),
99-
returnedRecord.getThirdFirstName());
100-
} finally {
101-
sqlSession.close();
102-
}
79+
assertEquals(generatedCustomerId, returnedRecord.getCustomerId());
80+
assertEquals(record.geteMail(), returnedRecord.geteMail());
81+
assertEquals(record.getEmailaddress(), returnedRecord.getEmailaddress());
82+
assertEquals(record.getFirstFirstName(), returnedRecord.getFirstFirstName());
83+
assertEquals(record.getFrom(), returnedRecord.getFrom());
84+
assertEquals(record.getId1(), returnedRecord.getId1());
85+
assertEquals(record.getId2(), returnedRecord.getId2());
86+
assertEquals(record.getId5(), returnedRecord.getId5());
87+
assertEquals(record.getId6(), returnedRecord.getId6());
88+
assertEquals(record.getId7(), returnedRecord.getId7());
89+
assertEquals(record.getSecondFirstName(), returnedRecord.getSecondFirstName());
90+
assertEquals(record.getThirdFirstName(), returnedRecord.getThirdFirstName());
91+
} finally {
92+
sqlSession.close();
10393
}
94+
}
10495

10596
}

0 commit comments

Comments
 (0)