Skip to content

Commit

Permalink
Fix most coding standards issues in Test/Case/Utility
Browse files Browse the repository at this point in the history
  • Loading branch information
@markstory
markstory committed Mar 14, 2012
1 parent 4e94ebe commit 1efee89
Show file tree
Hide file tree
Showing 11 changed files with 221 additions and 202 deletions.
24 changes: 12 additions & 12 deletions lib/Cake/Test/Case/Utility/CakeNumberTest.php
View file
Expand Up @@ -108,15 +108,15 @@ public function testCurrency() {
$expected = '100 100 100,00€';
$this->assertEquals($expected, $result);

$result = $this->Number->currency(1000.45, NULL, array('after' => 'øre', 'before' => 'Kr. ', 'decimals' => ',', 'thousands' => '.'));
$result = $this->Number->currency(1000.45, null, array('after' => 'øre', 'before' => 'Kr. ', 'decimals' => ',', 'thousands' => '.'));
$expected = 'Kr. 1.000,45';
$this->assertEquals($expected, $result);

$result = $this->Number->currency(0.5, 'USD');
$expected = '50c';
$this->assertEquals($expected, $result);

$result = $this->Number->currency(0.5, NULL, array('after' => 'øre'));
$result = $this->Number->currency(0.5, null, array('after' => 'øre'));
$expected = '50øre';
$this->assertEquals($expected, $result);

Expand Down Expand Up @@ -247,7 +247,6 @@ public function testCurrencyNegative() {
$result = $this->Number->currency($value, 'GBP', array('negative' => '-'));
$expected = '-£100,100,100.00';
$this->assertEquals($expected, $result);

}

/**
Expand Down Expand Up @@ -400,39 +399,39 @@ public function testToReadableSize() {
$expected = '1 KB';
$this->assertEquals($expected, $result);

$result = $this->Number->toReadableSize(1024*512);
$result = $this->Number->toReadableSize(1024 * 512);
$expected = '512 KB';
$this->assertEquals($expected, $result);

$result = $this->Number->toReadableSize(1024*1024-1);
$result = $this->Number->toReadableSize(1024 * 1024 - 1);
$expected = '1.00 MB';
$this->assertEquals($expected, $result);

$result = $this->Number->toReadableSize(1024*1024*512);
$result = $this->Number->toReadableSize(1024 * 1024 * 512);
$expected = '512.00 MB';
$this->assertEquals($expected, $result);

$result = $this->Number->toReadableSize(1024*1024*1024-1);
$result = $this->Number->toReadableSize(1024 * 1024 * 1024 - 1);
$expected = '1.00 GB';
$this->assertEquals($expected, $result);

$result = $this->Number->toReadableSize(1024*1024*1024*512);
$result = $this->Number->toReadableSize(1024 * 1024 * 1024 * 512);
$expected = '512.00 GB';
$this->assertEquals($expected, $result);

$result = $this->Number->toReadableSize(1024*1024*1024*1024-1);
$result = $this->Number->toReadableSize(1024 * 1024 * 1024 * 1024 - 1);
$expected = '1.00 TB';
$this->assertEquals($expected, $result);

$result = $this->Number->toReadableSize(1024*1024*1024*1024*512);
$result = $this->Number->toReadableSize(1024 * 1024 * 1024 * 1024 * 512);
$expected = '512.00 TB';
$this->assertEquals($expected, $result);

$result = $this->Number->toReadableSize(1024*1024*1024*1024*1024-1);
$result = $this->Number->toReadableSize(1024 * 1024 * 1024 * 1024 * 1024 - 1);
$expected = '1024.00 TB';
$this->assertEquals($expected, $result);

$result = $this->Number->toReadableSize(1024*1024*1024*1024*1024*1024);
$result = $this->Number->toReadableSize(1024 * 1024 * 1024 * 1024 * 1024 * 1024);
$expected = (1024 * 1024) . '.00 TB';
$this->assertEquals($expected, $result);
}
Expand All @@ -459,4 +458,5 @@ public function testToPercentage() {
$expected = '0.0000%';
$this->assertEquals($expected, $result);
}

}
93 changes: 46 additions & 47 deletions lib/Cake/Test/Case/Utility/CakeTimeTest.php
View file
Expand Up @@ -121,7 +121,7 @@ public function testTimeAgoInWords() {
$hours = 0;
$minutes = 0;
$seconds = 0;
$relative_date = '';
$relativeDate = '';

// Trying to take into account the number of days in a month
$month = date('m') - $months;
Expand All @@ -137,43 +137,43 @@ public function testTimeAgoInWords() {

if ($years > 0) {
// years and months and days
$relative_date .= ($relative_date ? ', -' : '-') . $years . ' year' . ($years > 1 ? 's' : '');
$relative_date .= $months > 0 ? ($relative_date ? ', -' : '-') . $months . ' month' . ($months > 1 ? 's' : '') : '';
$relative_date .= $weeks > 0 ? ($relative_date ? ', -' : '-') . $weeks . ' week' . ($weeks > 1 ? 's' : '') : '';
$relative_date .= $days > 0 ? ($relative_date ? ', -' : '-') . $days . ' day' . ($days > 1 ? 's' : '') : '';
$relativeDate .= ($relativeDate ? ', -' : '-') . $years . ' year' . ($years > 1 ? 's' : '');
$relativeDate .= $months > 0 ? ($relativeDate ? ', -' : '-') . $months . ' month' . ($months > 1 ? 's' : '') : '';
$relativeDate .= $weeks > 0 ? ($relativeDate ? ', -' : '-') . $weeks . ' week' . ($weeks > 1 ? 's' : '') : '';
$relativeDate .= $days > 0 ? ($relativeDate ? ', -' : '-') . $days . ' day' . ($days > 1 ? 's' : '') : '';
} elseif (abs($months) > 0) {
// months, weeks and days
$relative_date .= ($relative_date ? ', -' : '-') . $months . ' month' . ($months > 1 ? 's' : '');
$relative_date .= $weeks > 0 ? ($relative_date ? ', -' : '-') . $weeks . ' week' . ($weeks > 1 ? 's' : '') : '';
$relative_date .= $days > 0 ? ($relative_date ? ', -' : '-') . $days . ' day' . ($days > 1 ? 's' : '') : '';
$relativeDate .= ($relativeDate ? ', -' : '-') . $months . ' month' . ($months > 1 ? 's' : '');
$relativeDate .= $weeks > 0 ? ($relativeDate ? ', -' : '-') . $weeks . ' week' . ($weeks > 1 ? 's' : '') : '';
$relativeDate .= $days > 0 ? ($relativeDate ? ', -' : '-') . $days . ' day' . ($days > 1 ? 's' : '') : '';
} elseif (abs($weeks) > 0) {
// weeks and days
$relative_date .= ($relative_date ? ', -' : '-') . $weeks . ' week' . ($weeks > 1 ? 's' : '');
$relative_date .= $days > 0 ? ($relative_date ? ', -' : '-') . $days . ' day' . ($days > 1 ? 's' : '') : '';
$relativeDate .= ($relativeDate ? ', -' : '-') . $weeks . ' week' . ($weeks > 1 ? 's' : '');
$relativeDate .= $days > 0 ? ($relativeDate ? ', -' : '-') . $days . ' day' . ($days > 1 ? 's' : '') : '';
} elseif (abs($days) > 0) {
// days and hours
$relative_date .= ($relative_date ? ', -' : '-') . $days . ' day' . ($days > 1 ? 's' : '');
$relative_date .= $hours > 0 ? ($relative_date ? ', -' : '-') . $hours . ' hour' . ($hours > 1 ? 's' : '') : '';
$relativeDate .= ($relativeDate ? ', -' : '-') . $days . ' day' . ($days > 1 ? 's' : '');
$relativeDate .= $hours > 0 ? ($relativeDate ? ', -' : '-') . $hours . ' hour' . ($hours > 1 ? 's' : '') : '';
} elseif (abs($hours) > 0) {
// hours and minutes
$relative_date .= ($relative_date ? ', -' : '-') . $hours . ' hour' . ($hours > 1 ? 's' : '');
$relative_date .= $minutes > 0 ? ($relative_date ? ', -' : '-') . $minutes . ' minute' . ($minutes > 1 ? 's' : '') : '';
$relativeDate .= ($relativeDate ? ', -' : '-') . $hours . ' hour' . ($hours > 1 ? 's' : '');
$relativeDate .= $minutes > 0 ? ($relativeDate ? ', -' : '-') . $minutes . ' minute' . ($minutes > 1 ? 's' : '') : '';
} elseif (abs($minutes) > 0) {
// minutes only
$relative_date .= ($relative_date ? ', -' : '-') . $minutes . ' minute' . ($minutes > 1 ? 's' : '');
$relativeDate .= ($relativeDate ? ', -' : '-') . $minutes . ' minute' . ($minutes > 1 ? 's' : '');
} else {
// seconds only
$relative_date .= ($relative_date ? ', -' : '-') . $seconds . ' second' . ($seconds != 1 ? 's' : '');
$relativeDate .= ($relativeDate ? ', -' : '-') . $seconds . ' second' . ($seconds != 1 ? 's' : '');
}

if (date('j/n/y', strtotime(str_replace(',', '', $relative_date))) != '1/1/70') {
$result = $this->Time->timeAgoInWords(strtotime(str_replace(',', '', $relative_date)), array('end' => '8 years'), true);
if ($relative_date == '0 seconds') {
$relative_date = '0 seconds ago';
if (date('j/n/y', strtotime(str_replace(',', '', $relativeDate))) != '1/1/70') {
$result = $this->Time->timeAgoInWords(strtotime(str_replace(',', '', $relativeDate)), array('end' => '8 years'), true);
if ($relativeDate == '0 seconds') {
$relativeDate = '0 seconds ago';
}

$relative_date = str_replace('-', '', $relative_date) . ' ago';
$this->assertEquals($result, $relative_date);
$relativeDate = str_replace('-', '', $relativeDate) . ' ago';
$this->assertEquals($result, $relativeDate);

}
}
Expand All @@ -187,47 +187,47 @@ public function testTimeAgoInWords() {
$minutes = 0;
$seconds = 0;

$relative_date = '';
$relativeDate = '';

if ($years > 0) {
// years and months and days
$relative_date .= ($relative_date ? ', ' : '') . $years . ' year' . ($years > 1 ? 's' : '');
$relative_date .= $months > 0 ? ($relative_date ? ', ' : '') . $months . ' month' . ($months > 1 ? 's' : '') : '';
$relative_date .= $weeks > 0 ? ($relative_date ? ', ' : '') . $weeks . ' week' . ($weeks > 1 ? 's' : '') : '';
$relative_date .= $days > 0 ? ($relative_date ? ', ' : '') . $days . ' day' . ($days > 1 ? 's' : '') : '';
$relativeDate .= ($relativeDate ? ', ' : '') . $years . ' year' . ($years > 1 ? 's' : '');
$relativeDate .= $months > 0 ? ($relativeDate ? ', ' : '') . $months . ' month' . ($months > 1 ? 's' : '') : '';
$relativeDate .= $weeks > 0 ? ($relativeDate ? ', ' : '') . $weeks . ' week' . ($weeks > 1 ? 's' : '') : '';
$relativeDate .= $days > 0 ? ($relativeDate ? ', ' : '') . $days . ' day' . ($days > 1 ? 's' : '') : '';
} elseif (abs($months) > 0) {
// months, weeks and days
$relative_date .= ($relative_date ? ', ' : '') . $months . ' month' . ($months > 1 ? 's' : '');
$relative_date .= $weeks > 0 ? ($relative_date ? ', ' : '') . $weeks . ' week' . ($weeks > 1 ? 's' : '') : '';
$relative_date .= $days > 0 ? ($relative_date ? ', ' : '') . $days . ' day' . ($days > 1 ? 's' : '') : '';
$relativeDate .= ($relativeDate ? ', ' : '') . $months . ' month' . ($months > 1 ? 's' : '');
$relativeDate .= $weeks > 0 ? ($relativeDate ? ', ' : '') . $weeks . ' week' . ($weeks > 1 ? 's' : '') : '';
$relativeDate .= $days > 0 ? ($relativeDate ? ', ' : '') . $days . ' day' . ($days > 1 ? 's' : '') : '';
} elseif (abs($weeks) > 0) {
// weeks and days
$relative_date .= ($relative_date ? ', ' : '') . $weeks . ' week' . ($weeks > 1 ? 's' : '');
$relative_date .= $days > 0 ? ($relative_date ? ', ' : '') . $days . ' day' . ($days > 1 ? 's' : '') : '';
$relativeDate .= ($relativeDate ? ', ' : '') . $weeks . ' week' . ($weeks > 1 ? 's' : '');
$relativeDate .= $days > 0 ? ($relativeDate ? ', ' : '') . $days . ' day' . ($days > 1 ? 's' : '') : '';
} elseif (abs($days) > 0) {
// days and hours
$relative_date .= ($relative_date ? ', ' : '') . $days . ' day' . ($days > 1 ? 's' : '');
$relative_date .= $hours > 0 ? ($relative_date ? ', ' : '') . $hours . ' hour' . ($hours > 1 ? 's' : '') : '';
$relativeDate .= ($relativeDate ? ', ' : '') . $days . ' day' . ($days > 1 ? 's' : '');
$relativeDate .= $hours > 0 ? ($relativeDate ? ', ' : '') . $hours . ' hour' . ($hours > 1 ? 's' : '') : '';
} elseif (abs($hours) > 0) {
// hours and minutes
$relative_date .= ($relative_date ? ', ' : '') . $hours . ' hour' . ($hours > 1 ? 's' : '');
$relative_date .= $minutes > 0 ? ($relative_date ? ', ' : '') . $minutes . ' minute' . ($minutes > 1 ? 's' : '') : '';
$relativeDate .= ($relativeDate ? ', ' : '') . $hours . ' hour' . ($hours > 1 ? 's' : '');
$relativeDate .= $minutes > 0 ? ($relativeDate ? ', ' : '') . $minutes . ' minute' . ($minutes > 1 ? 's' : '') : '';
} elseif (abs($minutes) > 0) {
// minutes only
$relative_date .= ($relative_date ? ', ' : '') . $minutes . ' minute' . ($minutes > 1 ? 's' : '');
$relativeDate .= ($relativeDate ? ', ' : '') . $minutes . ' minute' . ($minutes > 1 ? 's' : '');
} else {
// seconds only
$relative_date .= ($relative_date ? ', ' : '') . $seconds . ' second' . ($seconds != 1 ? 's' : '');
$relativeDate .= ($relativeDate ? ', ' : '') . $seconds . ' second' . ($seconds != 1 ? 's' : '');
}

if (date('j/n/y', strtotime(str_replace(',', '', $relative_date))) != '1/1/70') {
$result = $this->Time->timeAgoInWords(strtotime(str_replace(',', '', $relative_date)), array('end' => '8 years'), true);
if ($relative_date == '0 seconds') {
$relative_date = '0 seconds ago';
if (date('j/n/y', strtotime(str_replace(',', '', $relativeDate))) != '1/1/70') {
$result = $this->Time->timeAgoInWords(strtotime(str_replace(',', '', $relativeDate)), array('end' => '8 years'), true);
if ($relativeDate == '0 seconds') {
$relativeDate = '0 seconds ago';
}

$relative_date = str_replace('-', '', $relative_date) . '';
$this->assertEquals($result, $relative_date);
$relativeDate = str_replace('-', '', $relativeDate) . '';
$this->assertEquals($result, $relativeDate);
}
}

Expand Down Expand Up @@ -364,7 +364,7 @@ public function testDaysAsSql() {
$begin = time();
$end = time() + DAY;
$field = 'my_field';
$expected = '(my_field >= \''.date('Y-m-d', $begin).' 00:00:00\') AND (my_field <= \''.date('Y-m-d', $end).' 23:59:59\')';
$expected = '(my_field >= \'' . date('Y-m-d', $begin) . ' 00:00:00\') AND (my_field <= \'' . date('Y-m-d', $end) . ' 23:59:59\')';
$this->assertEquals($expected, $this->Time->daysAsSql($begin, $end, $field));
}

Expand All @@ -376,7 +376,7 @@ public function testDaysAsSql() {
public function testDayAsSql() {
$time = time();
$field = 'my_field';
$expected = '(my_field >= \''.date('Y-m-d', $time).' 00:00:00\') AND (my_field <= \''.date('Y-m-d', $time).' 23:59:59\')';
$expected = '(my_field >= \'' . date('Y-m-d', $time) . ' 00:00:00\') AND (my_field <= \'' . date('Y-m-d', $time) . ' 23:59:59\')';
$this->assertEquals($expected, $this->Time->dayAsSql($time, $field));
}

Expand Down Expand Up @@ -515,7 +515,6 @@ public function testIsThisMonth() {
$this->assertFalse($result);
$result = $this->Time->isThisMonth(mktime(0, 0, 0, date('m'), mt_rand(1, 28), date('Y') + mt_rand(1, 12)));
$this->assertFalse($result);

}

/**
Expand Down
10 changes: 5 additions & 5 deletions lib/Cake/Test/Case/Utility/ClassRegistryTest.php
View file
Expand Up @@ -122,7 +122,7 @@ class RegisterCategory extends ClassRegisterModel {
*/
public $name = 'RegisterCategory';
}
/**
/**
* RegisterPrefixedDs class
*
* @package Cake.Test.Case.Utility
Expand All @@ -142,7 +142,8 @@ class RegisterPrefixedDs extends ClassRegisterModel {
*/
abstract class ClassRegistryAbstractModel extends ClassRegisterModel {

abstract function doSomething();
public abstract function doSomething();

}

