Skip to content

Commit 1efee89

Browse files
markstorymarkstory
committed
Fix most coding standards issues in Test/Case/Utility
1 parent 4e94ebe commit 1efee89

File tree

11 files changed

+221
-202
lines changed

11 files changed

+221
-202
lines changed

‎lib/Cake/Test/Case/Utility/CakeNumberTest.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -108,15 +108,15 @@ public function testCurrency() {
108108
$expected = '100 100 100,00€';
109109
$this->assertEquals($expected, $result);
110110

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

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

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

@@ -247,7 +247,6 @@ public function testCurrencyNegative() {
247247
$result = $this->Number->currency($value, 'GBP', array('negative' => '-'));
248248
$expected = '-£100,100,100.00';
249249
$this->assertEquals($expected, $result);
250-
251250
}
252251

253252
/**
@@ -400,39 +399,39 @@ public function testToReadableSize() {
400399
$expected = '1 KB';
401400
$this->assertEquals($expected, $result);
402401

403-
$result = $this->Number->toReadableSize(1024*512);
402+
$result = $this->Number->toReadableSize(1024 * 512);
404403
$expected = '512 KB';
405404
$this->assertEquals($expected, $result);
406405

407-
$result = $this->Number->toReadableSize(1024*1024-1);
406+
$result = $this->Number->toReadableSize(1024 * 1024 - 1);
408407
$expected = '1.00 MB';
409408
$this->assertEquals($expected, $result);
410409

411-
$result = $this->Number->toReadableSize(1024*1024*512);
410+
$result = $this->Number->toReadableSize(1024 * 1024 * 512);
412411
$expected = '512.00 MB';
413412
$this->assertEquals($expected, $result);
414413

415-
$result = $this->Number->toReadableSize(1024*1024*1024-1);
414+
$result = $this->Number->toReadableSize(1024 * 1024 * 1024 - 1);
416415
$expected = '1.00 GB';
417416
$this->assertEquals($expected, $result);
418417

419-
$result = $this->Number->toReadableSize(1024*1024*1024*512);
418+
$result = $this->Number->toReadableSize(1024 * 1024 * 1024 * 512);
420419
$expected = '512.00 GB';
421420
$this->assertEquals($expected, $result);
422421

423-
$result = $this->Number->toReadableSize(1024*1024*1024*1024-1);
422+
$result = $this->Number->toReadableSize(1024 * 1024 * 1024 * 1024 - 1);
424423
$expected = '1.00 TB';
425424
$this->assertEquals($expected, $result);
426425

427-
$result = $this->Number->toReadableSize(1024*1024*1024*1024*512);
426+
$result = $this->Number->toReadableSize(1024 * 1024 * 1024 * 1024 * 512);
428427
$expected = '512.00 TB';
429428
$this->assertEquals($expected, $result);
430429

431-
$result = $this->Number->toReadableSize(1024*1024*1024*1024*1024-1);
430+
$result = $this->Number->toReadableSize(1024 * 1024 * 1024 * 1024 * 1024 - 1);
432431
$expected = '1024.00 TB';
433432
$this->assertEquals($expected, $result);
434433

435-
$result = $this->Number->toReadableSize(1024*1024*1024*1024*1024*1024);
434+
$result = $this->Number->toReadableSize(1024 * 1024 * 1024 * 1024 * 1024 * 1024);
436435
$expected = (1024 * 1024) . '.00 TB';
437436
$this->assertEquals($expected, $result);
438437
}
@@ -459,4 +458,5 @@ public function testToPercentage() {
459458
$expected = '0.0000%';
460459
$this->assertEquals($expected, $result);
461460
}
461+
462462
}

‎lib/Cake/Test/Case/Utility/CakeTimeTest.php

Lines changed: 46 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public function testTimeAgoInWords() {
121121
$hours = 0;
122122
$minutes = 0;
123123
$seconds = 0;
124-
$relative_date = '';
124+
$relativeDate = '';
125125

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

138138
if ($years > 0) {
139139
// years and months and days
140-
$relative_date .= ($relative_date ? ', -' : '-') . $years . ' year' . ($years > 1 ? 's' : '');
141-
$relative_date .= $months > 0 ? ($relative_date ? ', -' : '-') . $months . ' month' . ($months > 1 ? 's' : '') : '';
142-
$relative_date .= $weeks > 0 ? ($relative_date ? ', -' : '-') . $weeks . ' week' . ($weeks > 1 ? 's' : '') : '';
143-
$relative_date .= $days > 0 ? ($relative_date ? ', -' : '-') . $days . ' day' . ($days > 1 ? 's' : '') : '';
140+
$relativeDate .= ($relativeDate ? ', -' : '-') . $years . ' year' . ($years > 1 ? 's' : '');
141+
$relativeDate .= $months > 0 ? ($relativeDate ? ', -' : '-') . $months . ' month' . ($months > 1 ? 's' : '') : '';
142+
$relativeDate .= $weeks > 0 ? ($relativeDate ? ', -' : '-') . $weeks . ' week' . ($weeks > 1 ? 's' : '') : '';
143+
$relativeDate .= $days > 0 ? ($relativeDate ? ', -' : '-') . $days . ' day' . ($days > 1 ? 's' : '') : '';
144144
} elseif (abs($months) > 0) {
145145
// months, weeks and days
146-
$relative_date .= ($relative_date ? ', -' : '-') . $months . ' month' . ($months > 1 ? 's' : '');
147-
$relative_date .= $weeks > 0 ? ($relative_date ? ', -' : '-') . $weeks . ' week' . ($weeks > 1 ? 's' : '') : '';
148-
$relative_date .= $days > 0 ? ($relative_date ? ', -' : '-') . $days . ' day' . ($days > 1 ? 's' : '') : '';
146+
$relativeDate .= ($relativeDate ? ', -' : '-') . $months . ' month' . ($months > 1 ? 's' : '');
147+
$relativeDate .= $weeks > 0 ? ($relativeDate ? ', -' : '-') . $weeks . ' week' . ($weeks > 1 ? 's' : '') : '';
148+
$relativeDate .= $days > 0 ? ($relativeDate ? ', -' : '-') . $days . ' day' . ($days > 1 ? 's' : '') : '';
149149
} elseif (abs($weeks) > 0) {
150150
// weeks and days
151-
$relative_date .= ($relative_date ? ', -' : '-') . $weeks . ' week' . ($weeks > 1 ? 's' : '');
152-
$relative_date .= $days > 0 ? ($relative_date ? ', -' : '-') . $days . ' day' . ($days > 1 ? 's' : '') : '';
151+
$relativeDate .= ($relativeDate ? ', -' : '-') . $weeks . ' week' . ($weeks > 1 ? 's' : '');
152+
$relativeDate .= $days > 0 ? ($relativeDate ? ', -' : '-') . $days . ' day' . ($days > 1 ? 's' : '') : '';
153153
} elseif (abs($days) > 0) {
154154
// days and hours
155-
$relative_date .= ($relative_date ? ', -' : '-') . $days . ' day' . ($days > 1 ? 's' : '');
156-
$relative_date .= $hours > 0 ? ($relative_date ? ', -' : '-') . $hours . ' hour' . ($hours > 1 ? 's' : '') : '';
155+
$relativeDate .= ($relativeDate ? ', -' : '-') . $days . ' day' . ($days > 1 ? 's' : '');
156+
$relativeDate .= $hours > 0 ? ($relativeDate ? ', -' : '-') . $hours . ' hour' . ($hours > 1 ? 's' : '') : '';
157157
} elseif (abs($hours) > 0) {
158158
// hours and minutes
159-
$relative_date .= ($relative_date ? ', -' : '-') . $hours . ' hour' . ($hours > 1 ? 's' : '');
160-
$relative_date .= $minutes > 0 ? ($relative_date ? ', -' : '-') . $minutes . ' minute' . ($minutes > 1 ? 's' : '') : '';
159+
$relativeDate .= ($relativeDate ? ', -' : '-') . $hours . ' hour' . ($hours > 1 ? 's' : '');
160+
$relativeDate .= $minutes > 0 ? ($relativeDate ? ', -' : '-') . $minutes . ' minute' . ($minutes > 1 ? 's' : '') : '';
161161
} elseif (abs($minutes) > 0) {
162162
// minutes only
163-
$relative_date .= ($relative_date ? ', -' : '-') . $minutes . ' minute' . ($minutes > 1 ? 's' : '');
163+
$relativeDate .= ($relativeDate ? ', -' : '-') . $minutes . ' minute' . ($minutes > 1 ? 's' : '');
164164
} else {
165165
// seconds only
166-
$relative_date .= ($relative_date ? ', -' : '-') . $seconds . ' second' . ($seconds != 1 ? 's' : '');
166+
$relativeDate .= ($relativeDate ? ', -' : '-') . $seconds . ' second' . ($seconds != 1 ? 's' : '');
167167
}
168168

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

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

178178
}
179179
}
@@ -187,47 +187,47 @@ public function testTimeAgoInWords() {
187187
$minutes = 0;
188188
$seconds = 0;
189189

190-
$relative_date = '';
190+
$relativeDate = '';
191191

192192
if ($years > 0) {
193193
// years and months and days
194-
$relative_date .= ($relative_date ? ', ' : '') . $years . ' year' . ($years > 1 ? 's' : '');
195-
$relative_date .= $months > 0 ? ($relative_date ? ', ' : '') . $months . ' month' . ($months > 1 ? 's' : '') : '';
196-
$relative_date .= $weeks > 0 ? ($relative_date ? ', ' : '') . $weeks . ' week' . ($weeks > 1 ? 's' : '') : '';
197-
$relative_date .= $days > 0 ? ($relative_date ? ', ' : '') . $days . ' day' . ($days > 1 ? 's' : '') : '';
194+
$relativeDate .= ($relativeDate ? ', ' : '') . $years . ' year' . ($years > 1 ? 's' : '');
195+
$relativeDate .= $months > 0 ? ($relativeDate ? ', ' : '') . $months . ' month' . ($months > 1 ? 's' : '') : '';
196+
$relativeDate .= $weeks > 0 ? ($relativeDate ? ', ' : '') . $weeks . ' week' . ($weeks > 1 ? 's' : '') : '';
197+
$relativeDate .= $days > 0 ? ($relativeDate ? ', ' : '') . $days . ' day' . ($days > 1 ? 's' : '') : '';
198198
} elseif (abs($months) > 0) {
199199
// months, weeks and days
200-
$relative_date .= ($relative_date ? ', ' : '') . $months . ' month' . ($months > 1 ? 's' : '');
201-
$relative_date .= $weeks > 0 ? ($relative_date ? ', ' : '') . $weeks . ' week' . ($weeks > 1 ? 's' : '') : '';
202-
$relative_date .= $days > 0 ? ($relative_date ? ', ' : '') . $days . ' day' . ($days > 1 ? 's' : '') : '';
200+
$relativeDate .= ($relativeDate ? ', ' : '') . $months . ' month' . ($months > 1 ? 's' : '');
201+
$relativeDate .= $weeks > 0 ? ($relativeDate ? ', ' : '') . $weeks . ' week' . ($weeks > 1 ? 's' : '') : '';
202+
$relativeDate .= $days > 0 ? ($relativeDate ? ', ' : '') . $days . ' day' . ($days > 1 ? 's' : '') : '';
203203
} elseif (abs($weeks) > 0) {
204204
// weeks and days
205-
$relative_date .= ($relative_date ? ', ' : '') . $weeks . ' week' . ($weeks > 1 ? 's' : '');
206-
$relative_date .= $days > 0 ? ($relative_date ? ', ' : '') . $days . ' day' . ($days > 1 ? 's' : '') : '';
205+
$relativeDate .= ($relativeDate ? ', ' : '') . $weeks . ' week' . ($weeks > 1 ? 's' : '');
206+
$relativeDate .= $days > 0 ? ($relativeDate ? ', ' : '') . $days . ' day' . ($days > 1 ? 's' : '') : '';
207207
} elseif (abs($days) > 0) {
208208
// days and hours
209-
$relative_date .= ($relative_date ? ', ' : '') . $days . ' day' . ($days > 1 ? 's' : '');
210-
$relative_date .= $hours > 0 ? ($relative_date ? ', ' : '') . $hours . ' hour' . ($hours > 1 ? 's' : '') : '';
209+
$relativeDate .= ($relativeDate ? ', ' : '') . $days . ' day' . ($days > 1 ? 's' : '');
210+
$relativeDate .= $hours > 0 ? ($relativeDate ? ', ' : '') . $hours . ' hour' . ($hours > 1 ? 's' : '') : '';
211211
} elseif (abs($hours) > 0) {
212212
// hours and minutes
213-
$relative_date .= ($relative_date ? ', ' : '') . $hours . ' hour' . ($hours > 1 ? 's' : '');
214-
$relative_date .= $minutes > 0 ? ($relative_date ? ', ' : '') . $minutes . ' minute' . ($minutes > 1 ? 's' : '') : '';
213+
$relativeDate .= ($relativeDate ? ', ' : '') . $hours . ' hour' . ($hours > 1 ? 's' : '');
214+
$relativeDate .= $minutes > 0 ? ($relativeDate ? ', ' : '') . $minutes . ' minute' . ($minutes > 1 ? 's' : '') : '';
215215
} elseif (abs($minutes) > 0) {
216216
// minutes only
217-
$relative_date .= ($relative_date ? ', ' : '') . $minutes . ' minute' . ($minutes > 1 ? 's' : '');
217+
$relativeDate .= ($relativeDate ? ', ' : '') . $minutes . ' minute' . ($minutes > 1 ? 's' : '');
218218
} else {
219219
// seconds only
220-
$relative_date .= ($relative_date ? ', ' : '') . $seconds . ' second' . ($seconds != 1 ? 's' : '');
220+
$relativeDate .= ($relativeDate ? ', ' : '') . $seconds . ' second' . ($seconds != 1 ? 's' : '');
221221
}
222222

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

229-
$relative_date = str_replace('-', '', $relative_date) . '';
230-
$this->assertEquals($result, $relative_date);
229+
$relativeDate = str_replace('-', '', $relativeDate) . '';
230+
$this->assertEquals($result, $relativeDate);
231231
}
232232
}
233233

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

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

@@ -515,7 +515,6 @@ public function testIsThisMonth() {
515515
$this->assertFalse($result);
516516
$result = $this->Time->isThisMonth(mktime(0, 0, 0, date('m'), mt_rand(1, 28), date('Y') + mt_rand(1, 12)));
517517
$this->assertFalse($result);
518-
519518
}
520519

521520
/**

‎lib/Cake/Test/Case/Utility/ClassRegistryTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ class RegisterCategory extends ClassRegisterModel {
122122
*/
123123
public $name = 'RegisterCategory';
124124
}
125-
/**
125+
/**
126126
* RegisterPrefixedDs class
127127
*
128128
* @package Cake.Test.Case.Utility
@@ -142,7 +142,8 @@ class RegisterPrefixedDs extends ClassRegisterModel {
142142
*/
143143
abstract class ClassRegistryAbstractModel extends ClassRegisterModel {
144144

145-
abstract function doSomething();
145+
public abstract function doSomething();
146+
146147
}
147148

