Temporary roll-back of #890994, per Dries's feedback.

1 files changed, 4 insertions, 8 deletions

diff --git a/modules/simpletest/tests/entity_query.test b/modules/simpletest/tests/entity_query.test
index e120c53b2..0b3db8b59 100644
--- a/modules/simpletest/tests/entity_query.test
+++ b/modules/simpletest/tests/entity_query.test
@@ -501,20 +501,16 @@ class EntityFieldQueryTestCase extends DrupalWebTestCase {
     $query = new EntityFieldQuery();
     $query
       ->entityCondition('entity_type', 'test_entity_bundle_key')
-      ->propertyCondition('fttype', 'und', 'CONTAINS');
+      ->propertyCondition('ftid', 1, 'CONTAINS');
     $this->assertEntityFieldQuery($query, array(
       array('test_entity_bundle_key', 1),
-      array('test_entity_bundle_key', 2),
-      array('test_entity_bundle_key', 3),
-      array('test_entity_bundle_key', 4),
-      array('test_entity_bundle_key', 5),
-      array('test_entity_bundle_key', 6),
     ), t('Test the "contains" operation on a property.'));
 
     $query = new EntityFieldQuery();
-    $query->fieldCondition($this->fields[1], 'shape', 'uar', 'CONTAINS');
+    $query->fieldCondition($this->fields[0], 'value', 3, 'CONTAINS');
     $this->assertEntityFieldQuery($query, array(
-      array('test_entity_bundle', 5),
+      array('test_entity_bundle_key', 3),
+      array('test_entity', 3),
     ), t('Test the "contains" operation on a field.'));
 
     $query = new EntityFieldQuery();