/**
Expand All @@ -151,6 +152,7 @@ abstract function doSomething();
interface ClassRegistryInterfaceTest {

public function doSomething();

}

/**
Expand All @@ -166,7 +168,6 @@ class ClassRegistryTest extends CakeTestCase {
* @return void
*/
public function testAddModel() {

$Tag = ClassRegistry::init('RegisterArticleTag');
$this->assertTrue(is_a($Tag, 'RegisterArticleTag'));

Expand All @@ -183,7 +184,6 @@ public function testAddModel() {
$NewTag = ClassRegistry::init(array('class' => 'RegisterArticleTag', 'alias' => 'NewTag'));
$this->assertTrue(is_a($Tag, 'RegisterArticleTag'));


$NewTagCopy = ClassRegistry::init(array('class' => 'RegisterArticleTag', 'alias' => 'NewTag'));

$this->assertNotSame($Tag, $NewTag);
Expand Down Expand Up @@ -336,7 +336,7 @@ public function testInitStrict() {
public function testInitAbstractClass() {
ClassRegistry::init('ClassRegistryAbstractModel');
}

/**
* Test that you cannot init() an abstract class. A exception will be raised.
*
Expand Down
8 changes: 4 additions & 4 deletions lib/Cake/Test/Case/Utility/DebuggerTest.php
View file
Expand Up @@ -29,13 +29,13 @@ class DebuggerTestCaseDebugger extends Debugger {
/**
* DebuggerTest class
*
* !!! Be careful with changing code below as it may
* !!! change line numbers which are used in the tests
*
* @package Cake.Test.Case.Utility
*/
class DebuggerTest extends CakeTestCase {
// !!!
// !!! Be careful with changing code below as it may
// !!! change line numbers which are used in the tests
// !!!

protected $_restoreError = false;

/**
Expand Down
6 changes: 3 additions & 3 deletions lib/Cake/Test/Case/Utility/FileTest.php
View file
Expand Up @@ -76,7 +76,7 @@ public function testBasic() {
'dirname' => dirname(__FILE__),
'basename' => basename(__FILE__),
'extension' => 'php',
'filename' =>'FileTest',
'filename' => 'FileTest',
'filesize' => filesize($file),
'mime' => 'text/x-php'
);
Expand Down Expand Up @@ -179,7 +179,7 @@ public function testOffset() {
$this->assertEquals($expecting, $result);

$result = $this->File->offset();
$expecting = 5+3;
$expecting = 5 + 3;
$this->assertSame($result, $expecting);
}

Expand Down Expand Up @@ -230,7 +230,7 @@ public function testClose() {
* @return void
*/
public function testCreate() {
$tmpFile = TMP.'tests' . DS . 'cakephp.file.test.tmp';
$tmpFile = TMP . 'tests' . DS . 'cakephp.file.test.tmp';
$File = new File($tmpFile, true, 0777);
$this->assertTrue($File->exists());
}
Expand Down

1 comment on commit 1efee89

@huoxito
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

great to see how you care about that code, thanks

Please sign in to comment.