Skip to content

Commit

Permalink
MDL-45699 cache: renamed cache_config_phpunittest
Browse files Browse the repository at this point in the history 
Renamed cache_config_phpunittest to cache_config_testing
  • Loading branch information
Sam Hemelryk committed Dec 8, 2014
1 parent 45a8db7 commit 427c41e
Show file tree
Hide file tree
Showing 7 changed files with 70 additions and 51 deletions.
2 changes: 1 addition & 1 deletion cache/classes/factory.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ public function create_config_instance($writer = false) {
// We have just a single class for PHP unit tests. We don't care enough about its
// performance to do otherwise and having a single method allows us to inject things into it
// while testing.
$class = 'cache_config_phpunittest';
$class = 'cache_config_testing';
}

// Check if we need to create a config file with defaults.
Expand Down
4 changes: 2 additions & 2 deletions cache/stores/session/tests/session_test.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ protected function get_class_name() {
* Test the maxsize option.
*/
public function test_maxsize() {
$config = cache_config_phpunittest::instance();
$config = cache_config_testing::instance();
$config->phpunit_add_definition('phpunit/one', array(
'mode' => cache_store::MODE_SESSION,
'component' => 'phpunit',
Expand Down Expand Up @@ -171,7 +171,7 @@ public function test_maxsize() {
}

public function test_ttl() {
$config = cache_config_phpunittest::instance();
$config = cache_config_testing::instance();
$config->phpunit_add_definition('phpunit/three', array(
'mode' => cache_store::MODE_SESSION,
'component' => 'phpunit',
Expand Down
2 changes: 1 addition & 1 deletion cache/stores/static/tests/static_test.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ protected function get_class_name() {
*/
public function test_maxsize() {
$defid = 'phpunit/testmaxsize';
$config = cache_config_phpunittest::instance();
$config = cache_config_testing::instance();
$config->phpunit_add_definition($defid, array(
'mode' => cache_store::MODE_REQUEST,
'component' => 'phpunit',
Expand Down
4 changes: 2 additions & 2 deletions cache/tests/administration_helper_test.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class core_cache_administration_helper_testcase extends advanced_testcase {
public function setUp() {
parent::setUp();
cache_factory::reset();
cache_config_phpunittest::create_default_configuration();
cache_config_testing::create_default_configuration();
}

/**
Expand Down Expand Up @@ -193,7 +193,7 @@ public function test_hash_key() {
set_debugging(DEBUG_ALL);

// First with simplekeys
$instance = cache_config_phpunittest::instance(true);
$instance = cache_config_testing::instance(true);
$instance->phpunit_add_definition('phpunit/hashtest', array(
'mode' => cache_store::MODE_APPLICATION,
'component' => 'phpunit',
Expand Down
78 changes: 39 additions & 39 deletions cache/tests/cache_test.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class core_cache_testcase extends advanced_testcase {
public function setUp() {
parent::setUp();
cache_factory::reset();
cache_config_phpunittest::create_default_configuration();
cache_config_testing::create_default_configuration();
}

/**
Expand Down Expand Up @@ -90,9 +90,9 @@ public function test_cache_config() {
}

$instance = cache_config::instance();
$this->assertInstanceOf('cache_config_phpunittest', $instance);
$this->assertInstanceOf('cache_config_testing', $instance);

$this->assertTrue(cache_config_phpunittest::config_file_exists());
$this->assertTrue(cache_config_testing::config_file_exists());

$stores = $instance->get_all_stores();
$this->assertCount(3, $stores);
Expand Down Expand Up @@ -150,7 +150,7 @@ public function test_cache_config() {
* Tests for cache keys that would break on windows.
*/
public function test_windows_nasty_keys() {
$instance = cache_config_phpunittest::instance();
$instance = cache_config_testing::instance();
$instance->phpunit_add_definition('phpunit/windowskeytest', array(
'mode' => cache_store::MODE_APPLICATION,
'component' => 'phpunit',
Expand All @@ -171,7 +171,7 @@ public function test_default_application_cache() {
$this->assertInstanceOf('cache_application', $cache);
$this->run_on_cache($cache);

$instance = cache_config_phpunittest::instance(true);
$instance = cache_config_testing::instance(true);
$instance->phpunit_add_definition('phpunit/test_default_application_cache', array(
'mode' => cache_store::MODE_APPLICATION,
'component' => 'phpunit',
Expand Down Expand Up @@ -206,7 +206,7 @@ public function test_default_request_cache() {
* Tests using a cache system when there are no stores available (who knows what the admin did to achieve this).
*/
public function test_on_cache_without_store() {
$instance = cache_config_phpunittest::instance(true);
$instance = cache_config_testing::instance(true);
$instance->phpunit_add_definition('phpunit/nostoretest1', array(
'mode' => cache_store::MODE_APPLICATION,
'component' => 'phpunit',
Expand Down Expand Up @@ -435,7 +435,7 @@ protected function run_on_cache(cache_loader $cache) {
* Tests a definition using a data loader
*/
public function test_definition_data_loader() {
$instance = cache_config_phpunittest::instance(true);
$instance = cache_config_testing::instance(true);
$instance->phpunit_add_definition('phpunit/datasourcetest', array(
'mode' => cache_store::MODE_APPLICATION,
'component' => 'phpunit',
Expand Down Expand Up @@ -476,7 +476,7 @@ public function test_definition_data_loader() {
* Tests a definition using an overridden loader
*/
public function test_definition_overridden_loader() {
$instance = cache_config_phpunittest::instance(true);
$instance = cache_config_testing::instance(true);
$instance->phpunit_add_definition('phpunit/overridetest', array(
'mode' => cache_store::MODE_APPLICATION,
'component' => 'phpunit',
Expand All @@ -501,8 +501,8 @@ public function test_definition_overridden_loader() {
* Test the mappingsonly setting.
*/
public function test_definition_mappings_only() {
/** @var cache_config_phpunittest $instance */
$instance = cache_config_phpunittest::instance(true);
/** @var cache_config_testing $instance */
$instance = cache_config_testing::instance(true);
$instance->phpunit_add_definition('phpunit/mappingsonly', array(
'mode' => cache_store::MODE_APPLICATION,
'component' => 'phpunit',
Expand Down Expand Up @@ -530,7 +530,7 @@ public function test_definition_mappings_only() {
* Test a very basic definition.
*/
public function test_definition() {
$instance = cache_config_phpunittest::instance();
$instance = cache_config_testing::instance();
$instance->phpunit_add_definition('phpunit/test', array(
'mode' => cache_store::MODE_APPLICATION,
'component' => 'phpunit',
Expand All @@ -548,7 +548,7 @@ public function test_definition() {
* Test a definition using the simple keys.
*/
public function test_definition_simplekeys() {
$instance = cache_config_phpunittest::instance();
$instance = cache_config_testing::instance();
$instance->phpunit_add_definition('phpunit/simplekeytest', array(
'mode' => cache_store::MODE_APPLICATION,
'component' => 'phpunit',
Expand All @@ -574,7 +574,7 @@ public function test_definition_simplekeys() {
* Test a negative TTL on an application cache.
*/
public function test_application_ttl_negative() {
$instance = cache_config_phpunittest::instance(true);
$instance = cache_config_testing::instance(true);
$instance->phpunit_add_definition('phpunit/ttltest', array(
'mode' => cache_store::MODE_APPLICATION,
'component' => 'phpunit',
Expand Down Expand Up @@ -623,7 +623,7 @@ public function test_application_ttl_negative() {
* Test a positive TTL on an application cache.
*/
public function test_application_ttl_positive() {
$instance = cache_config_phpunittest::instance(true);
$instance = cache_config_testing::instance(true);
$instance->phpunit_add_definition('phpunit/ttltest', array(
'mode' => cache_store::MODE_APPLICATION,
'component' => 'phpunit',
Expand Down Expand Up @@ -672,7 +672,7 @@ public function test_application_ttl_positive() {
* Test a negative TTL on an session cache.
*/
public function test_session_ttl_positive() {
$instance = cache_config_phpunittest::instance(true);
$instance = cache_config_testing::instance(true);
$instance->phpunit_add_definition('phpunit/ttltest', array(
'mode' => cache_store::MODE_SESSION,
'component' => 'phpunit',
Expand Down Expand Up @@ -721,7 +721,7 @@ public function test_session_ttl_positive() {
* Tests manual locking operations on an application cache
*/
public function test_application_manual_locking() {
$instance = cache_config_phpunittest::instance();
$instance = cache_config_testing::instance();
$instance->phpunit_add_definition('phpunit/lockingtest', array(
'mode' => cache_store::MODE_APPLICATION,
'component' => 'phpunit',
Expand Down Expand Up @@ -750,7 +750,7 @@ public function test_application_manual_locking() {
* Tests application cache event invalidation
*/
public function test_application_event_invalidation() {
$instance = cache_config_phpunittest::instance();
$instance = cache_config_testing::instance();
$instance->phpunit_add_definition('phpunit/eventinvalidationtest', array(
'mode' => cache_store::MODE_APPLICATION,
'component' => 'phpunit',
Expand Down Expand Up @@ -785,7 +785,7 @@ public function test_application_event_invalidation() {
* Tests session cache event invalidation
*/
public function test_session_event_invalidation() {
$instance = cache_config_phpunittest::instance();
$instance = cache_config_testing::instance();
$instance->phpunit_add_definition('phpunit/test_session_event_invalidation', array(
'mode' => cache_store::MODE_SESSION,
'component' => 'phpunit',
Expand Down Expand Up @@ -821,7 +821,7 @@ public function test_session_event_invalidation() {
* Tests application cache definition invalidation
*/
public function test_application_definition_invalidation() {
$instance = cache_config_phpunittest::instance();
$instance = cache_config_testing::instance();
$instance->phpunit_add_definition('phpunit/definitioninvalidation', array(
'mode' => cache_store::MODE_APPLICATION,
'component' => 'phpunit',
Expand Down Expand Up @@ -857,7 +857,7 @@ public function test_application_definition_invalidation() {
* Tests session cache definition invalidation
*/
public function test_session_definition_invalidation() {
$instance = cache_config_phpunittest::instance();
$instance = cache_config_testing::instance();
$instance->phpunit_add_definition('phpunit/test_session_definition_invalidation', array(
'mode' => cache_store::MODE_SESSION,
'component' => 'phpunit',
Expand Down Expand Up @@ -901,7 +901,7 @@ public function test_distributed_application_event_invalidation() {
// We need to add data the to cache, invalidate it by event, manually force it back without MUC knowing to simulate a
// disconnected/distributed setup (think load balanced server using local cache), instantiate the cache again and finally
// check that it is not picked up.
$instance = cache_config_phpunittest::instance();
$instance = cache_config_testing::instance();
$instance->phpunit_add_definition('phpunit/eventinvalidationtest', array(
'mode' => cache_store::MODE_APPLICATION,
'component' => 'phpunit',
Expand Down Expand Up @@ -939,7 +939,7 @@ public function test_distributed_application_event_invalidation() {

// Test 1: Rebuild without the event and test its there.
cache_factory::reset();
$instance = cache_config_phpunittest::instance();
$instance = cache_config_testing::instance();
$instance->phpunit_add_definition('phpunit/eventinvalidationtest', array(
'mode' => cache_store::MODE_APPLICATION,
'component' => 'phpunit',
Expand All @@ -952,7 +952,7 @@ public function test_distributed_application_event_invalidation() {

// Test 2: Rebuild and test the invalidation of the event via the invalidation cache.
cache_factory::reset();
$instance = cache_config_phpunittest::instance();
$instance = cache_config_testing::instance();
$instance->phpunit_add_definition('phpunit/eventinvalidationtest', array(
'mode' => cache_store::MODE_APPLICATION,
'component' => 'phpunit',
Expand All @@ -971,7 +971,7 @@ public function test_distributed_application_event_invalidation() {
* Tests application cache event purge
*/
public function test_application_event_purge() {
$instance = cache_config_phpunittest::instance();
$instance = cache_config_testing::instance();
$instance->phpunit_add_definition('phpunit/eventpurgetest', array(
'mode' => cache_store::MODE_APPLICATION,
'component' => 'phpunit',
Expand Down Expand Up @@ -1022,7 +1022,7 @@ public function test_application_event_purge() {
* Tests session cache event purge
*/
public function test_session_event_purge() {
$instance = cache_config_phpunittest::instance();
$instance = cache_config_testing::instance();
$instance->phpunit_add_definition('phpunit/eventpurgetest', array(
'mode' => cache_store::MODE_SESSION,
'component' => 'phpunit',
Expand Down Expand Up @@ -1073,7 +1073,7 @@ public function test_session_event_purge() {
* Tests application cache definition purge
*/
public function test_application_definition_purge() {
$instance = cache_config_phpunittest::instance();
$instance = cache_config_testing::instance();
$instance->phpunit_add_definition('phpunit/definitionpurgetest', array(
'mode' => cache_store::MODE_APPLICATION,
'component' => 'phpunit',
Expand Down Expand Up @@ -1108,15 +1108,15 @@ public function test_alt_cache_path() {
}
$this->resetAfterTest();
$CFG->altcacheconfigpath = $CFG->dataroot.'/cache/altcacheconfigpath';
$instance = cache_config_phpunittest::instance();
$instance = cache_config_testing::instance();
$this->assertInstanceOf('cache_config', $instance);
}

/**
* Test disabling the cache stores.
*/
public function test_disable_stores() {
$instance = cache_config_phpunittest::instance();
$instance = cache_config_testing::instance();
$instance->phpunit_add_definition('phpunit/disabletest1', array(
'mode' => cache_store::MODE_APPLICATION,
'component' => 'phpunit',
Expand Down Expand Up @@ -1245,14 +1245,14 @@ public function test_disable() {

$factory = cache_factory::instance(true);
$config = $factory->create_config_instance();
$this->assertEquals('cache_config_phpunittest', get_class($config));
$this->assertEquals('cache_config_testing', get_class($config));
}

/**
* Test that multiple application loaders work ok.
*/
public function test_multiple_application_loaders() {
$instance = cache_config_phpunittest::instance(true);
$instance = cache_config_testing::instance(true);
$instance->phpunit_add_file_store('phpunittest1');
$instance->phpunit_add_file_store('phpunittest2');
$instance->phpunit_add_definition('phpunit/multi_loader', array(
Expand Down Expand Up @@ -1320,8 +1320,8 @@ public function test_multiple_application_loaders() {
* Test that multiple application loaders work ok.
*/
public function test_multiple_session_loaders() {
/* @var cache_config_phpunittest $instance */
$instance = cache_config_phpunittest::instance(true);
/* @var cache_config_testing $instance */
$instance = cache_config_testing::instance(true);
$instance->phpunit_add_session_store('phpunittest1');
$instance->phpunit_add_session_store('phpunittest2');
$instance->phpunit_add_definition('phpunit/multi_loader', array(
Expand Down Expand Up @@ -1418,7 +1418,7 @@ public function test_session_cache_switch_user() {
*/
public function test_session_cache_switch_user_application_mapping() {
$this->resetAfterTest(true);
$instance = cache_config_phpunittest::instance(true);
$instance = cache_config_testing::instance(true);
$instance->phpunit_add_file_store('testfilestore');
$instance->phpunit_add_definition('phpunit/testappsession', array(
'mode' => cache_store::MODE_SESSION,
Expand Down Expand Up @@ -1453,7 +1453,7 @@ public function test_session_cache_switch_user_application_mapping() {
* Test two session caches being used at once to confirm collisions don't occur.
*/
public function test_dual_session_caches() {
$instance = cache_config_phpunittest::instance(true);
$instance = cache_config_testing::instance(true);
$instance->phpunit_add_definition('phpunit/testsess1', array(
'mode' => cache_store::MODE_SESSION,
'component' => 'phpunit',
Expand Down Expand Up @@ -1518,7 +1518,7 @@ public function test_session_cache_switch_user_multiple() {
* Test application locking.
*/
public function test_application_locking() {
$instance = cache_config_phpunittest::instance(true);
$instance = cache_config_testing::instance(true);
$instance->phpunit_add_definition('phpunit/test_application_locking', array(
'mode' => cache_store::MODE_APPLICATION,
'component' => 'phpunit',
Expand All @@ -1544,7 +1544,7 @@ public function test_application_locking() {
* Test the static cache_helper method purge_stores_used_by_definition.
*/
public function test_purge_stores_used_by_definition() {
$instance = cache_config_phpunittest::instance(true);
$instance = cache_config_testing::instance(true);
$instance->phpunit_add_definition('phpunit/test_purge_stores_used_by_definition', array(
'mode' => cache_store::MODE_APPLICATION,
'component' => 'phpunit',
Expand All @@ -1566,7 +1566,7 @@ public function test_purge_stores_used_by_definition() {
* Test purge routines.
*/
public function test_purge_routines() {
$instance = cache_config_phpunittest::instance(true);
$instance = cache_config_testing::instance(true);
$instance->phpunit_add_definition('phpunit/purge1', array(
'mode' => cache_store::MODE_APPLICATION,
'component' => 'phpunit',
Expand Down Expand Up @@ -1613,7 +1613,7 @@ public function test_purge_routines() {
* Test that the default stores all support searching.
*/
public function test_defaults_support_searching() {
$instance = cache_config_phpunittest::instance(true);
$instance = cache_config_testing::instance(true);
$instance->phpunit_add_definition('phpunit/search1', array(
'mode' => cache_store::MODE_APPLICATION,
'component' => 'phpunit',
Expand Down Expand Up @@ -1660,7 +1660,7 @@ public function test_defaults_support_searching() {
}

public function test_static_acceleration() {
$instance = cache_config_phpunittest::instance();
$instance = cache_config_testing::instance();
$instance->phpunit_add_definition('phpunit/accelerated', array(
'mode' => cache_store::MODE_APPLICATION,
'component' => 'phpunit',
Expand Down
Loading

0 comments on commit 427c41e

Please sign in to comment.