diff options
author | webchick <webchick@24967.no-reply.drupal.org> | 2012-01-21 09:54:59 -0800 |
---|---|---|
committer | webchick <webchick@24967.no-reply.drupal.org> | 2012-01-21 09:54:59 -0800 |
commit | 2797acb9525d197725af01e7bca32df32cba8566 (patch) | |
tree | 8d712fbe42cf2bb65ff260baa7e2a1a92db88920 | |
parent | 0736fbb14bb42e0e8c9d6583501fa93ea7ad58c2 (diff) | |
download | brdo-2797acb9525d197725af01e7bca32df32cba8566.tar.gz brdo-2797acb9525d197725af01e7bca32df32cba8566.tar.bz2 |
Issue #1391426 by yched: Fixed Wrong bundles in EntityFieldQueryTestCase.
-rw-r--r-- | modules/field/tests/field_test.entity.inc | 4 | ||||
-rw-r--r-- | modules/simpletest/tests/entity_query.test | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/modules/field/tests/field_test.entity.inc b/modules/field/tests/field_test.entity.inc index b7c70a677..52ed3fcd0 100644 --- a/modules/field/tests/field_test.entity.inc +++ b/modules/field/tests/field_test.entity.inc @@ -58,7 +58,7 @@ function field_test_entity_info() { 'id' => 'ftid', 'bundle' => 'fttype', ), - 'bundles' => array('bundle1' => array('label' => 'Bundle1'), 'bundle2' => array('label' => 'Bundle2')), + 'bundles' => array('bundle1' => array('label' => 'Bundle1'), 'bundle2' => array('label' => 'Bundle2')) + $bundles, 'view modes' => $test_entity_modes, ), // In this case, the bundle key is not stored in the database. @@ -72,7 +72,7 @@ function field_test_entity_info() { 'id' => 'ftid', 'bundle' => 'fttype', ), - 'bundles' => array('test_entity_2' => array('label' => 'Test entity 2')), + 'bundles' => array('test_entity_2' => array('label' => 'Test entity 2')) + $bundles, 'view modes' => $test_entity_modes, ), // @see EntityPropertiesTestCase::testEntityLabel() diff --git a/modules/simpletest/tests/entity_query.test b/modules/simpletest/tests/entity_query.test index 97214206f..d5e5524f2 100644 --- a/modules/simpletest/tests/entity_query.test +++ b/modules/simpletest/tests/entity_query.test @@ -22,10 +22,10 @@ class EntityFieldQueryTestCase extends DrupalWebTestCase { function setUp() { parent::setUp(array('field_test')); - field_attach_create_bundle('test_entity_bundle_key', 'bundle1'); - field_attach_create_bundle('test_entity_bundle_key', 'bundle2'); - field_attach_create_bundle('test_entity', 'test_bundles'); - field_attach_create_bundle('test_entity_bundle', 'test_entity_bundle'); + field_test_create_bundle('bundle1'); + field_test_create_bundle('bundle2'); + field_test_create_bundle('test_bundle'); + field_test_create_bundle('test_entity_bundle'); $instances = array(); $this->fields = array(); |