You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ibatis.apache.org by jg...@apache.org on 2007/10/26 22:55:09 UTC
svn commit: r588774 [1/5] - in
/ibatis/trunk/java/mapper/mapper2/tools/abator/core: build/ doc/ htmldoc/
src/org/apache/ibatis/abator/config/ testJava2/abatortest/java2/
testJava2/abatortest/java2/execute/conditional/legacy/
testJava2/abatortest/java2/...
Author: jgbutler
Date: Fri Oct 26 13:55:08 2007
New Revision: 588774
URL: http://svn.apache.org/viewvc?rev=588774&view=rev
Log:
Abator: More tests for updatebyexample
Added:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/conditional/legacy/ConditionalLegacyTestSuite.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/conditional/legacy/CountByExampleTests.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/conditional/legacy/DeleteByExampleTests.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/conditional/legacy/DeleteByPrimaryKeyTests.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/conditional/legacy/InsertTests.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/conditional/legacy/SelectByExampleTests.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/conditional/legacy/SelectByPrimaryKeyTests.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/conditional/legacy/UpdateByPrimaryKeyTests.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/CompleteJava5TestSuite.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/conditional/java2/UpdateByExampleTests.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/conditional/java5/UpdateByExampleTests.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/flat/java2/UpdateByExampleTests.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/flat/java5/UpdateByExampleTests.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/hierarchical/java2/UpdateByExampleTests.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/hierarchical/java5/UpdateByExampleTests.java
Removed:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/conditional/legacy/ConditionalLegacyTests.java
Modified:
ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/version.properties
ibatis/trunk/java/mapper/mapper2/tools/abator/core/doc/ReleaseNotes.txt
ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/whatsNew.html
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/AbatorContext.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/TableConfiguration.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/CompleteJava2TestSuite.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/miscellaneous/MiscellaneousTests.java
ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/miscellaneous/MiscellaneousTests.java
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/version.properties
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/version.properties?rev=588774&r1=588773&r2=588774&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/version.properties (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/version.properties Fri Oct 26 13:55:08 2007
@@ -1,4 +1,4 @@
-#Abator build version info
-#Sat Oct 20 02:24:15 CDT 2007
-version=1.1.0
-buildNum=399
+#Abator build version info
+#Fri Sep 28 16:20:34 CDT 2007
+version=1.1.0
+buildNum=393
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/doc/ReleaseNotes.txt
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/doc/ReleaseNotes.txt?rev=588774&r1=588773&r2=588774&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/doc/ReleaseNotes.txt (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/doc/ReleaseNotes.txt Fri Oct 26 13:55:08 2007
@@ -15,12 +15,13 @@
2. Add "clear" method to generated example classes in the Java2/Java5
generator sets
3. Add support for "ignoreQualifiersAtRuntime" and "runtimeTableName" on
- the <table> configuration
+ the <table> configuration - this makes it easier to deal with tables
+ that are behind public aliases.
4. Added support for persisting a configuration to XML - this to enable
a graphical editor in the future
5. Add afterXXXGenerationHook() methods in all generators to enable adding
- extra Java code or XML elements to any generated object. Will make it
- easier to create customized generators
+ extra Java code or XML elements to any generated object. This will make
+ it easier to create customized generators
6. Added SYBASE database dialect for generated keys
7. Added the ability to specify that resultMaps should use column indexes
rather than column name. This is necessary in poorly designed tables
@@ -35,6 +36,7 @@
command line and the Ant task
12. IBATIS-414 - make the Example and Criteria classes extendable
13. Added countByExample generated method
+14. Java2 is now the default generator set
-------------------------------------------------------------------------------
Version 1.0.0:
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/whatsNew.html
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/whatsNew.html?rev=588774&r1=588773&r2=588774&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/whatsNew.html (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/htmldoc/whatsNew.html Fri Oct 26 13:55:08 2007
@@ -16,10 +16,16 @@
<dt>countByExample</dt>
<dd>This method will return an integer representing the number of rows in a table
that match the given example.</dd>
+ <dt>updateByExample</dt>
+ <dd>This method will update all rows in a table that match a given example. This method is
+ available in the Java2 and Java5 generator sets only. There is also a "selective" version
+ of the method that only updates certain columns of a table.</dd>
</dl>
<h3>Miscellaneous Changes</h3>
<ul>
+ <li>Java2 is now the default generator set. The Legacy generator set will be removed in
+ the next release of Abator.</li>
<li>Fixed a bug that caused the "trimStrings" property to fail</li>
<li>Fixed the XML file merger so that internal entities are preserved</li>
<li>Added the ability to specify properties to ignore qualifiers and change runtime
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/AbatorContext.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/AbatorContext.java?rev=588774&r1=588773&r2=588774&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/AbatorContext.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/AbatorContext.java Fri Oct 26 13:55:08 2007
@@ -86,8 +86,7 @@
}
if (generatorSetType == null) {
- // TODO - make Java2 the default in some future release
- generatorSet = new LegacyGeneratorSet();
+ generatorSet = new Java2GeneratorSet();
} else if ("Legacy".equalsIgnoreCase(generatorSetType)) { //$NON-NLS-1$
generatorSet = new LegacyGeneratorSet();
} else if ("Java2".equalsIgnoreCase(generatorSetType)) { //$NON-NLS-1$
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/TableConfiguration.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/TableConfiguration.java?rev=588774&r1=588773&r2=588774&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/TableConfiguration.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/src/org/apache/ibatis/abator/config/TableConfiguration.java Fri Oct 26 13:55:08 2007
@@ -245,7 +245,9 @@
|| insertStatementEnabled
|| updateByPrimaryKeyStatementEnabled
|| deleteByExampleStatementEnabled
- || deleteByPrimaryKeyStatementEnabled;
+ || deleteByPrimaryKeyStatementEnabled
+ || countByExampleStatementEnabled
+ || updateByExampleStatementEnabled;
}
public void setGeneratedKey(GeneratedKey generatedKey) {
@@ -384,6 +386,10 @@
xmlElement.addAttribute(new Attribute("enableCountByExample", "false")); //$NON-NLS-1$ //$NON-NLS-2$
}
+ if (!updateByExampleStatementEnabled) {
+ xmlElement.addAttribute(new Attribute("enableUpdateByExample", "false")); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
if (StringUtility.stringHasValue(selectByPrimaryKeyQueryId)) {
xmlElement.addAttribute(new Attribute("selectByPrimaryKeyQueryId", selectByPrimaryKeyQueryId)); //$NON-NLS-1$
}
Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/CompleteJava2TestSuite.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/CompleteJava2TestSuite.java?rev=588774&r1=588773&r2=588774&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/CompleteJava2TestSuite.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/CompleteJava2TestSuite.java Fri Oct 26 13:55:08 2007
@@ -3,7 +3,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
import abatortest.java2.execute.conditional.java2.ConditionalJava2TestSuite;
-import abatortest.java2.execute.conditional.legacy.ConditionalLegacyTests;
+import abatortest.java2.execute.conditional.legacy.ConditionalLegacyTestSuite;
import abatortest.java2.execute.flat.java2.FlatJava2Tests;
import abatortest.java2.execute.flat.legacy.FlatLegacyTests;
import abatortest.java2.execute.hierarchical.java2.HierarchicalJava2Tests;
@@ -13,10 +13,10 @@
public class CompleteJava2TestSuite {
public static Test suite() {
- TestSuite suite = new TestSuite("All Tests");
+ TestSuite suite = new TestSuite("All Java 2 Tests");
suite.addTest(ConditionalJava2TestSuite.suite());
- suite.addTestSuite(ConditionalLegacyTests.class);
+ suite.addTest(ConditionalLegacyTestSuite.suite());
suite.addTestSuite(FlatJava2Tests.class);
suite.addTestSuite(FlatLegacyTests.class);
suite.addTestSuite(HierarchicalJava2Tests.class);
Added: ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/conditional/legacy/ConditionalLegacyTestSuite.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/conditional/legacy/ConditionalLegacyTestSuite.java?rev=588774&view=auto
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/conditional/legacy/ConditionalLegacyTestSuite.java (added)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/conditional/legacy/ConditionalLegacyTestSuite.java Fri Oct 26 13:55:08 2007
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package abatortest.java2.execute.conditional.legacy;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * @author Jeff Butler
+ *
+ */
+public class ConditionalLegacyTestSuite {
+
+ public static Test suite() {
+ TestSuite suite = new TestSuite("Conditional Legacy Tests");
+
+ suite.addTestSuite(CountByExampleTests.class);
+ suite.addTestSuite(DeleteByExampleTests.class);
+ suite.addTestSuite(DeleteByPrimaryKeyTests.class);
+ suite.addTestSuite(InsertTests.class);
+ suite.addTestSuite(SelectByExampleTests.class);
+ suite.addTestSuite(SelectByPrimaryKeyTests.class);
+ suite.addTestSuite(UpdateByPrimaryKeyTests.class);
+
+ return suite;
+ }
+}
Added: ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/conditional/legacy/CountByExampleTests.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/conditional/legacy/CountByExampleTests.java?rev=588774&view=auto
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/conditional/legacy/CountByExampleTests.java (added)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/conditional/legacy/CountByExampleTests.java Fri Oct 26 13:55:08 2007
@@ -0,0 +1,315 @@
+/*
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package abatortest.java2.execute.conditional.legacy;
+
+import java.sql.SQLException;
+
+import abatortest.java2.BaseTest;
+import abatortest.java2.generated.conditional.legacy.dao.AwfulTableDAO;
+import abatortest.java2.generated.conditional.legacy.dao.AwfulTableDAOImpl;
+import abatortest.java2.generated.conditional.legacy.dao.FieldsblobsDAO;
+import abatortest.java2.generated.conditional.legacy.dao.FieldsblobsDAOImpl;
+import abatortest.java2.generated.conditional.legacy.dao.FieldsonlyDAO;
+import abatortest.java2.generated.conditional.legacy.dao.FieldsonlyDAOImpl;
+import abatortest.java2.generated.conditional.legacy.dao.PkblobsDAO;
+import abatortest.java2.generated.conditional.legacy.dao.PkblobsDAOImpl;
+import abatortest.java2.generated.conditional.legacy.dao.PkfieldsDAO;
+import abatortest.java2.generated.conditional.legacy.dao.PkfieldsDAOImpl;
+import abatortest.java2.generated.conditional.legacy.dao.PkfieldsblobsDAO;
+import abatortest.java2.generated.conditional.legacy.dao.PkfieldsblobsDAOImpl;
+import abatortest.java2.generated.conditional.legacy.dao.PkonlyDAO;
+import abatortest.java2.generated.conditional.legacy.dao.PkonlyDAOImpl;
+import abatortest.java2.generated.conditional.legacy.model.AwfulTable;
+import abatortest.java2.generated.conditional.legacy.model.AwfulTableExample;
+import abatortest.java2.generated.conditional.legacy.model.FieldsblobsExample;
+import abatortest.java2.generated.conditional.legacy.model.FieldsblobsWithBLOBs;
+import abatortest.java2.generated.conditional.legacy.model.Fieldsonly;
+import abatortest.java2.generated.conditional.legacy.model.FieldsonlyExample;
+import abatortest.java2.generated.conditional.legacy.model.Pkblobs;
+import abatortest.java2.generated.conditional.legacy.model.PkblobsExample;
+import abatortest.java2.generated.conditional.legacy.model.Pkfields;
+import abatortest.java2.generated.conditional.legacy.model.PkfieldsExample;
+import abatortest.java2.generated.conditional.legacy.model.Pkfieldsblobs;
+import abatortest.java2.generated.conditional.legacy.model.PkfieldsblobsExample;
+import abatortest.java2.generated.conditional.legacy.model.PkonlyExample;
+import abatortest.java2.generated.conditional.legacy.model.PkonlyKey;
+
+/**
+ * @author Jeff Butler
+ *
+ */
+public class CountByExampleTests extends BaseTest {
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ initSqlMapClient(
+ "abatortest/java2/execute/conditional/legacy/SqlMapConfig.xml",
+ null);
+ }
+
+ public void testFieldsOnlyCountByExample() {
+ FieldsonlyDAO dao = new FieldsonlyDAOImpl(sqlMapClient);
+
+ try {
+ Fieldsonly record = new Fieldsonly();
+ record.setDoublefield(new Double(11.22));
+ record.setFloatfield(new Double(33.44));
+ record.setIntegerfield(new Integer(5));
+ dao.insert(record);
+
+ record = new Fieldsonly();
+ record.setDoublefield(new Double(44.55));
+ record.setFloatfield(new Double(66.77));
+ record.setIntegerfield(new Integer(8));
+ dao.insert(record);
+
+ record = new Fieldsonly();
+ record.setDoublefield(new Double(88.99));
+ record.setFloatfield(new Double(100.111));
+ record.setIntegerfield(new Integer(9));
+ dao.insert(record);
+
+ FieldsonlyExample example = new FieldsonlyExample();
+ example.setIntegerfield(new Integer(5));
+ example
+ .setIntegerfield_Indicator(FieldsonlyExample.EXAMPLE_GREATER_THAN);
+
+ int rows = dao.countByExample(example);
+ assertEquals(2, rows);
+
+ example = new FieldsonlyExample();
+ rows = dao.countByExample(example);
+ assertEquals(3, rows);
+ } catch (SQLException e) {
+ fail(e.getMessage());
+ }
+ }
+
+ public void testPKOnlyCountByExample() {
+ PkonlyDAO dao = new PkonlyDAOImpl(sqlMapClient);
+
+ try {
+ PkonlyKey key = new PkonlyKey();
+ key.setId(new Integer(1));
+ key.setSeqNum(new Integer(3));
+ dao.insert(key);
+
+ key = new PkonlyKey();
+ key.setId(new Integer(5));
+ key.setSeqNum(new Integer(6));
+ dao.insert(key);
+
+ key = new PkonlyKey();
+ key.setId(new Integer(7));
+ key.setSeqNum(new Integer(8));
+ dao.insert(key);
+
+ PkonlyExample example = new PkonlyExample();
+ example.setId(new Integer(4));
+ example.setId_Indicator(PkonlyExample.EXAMPLE_GREATER_THAN);
+ int rows = dao.countByExample(example);
+ assertEquals(2, rows);
+
+ example = new PkonlyExample();
+ rows = dao.countByExample(example);
+ assertEquals(3, rows);
+ } catch (SQLException e) {
+ fail(e.getMessage());
+ }
+ }
+
+ public void testPKFieldsCountByExample() {
+ PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+
+ try {
+ Pkfields record = new Pkfields();
+ record.setFirstname("Jeff");
+ record.setLastname("Smith");
+ record.setId1(new Integer(1));
+ record.setId2(new Integer(2));
+ dao.insert(record);
+
+ record = new Pkfields();
+ record.setFirstname("Bob");
+ record.setLastname("Jones");
+ record.setId1(new Integer(3));
+ record.setId2(new Integer(4));
+
+ dao.insert(record);
+
+ PkfieldsExample example = new PkfieldsExample();
+ example.setLastname("J%");
+ example.setLastname_Indicator(PkfieldsExample.EXAMPLE_LIKE);
+ int rows = dao.countByExample(example);
+ assertEquals(1, rows);
+
+ example = new PkfieldsExample();
+ rows = dao.countByExample(example);
+ assertEquals(2, rows);
+ } catch (SQLException e) {
+ fail(e.getMessage());
+ }
+ }
+
+ public void testPKBlobsCountByExample() {
+ PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+
+ try {
+ Pkblobs record = new Pkblobs();
+ record.setId(new Integer(3));
+ record.setBlob1(generateRandomBlob());
+ record.setBlob2(generateRandomBlob());
+ dao.insert(record);
+
+ record = new Pkblobs();
+ record.setId(new Integer(6));
+ record.setBlob1(generateRandomBlob());
+ record.setBlob2(generateRandomBlob());
+ dao.insert(record);
+
+ PkblobsExample example = new PkblobsExample();
+ example.setId(new Integer(4));
+ example.setId_Indicator(PkblobsExample.EXAMPLE_LESS_THAN);
+ int rows = dao.countByExample(example);
+ assertEquals(1, rows);
+
+ example = new PkblobsExample();
+ rows = dao.countByExample(example);
+ assertEquals(2, rows);
+ } catch (SQLException e) {
+ fail(e.getMessage());
+ }
+ }
+
+ public void testPKFieldsBlobsCountByExample() {
+ PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+
+ try {
+ Pkfieldsblobs record = new Pkfieldsblobs();
+ record.setId1(new Integer(3));
+ record.setId2(new Integer(4));
+ record.setFirstname("Jeff");
+ record.setLastname("Smith");
+ record.setBlob1(generateRandomBlob());
+ dao.insert(record);
+
+ record = new Pkfieldsblobs();
+ record.setId1(new Integer(5));
+ record.setId2(new Integer(6));
+ record.setFirstname("Scott");
+ record.setLastname("Jones");
+ record.setBlob1(generateRandomBlob());
+ dao.insert(record);
+
+ PkfieldsblobsExample example = new PkfieldsblobsExample();
+ example.setId1(new Integer(3));
+ example.setId1_Indicator(PkfieldsblobsExample.EXAMPLE_NOT_EQUALS);
+ int rows = dao.countByExample(example);
+ assertEquals(1, rows);
+
+ example = new PkfieldsblobsExample();
+ rows = dao.countByExample(example);
+ assertEquals(2, rows);
+ } catch (SQLException e) {
+ fail(e.getMessage());
+ }
+ }
+
+ public void testFieldsBlobsCountByExample() {
+ FieldsblobsDAO dao = new FieldsblobsDAOImpl(sqlMapClient);
+
+ try {
+ FieldsblobsWithBLOBs record = new FieldsblobsWithBLOBs();
+ record.setFirstname("Jeff");
+ record.setLastname("Smith");
+ record.setBlob1(generateRandomBlob());
+ record.setBlob2(generateRandomBlob());
+ dao.insert(record);
+
+ record = new FieldsblobsWithBLOBs();
+ record.setFirstname("Scott");
+ record.setLastname("Jones");
+ record.setBlob1(generateRandomBlob());
+ record.setBlob2(generateRandomBlob());
+ dao.insert(record);
+
+ FieldsblobsExample example = new FieldsblobsExample();
+ example.setFirstname("S%");
+ example.setFirstname_Indicator(FieldsblobsExample.EXAMPLE_LIKE);
+ int rows = dao.countByExample(example);
+ assertEquals(1, rows);
+
+ example = new FieldsblobsExample();
+ rows = dao.countByExample(example);
+ assertEquals(2, rows);
+ } catch (SQLException e) {
+ fail(e.getMessage());
+ }
+ }
+
+ public void testAwfulTableCountByExample() {
+ AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+
+ try {
+ AwfulTable record = new AwfulTable();
+ record.seteMail("fred@fred.com");
+ record.setEmailaddress("alsofred@fred.com");
+ record.setFirstFirstName("fred1");
+ record.setFourthFirstName("fred4");
+ record.setFrom("from field");
+ record.setId1(new Integer(1));
+ record.setId2(new Integer(2));
+ record.setId5(new Integer(5));
+ record.setId6(new Integer(6));
+ record.setId7(new Integer(7));
+ record.setSecondCustomerId(new Integer(567));
+ record.setSecondFirstName("fred2");
+ record.setThirdFirstName("fred3");
+
+ dao.insert(record);
+
+ record = new AwfulTable();
+ record.seteMail("fred2@fred.com");
+ record.setEmailaddress("alsofred2@fred.com");
+ record.setFirstFirstName("fred11");
+ record.setFourthFirstName("fred44");
+ record.setFrom("from from field");
+ record.setId1(new Integer(11));
+ record.setId2(new Integer(22));
+ record.setId5(new Integer(55));
+ record.setId6(new Integer(66));
+ record.setId7(new Integer(77));
+ record.setSecondCustomerId(new Integer(567567));
+ record.setSecondFirstName("fred22");
+ record.setThirdFirstName("fred33");
+
+ dao.insert(record);
+
+ AwfulTableExample example = new AwfulTableExample();
+ example.seteMail("fred@%");
+ example.seteMail_Indicator(AwfulTableExample.EXAMPLE_LIKE);
+ int rows = dao.countByExample(example);
+ assertEquals(1, rows);
+
+ example = new AwfulTableExample();
+ rows = dao.countByExample(example);
+ assertEquals(2, rows);
+ } catch (SQLException e) {
+ fail(e.getMessage());
+ }
+ }
+}
Added: ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/conditional/legacy/DeleteByExampleTests.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/conditional/legacy/DeleteByExampleTests.java?rev=588774&view=auto
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/conditional/legacy/DeleteByExampleTests.java (added)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/conditional/legacy/DeleteByExampleTests.java Fri Oct 26 13:55:08 2007
@@ -0,0 +1,336 @@
+/*
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package abatortest.java2.execute.conditional.legacy;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import abatortest.java2.BaseTest;
+import abatortest.java2.generated.conditional.legacy.dao.AwfulTableDAO;
+import abatortest.java2.generated.conditional.legacy.dao.AwfulTableDAOImpl;
+import abatortest.java2.generated.conditional.legacy.dao.FieldsblobsDAO;
+import abatortest.java2.generated.conditional.legacy.dao.FieldsblobsDAOImpl;
+import abatortest.java2.generated.conditional.legacy.dao.FieldsonlyDAO;
+import abatortest.java2.generated.conditional.legacy.dao.FieldsonlyDAOImpl;
+import abatortest.java2.generated.conditional.legacy.dao.PkblobsDAO;
+import abatortest.java2.generated.conditional.legacy.dao.PkblobsDAOImpl;
+import abatortest.java2.generated.conditional.legacy.dao.PkfieldsDAO;
+import abatortest.java2.generated.conditional.legacy.dao.PkfieldsDAOImpl;
+import abatortest.java2.generated.conditional.legacy.dao.PkfieldsblobsDAO;
+import abatortest.java2.generated.conditional.legacy.dao.PkfieldsblobsDAOImpl;
+import abatortest.java2.generated.conditional.legacy.dao.PkonlyDAO;
+import abatortest.java2.generated.conditional.legacy.dao.PkonlyDAOImpl;
+import abatortest.java2.generated.conditional.legacy.model.AwfulTable;
+import abatortest.java2.generated.conditional.legacy.model.AwfulTableExample;
+import abatortest.java2.generated.conditional.legacy.model.FieldsblobsExample;
+import abatortest.java2.generated.conditional.legacy.model.FieldsblobsWithBLOBs;
+import abatortest.java2.generated.conditional.legacy.model.Fieldsonly;
+import abatortest.java2.generated.conditional.legacy.model.FieldsonlyExample;
+import abatortest.java2.generated.conditional.legacy.model.Pkblobs;
+import abatortest.java2.generated.conditional.legacy.model.PkblobsExample;
+import abatortest.java2.generated.conditional.legacy.model.Pkfields;
+import abatortest.java2.generated.conditional.legacy.model.PkfieldsExample;
+import abatortest.java2.generated.conditional.legacy.model.Pkfieldsblobs;
+import abatortest.java2.generated.conditional.legacy.model.PkfieldsblobsExample;
+import abatortest.java2.generated.conditional.legacy.model.PkonlyExample;
+import abatortest.java2.generated.conditional.legacy.model.PkonlyKey;
+
+/**
+ * @author Jeff Butler
+ *
+ */
+public class DeleteByExampleTests extends BaseTest {
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ initSqlMapClient(
+ "abatortest/java2/execute/conditional/legacy/SqlMapConfig.xml",
+ null);
+ }
+
+ public void testFieldsOnlyDeleteByExample() {
+ FieldsonlyDAO dao = new FieldsonlyDAOImpl(sqlMapClient);
+
+ try {
+ Fieldsonly record = new Fieldsonly();
+ record.setDoublefield(new Double(11.22));
+ record.setFloatfield(new Double(33.44));
+ record.setIntegerfield(new Integer(5));
+ dao.insert(record);
+
+ record = new Fieldsonly();
+ record.setDoublefield(new Double(44.55));
+ record.setFloatfield(new Double(66.77));
+ record.setIntegerfield(new Integer(8));
+ dao.insert(record);
+
+ record = new Fieldsonly();
+ record.setDoublefield(new Double(88.99));
+ record.setFloatfield(new Double(100.111));
+ record.setIntegerfield(new Integer(9));
+ dao.insert(record);
+
+ FieldsonlyExample example = new FieldsonlyExample();
+ example.setIntegerfield(new Integer(5));
+ example
+ .setIntegerfield_Indicator(FieldsonlyExample.EXAMPLE_GREATER_THAN);
+
+ int rows = dao.deleteByExample(example);
+ assertEquals(2, rows);
+
+ example = new FieldsonlyExample();
+ List answer = dao.selectByExample(example);
+ assertEquals(1, answer.size());
+ } catch (SQLException e) {
+ fail(e.getMessage());
+ }
+ }
+
+ public void testPKOnlyDeleteByExample() {
+ PkonlyDAO dao = new PkonlyDAOImpl(sqlMapClient);
+
+ try {
+ PkonlyKey key = new PkonlyKey();
+ key.setId(new Integer(1));
+ key.setSeqNum(new Integer(3));
+ dao.insert(key);
+
+ key = new PkonlyKey();
+ key.setId(new Integer(5));
+ key.setSeqNum(new Integer(6));
+ dao.insert(key);
+
+ key = new PkonlyKey();
+ key.setId(new Integer(7));
+ key.setSeqNum(new Integer(8));
+ dao.insert(key);
+
+ PkonlyExample example = new PkonlyExample();
+ example.setId(new Integer(4));
+ example.setId_Indicator(PkonlyExample.EXAMPLE_GREATER_THAN);
+ int rows = dao.deleteByExample(example);
+ assertEquals(2, rows);
+
+ example = new PkonlyExample();
+ List answer = dao.selectByExample(example);
+ assertEquals(1, answer.size());
+ } catch (SQLException e) {
+ fail(e.getMessage());
+ }
+ }
+
+ public void testPKFieldsDeleteByExample() {
+ PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+
+ try {
+ Pkfields record = new Pkfields();
+ record.setFirstname("Jeff");
+ record.setLastname("Smith");
+ record.setId1(new Integer(1));
+ record.setId2(new Integer(2));
+ dao.insert(record);
+
+ record = new Pkfields();
+ record.setFirstname("Bob");
+ record.setLastname("Jones");
+ record.setId1(new Integer(3));
+ record.setId2(new Integer(4));
+
+ dao.insert(record);
+
+ PkfieldsExample example = new PkfieldsExample();
+ List answer = dao.selectByExample(example);
+ assertEquals(2, answer.size());
+
+ example = new PkfieldsExample();
+ example.setLastname("J%");
+ example.setLastname_Indicator(PkfieldsExample.EXAMPLE_LIKE);
+ int rows = dao.deleteByExample(example);
+ assertEquals(1, rows);
+
+ example = new PkfieldsExample();
+ answer = dao.selectByExample(example);
+ assertEquals(1, answer.size());
+ } catch (SQLException e) {
+ fail(e.getMessage());
+ }
+ }
+
+ public void testPKBlobsDeleteByExample() {
+ PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+
+ try {
+ Pkblobs record = new Pkblobs();
+ record.setId(new Integer(3));
+ record.setBlob1(generateRandomBlob());
+ record.setBlob2(generateRandomBlob());
+ dao.insert(record);
+
+ record = new Pkblobs();
+ record.setId(new Integer(6));
+ record.setBlob1(generateRandomBlob());
+ record.setBlob2(generateRandomBlob());
+ dao.insert(record);
+
+ PkblobsExample example = new PkblobsExample();
+ List answer = dao.selectByExampleWithoutBLOBs(example);
+ assertEquals(2, answer.size());
+
+ example = new PkblobsExample();
+ example.setId(new Integer(4));
+ example.setId_Indicator(PkblobsExample.EXAMPLE_LESS_THAN);
+ int rows = dao.deleteByExample(example);
+ assertEquals(1, rows);
+
+ example = new PkblobsExample();
+ answer = dao.selectByExampleWithoutBLOBs(example);
+ assertEquals(1, answer.size());
+ } catch (SQLException e) {
+ fail(e.getMessage());
+ }
+ }
+
+ public void testPKFieldsBlobsDeleteByExample() {
+ PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+
+ try {
+ Pkfieldsblobs record = new Pkfieldsblobs();
+ record.setId1(new Integer(3));
+ record.setId2(new Integer(4));
+ record.setFirstname("Jeff");
+ record.setLastname("Smith");
+ record.setBlob1(generateRandomBlob());
+ dao.insert(record);
+
+ record = new Pkfieldsblobs();
+ record.setId1(new Integer(5));
+ record.setId2(new Integer(6));
+ record.setFirstname("Scott");
+ record.setLastname("Jones");
+ record.setBlob1(generateRandomBlob());
+ dao.insert(record);
+
+ PkfieldsblobsExample example = new PkfieldsblobsExample();
+ List answer = dao.selectByExampleWithoutBLOBs(example);
+ assertEquals(2, answer.size());
+
+ example = new PkfieldsblobsExample();
+ example.setId1(new Integer(3));
+ example.setId1_Indicator(PkfieldsblobsExample.EXAMPLE_NOT_EQUALS);
+ int rows = dao.deleteByExample(example);
+ assertEquals(1, rows);
+
+ example = new PkfieldsblobsExample();
+ answer = dao.selectByExampleWithoutBLOBs(example);
+ assertEquals(1, answer.size());
+ } catch (SQLException e) {
+ fail(e.getMessage());
+ }
+ }
+
+ public void testFieldsBlobsDeleteByExample() {
+ FieldsblobsDAO dao = new FieldsblobsDAOImpl(sqlMapClient);
+
+ try {
+ FieldsblobsWithBLOBs record = new FieldsblobsWithBLOBs();
+ record.setFirstname("Jeff");
+ record.setLastname("Smith");
+ record.setBlob1(generateRandomBlob());
+ record.setBlob2(generateRandomBlob());
+ dao.insert(record);
+
+ record = new FieldsblobsWithBLOBs();
+ record.setFirstname("Scott");
+ record.setLastname("Jones");
+ record.setBlob1(generateRandomBlob());
+ record.setBlob2(generateRandomBlob());
+ dao.insert(record);
+
+ FieldsblobsExample example = new FieldsblobsExample();
+ List answer = dao.selectByExampleWithoutBLOBs(example);
+ assertEquals(2, answer.size());
+
+ example = new FieldsblobsExample();
+ example.setFirstname("S%");
+ example.setFirstname_Indicator(FieldsblobsExample.EXAMPLE_LIKE);
+ int rows = dao.deleteByExample(example);
+ assertEquals(1, rows);
+
+ example = new FieldsblobsExample();
+ answer = dao.selectByExampleWithoutBLOBs(example);
+ assertEquals(1, answer.size());
+ } catch (SQLException e) {
+ fail(e.getMessage());
+ }
+ }
+
+ public void testAwfulTableDeleteByExample() {
+ AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+
+ try {
+ AwfulTable record = new AwfulTable();
+ record.seteMail("fred@fred.com");
+ record.setEmailaddress("alsofred@fred.com");
+ record.setFirstFirstName("fred1");
+ record.setFourthFirstName("fred4");
+ record.setFrom("from field");
+ record.setId1(new Integer(1));
+ record.setId2(new Integer(2));
+ record.setId5(new Integer(5));
+ record.setId6(new Integer(6));
+ record.setId7(new Integer(7));
+ record.setSecondCustomerId(new Integer(567));
+ record.setSecondFirstName("fred2");
+ record.setThirdFirstName("fred3");
+
+ dao.insert(record);
+
+ record = new AwfulTable();
+ record.seteMail("fred2@fred.com");
+ record.setEmailaddress("alsofred2@fred.com");
+ record.setFirstFirstName("fred11");
+ record.setFourthFirstName("fred44");
+ record.setFrom("from from field");
+ record.setId1(new Integer(11));
+ record.setId2(new Integer(22));
+ record.setId5(new Integer(55));
+ record.setId6(new Integer(66));
+ record.setId7(new Integer(77));
+ record.setSecondCustomerId(new Integer(567567));
+ record.setSecondFirstName("fred22");
+ record.setThirdFirstName("fred33");
+
+ dao.insert(record);
+
+ AwfulTableExample example = new AwfulTableExample();
+ List answer = dao.selectByExample(example);
+ assertEquals(2, answer.size());
+
+ example = new AwfulTableExample();
+ example.seteMail("fred@%");
+ example.seteMail_Indicator(AwfulTableExample.EXAMPLE_LIKE);
+ int rows = dao.deleteByExample(example);
+ assertEquals(1, rows);
+
+ example = new AwfulTableExample();
+ answer = dao.selectByExample(example);
+ assertEquals(1, answer.size());
+ } catch (SQLException e) {
+ fail(e.getMessage());
+ }
+ }
+}
Added: ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/conditional/legacy/DeleteByPrimaryKeyTests.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/conditional/legacy/DeleteByPrimaryKeyTests.java?rev=588774&view=auto
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/conditional/legacy/DeleteByPrimaryKeyTests.java (added)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/conditional/legacy/DeleteByPrimaryKeyTests.java Fri Oct 26 13:55:08 2007
@@ -0,0 +1,211 @@
+/*
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package abatortest.java2.execute.conditional.legacy;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import abatortest.java2.BaseTest;
+import abatortest.java2.generated.conditional.legacy.dao.AwfulTableDAO;
+import abatortest.java2.generated.conditional.legacy.dao.AwfulTableDAOImpl;
+import abatortest.java2.generated.conditional.legacy.dao.PkblobsDAO;
+import abatortest.java2.generated.conditional.legacy.dao.PkblobsDAOImpl;
+import abatortest.java2.generated.conditional.legacy.dao.PkfieldsDAO;
+import abatortest.java2.generated.conditional.legacy.dao.PkfieldsDAOImpl;
+import abatortest.java2.generated.conditional.legacy.dao.PkfieldsblobsDAO;
+import abatortest.java2.generated.conditional.legacy.dao.PkfieldsblobsDAOImpl;
+import abatortest.java2.generated.conditional.legacy.dao.PkonlyDAO;
+import abatortest.java2.generated.conditional.legacy.dao.PkonlyDAOImpl;
+import abatortest.java2.generated.conditional.legacy.model.AwfulTable;
+import abatortest.java2.generated.conditional.legacy.model.AwfulTableExample;
+import abatortest.java2.generated.conditional.legacy.model.Pkblobs;
+import abatortest.java2.generated.conditional.legacy.model.PkblobsExample;
+import abatortest.java2.generated.conditional.legacy.model.Pkfields;
+import abatortest.java2.generated.conditional.legacy.model.PkfieldsExample;
+import abatortest.java2.generated.conditional.legacy.model.PkfieldsKey;
+import abatortest.java2.generated.conditional.legacy.model.Pkfieldsblobs;
+import abatortest.java2.generated.conditional.legacy.model.PkfieldsblobsExample;
+import abatortest.java2.generated.conditional.legacy.model.PkfieldsblobsKey;
+import abatortest.java2.generated.conditional.legacy.model.PkonlyExample;
+import abatortest.java2.generated.conditional.legacy.model.PkonlyKey;
+
+/**
+ * @author Jeff Butler
+ *
+ */
+public class DeleteByPrimaryKeyTests extends BaseTest {
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ initSqlMapClient(
+ "abatortest/java2/execute/conditional/legacy/SqlMapConfig.xml",
+ null);
+ }
+
+ public void testPKOnlyDeleteByPrimaryKey() {
+ PkonlyDAO dao = new PkonlyDAOImpl(sqlMapClient);
+
+ try {
+ PkonlyKey key = new PkonlyKey();
+ key.setId(new Integer(1));
+ key.setSeqNum(new Integer(3));
+ dao.insert(key);
+
+ key = new PkonlyKey();
+ key.setId(new Integer(5));
+ key.setSeqNum(new Integer(6));
+ dao.insert(key);
+
+ PkonlyExample example = new PkonlyExample();
+ List answer = dao.selectByExample(example);
+ assertEquals(2, answer.size());
+
+ key = new PkonlyKey();
+ key.setId(new Integer(5));
+ key.setSeqNum(new Integer(6));
+ int rows = dao.deleteByPrimaryKey(key);
+ assertEquals(1, rows);
+
+ answer = dao.selectByExample(example);
+ assertEquals(1, answer.size());
+ } catch (SQLException e) {
+ fail(e.getMessage());
+ }
+ }
+
+ public void testPKfieldsDeleteByPrimaryKey() {
+ PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+
+ try {
+ Pkfields record = new Pkfields();
+ record.setFirstname("Jeff");
+ record.setLastname("Smith");
+ record.setId1(new Integer(1));
+ record.setId2(new Integer(2));
+
+ dao.insert(record);
+
+ PkfieldsKey key = new PkfieldsKey();
+ key.setId1(new Integer(1));
+ key.setId2(new Integer(2));
+
+ int rows = dao.deleteByPrimaryKey(key);
+ assertEquals(1, rows);
+
+ PkfieldsExample example = new PkfieldsExample();
+ List answer = dao.selectByExample(example);
+ assertEquals(0, answer.size());
+ } catch (SQLException e) {
+ fail(e.getMessage());
+ }
+ }
+
+ public void testPKBlobsDeleteByPrimaryKey() {
+ PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+
+ try {
+ Pkblobs record = new Pkblobs();
+ record.setId(new Integer(3));
+ record.setBlob1(generateRandomBlob());
+ record.setBlob2(generateRandomBlob());
+ dao.insert(record);
+
+ PkblobsExample example = new PkblobsExample();
+ List answer = dao.selectByExampleWithoutBLOBs(example);
+ assertEquals(1, answer.size());
+
+ int rows = dao.deleteByPrimaryKey(new Integer(3));
+ assertEquals(1, rows);
+
+ example = new PkblobsExample();
+ answer = dao.selectByExampleWithoutBLOBs(example);
+ assertEquals(0, answer.size());
+ } catch (SQLException e) {
+ fail(e.getMessage());
+ }
+ }
+
+ public void testPKFieldsBlobsDeleteByPrimaryKey() {
+ PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+
+ try {
+ Pkfieldsblobs record = new Pkfieldsblobs();
+ record.setId1(new Integer(3));
+ record.setId2(new Integer(4));
+ record.setFirstname("Jeff");
+ record.setLastname("Smith");
+ record.setBlob1(generateRandomBlob());
+ dao.insert(record);
+
+ record = new Pkfieldsblobs();
+ record.setId1(new Integer(5));
+ record.setId2(new Integer(6));
+ record.setFirstname("Scott");
+ record.setLastname("Jones");
+ record.setBlob1(generateRandomBlob());
+ dao.insert(record);
+
+ PkfieldsblobsExample example = new PkfieldsblobsExample();
+ List answer = dao.selectByExampleWithoutBLOBs(example);
+ assertEquals(2, answer.size());
+
+ PkfieldsblobsKey key = new PkfieldsblobsKey();
+ key.setId1(new Integer(5));
+ key.setId2(new Integer(6));
+ int rows = dao.deleteByPrimaryKey(key);
+ assertEquals(1, rows);
+
+ example = new PkfieldsblobsExample();
+ answer = dao.selectByExampleWithoutBLOBs(example);
+ assertEquals(1, answer.size());
+ } catch (SQLException e) {
+ fail(e.getMessage());
+ }
+ }
+
+ public void testAwfulTableDeleteByPrimaryKey() {
+ AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+
+ try {
+ AwfulTable record = new AwfulTable();
+ record.seteMail("fred@fred.com");
+ record.setEmailaddress("alsofred@fred.com");
+ record.setFirstFirstName("fred1");
+ record.setFourthFirstName("fred4");
+ record.setFrom("from field");
+ record.setId1(new Integer(1));
+ record.setId2(new Integer(2));
+ record.setId5(new Integer(5));
+ record.setId6(new Integer(6));
+ record.setId7(new Integer(7));
+ record.setSecondCustomerId(new Integer(567));
+ record.setSecondFirstName("fred2");
+ record.setThirdFirstName("fred3");
+
+ Integer generatedCustomerId = dao.insert(record);
+
+ int rows = dao.deleteByPrimaryKey(generatedCustomerId);
+ assertEquals(1, rows);
+
+ AwfulTableExample example = new AwfulTableExample();
+ List answer = dao.selectByExample(example);
+ assertEquals(0, answer.size());
+ } catch (SQLException e) {
+ fail(e.getMessage());
+ }
+ }
+}
Added: ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/conditional/legacy/InsertTests.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/conditional/legacy/InsertTests.java?rev=588774&view=auto
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/conditional/legacy/InsertTests.java (added)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava2/abatortest/java2/execute/conditional/legacy/InsertTests.java Fri Oct 26 13:55:08 2007
@@ -0,0 +1,295 @@
+/*
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package abatortest.java2.execute.conditional.legacy;
+
+import java.math.BigDecimal;
+import java.sql.SQLException;
+import java.util.Date;
+import java.util.List;
+
+import abatortest.java2.BaseTest;
+import abatortest.java2.generated.conditional.legacy.dao.AwfulTableDAO;
+import abatortest.java2.generated.conditional.legacy.dao.AwfulTableDAOImpl;
+import abatortest.java2.generated.conditional.legacy.dao.FieldsblobsDAO;
+import abatortest.java2.generated.conditional.legacy.dao.FieldsblobsDAOImpl;
+import abatortest.java2.generated.conditional.legacy.dao.FieldsonlyDAO;
+import abatortest.java2.generated.conditional.legacy.dao.FieldsonlyDAOImpl;
+import abatortest.java2.generated.conditional.legacy.dao.PkblobsDAO;
+import abatortest.java2.generated.conditional.legacy.dao.PkblobsDAOImpl;
+import abatortest.java2.generated.conditional.legacy.dao.PkfieldsDAO;
+import abatortest.java2.generated.conditional.legacy.dao.PkfieldsDAOImpl;
+import abatortest.java2.generated.conditional.legacy.dao.PkfieldsblobsDAO;
+import abatortest.java2.generated.conditional.legacy.dao.PkfieldsblobsDAOImpl;
+import abatortest.java2.generated.conditional.legacy.dao.PkonlyDAO;
+import abatortest.java2.generated.conditional.legacy.dao.PkonlyDAOImpl;
+import abatortest.java2.generated.conditional.legacy.model.AwfulTable;
+import abatortest.java2.generated.conditional.legacy.model.FieldsblobsExample;
+import abatortest.java2.generated.conditional.legacy.model.FieldsblobsWithBLOBs;
+import abatortest.java2.generated.conditional.legacy.model.Fieldsonly;
+import abatortest.java2.generated.conditional.legacy.model.FieldsonlyExample;
+import abatortest.java2.generated.conditional.legacy.model.Pkblobs;
+import abatortest.java2.generated.conditional.legacy.model.PkblobsExample;
+import abatortest.java2.generated.conditional.legacy.model.Pkfields;
+import abatortest.java2.generated.conditional.legacy.model.PkfieldsKey;
+import abatortest.java2.generated.conditional.legacy.model.Pkfieldsblobs;
+import abatortest.java2.generated.conditional.legacy.model.PkfieldsblobsExample;
+import abatortest.java2.generated.conditional.legacy.model.PkonlyExample;
+import abatortest.java2.generated.conditional.legacy.model.PkonlyKey;
+
+/**
+ * @author Jeff Butler
+ *
+ */
+public class InsertTests extends BaseTest {
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ initSqlMapClient(
+ "abatortest/java2/execute/conditional/legacy/SqlMapConfig.xml",
+ null);
+ }
+
+ public void testFieldsOnlyInsert() {
+ FieldsonlyDAO dao = new FieldsonlyDAOImpl(sqlMapClient);
+
+ try {
+ Fieldsonly record = new Fieldsonly();
+ record.setDoublefield(new Double(11.22));
+ record.setFloatfield(new Double(33.44));
+ record.setIntegerfield(new Integer(5));
+ dao.insert(record);
+
+ FieldsonlyExample example = new FieldsonlyExample();
+ example.setIntegerfield(new Integer(5));
+ example.setIntegerfield_Indicator(FieldsonlyExample.EXAMPLE_EQUALS);
+
+ List answer = dao.selectByExample(example);
+ assertEquals(1, answer.size());
+
+ Fieldsonly returnedRecord = (Fieldsonly) answer.get(0);
+ assertEquals(record.getIntegerfield(), returnedRecord
+ .getIntegerfield());
+ assertEquals(record.getDoublefield(), returnedRecord
+ .getDoublefield());
+ assertEquals(record.getFloatfield(), returnedRecord.getFloatfield());
+ } catch (SQLException e) {
+ fail(e.getMessage());
+ }
+ }
+
+ public void testPKOnlyInsert() {
+ PkonlyDAO dao = new PkonlyDAOImpl(sqlMapClient);
+
+ try {
+ PkonlyKey key = new PkonlyKey();
+ key.setId(new Integer(1));
+ key.setSeqNum(new Integer(3));
+ dao.insert(key);
+
+ PkonlyExample example = new PkonlyExample();
+ List answer = dao.selectByExample(example);
+ assertEquals(1, answer.size());
+
+ PkonlyKey returnedRecord = (PkonlyKey) answer.get(0);
+ assertEquals(key.getId(), returnedRecord.getId());
+ assertEquals(key.getSeqNum(), returnedRecord.getSeqNum());
+ } catch (SQLException e) {
+ fail(e.getMessage());
+ }
+ }
+
+ public void testPKFieldsInsert() {
+ PkfieldsDAO dao = new PkfieldsDAOImpl(sqlMapClient);
+
+ try {
+ Pkfields record = new Pkfields();
+ record.setDatefield(new Date());
+ record.setDecimal100field(new Long(10L));
+ record.setDecimal155field(new BigDecimal("15.12345"));
+ record.setDecimal30field(new Short((short) 3));
+ record.setDecimal60field(new Integer(6));
+ record.setFirstname("Jeff");
+ record.setId1(new Integer(1));
+ record.setId2(new Integer(2));
+ record.setLastname("Butler");
+ record.setTimefield(new Date());
+ record.setTimestampfield(new Date());
+
+ dao.insert(record);
+
+ PkfieldsKey key = new PkfieldsKey();
+ key.setId1(new Integer(1));
+ key.setId2(new Integer(2));
+
+ Pkfields returnedRecord = dao.selectByPrimaryKey(key);
+ assertNotNull(returnedRecord);
+
+ assertTrue(datesAreEqual(record.getDatefield(), returnedRecord
+ .getDatefield()));
+ assertEquals(record.getDecimal100field(), returnedRecord
+ .getDecimal100field());
+ assertEquals(record.getDecimal155field(), returnedRecord
+ .getDecimal155field());
+ assertEquals(record.getDecimal30field(), returnedRecord
+ .getDecimal30field());
+ assertEquals(record.getDecimal60field(), returnedRecord
+ .getDecimal60field());
+ assertEquals(record.getFirstname(), returnedRecord.getFirstname());
+ assertEquals(record.getId1(), returnedRecord.getId1());
+ assertEquals(record.getId2(), returnedRecord.getId2());
+ assertEquals(record.getLastname(), returnedRecord.getLastname());
+ assertTrue(timesAreEqual(record.getTimefield(), returnedRecord
+ .getTimefield()));
+ assertEquals(record.getTimestampfield(), returnedRecord
+ .getTimestampfield());
+ } catch (SQLException e) {
+ fail(e.getMessage());
+ }
+ }
+
+ public void testPKBlobsInsert() {
+ PkblobsDAO dao = new PkblobsDAOImpl(sqlMapClient);
+
+ try {
+ Pkblobs record = new Pkblobs();
+ record.setId(new Integer(3));
+ record.setBlob1(generateRandomBlob());
+ record.setBlob2(generateRandomBlob());
+ dao.insert(record);
+
+ PkblobsExample example = new PkblobsExample();
+ List answer = dao.selectByExampleWithBLOBs(example);
+ assertEquals(1, answer.size());
+
+ Pkblobs returnedRecord = (Pkblobs) answer.get(0);
+ assertEquals(record.getId(), returnedRecord.getId());
+ assertTrue(blobsAreEqual(record.getBlob1(), returnedRecord
+ .getBlob1()));
+ assertTrue(blobsAreEqual(record.getBlob2(), returnedRecord
+ .getBlob2()));
+ } catch (SQLException e) {
+ fail(e.getMessage());
+ }
+ }
+
+ public void testPKFieldsBlobsInsert() {
+ PkfieldsblobsDAO dao = new PkfieldsblobsDAOImpl(sqlMapClient);
+
+ try {
+ Pkfieldsblobs record = new Pkfieldsblobs();
+ record.setId1(new Integer(3));
+ record.setId2(new Integer(4));
+ record.setFirstname("Jeff");
+ record.setLastname("Smith");
+ record.setBlob1(generateRandomBlob());
+ dao.insert(record);
+
+ PkfieldsblobsExample example = new PkfieldsblobsExample();
+ List answer = dao.selectByExampleWithBLOBs(example);
+ assertEquals(1, answer.size());
+
+ Pkfieldsblobs returnedRecord = (Pkfieldsblobs) answer.get(0);
+ assertEquals(record.getId1(), returnedRecord.getId1());
+ assertEquals(record.getId2(), returnedRecord.getId2());
+ assertEquals(record.getFirstname(), returnedRecord.getFirstname());
+ assertEquals(record.getLastname(), returnedRecord.getLastname());
+ assertTrue(blobsAreEqual(record.getBlob1(), returnedRecord
+ .getBlob1()));
+ } catch (SQLException e) {
+ fail(e.getMessage());
+ }
+ }
+
+ public void testFieldsBlobsInsert() {
+ FieldsblobsDAO dao = new FieldsblobsDAOImpl(sqlMapClient);
+
+ try {
+ FieldsblobsWithBLOBs record = new FieldsblobsWithBLOBs();
+ record.setFirstname("Jeff");
+ record.setLastname("Smith");
+ record.setBlob1(generateRandomBlob());
+ record.setBlob2(generateRandomBlob());
+ dao.insert(record);
+
+ FieldsblobsExample example = new FieldsblobsExample();
+ List answer = dao.selectByExampleWithBLOBs(example);
+ assertEquals(1, answer.size());
+
+ FieldsblobsWithBLOBs returnedRecord = (FieldsblobsWithBLOBs) answer
+ .get(0);
+ assertEquals(record.getFirstname(), returnedRecord.getFirstname());
+ assertEquals(record.getLastname(), returnedRecord.getLastname());
+ assertTrue(blobsAreEqual(record.getBlob1(), returnedRecord
+ .getBlob1()));
+ assertTrue(blobsAreEqual(record.getBlob2(), returnedRecord
+ .getBlob2()));
+ } catch (SQLException e) {
+ fail(e.getMessage());
+ }
+ }
+
+ public void testAwfulTableInsert() {
+ AwfulTableDAO dao = new AwfulTableDAOImpl(sqlMapClient);
+
+ try {
+ AwfulTable record = new AwfulTable();
+
+ record.seteMail("fred@fred.com");
+ record.setEmailaddress("alsofred@fred.com");
+ record.setFirstFirstName("fred1");
+ record.setFourthFirstName("fred4");
+ record.setFrom("from field");
+ record.setId1(new Integer(1));
+ record.setId2(new Integer(2));
+ record.setId5(new Integer(5));
+ record.setId6(new Integer(6));
+ record.setId7(new Integer(7));
+ record.setSecondCustomerId(new Integer(567));
+ record.setSecondFirstName("fred2");
+ record.setThirdFirstName("fred3");
+
+ Integer generatedCustomerId = dao.insert(record);
+ assertEquals(57, generatedCustomerId.intValue());
+
+ AwfulTable returnedRecord = dao
+ .selectByPrimaryKey(generatedCustomerId);
+
+ assertEquals(generatedCustomerId, returnedRecord.getCustomerId());
+ assertEquals(record.geteMail(), returnedRecord.geteMail());
+ assertEquals(record.getEmailaddress(), returnedRecord
+ .getEmailaddress());
+ assertEquals(record.getFirstFirstName(), returnedRecord
+ .getFirstFirstName());
+ assertEquals(record.getFourthFirstName(), returnedRecord
+ .getFourthFirstName());
+ assertEquals(record.getFrom(), returnedRecord.getFrom());
+ assertEquals(record.getId1(), returnedRecord.getId1());
+ assertEquals(record.getId2(), returnedRecord.getId2());
+ assertEquals(record.getId5(), returnedRecord.getId5());
+ assertEquals(record.getId6(), returnedRecord.getId6());
+ assertEquals(record.getId7(), returnedRecord.getId7());
+ assertEquals(record.getSecondCustomerId(), returnedRecord
+ .getSecondCustomerId());
+ assertEquals(record.getSecondFirstName(), returnedRecord
+ .getSecondFirstName());
+ assertEquals(record.getThirdFirstName(), returnedRecord
+ .getThirdFirstName());
+ } catch (SQLException e) {
+ fail(e.getMessage());
+ }
+ }
+}