diff options
| -rw-r--r-- | modules/simpletest/tests/entity_cache_test.module | 20 | ||||
| -rw-r--r-- | modules/system/system.test | 5 |
2 files changed, 17 insertions, 8 deletions
diff --git a/modules/simpletest/tests/entity_cache_test.module b/modules/simpletest/tests/entity_cache_test.module index ce9d7eba9..b1daf683f 100644 --- a/modules/simpletest/tests/entity_cache_test.module +++ b/modules/simpletest/tests/entity_cache_test.module @@ -9,14 +9,20 @@ /** * Implements hook_watchdog(). * - * This function is called during module_enable() and tries to access entity - * information provided by the module this one depends on. The information is - * stored in a temporary system variable and is later analyzed in the test - * case. + * This hook is called during module_enable() and since this hook + * implementation is invoked, we have to expect that this module and dependent + * modules have been properly installed already. So we expect to be able to + * retrieve the entity information that has been registered by the required + * dependency module. * * @see EnableDisableTestCase::testEntityCache() + * @see entity_cache_test_dependency_entity_info() */ -function entity_cache_test_watchdog() { - $info = entity_get_info('entity_cache_test'); - variable_set('entity_cache_test', $info); +function entity_cache_test_watchdog($log_entry) { + if ($log_entry['type'] == 'system' && $log_entry['message'] == '%module module installed.') { + $info = entity_get_info('entity_cache_test'); + // Store the information in a system variable to analyze it later in the + // test case. + variable_set('entity_cache_test', $info); + } } diff --git a/modules/system/system.test b/modules/system/system.test index e6db7a13c..da7042ac2 100644 --- a/modules/system/system.test +++ b/modules/system/system.test @@ -161,11 +161,14 @@ class EnableDisableTestCase extends ModuleTestCase { /** * Tests entity cache after enabling a module with a dependency on an enitity * providing module. + * + * @see entity_cache_test_watchdog() */ function testEntityCache() { module_enable(array('entity_cache_test')); $info = variable_get('entity_cache_test'); - $this->assertNotNull($info, t('Entity information must not be NULL')); + $this->assertEqual($info['label'], 'Entity Cache Test', 'Entity info label is correct.'); + $this->assertEqual($info['controller class'], 'DrupalDefaultEntityController', 'Entity controller class info is correct.'); } } |