Skip to content

Commit

Permalink
Changing package of tests from "cake.tests" to "cake".
Browse files Browse the repository at this point in the history
Moving tearDown et al. to the top of each test class.
Adding short descriptions to docblocks.
Adding missing docblocks.
Removing unnecessary blank lines and whitespaces.
Updating labels of test groups.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8116 3807eeeb-6ff5-0310-8944-8be069107fe0
  • Loading branch information
mariuswilms committed Mar 18, 2009
1 parent 78daa13 commit 3c3b852
Show file tree
Hide file tree
Showing 224 changed files with 1,882 additions and 1,802 deletions.
6 changes: 3 additions & 3 deletions cake/tests/cases/basics.test.php
@@ -1,7 +1,7 @@
<?php
/* SVN FILE: $Id$ */
/**
* Short description for file.
* BasicsTest file
*
* Long description for file
*
Expand All @@ -16,7 +16,7 @@
* @filesource
* @copyright Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
* @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
* @package cake.tests
* @package cake
* @subpackage cake.tests.cases
* @since CakePHP(tm) v 1.2.0.4206
* @version $Revision$
Expand All @@ -29,7 +29,7 @@
/**
* BasicsTest class
*
* @package cake.tests
* @package cake
* @subpackage cake.tests.cases
*/
class BasicsTest extends CakeTestCase {
Expand Down
8 changes: 4 additions & 4 deletions cake/tests/cases/console/cake.test.php
@@ -1,7 +1,7 @@
<?php
/* SVN FILE: $Id$ */
/**
* Short description for file.
* ShellDispatcherTest file
*
* Long description for file
*
Expand All @@ -16,7 +16,7 @@
* @filesource
* @copyright Copyright 2005-2007, Cake Software Foundation, Inc.
* @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
* @package cake.tests
* @package cake
* @subpackage cake.tests.cases.console
* @since CakePHP(tm) v 1.2.0.5432
* @version $Revision$
Expand Down Expand Up @@ -110,9 +110,9 @@ function _stop($status = 0) {
}
}
/**
* Short description for class.
* ShellDispatcherTest
*
* @package cake.tests
* @package cake
* @subpackage cake.tests.cases.libs
*/
class ShellDispatcherTest extends UnitTestCase {
Expand Down
14 changes: 7 additions & 7 deletions cake/tests/cases/console/libs/shell.test.php
@@ -1,9 +1,9 @@
<?php
/* SVN FILE: $Id$ */
/**
* Test Case for Shell
* ShellTest file
*
* Long description for file
* Test Case for Shell
*
* PHP versions 4 and 5
*
Expand All @@ -16,7 +16,7 @@
* @filesource
* @copyright Copyright 2006-2008, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake.tests
* @package cake
* @subpackage cake.tests.cases.console.libs
* @since CakePHP v 1.2.0.7726
* @version $Revision$
Expand Down Expand Up @@ -44,31 +44,31 @@
/**
* TestShell class
*
* @package cake.tests
* @package cake
* @subpackage cake.tests.cases.console.libs
*/
class TestShell extends Shell {
}
/**
* TestAppleTask class
*
* @package cake.tests
* @package cake
* @subpackage cake.tests.cases.console.libs
*/
class TestAppleTask extends Shell {
}
/**
* TestBananaTask class
*
* @package cake.tests
* @package cake
* @subpackage cake.tests.cases.console.libs
*/
class TestBananaTask extends Shell {
}
/**
* ShellTest class
*
* @package cake.tests
* @package cake
* @subpackage cake.tests.cases.console.libs
*/
class ShellTest extends CakeTestCase {
Expand Down
17 changes: 8 additions & 9 deletions cake/tests/cases/console/libs/tasks/extract.test.php
@@ -1,9 +1,9 @@
<?php
/* SVN FILE: $Id: extract.test.php 7838 2008-11-07 10:41:52Z nate $ */
/* SVN FILE: $Id$ */
/**
* Test Case for i18n extraction shell task
* ExtractTaskTest file
*
* Long description for file
* Test Case for i18n extraction shell task
*
* PHP versions 4 and 5
*
Expand All @@ -16,12 +16,12 @@
* @filesource
* @copyright Copyright 2006-2008, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake.tests
* @package cake
* @subpackage cake.tests.cases.console.libs.tasks
* @since CakePHP v 1.2.0.7726
* @version $Revision: 7838 $
* @modifiedby $LastChangedBy: DarkAngelBGE $
* @lastmodified $Date: 2008-11-07 05:41:52 -0500 (Fri, 07 Nov 2008) $
* @version $Revision$
* @modifiedby $LastChangedBy$
* @lastmodified $Date$
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
App::import('Core', array('Shell', 'Folder'));
Expand All @@ -45,11 +45,10 @@
'ShellDispatcher', 'TestExtractTaskMockShellDispatcher',
array('getInput', 'stdout', 'stderr', '_stop', '_initEnvironment')
);

/**
* ExtractTaskTest class
*
* @package cake.tests
* @package cake
* @subpackage cake.tests.cases.console.libs.tasks
*/
class ExtractTaskTest extends CakeTestCase {
Expand Down
8 changes: 4 additions & 4 deletions cake/tests/cases/console/libs/tasks/test.test.php
@@ -1,9 +1,9 @@
<?php
/* SVN FILE: $Id$ */
/**
* Test Case for test generation shell task
* TestTaskTest file
*
* Long description for file
* Test Case for test generation shell task
*
* PHP versions 4 and 5
*
Expand All @@ -16,7 +16,7 @@
* @filesource
* @copyright Copyright 2006-2008, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake.tests
* @package cake
* @subpackage cake.tests.cases.console.libs.tasks
* @since CakePHP v 1.2.0.7726
* @version $Revision$
Expand Down Expand Up @@ -52,7 +52,7 @@
/**
* TestTaskTest class
*
* @package cake.tests
* @package cake
* @subpackage cake.tests.cases.console.libs.tasks
*/
class TestTaskTest extends CakeTestCase {
Expand Down
31 changes: 13 additions & 18 deletions cake/tests/cases/dispatcher.test.php
@@ -1,7 +1,7 @@
<?php
/* SVN FILE: $Id$ */
/**
* Short description for file.
* DispatcherTest file
*
* Long description for file
*
Expand All @@ -16,7 +16,7 @@
* @filesource
* @copyright Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
* @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
* @package cake.tests
* @package cake
* @subpackage cake.tests.cases
* @since CakePHP(tm) v 1.2.0.4206
* @version $Revision$
Expand Down Expand Up @@ -72,7 +72,6 @@ function cakeError($filename, $params) {
function _stop() {
return true;
}

}
/**
* MyPluginAppController class
Expand All @@ -81,7 +80,6 @@ function _stop() {
* @subpackage cake.tests.cases
*/
class MyPluginAppController extends AppController {

}
/**
* MyPluginController class
Expand Down Expand Up @@ -182,7 +180,6 @@ function index() {
function _protected() {
return true;
}

/**
* redirect method overriding
*
Expand Down Expand Up @@ -264,7 +261,6 @@ class TestDispatchPagesController extends AppController {
function admin_index() {
return true;
}

/**
* camelCased method
*
Expand All @@ -282,7 +278,6 @@ function camelCased() {
* @subpackage cake.tests.cases
*/
class ArticlesTestAppController extends AppController {

}
/**
* ArticlesTestController class
Expand Down Expand Up @@ -481,9 +476,9 @@ function index() {
}
}
/**
* Short description for class.
* DispatcherTest class
*
* @package cake.tests
* @package cake
* @subpackage cake.tests.cases
*/
class DispatcherTest extends CakeTestCase {
Expand All @@ -502,6 +497,15 @@ function setUp() {
Configure::write('App.webroot', 'webroot');
Configure::write('Cache.disable', true);
}
/**
* tearDown method
*
* @access public
* @return void
*/
function tearDown() {
$_GET = $this->_get;
}
/**
* testParseParamsWithoutZerosAndEmptyPost method
*
Expand Down Expand Up @@ -2088,14 +2092,5 @@ function __cachePath($here) {
}
return $filename;
}
/**
* tearDown method
*
* @access public
* @return void
*/
function tearDown() {
$_GET = $this->_get;
}
}
?>
8 changes: 4 additions & 4 deletions cake/tests/cases/libs/cache.test.php
@@ -1,7 +1,7 @@
<?php
/* SVN FILE: $Id$ */
/**
* Short description for file.
* CacheTest file
*
* Long description for file
*
Expand All @@ -16,7 +16,7 @@
* @filesource
* @copyright Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
* @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
* @package cake.tests
* @package cake
* @subpackage cake.tests.cases.libs
* @since CakePHP(tm) v 1.2.0.5432
* @version $Revision$
Expand All @@ -28,9 +28,9 @@
require LIBS . 'cache.php';
}
/**
* Short description for class.
* CacheTest class
*
* @package cake.tests
* @package cake
* @subpackage cake.tests.cases.libs
*/
class CacheTest extends CakeTestCase {
Expand Down
26 changes: 13 additions & 13 deletions cake/tests/cases/libs/cache/apc.test.php
@@ -1,7 +1,7 @@
<?php
/* SVN FILE: $Id$ */
/**
* Short description for file.
* ApcEngineTest file
*
* Long description for file
*
Expand All @@ -16,7 +16,7 @@
* @filesource
* @copyright Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
* @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
* @package cake.tests
* @package cake
* @subpackage cake.tests.cases.libs.cache
* @since CakePHP(tm) v 1.2.0.5434
* @version $Revision$
Expand All @@ -28,9 +28,9 @@
require LIBS . 'cache.php';
}
/**
* Short description for class.
* ApcEngineTest class
*
* @package cake.tests
* @package cake
* @subpackage cake.tests.cases.libs.cache
*/
class ApcEngineTest extends UnitTestCase {
Expand All @@ -56,6 +56,15 @@ function skip() {
function setUp() {
Cache::config('apc', array('engine'=>'Apc', 'prefix' => 'cake_'));
}
/**
* tearDown method
*
* @access public
* @return void
*/
function tearDown() {
Cache::config('default');
}
/**
* testReadAndWriteCache method
*
Expand Down Expand Up @@ -127,14 +136,5 @@ function testDeleteCache() {
$result = Cache::delete('delete_test');
$this->assertTrue($result);
}
/**
* tearDown method
*
* @access public
* @return void
*/
function tearDown() {
Cache::config('default');
}
}
?>

0 comments on commit 3c3b852

Please sign in to comment.