148149
/**
@@ -151,6 +152,7 @@ abstract function doSomething();
151152
interface ClassRegistryInterfaceTest {
152153

153154
public function doSomething();
155+
154156
}
155157

156158
/**
@@ -166,7 +168,6 @@ class ClassRegistryTest extends CakeTestCase {
166168
* @return void
167169
*/
168170
public function testAddModel() {
169-
170171
$Tag = ClassRegistry::init('RegisterArticleTag');
171172
$this->assertTrue(is_a($Tag, 'RegisterArticleTag'));
172173

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

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

189189
$this->assertNotSame($Tag, $NewTag);
@@ -336,7 +336,7 @@ public function testInitStrict() {
336336
public function testInitAbstractClass() {
337337
ClassRegistry::init('ClassRegistryAbstractModel');
338338
}
339-
339+
340340
/**
341341
* Test that you cannot init() an abstract class. A exception will be raised.
342342
*

‎lib/Cake/Test/Case/Utility/DebuggerTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ class DebuggerTestCaseDebugger extends Debugger {
2929
/**
3030
* DebuggerTest class
3131
*
32+
* !!! Be careful with changing code below as it may
33+
* !!! change line numbers which are used in the tests
34+
*
3235
* @package Cake.Test.Case.Utility
3336
*/
3437
class DebuggerTest extends CakeTestCase {
35-
// !!!
36-
// !!! Be careful with changing code below as it may
37-
// !!! change line numbers which are used in the tests
38-
// !!!
38+
3939
protected $_restoreError = false;
4040

4141
/**

‎lib/Cake/Test/Case/Utility/FileTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public function testBasic() {
7676
'dirname' => dirname(__FILE__),
7777
'basename' => basename(__FILE__),
7878
'extension' => 'php',
79-
'filename' =>'FileTest',
79+
'filename' => 'FileTest',
8080
'filesize' => filesize($file),
8181
'mime' => 'text/x-php'
8282
);
@@ -179,7 +179,7 @@ public function testOffset() {
179179
$this->assertEquals($expecting, $result);
180180

181181
$result = $this->File->offset();
182-
$expecting = 5+3;
182+
$expecting = 5 + 3;
183183
$this->assertSame($result, $expecting);
184184
}
185185

@@ -230,7 +230,7 @@ public function testClose() {
230230
* @return void
231231
*/
232232
public function testCreate() {
233-
$tmpFile = TMP.'tests' . DS . 'cakephp.file.test.tmp';
233+
$tmpFile = TMP . 'tests' . DS . 'cakephp.file.test.tmp';
234234
$File = new File($tmpFile, true, 0777);
235235
$this->assertTrue($File->exists());
236236
}

0 commit comments

Comments
 (0)