From 0f232ed6e8071f79756f266fc65bd86fbf399b68 Mon Sep 17 00:00:00 2001 From: Marina Glancy Date: Tue, 9 Apr 2013 14:40:15 +1000 Subject: [PATCH] MDL-34346 fixed missing string and correct instantiating of repositories in tests --- lang/en/cache.php | 1 + repository/tests/repository_test.php | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lang/en/cache.php b/lang/en/cache.php index d081b61cb28..689e6aebad4 100644 --- a/lang/en/cache.php +++ b/lang/en/cache.php @@ -53,6 +53,7 @@ $string['cachedef_plugininfo_repository'] = 'Plugin info - repositories'; $string['cachedef_pluginlist'] = 'Plugin list'; $string['cachedef_plugintypes'] = 'Plugin types'; $string['cachedef_questiondata'] = 'Question definitions'; +$string['cachedef_repositories'] = 'Repositories instances data'; $string['cachedef_string'] = 'Language string cache'; $string['cachedef_yuimodules'] = 'YUI Module definitions'; $string['cachelock_file_default'] = 'Default file locking'; diff --git a/repository/tests/repository_test.php b/repository/tests/repository_test.php index 72df62cc995..89afd41837f 100644 --- a/repository/tests/repository_test.php +++ b/repository/tests/repository_test.php @@ -173,7 +173,7 @@ class repositorylib_testcase extends advanced_testcase { // Instance on a site level. $repoid = repository::static_function('flickr_public', 'create', 'flickr_public', 0, $syscontext, $params); - $systemrepo = repository::get_instance($repoid); + $systemrepo = repository::get_repository_by_id($repoid, $syscontext); role_assign($roleid, $user->id, $syscontext->id); assign_capability('moodle/site:config', CAP_ALLOW, $roleid, $syscontext, true); @@ -198,7 +198,7 @@ class repositorylib_testcase extends advanced_testcase { $this->getDataGenerator()->enrol_user($user->id, $course->id, $roleid); $repoid = repository::static_function('flickr_public', 'create', 'flickr_public', 0, $coursecontext, $params); - $courserepo = repository::get_instance($repoid); + $courserepo = repository::get_repository_by_id($repoid, $coursecontext); assign_capability('moodle/course:update', CAP_ALLOW, $roleid, $coursecontext, true); assign_capability('repository/flickr_public:view', CAP_ALLOW, $roleid, $coursecontext, true); @@ -226,13 +226,13 @@ class repositorylib_testcase extends advanced_testcase { // Editing someone else's instance. $repoid = repository::static_function('flickr_public', 'create', 'flickr_public', 0, $otherusercontext, $params); - $userrepo = repository::get_instance($repoid); + $userrepo = repository::get_repository_by_id($repoid, $syscontext); $this->assertFalse($userrepo->can_be_edited_by_user()); // Editing my own instance. $usercontext = context_user::instance($user->id); $repoid = repository::static_function('flickr_public', 'create', 'flickr_public', 0, $usercontext, $params); - $userrepo = repository::get_instance($repoid); + $userrepo = repository::get_repository_by_id($repoid, $syscontext); $this->assertTrue($userrepo->can_be_edited_by_user()); }