aboutsummaryrefslogtreecommitdiff
path: root/engine/tests
diff options
context:
space:
mode:
Diffstat (limited to 'engine/tests')
-rw-r--r--engine/tests/api/metastrings.php2
-rw-r--r--engine/tests/api/plugins.php10
-rw-r--r--engine/tests/test_files/plugin_18/manifest.xml2
3 files changed, 1 insertions, 13 deletions
diff --git a/engine/tests/api/metastrings.php b/engine/tests/api/metastrings.php
index e5cfe80e1..9b5d7ee4e 100644
--- a/engine/tests/api/metastrings.php
+++ b/engine/tests/api/metastrings.php
@@ -164,7 +164,7 @@ class ElggCoreMetastringsTest extends ElggCoreUnitTest {
}
$options = array();
- $this->assertFalse(elgg_is_valid_options_for_batch_operation($options), $type);
+ $this->assertFalse(elgg_is_valid_options_for_batch_operation($options, $type));
foreach ($required as $key) {
$options = array();
diff --git a/engine/tests/api/plugins.php b/engine/tests/api/plugins.php
index 853af45e9..00b0d4513 100644
--- a/engine/tests/api/plugins.php
+++ b/engine/tests/api/plugins.php
@@ -105,8 +105,6 @@ class ElggCorePluginsAPITest extends ElggCoreUnitTest {
array('type' => 'plugin', 'name' => 'facebook_connect', 'version' => 1.0),
),
- 'on_activate' => array('setup_function'),
- 'on_deactivate' => array('teardown_function'),
'admin_interface' => 'simple',
'activate_on_install' => true
);
@@ -279,14 +277,6 @@ class ElggCorePluginsAPITest extends ElggCoreUnitTest {
$this->assertEqual($this->manifest17->getConflicts(), array());
}
- public function testElggPluginManifestGetOnActivate() {
- $this->assertEqual($this->manifest18->getOnActivate(), array('setup_function'));
- }
-
- public function testElggPluginManifestGetOnDeactivate() {
- $this->assertEqual($this->manifest18->getOnDeactivate(), array('teardown_function'));
- }
-
public function testElggPluginManifestGetAdminInterface() {
$this->assertEqual($this->manifest18->getAdminInterface(), 'simple');
}
diff --git a/engine/tests/test_files/plugin_18/manifest.xml b/engine/tests/test_files/plugin_18/manifest.xml
index c6cf4f807..23f0fa0bf 100644
--- a/engine/tests/test_files/plugin_18/manifest.xml
+++ b/engine/tests/test_files/plugin_18/manifest.xml
@@ -34,8 +34,6 @@
<category>ServiceAPI</category>
- <on_activate>setup_function</on_activate>
- <on_deactivate>teardown_function</on_deactivate>
<admin_interface>simple</admin_interface>
<activate_on_install>true</activate_on_install>