From b5486ce89b1c9192132b6530d5aac15ffeda6f37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= <commits@skodak.org>
Date: Fri, 11 Oct 2013 00:09:04 +0200
Subject: [PATCH] MDL-41953 add more tests for invalid plugin names

---
 lib/tests/component_test.php | 3 +++
 lib/tests/moodlelib_test.php | 1 +
 2 files changed, 4 insertions(+)

diff --git a/lib/tests/component_test.php b/lib/tests/component_test.php
index efeff4569ff..2f57c457762 100644
--- a/lib/tests/component_test.php
+++ b/lib/tests/component_test.php
@@ -205,6 +205,7 @@ class core_component_testcase extends advanced_testcase {
         $this->assertFalse(core_component::is_valid_plugin_name('mod', 'example.xx'));
         $this->assertFalse(core_component::is_valid_plugin_name('mod', '.example'));
         $this->assertFalse(core_component::is_valid_plugin_name('mod', '_example'));
+        $this->assertFalse(core_component::is_valid_plugin_name('mod', 'example_'));
         $this->assertFalse(core_component::is_valid_plugin_name('mod', 'example_x1'));
         $this->assertFalse(core_component::is_valid_plugin_name('mod', 'example-x1'));
         $this->assertFalse(core_component::is_valid_plugin_name('mod', 'role'));
@@ -220,6 +221,8 @@ class core_component_testcase extends advanced_testcase {
         $this->assertFalse(core_component::is_valid_plugin_name('tool', 'example-xx'));
         $this->assertFalse(core_component::is_valid_plugin_name('tool', '.example'));
         $this->assertFalse(core_component::is_valid_plugin_name('tool', '_example'));
+        $this->assertFalse(core_component::is_valid_plugin_name('tool', 'example_'));
+        $this->assertFalse(core_component::is_valid_plugin_name('tool', 'example__x1'));
     }
 
     public function test_normalize_component() {
diff --git a/lib/tests/moodlelib_test.php b/lib/tests/moodlelib_test.php
index 607a1436f45..ea638bcf0f4 100644
--- a/lib/tests/moodlelib_test.php
+++ b/lib/tests/moodlelib_test.php
@@ -490,6 +490,7 @@ class core_moodlelib_testcase extends advanced_testcase {
         $this->assertSame('', clean_param('auth_something__xx', PARAM_COMPONENT));
         $this->assertSame('', clean_param('mod_Something', PARAM_COMPONENT));
         $this->assertSame('', clean_param('mod_somethíng', PARAM_COMPONENT));
+        $this->assertSame('', clean_param('mod__something', PARAM_COMPONENT));
         $this->assertSame('', clean_param('auth_xx-yy', PARAM_COMPONENT));
         $this->assertSame('', clean_param('_auth_xx', PARAM_COMPONENT));
         $this->assertSame('', clean_param('a2uth_xx', PARAM_COMPONENT));