You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ibatis.apache.org by cb...@apache.org on 2009/06/16 06:28:52 UTC
svn commit: r785070 - in
/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted:
includes/ integer_enum/ selectkey/
Author: cbegin
Date: Tue Jun 16 04:28:52 2009
New Revision: 785070
URL: http://svn.apache.org/viewvc?rev=785070&view=rev
Log:
added new dynamic sql test. refactored other tests
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/includes/IncludeTest.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/includes/Mapper.xml
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/includes/MapperConfig.xml
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/integer_enum/IntegerEnumTest.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/MapperConfig.xml
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/SelectKeyTest.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/Table1.xml
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/Table2.xml
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/includes/IncludeTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/includes/IncludeTest.java?rev=785070&r1=785069&r2=785070&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/includes/IncludeTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/includes/IncludeTest.java Tue Jun 16 04:28:52 2009
@@ -1,20 +1,20 @@
package org.apache.ibatis.submitted.includes;
-import java.io.Reader;
-
-import junit.framework.TestCase;
-
import org.apache.ibatis.io.Resources;
-import org.apache.ibatis.session.SqlSessionFactory;
-import org.apache.ibatis.session.SqlSessionFactoryBuilder;
+import org.apache.ibatis.session.*;
+import static org.junit.Assert.assertNotNull;
+import org.junit.Test;
+
+import java.io.Reader;
-public class IncludeTest extends TestCase {
+public class IncludeTest {
- public void testIncludes() throws Exception {
- String resource = "org/apache/ibatis/submitted/includes/MapperConfig.xml";
- Reader reader = Resources.getResourceAsReader(resource);
- SqlSessionFactoryBuilder builder = new SqlSessionFactoryBuilder();
- SqlSessionFactory sqlMapper = builder.build(reader);
- assertNotNull(sqlMapper);
- }
+ @Test
+ public void testIncludes() throws Exception {
+ String resource = "org/apache/ibatis/submitted/includes/MapperConfig.xml";
+ Reader reader = Resources.getResourceAsReader(resource);
+ SqlSessionFactoryBuilder builder = new SqlSessionFactoryBuilder();
+ SqlSessionFactory sqlMapper = builder.build(reader);
+ assertNotNull(sqlMapper);
+ }
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/includes/Mapper.xml
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/includes/Mapper.xml?rev=785070&r1=785069&r2=785070&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/includes/Mapper.xml (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/includes/Mapper.xml Tue Jun 16 04:28:52 2009
@@ -4,19 +4,19 @@
<sql id="sometable">
SomeTable
</sql>
-
+
<select id="select" resultType="map">
<include refid="org.apache.ibatis.submitted.includes.fragments.select"/>
field1, field2, field3
from
- <include refid="sometable" />
+ <include refid="sometable"/>
</select>
-
+
<update id="update" parameterType="map">
<include refid="org.apache.ibatis.submitted.includes.fragments.update"/>
- <include refid="org.apache.ibatis.submitted.includes.mapper.sometable" />
+ <include refid="org.apache.ibatis.submitted.includes.mapper.sometable"/>
set Field2 = #{field2,jdbcType=INTEGER},
- Field3 = #{field3,jdbcType=VARCHAR},
+ Field3 = #{field3,jdbcType=VARCHAR},
where field1 = #{field1,jdbcType=INTEGER}
</update>
</mapper>
\ No newline at end of file
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/includes/MapperConfig.xml
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/includes/MapperConfig.xml?rev=785070&r1=785069&r2=785070&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/includes/MapperConfig.xml (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/includes/MapperConfig.xml Tue Jun 16 04:28:52 2009
@@ -6,8 +6,8 @@
<configuration>
<mappers>
- <mapper resource="org/apache/ibatis/submitted/includes/Fragments.xml" />
- <mapper resource="org/apache/ibatis/submitted/includes/Mapper.xml" />
+ <mapper resource="org/apache/ibatis/submitted/includes/Fragments.xml"/>
+ <mapper resource="org/apache/ibatis/submitted/includes/Mapper.xml"/>
</mappers>
</configuration>
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/integer_enum/IntegerEnumTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/integer_enum/IntegerEnumTest.java?rev=785070&r1=785069&r2=785070&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/integer_enum/IntegerEnumTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/integer_enum/IntegerEnumTest.java Tue Jun 16 04:28:52 2009
@@ -1,10 +1,10 @@
package org.apache.ibatis.submitted.integer_enum;
+import org.apache.ibatis.BaseDataTest;
import org.apache.ibatis.io.Resources;
import org.apache.ibatis.session.*;
-import org.apache.ibatis.BaseDataTest;
+import static org.junit.Assert.assertNotNull;
import org.junit.Test;
-import static org.junit.Assert.*;
import javax.sql.DataSource;
import java.io.Reader;
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/MapperConfig.xml
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/MapperConfig.xml?rev=785070&r1=785069&r2=785070&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/MapperConfig.xml (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/MapperConfig.xml Tue Jun 16 04:28:52 2009
@@ -6,8 +6,8 @@
<configuration>
<mappers>
- <mapper resource="org/apache/ibatis/submitted/selectkey/Table1.xml" />
- <mapper resource="org/apache/ibatis/submitted/selectkey/Table2.xml" />
+ <mapper resource="org/apache/ibatis/submitted/selectkey/Table1.xml"/>
+ <mapper resource="org/apache/ibatis/submitted/selectkey/Table2.xml"/>
</mappers>
</configuration>
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/SelectKeyTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/SelectKeyTest.java?rev=785070&r1=785069&r2=785070&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/SelectKeyTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/SelectKeyTest.java Tue Jun 16 04:28:52 2009
@@ -1,22 +1,22 @@
package org.apache.ibatis.submitted.selectkey;
-import java.io.Reader;
-
-import junit.framework.TestCase;
-
import org.apache.ibatis.io.Resources;
-import org.apache.ibatis.session.SqlSessionFactory;
-import org.apache.ibatis.session.SqlSessionFactoryBuilder;
+import org.apache.ibatis.session.*;
+import static org.junit.Assert.assertNotNull;
+import org.junit.Test;
+
+import java.io.Reader;
-public class SelectKeyTest extends TestCase {
+public class SelectKeyTest {
- public void testSelectKey() throws Exception {
- // this test checks to make sure that we can have select keys with the same
- // insert id in different namespaces
- String resource = "org/apache/ibatis/submitted/selectkey/MapperConfig.xml";
- Reader reader = Resources.getResourceAsReader(resource);
- SqlSessionFactoryBuilder builder = new SqlSessionFactoryBuilder();
- SqlSessionFactory sqlMapper = builder.build(reader);
- assertNotNull(sqlMapper);
- }
+ @Test
+ public void testSelectKey() throws Exception {
+ // this test checks to make sure that we can have select keys with the same
+ // insert id in different namespaces
+ String resource = "org/apache/ibatis/submitted/selectkey/MapperConfig.xml";
+ Reader reader = Resources.getResourceAsReader(resource);
+ SqlSessionFactoryBuilder builder = new SqlSessionFactoryBuilder();
+ SqlSessionFactory sqlMapper = builder.build(reader);
+ assertNotNull(sqlMapper);
+ }
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/Table1.xml
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/Table1.xml?rev=785070&r1=785069&r2=785070&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/Table1.xml (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/Table1.xml Tue Jun 16 04:28:52 2009
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN" "http://ibatis.apache.org/dtd/ibatis-3-mapper.dtd">
<mapper namespace="org.apache.ibatis.submitted.selectkey.Table1">
- <insert id="insert" parameterType="map" >
+ <insert id="insert" parameterType="map">
insert into table1 (name) values (#{name})
- <selectKey resultType="java.lang.Integer" keyProperty="id" >
+ <selectKey resultType="java.lang.Integer" keyProperty="id">
CALL IDENTITY()
</selectKey>
</insert>
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/Table2.xml
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/Table2.xml?rev=785070&r1=785069&r2=785070&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/Table2.xml (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/selectkey/Table2.xml Tue Jun 16 04:28:52 2009
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN" "http://ibatis.apache.org/dtd/ibatis-3-mapper.dtd">
<mapper namespace="org.apache.ibatis.submitted.selectkey.Table2">
- <insert id="insert" parameterType="map" >
+ <insert id="insert" parameterType="map">
insert into table2 (name) values (#{name})
- <selectKey resultType="java.lang.Integer" keyProperty="id" >
+ <selectKey resultType="java.lang.Integer" keyProperty="id">
CALL IDENTITY()
</selectKey>
</insert>