summaryrefslogtreecommitdiff
path: root/_test
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2012-04-20 22:19:44 +0200
committerAndreas Gohr <andi@splitbrain.org>2012-04-20 22:19:44 +0200
commite37739ccaac4a28aa2176487a637cbdf3d1b85a0 (patch)
treec902bf68d4e212aa2bd71f23d95e751060e639ed /_test
parent42dcf8b19dfef94b81a71813ce58e6a0b0026cb1 (diff)
downloadrpg-e37739ccaac4a28aa2176487a637cbdf3d1b85a0.tar.gz
rpg-e37739ccaac4a28aa2176487a637cbdf3d1b85a0.tar.bz2
some cleanup
removed unneeded data files, converted tabs to spaces
Diffstat (limited to '_test')
-rw-r--r--_test/data/deleted.files257
-rw-r--r--_test/data/security.pngbin7917 -> 0 bytes
-rw-r--r--_test/data/security.xcfbin12093 -> 0 bytes
-rw-r--r--_test/tests/test/basic.test.php26
-rw-r--r--_test/tests/test/globals.test.php6
-rw-r--r--_test/tests/test/plugins_defaults.test.php4
-rw-r--r--_test/tests/test/reset.test.php1
-rw-r--r--_test/tests/test/scope.test.php78
8 files changed, 57 insertions, 315 deletions
diff --git a/_test/data/deleted.files b/_test/data/deleted.files
deleted file mode 100644
index d034e1d5b..000000000
--- a/_test/data/deleted.files
+++ /dev/null
@@ -1,257 +0,0 @@
-# This is a list of files that were present in previous DokuWiki releases
-# but were removed later. An up to date DokuWiki should not have any of
-# the files installed
-# A copy of this list is maintained at
-# http://www.dokuwiki.org/install:upgrade#files_to_remove
-
-# removed in 2011-11-10
-lib/_fla/.htaccess
-lib/_fla/MultipleUpload.as
-lib/_fla/README
-lib/_fla/index.html
-lib/_fla/multipleUpload.fla
-lib/exe/multipleUpload.swf
-lib/images/multiupload.png
-lib/scripts/ajax.js
-lib/scripts/events.js
-lib/scripts/subscriptions.js
-
-# removed in 2011-05-25
-conf/words.aspell.dist
-lib/styles/style.css
-
-# removed in 2010-11-07
-inc/lang/ar/subscribermail.txt
-inc/lang/az/subscribermail.txt
-inc/lang/bg/subscribermail.txt
-inc/lang/ca/subscribermail.txt
-inc/lang/ca-valencia/subscribermail.txt
-inc/lang/cs/subscribermail.txt
-inc/lang/da/subscribermail.txt
-inc/lang/de-informal/subscribermail.txt
-inc/lang/el/subscribermail.txt
-inc/lang/eo/subscribermail.txt
-inc/lang/es/subscribermail.txt
-inc/lang/et/subscribermail.txt
-inc/lang/eu/subscribermail.txt
-inc/lang/fa/subscribermail.txt
-inc/lang/fi/subscribermail.txt
-inc/lang/fo/subscribermail.txt
-inc/lang/fr/subscribermail.txt
-inc/lang/gl/subscribermail.txt
-inc/lang/he/subscribermail.txt
-inc/lang/hr/subscribermail.txt
-inc/lang/hu/subscribermail.txt
-inc/lang/id/subscribermail.txt
-inc/lang/is/subscribermail.txt
-inc/lang/it/subscribermail.txt
-inc/lang/ja/subscribermail.txt
-inc/lang/ko/subscribermail.txt
-inc/lang/ku/subscribermail.txt
-inc/lang/lt/subscribermail.txt
-inc/lang/lv/subscribermail.txt
-inc/lang/mr/subscribermail.txt
-inc/lang/ne/subscribermail.txt
-inc/lang/nl/subscribermail.txt
-inc/lang/no/subscribermail.txt
-inc/lang/pl/subscribermail.txt
-inc/lang/pt-br/subscribermail.txt
-inc/lang/pt/subscribermail.txt
-inc/lang/ro/subscribermail.txt
-inc/lang/ru/subscribermail.txt
-inc/lang/sk/subscribermail.txt
-inc/lang/sr/subscribermail.txt
-inc/lang/sv/subscribermail.txt
-inc/lang/th/subscribermail.txt
-inc/lang/tr/subscribermail.txt
-inc/lang/uk/subscribermail.txt
-inc/lang/zh/subscribermail.txt
-inc/lang/zh-tw/subscribermail.txt
-
-# removed in rc2010-10-07
-conf/msg
-inc/lang/bg/wordblock.txt
-inc/lang/ca-valencia/wordblock.txt
-inc/lang/ca/wordblock.txt
-inc/lang/cs/wordblock.txt
-inc/lang/da/wordblock.txt
-inc/lang/de-informal/wordblock.txt
-inc/lang/de/subscribermail.txt
-inc/lang/de/wordblock.txt
-inc/lang/el/wordblock.txt
-inc/lang/en/subscribermail.txt
-inc/lang/en/wordblock.txt
-inc/lang/eo/wordblock.txt
-inc/lang/es/wordblock.txt
-inc/lang/et/wordblock.txt
-inc/lang/eu/wordblock.txt
-inc/lang/fa/wordblock.txt
-inc/lang/fi/wordblock.txt
-inc/lang/fo/wordblock.txt
-inc/lang/fr/wordblock.txt
-inc/lang/he/wordblock.txt
-inc/lang/hr/wordblock.txt
-inc/lang/hu/wordblock.txt
-inc/lang/id/wordblock.txt
-inc/lang/it/wordblock.txt
-inc/lang/ja/wordblock.txt
-inc/lang/ko/wordblock.txt
-inc/lang/ku/wordblock.txt
-inc/lang/lt/wordblock.txt
-inc/lang/lv/wordblock.txt
-inc/lang/mg/wordblock.txt
-inc/lang/mr/wordblock.txt
-inc/lang/nl/wordblock.txt
-inc/lang/no/wordblock.txt
-inc/lang/pl/wordblock.txt
-inc/lang/pt-br/wordblock.txt
-inc/lang/pt/wordblock.txt
-inc/lang/ro/wordblock.txt
-inc/lang/sk/wordblock.txt
-inc/lang/sl/wordblock.txt
-inc/lang/sr/wordblock.txt
-inc/lang/sv/wordblock.txt
-inc/lang/th/wordblock.txt
-inc/lang/tr/wordblock.txt
-inc/lang/uk/wordblock.txt
-inc/lang/vi/wordblock.txt
-inc/lang/zh-tw/wordblock.txt
-inc/lang/zh/wordblock.txt
-lib/scripts/pngbehavior.htc
-
-# removed in rc2009-12-02
-inc/lang/ar/wordblock.txt
-inc/lang/ca-va/
-lib/plugins/acl/lang/ca-va/
-lib/plugins/config/lang/ca-va/
-lib/plugins/plugin/lang/ca-va/
-lib/plugins/popularity/lang/ca-va/
-lib/plugins/revert/lang/ca-va/
-lib/plugins/usermanager/lang/ca-va/
-
-# removed in rc2009-01-30
-lib/plugins/upgradeplugindirectory
-lib/plugins/upgradeplugindirectory/action.php
-
-# removed in rc2009-01-26
-inc/auth/punbb.class.php
-inc/lang/ko/edit.txt_bak
-inc/lang/ko/lang.php_bak
-inc/lang/ku/admin_acl.txt
-inc/lang/mg/admin_acl.txt
-lib/plugins/importoldchangelog
-lib/plugins/importoldchangelog/action.php
-lib/plugins/importoldindex
-lib/plugins/importoldindex/action.php
-lib/plugins/usermanager/images/no_user_edit.png
-lib/plugins/usermanager/images/user_edit.png
-lib/tpl/default/UWEB.css
-
-# removed in rc2008-03-31
-inc/aspell.php
-inc/geshi/css-gen.cfg
-inc/lang/fr/admin_acl.txt
-lib/exe/spellcheck.php
-lib/images/toolbar/spellcheck.png
-lib/images/toolbar/spellnoerr.png
-lib/images/toolbar/spellstop.png
-lib/images/toolbar/spellwait.gif
-lib/plugins/acl/lang/ar/intro.txt
-lib/plugins/acl/lang/bg/intro.txt
-lib/plugins/acl/lang/ca/intro.txt
-lib/plugins/acl/lang/cs/intro.txt
-lib/plugins/acl/lang/da/intro.txt
-lib/plugins/acl/lang/de/intro.txt
-lib/plugins/acl/lang/el/intro.txt
-lib/plugins/acl/lang/en/intro.txt
-lib/plugins/acl/lang/es/intro.txt
-lib/plugins/acl/lang/et/intro.txt
-lib/plugins/acl/lang/eu/intro.txt
-lib/plugins/acl/lang/fi/intro.txt
-lib/plugins/acl/lang/fr/intro.txt
-lib/plugins/acl/lang/gl/intro.txt
-lib/plugins/acl/lang/he/intro.txt
-lib/plugins/acl/lang/id/intro.txt
-lib/plugins/acl/lang/it/intro.txt
-lib/plugins/acl/lang/ja/intro.txt
-lib/plugins/acl/lang/ko/intro.txt
-lib/plugins/acl/lang/lt/intro.txt
-lib/plugins/acl/lang/lv/intro.txt
-lib/plugins/acl/lang/nl/intro.txt
-lib/plugins/acl/lang/no/intro.txt
-lib/plugins/acl/lang/pl/intro.txt
-lib/plugins/acl/lang/pt/intro.txt
-lib/plugins/acl/lang/ru/intro.txt
-lib/plugins/acl/lang/sk/intro.txt
-lib/plugins/acl/lang/sr/intro.txt
-lib/plugins/acl/lang/sv/intro.txt
-lib/plugins/acl/lang/tr/intro.txt
-lib/plugins/acl/lang/uk/intro.txt
-lib/plugins/acl/lang/vi/intro.txt
-lib/plugins/acl/lang/zh/intro.txt
-lib/plugins/acl/lang/zh-tw/intro.txt
-lib/scripts/spellcheck.js
-lib/styles/spellcheck.css
-
-# removed in 2007-06-26
-inc/parser/wiki.php
-lib/images/interwiki/bug.gif
-lib/plugins/base.php
-lib/plugins/plugin/inc
-lib/plugins/plugin/inc/tarlib.class.php
-lib/plugins/plugin/inc/zip.lib.php
-lib/scripts/domLib.js
-lib/scripts/domTT.js
-
-# removed in 2006-11-06
-inc/admin_acl.php
-inc/lang/lt/stopwords.txt
-inc/magpie
-inc/magpie/rss_cache.inc
-inc/magpie/rss_fetch.inc
-inc/magpie/rss_parse.inc
-inc/magpie/rss_utils.inc
-lib/exe/media.php
-lib/tpl/default/mediaedit.php
-lib/tpl/default/media.php
-lib/tpl/default/mediaref.php
-
-# removed in 2006-03-09
-data/pages/wiki/playground.txt
-inc/auth/ldap.php
-inc/auth/mysql.php
-inc/auth/pgsql.php
-inc/auth/plain.php
-inc/lang/ca/admin_acl.txt
-inc/lang/cs/admin_acl.txt
-inc/lang/da/admin_acl.txt
-inc/lang/de/admin_acl.txt
-inc/lang/en/admin_acl.txt
-inc/lang/et/admin_acl.txt
-inc/lang/eu/admin_acl.txt
-inc/lang/fr/admin_acl.txt
-inc/lang/it/admin_acl.txt
-inc/lang/ja/admin_acl.txt
-inc/lang/lt/admin_acl.txt
-inc/lang/lv/admin_acl.txt
-inc/lang/nl/admin_acl.txt
-inc/lang/no/admin_acl.txt
-inc/lang/pl/admin_acl.txt
-inc/lang/pt/admin_acl.txt
-inc/lang/vi/admin_acl.txt
-inc/lang/zh-tw/admin_acl.txt
-inc/parser/spamcheck.php
-lib/images/favicon.ico
-lib/images/thumbup.gif
-lib/images/toolbar/code.png
-lib/images/toolbar/empty.png
-lib/images/toolbar/extlink.png
-lib/images/toolbar/fonth1.png
-lib/images/toolbar/fonth2.png
-lib/images/toolbar/fonth3.png
-lib/images/toolbar/fonth4.png
-lib/images/toolbar/fonth5.png
-lib/images/toolbar/list.png
-lib/images/toolbar/list_ul.png
-lib/images/toolbar/rule.png
-lib/tpl/default/images/interwiki.png
diff --git a/_test/data/security.png b/_test/data/security.png
deleted file mode 100644
index c4f1a9771..000000000
--- a/_test/data/security.png
+++ /dev/null
Binary files differ
diff --git a/_test/data/security.xcf b/_test/data/security.xcf
deleted file mode 100644
index 990287830..000000000
--- a/_test/data/security.xcf
+++ /dev/null
Binary files differ
diff --git a/_test/tests/test/basic.test.php b/_test/tests/test/basic.test.php
index ca788a91d..b4926d2ba 100644
--- a/_test/tests/test/basic.test.php
+++ b/_test/tests/test/basic.test.php
@@ -4,19 +4,19 @@
* @group integration
*/
class InttestsBasicTest extends DokuWikiTest {
- /**
- * Execute the simplest possible request and expect
- * a dokuwiki page which obviously has the word "DokuWiki"
- * in it somewhere.
- */
- function testSimpleRun() {
- $request = new TestRequest();
+ /**
+ * Execute the simplest possible request and expect
+ * a dokuwiki page which obviously has the word "DokuWiki"
+ * in it somewhere.
+ */
+ function testSimpleRun() {
+ $request = new TestRequest();
- $response = $request->execute();
+ $response = $request->execute();
- $this->assertTrue(
- strpos($response->getContent(), 'DokuWiki') >= 0,
- 'DokuWiki was not a word in the output'
- );
- }
+ $this->assertTrue(
+ strpos($response->getContent(), 'DokuWiki') >= 0,
+ 'DokuWiki was not a word in the output'
+ );
+ }
}
diff --git a/_test/tests/test/globals.test.php b/_test/tests/test/globals.test.php
index b45b2bf83..180fd0d0d 100644
--- a/_test/tests/test/globals.test.php
+++ b/_test/tests/test/globals.test.php
@@ -5,9 +5,9 @@
*/
class InttestsGlobalsTest extends DokuWikiTest {
- /**
+ /**
* every request should be with its own variables
- */
+ */
function testFirstRun() {
global $EVENT_HANDLER;
@@ -24,7 +24,7 @@ class InttestsGlobalsTest extends DokuWikiTest {
);
$request->execute();
- }
+ }
/**
* @depends testFirstRun
diff --git a/_test/tests/test/plugins_defaults.test.php b/_test/tests/test/plugins_defaults.test.php
index a96dac931..953960bb7 100644
--- a/_test/tests/test/plugins_defaults.test.php
+++ b/_test/tests/test/plugins_defaults.test.php
@@ -5,7 +5,7 @@
*/
class InttestsPluginsDefaultTest extends DokuWikiTest {
- function testTestingPluginDisabledDefault() {
+ function testTestingPluginDisabledDefault() {
global $EVENT_HANDLER;
$request = new TestRequest();
@@ -20,5 +20,5 @@ class InttestsPluginsDefaultTest extends DokuWikiTest {
$request->execute();
$this->assertFalse($hookTriggered, 'Testing plugin did trigger!');
- }
+ }
}
diff --git a/_test/tests/test/reset.test.php b/_test/tests/test/reset.test.php
index 7c5978543..39c43cd3b 100644
--- a/_test/tests/test/reset.test.php
+++ b/_test/tests/test/reset.test.php
@@ -35,5 +35,4 @@ class InttestsScopeTest extends DokuWikiTest {
$this->assertFalse($this->triggered, 'trigger');
}
-
}
diff --git a/_test/tests/test/scope.test.php b/_test/tests/test/scope.test.php
index 9341ecef8..8c4ad9cf8 100644
--- a/_test/tests/test/scope.test.php
+++ b/_test/tests/test/scope.test.php
@@ -4,46 +4,46 @@
* @group integration
*/
class InttestsResetTest extends DokuWikiTest {
- /**
- * It should be possible to have two test cases within one test class.
- */
- function testFirstRun() {
- $request = new TestRequest();
- $response = $request->execute();
- $this->assertTrue(
- strpos($response->getContent(), 'DokuWiki') >= 0,
- 'DokuWiki was not a word in the output'
- );
- }
+ /**
+ * It should be possible to have two test cases within one test class.
+ */
+ function testFirstRun() {
+ $request = new TestRequest();
+ $response = $request->execute();
+ $this->assertTrue(
+ strpos($response->getContent(), 'DokuWiki') >= 0,
+ 'DokuWiki was not a word in the output'
+ );
+ }
- /**
- * @depends testFirstRun
- */
- function testSecondRun() {
- $request = new TestRequest();
- $response = $request->execute();
- $this->assertTrue(
- strpos($response->getContent(), 'DokuWiki') >= 0,
- 'DokuWiki was not a word in the output'
- );
- }
+ /**
+ * @depends testFirstRun
+ */
+ function testSecondRun() {
+ $request = new TestRequest();
+ $response = $request->execute();
+ $this->assertTrue(
+ strpos($response->getContent(), 'DokuWiki') >= 0,
+ 'DokuWiki was not a word in the output'
+ );
+ }
- /**
- * two requests within the same test case should be possible
- */
- function testMultipleRequests() {
- $request = new TestRequest();
- $response = $request->execute();
- $this->assertTrue(
- strpos($response->getContent(), 'DokuWiki') >= 0,
- 'DokuWiki was not a word in the output'
- );
+ /**
+ * two requests within the same test case should be possible
+ */
+ function testMultipleRequests() {
+ $request = new TestRequest();
+ $response = $request->execute();
+ $this->assertTrue(
+ strpos($response->getContent(), 'DokuWiki') >= 0,
+ 'DokuWiki was not a word in the output'
+ );
- $request = new TestRequest();
- $response = $request->execute();
- $this->assertTrue(
- strpos($response->getContent(), 'DokuWiki') >= 0,
- 'DokuWiki was not a word in the output'
- );
- }
+ $request = new TestRequest();
+ $response = $request->execute();
+ $this->assertTrue(
+ strpos($response->getContent(), 'DokuWiki') >= 0,
+ 'DokuWiki was not a word in the output'
+ );
+ }
}