diff --git a/ctools.info b/ctools.info index ea49c76..cacd137 100644 --- a/ctools.info +++ b/ctools.info @@ -18,9 +18,3 @@ files[] = tests/math_expression_stack.test files[] = tests/object_cache.test files[] = tests/object_cache_unit.test files[] = tests/page_tokens.test -files[] = tests/uuid_with_uuid.test -files[] = tests/uuid_without_uuid.test - -; Dependencies that are only used for the tests. -; @see tests/uuid_with_uuid.test -test_dependencies[] = uuid diff --git a/includes/plugins.inc b/includes/plugins.inc index a4abb53..7b53ae1 100644 --- a/includes/plugins.inc +++ b/includes/plugins.inc @@ -548,7 +548,6 @@ function ctools_plugin_get_directories($info) { * the active theme placed last. */ function _ctools_list_themes() { - // @TODO: Use drupal_static() here? static $themes; if (is_null($themes)) { $current = variable_get('theme_default', FALSE); diff --git a/plugins/cache/export_ui.inc b/plugins/cache/export_ui.inc index eccf18c..f21af10 100644 --- a/plugins/cache/export_ui.inc +++ b/plugins/cache/export_ui.inc @@ -14,10 +14,6 @@ $plugin = array( // Some operations use a 'finalize' but that really just means set // for us, since we're not using temporary storage for subsystems. 'cache finalize' => 'ctools_cache_export_ui_cache_set', - // @todo The API specifications say that a 'cache clear' callback is required, - // but there is none provided? - // @see cache.inc - // 'cache clear' => ??? ); function ctools_cache_export_ui_cache_get($plugin_name, $key) { diff --git a/tests/css.test b/tests/css.test index 96ff4ff..6c03730 100644 --- a/tests/css.test +++ b/tests/css.test @@ -50,10 +50,6 @@ class CtoolsCssTestCase extends DrupalWebTestCase { $this->assertEqual($filtered_css, $file_contents, 'Filtered css file contents are correct'); } - /** - * @todo Test db-row-exist but file-not-exist case in ctools_css_retrieve(). - */ - /** * Test that Stored CSS snippets can be correctly overwritten. */ diff --git a/tests/uuid_with_uuid.test b/tests/uuid_with_uuid.test deleted file mode 100644 index eb8011e..0000000 --- a/tests/uuid_with_uuid.test +++ /dev/null @@ -1,55 +0,0 @@ - 'UUID handing, with UUID module', - 'description' => 'Check that the CTools UUID functions behave correctly when the UUID module is installed.', - 'group' => 'ctools', - 'dependencies' => array('ctools'), - // 'dependencies' => array('ctools', 'uuid'),. - ); - } - - /** - * {@inheritdoc} - */ - public function setUp(array $modules = array()) { - $modules[] = 'ctools'; - // @todo Add UUID as a test dependency and then add comment out this line. - // $modules[] = 'uuid'; - parent::setUp($modules); - } - - /** - * Check we can get a UUID. - * - * NB: This test will use one (and only one) of the mechanisms available - * from pear, - * - * @todo Fix this so testbot doesn't fail. - */ - public function DISABLED_testMakeNewUUID() { - // drupal_get_filename will report even if the module is disabled. - if (drupal_get_filename('module', 'uuid') && !module_exists('uuid')) { - module_enable(array('uuid')); - } - // If we now have uuid module, use it. - if (module_exists('uuid')) { - $uuid = ctools_uuid_generate(); - $this->assertTrue(ctools_uuid_is_valid($uuid), 'UUID generated (uuid): ' . $uuid); - } - else { - // Otherwise say we can't... - $this->verbose('uuid module not present'); - } - } - -} diff --git a/tests/uuid_without_uuid.test b/tests/uuid_without_uuid.test deleted file mode 100644 index 185b6fb..0000000 --- a/tests/uuid_without_uuid.test +++ /dev/null @@ -1,101 +0,0 @@ - 'UUID handing, without UUID module', - 'description' => 'Check that the CTools UUID functions behave correctly when the UUID module is not installed.', - 'group' => 'ctools', - 'dependencies' => array('ctools'), - ); - } - - /** - * {@inheritdoc} - */ - public function setUp(array $modules = array()) { - $modules[] = 'ctools'; - parent::setUp($modules); - } - - /** - * Check the UUID_PATTERN constant exists. - * - * @todo Fix this so testbot doesn't fail. - */ - public function DISABLED_testHaveUUIDpattern() { - ctools_include('uuid'); - $this->assertTrue(defined('UUID_PATTERN'), 'The UUID_PATTERN constant exists.'); - $this->assertTrue(is_string(UUID_PATTERN) && strlen(UUID_PATTERN) > 12, 'The UUID_PATTERN has an appropriate value.'); - } - - /** - * Check we can get a UUID when . - * - * NB: This test will use one (and only one) of the mechanisms available - * from pear, - * - * @todo Fix this so testbot doesn't fail. - */ - public function DISABLED_testMakeNewUUIDRaw() { - // drupal_get_filename will report even if the module is disabled. - if (drupal_get_filename('module', 'uuid') && module_exists('uuid')) { - module_disable(array('uuid')); - } - - ctools_include('uuid'); - $uuid = _ctools_uuid_generate_php(); - $this->assertTrue(ctools_uuid_is_valid($uuid), 'UUID generated (ctoolsphp): ' . $uuid); - } - - /** - * Check we can get a UUID when . - * - * NB: This test will use one (and only one) of the mechanisms available - * from pear, - * - * @todo Fix this so testbot doesn't fail. - */ - public function DISABLED_testMakeNewUUIDWrapper() { - // drupal_get_filename will report even if the module is disabled. - if (drupal_get_filename('module', 'uuid') && module_exists('uuid')) { - module_disable(array('uuid')); - } - - $uuid = ctools_uuid_generate(); - $this->assertTrue(ctools_uuid_is_valid($uuid), 'UUID generated (ctools): ' . $uuid); - } - - /** - * Check we can verify that a string looks like a UUID. - * - * @todo Fix this so testbot doesn't fail. - */ - public function DISABLED_testVerifyUUID() { - $checks = array( - NULL => FALSE, - '' => FALSE, - '0' => FALSE, - 'b5827a5cadd311e69a1f936389a27663' => FALSE, // version 1, no dashes - '15ff2566-add3-11e6-b98f' => FALSE, // incomplete - - '15ff2566-add3-11e6-b98f-080027dc4f7a' => TRUE, // version 1 - 'b5827a5c-add3-11e6-9a1f-936389a27663' => TRUE, // version 1 - '02d9e6d5-9467-382e-8f9b-9300a64ac3cd' => TRUE, // version 3 url-based - '5e330afb-50c6-45c2-a292-99c3168696d2' => TRUE, // version 4 uuid - '8f4ca4fd-154e-5063-b6db-aa91af137037' => TRUE, // version 5 - ); - - foreach ($checks as $uuid => $exp) { - $this->assertEqual(ctools_uuid_is_valid($uuid), $exp, 'Is Valid: UUIDs match expectations: ' . $uuid); - } - } - -}