Author: adrianc
Date: Tue May 21 07:07:54 2013
New Revision: 1484673
URL: http://svn.apache.org/r1484673
Log:
Updated EntityTestSuite.java to include tests for recent bug fixes in the
trunk. The tests are commented out for now, and the comments include the trunk
revisions that need to be backported to get the tests to work.
Modified:
ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java
Modified:
ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java?rev=1484673&r1=1484672&r2=1484673&view=diff
==============================================================================
---
ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java
(original)
+++
ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java
Tue May 21 07:07:54 2013
@@ -58,6 +58,8 @@ public class EntityTestSuite extends Ent
* with Derby. Going up to 100,000 causes problems all around because
Java List seems to be capped at about 65,000 values.
*
* NOTE: setting this lower so that the general tests don't take so long
to run; to really push it can increase this number.
+ * NOTE: Let's try to distinguish between functional testing and stress
testing. Any value greater than 1 will be sufficient
+ * for functional testing. Values like 10,000 or 100,000 are more
appropriate for stress testing.
*/
public static final long TEST_COUNT = 1000;
@@ -66,7 +68,7 @@ public class EntityTestSuite extends Ent
}
final static private int _level1max = 3; // number of TestingNode
entities to create
-
+
/*
* Tests storing values with the delegator's .create, .makeValue, and
.storeAll methods
*/
@@ -94,16 +96,121 @@ public class EntityTestSuite extends Ent
// retrieve a sample GenericValue, make sure it's correct
GenericValue testValue = delegator.findOne("TestingType", false,
"testingTypeId", "TEST-1");
assertEquals("Retrieved value has the correct description", "Testing
Type #1", testValue.getString("description"));
-
- // now update and store it
testValue.put("description", "New Testing Type #1");
+ // now store it
testValue.store();
-
// now retrieve it again and make sure that the updated value is
correct
testValue = delegator.findOne("TestingType", false, "testingTypeId",
"TEST-1");
assertEquals("Retrieved value has the correct description", "New
Testing Type #1", testValue.getString("description"));
}
+ public void testRemoveValue() throws Exception {
+ // Retrieve a sample GenericValue, make sure it's correct
+ GenericValue testValue = delegator.findOne("TestingType", false,
"testingTypeId", "TEST-4");
+ assertEquals("Retrieved value has the correct description", "Testing
Type #4", testValue.getString("description"));
+ testValue.remove();
+ // Test immutable
+ /* Requires revision 1471283
+ try {
+ testValue.put("description", "New Testing Type #4");
+ fail("Modified an immutable GenericValue");
+ } catch (IllegalStateException e) {
+ }
+ try {
+ testValue.remove("description");
+ fail("Modified an immutable GenericValue");
+ } catch (UnsupportedOperationException e) {
+ }
+ */
+ testValue = delegator.findOne("TestingType", false, "testingTypeId",
"TEST-4");
+ assertEquals("Finding removed value returns null", null, testValue);
+ }
+
+ /*
+ * Tests the entity cache
+ */
+ public void testEntityCache() throws Exception {
+ // Test primary key cache
+ GenericValue testValue = delegator.findOne("TestingType", true,
"testingTypeId", "TEST-3");
+ assertEquals("Retrieved from cache value has the correct description",
"Testing Type #3", testValue.getString("description"));
+ // Test immutable
+ try {
+ testValue.put("description", "New Testing Type #3");
+ fail("Modified an immutable GenericValue");
+ } catch (IllegalStateException e) {
+ }
+ /* Requires revision 1471283
+ try {
+ testValue.remove("description");
+ fail("Modified an immutable GenericValue");
+ } catch (UnsupportedOperationException e) {
+ }
+ */
+ // Test entity value update operation updates the cache
+ /* Requires revision 1471284, 1476296
+ testValue = (GenericValue) testValue.clone();
+ testValue.put("description", "New Testing Type #3");
+ testValue.store();
+ testValue = delegator.findOne("TestingType", true, "testingTypeId",
"TEST-3");
+ assertEquals("Retrieved from cache value has the correct description",
"New Testing Type #3", testValue.getString("description"));
+ // Test entity value remove operation updates the cache
+ testValue = (GenericValue) testValue.clone();
+ testValue.remove();
+ testValue = delegator.findOne("TestingType", true, "testingTypeId",
"TEST-3");
+ assertEquals("Retrieved from cache value is null", null, testValue);
+ // Test entity condition cache
+ EntityCondition testCondition =
EntityCondition.makeCondition("description", EntityOperator.EQUALS, "Testing
Type #2");
+ List<GenericValue> testList = delegator.findList("TestingType",
testCondition, null, null, null, true);
+ assertEquals("Delegator findList returned one value", 1,
testList.size());
+ testValue = testList.get(0);
+ assertEquals("Retrieved from cache value has the correct description",
"Testing Type #2", testValue.getString("description"));
+ // Test immutable
+ try {
+ testValue.put("description", "New Testing Type #2");
+ fail("Modified an immutable GenericValue");
+ } catch (IllegalStateException e) {
+ }
+ try {
+ testValue.remove("description");
+ fail("Modified an immutable GenericValue");
+ } catch (UnsupportedOperationException e) {
+ }
+ // Test entity value create operation updates the cache
+ testValue = (GenericValue) testValue.clone();
+ testValue.put("testingTypeId", "TEST-9");
+ testValue.create();
+ testList = delegator.findList("TestingType", testCondition, null,
null, null, true);
+ assertEquals("Delegator findList returned two values", 2,
testList.size());
+ // Test entity value update operation updates the cache
+ testValue.put("description", "New Testing Type #2");
+ testValue.store();
+ testList = delegator.findList("TestingType", testCondition, null,
null, null, true);
+ assertEquals("Delegator findList returned one value", 1,
testList.size());
+ // Test entity value remove operation updates the cache
+ testValue = testList.get(0);
+ testValue = (GenericValue) testValue.clone();
+ testValue.remove();
+ testList = delegator.findList("TestingType", testCondition, null,
null, null, true);
+ assertEquals("Delegator findList returned empty list", 0,
testList.size());
+ */
+ // Test view entities in the pk cache - updating an entity should
clear pk caches for all view entities containing that entity.
+ /* Requires revision 1484279
+ testValue = delegator.create("TestingSubtype", "testingTypeId",
"TEST-9", "subtypeDescription", "Testing Subtype #9");
+ assertNotNull("TestingSubtype created", testValue);
+ // Confirm member entity appears in the view
+ testValue = delegator.findOne("TestingViewPks", true, "testingTypeId",
"TEST-9");
+ assertEquals("View retrieved from cache has the correct member
description", "Testing Subtype #9", testValue.getString("subtypeDescription"));
+ testValue = delegator.findOne("TestingSubtype", true, "testingTypeId",
"TEST-9");
+ // Modify member entity
+ testValue = (GenericValue) testValue.clone();
+ testValue.put("subtypeDescription", "New Testing Subtype #9");
+ testValue.store();
+ // Check if cached view contains the modification
+ testValue = delegator.findOne("TestingViewPks", true, "testingTypeId",
"TEST-9");
+ assertEquals("View retrieved from cache has the correct member
description", "New Testing Subtype #9",
testValue.getString("subtypeDescription"));
+ */
+ }
+
/*
* Tests XML serialization by serializing/deserializing a GenericValue
*/
