You are viewing a plain text version of this content. The canonical link for it is here.
Posted to torque-dev@db.apache.org by tf...@apache.org on 2014/10/22 01:33:25 UTC
svn commit: r1633486 -
/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/EnumTest.java
Author: tfischer
Date: Tue Oct 21 23:33:25 2014
New Revision: 1633486
URL: http://svn.apache.org/r1633486
Log:
TORQUE-331 - adjust test of enum handling for mssql
Modified:
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/EnumTest.java
Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/EnumTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/EnumTest.java?rev=1633486&r1=1633485&r2=1633486&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/EnumTest.java (original)
+++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/EnumTest.java Tue Oct 21 23:33:25 2014
@@ -19,6 +19,9 @@ package org.apache.torque.datatypes;
* under the License.
*/
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.torque.BaseDatabaseTestCase;
import org.apache.torque.TestEnum;
import org.apache.torque.TorqueException;
@@ -35,6 +38,8 @@ import org.apache.torque.test.peer.EnumT
*/
public class EnumTest extends BaseDatabaseTestCase
{
+ private List<EnumTable> databaseStateBeforeTest;
+
@Override
public void setUp() throws Exception
{
@@ -53,18 +58,18 @@ public class EnumTest extends BaseDataba
fillTables();
// execute
- EnumTable enumTable = EnumTablePeer.retrieveByPK(1);
+ EnumTable enumTable = EnumTablePeer.retrieveByPK(databaseStateBeforeTest.get(0).getId());
// verify
- assertEquals(1, enumTable.getId());
+ assertEquals(databaseStateBeforeTest.get(0).getId(), enumTable.getId());
assertEquals(MyIntColumnEnum._1, enumTable.getIntColumn());
assertEquals(IntPrimitiveColumnEnum._1, enumTable.getIntPrimitiveColumn());
assertEquals(TestEnum.A, enumTable.getPredefinedEnumColumn());
assertEquals(VarcharColumnEnum.X, enumTable.getVarcharColumn());
// execute
- enumTable = EnumTablePeer.retrieveByPK(2);
+ enumTable = EnumTablePeer.retrieveByPK(databaseStateBeforeTest.get(1).getId());
// verify
- assertEquals(2, enumTable.getId());
+ assertEquals(databaseStateBeforeTest.get(1).getId(), enumTable.getId());
assertEquals(MyIntColumnEnum.TWO, enumTable.getIntColumn());
assertEquals(IntPrimitiveColumnEnum._2, enumTable.getIntPrimitiveColumn());
assertEquals(TestEnum.B, enumTable.getPredefinedEnumColumn());
@@ -79,8 +84,8 @@ public class EnumTest extends BaseDataba
public void testUpdate() throws Exception
{
// prepare
- EnumTable enumTable = EnumTablePeer.retrieveByPK(1);
- assertEquals(1, enumTable.getId());
+ EnumTable enumTable = EnumTablePeer.retrieveByPK(databaseStateBeforeTest.get(0).getId());
+ assertEquals(databaseStateBeforeTest.get(0).getId(), enumTable.getId());
assertEquals(MyIntColumnEnum._1, enumTable.getIntColumn());
assertEquals(IntPrimitiveColumnEnum._1, enumTable.getIntPrimitiveColumn());
assertEquals(TestEnum.A, enumTable.getPredefinedEnumColumn());
@@ -94,8 +99,8 @@ public class EnumTest extends BaseDataba
enumTable.save();
// verify
- enumTable = EnumTablePeer.retrieveByPK(1);
- assertEquals(1, enumTable.getId());
+ enumTable = EnumTablePeer.retrieveByPK(databaseStateBeforeTest.get(0).getId());
+ assertEquals(databaseStateBeforeTest.get(0).getId(), enumTable.getId());
assertEquals(MyIntColumnEnum._3, enumTable.getIntColumn());
assertEquals(IntPrimitiveColumnEnum._3, enumTable.getIntPrimitiveColumn());
assertEquals(TestEnum.C, enumTable.getPredefinedEnumColumn());
@@ -103,7 +108,7 @@ public class EnumTest extends BaseDataba
}
/**
- * Checks whether we can select enum values.
+ * Checks whether we can select enum values by enum value and by wrapped value.
*
* @throws Exception if the test fails
*/
@@ -118,7 +123,7 @@ public class EnumTest extends BaseDataba
// execute
EnumTable enumTable = EnumTablePeer.doSelectSingleRecord(criteria);
// verify
- assertEquals(1, enumTable.getId());
+ assertEquals(databaseStateBeforeTest.get(0).getId(), enumTable.getId());
// prepare
criteria = new Criteria()
@@ -129,7 +134,7 @@ public class EnumTest extends BaseDataba
// execute
enumTable = EnumTablePeer.doSelectSingleRecord(criteria);
// verify
- assertEquals(1, enumTable.getId());
+ assertEquals(databaseStateBeforeTest.get(0).getId(), enumTable.getId());
}
/**
@@ -141,20 +146,21 @@ public class EnumTest extends BaseDataba
Criteria criteria = new Criteria();
EnumTablePeer.doDelete(criteria);
+ databaseStateBeforeTest = new ArrayList<EnumTable>();
EnumTable enumTable = new EnumTable();
- enumTable.setId(1);
enumTable.setIntColumn(MyIntColumnEnum._1);
enumTable.setIntPrimitiveColumn(IntPrimitiveColumnEnum._1);
enumTable.setPredefinedEnumColumn(TestEnum.A);
enumTable.setVarcharColumn(VarcharColumnEnum.X);
enumTable.save();
+ databaseStateBeforeTest.add(enumTable);
enumTable = new EnumTable();
- enumTable.setId(2);
enumTable.setIntColumn(MyIntColumnEnum.TWO);
enumTable.setIntPrimitiveColumn(IntPrimitiveColumnEnum._2);
enumTable.setPredefinedEnumColumn(TestEnum.B);
enumTable.setVarcharColumn(VarcharColumnEnum.Y);
enumTable.save();
+ databaseStateBeforeTest.add(enumTable);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org