Browse Source

more debug statements removed

euromark 13 years ago
parent
commit
011e0e492b
36 changed files with 230 additions and 230 deletions
  1. 1 1
      Test/Case/Controller/Component/Auth/DirectAuthenticateTest.php
  2. 3 3
      Test/Case/Controller/Component/CommonComponentTest.php
  3. 1 1
      Test/Case/Lib/CaptchaLibTest.php
  4. 2 2
      Test/Case/Lib/EmailLibTest.php
  5. 1 1
      Test/Case/Lib/ExcelReaderLibTest.php
  6. 21 21
      Test/Case/Lib/GeocodeLibTest.php
  7. 7 7
      Test/Case/Lib/GooglLibTest.php
  8. 6 6
      Test/Case/Lib/HazardLibTest.php
  9. 3 3
      Test/Case/Lib/IcalLibTest.php
  10. 3 3
      Test/Case/Lib/ImapLibTest.php
  11. 5 5
      Test/Case/Lib/MimeLibTest.php
  12. 5 5
      Test/Case/Lib/RandomLibTest.php
  13. 4 4
      Test/Case/Lib/SpellLibTest.php
  14. 6 6
      Test/Case/Lib/Utility/FileLibTest.php
  15. 12 12
      Test/Case/Lib/Utility/TextLibTest.php
  16. 42 42
      Test/Case/Lib/Utility/TimeLibTest.php
  17. 2 2
      Test/Case/Model/Behavior/BitmaskedBehaviorTest.php
  18. 5 5
      Test/Case/Model/Behavior/CaptchaBehaviorTest.php
  19. 3 3
      Test/Case/Model/Behavior/CustomFindsBehaviorTest.php
  20. 2 2
      Test/Case/Model/Behavior/DecimalInputBehaviorTest.php
  21. 19 19
      Test/Case/Model/Behavior/GeocoderBehaviorTest.php
  22. 1 1
      Test/Case/Model/Behavior/NumberFormatBehaviorTest.php
  23. 3 3
      Test/Case/Model/Behavior/PasswordableBehaviorTest.php
  24. 2 2
      Test/Case/Model/Behavior/SluggedBehaviorTest.php
  25. 3 3
      Test/Case/Model/CodeKeyTest.php
  26. 32 32
      Test/Case/Model/MyModelTest.php
  27. 3 3
      Test/Case/Model/QloginTest.php
  28. 3 3
      Test/Case/Model/TokenTest.php
  29. 7 7
      Test/Case/View/Helper/CaptchaHelperTest.php
  30. 7 7
      Test/Case/View/Helper/DatetimeHelperTest.php
  31. 2 2
      Test/Case/View/Helper/FormatHelperTest.php
  32. 3 3
      Test/Case/View/Helper/GoogleMapV3HelperTest.php
  33. 4 4
      Test/Case/View/Helper/QrCodeHelperTest.php
  34. 3 3
      Test/Case/View/Helper/TextExtHelperTest.php
  35. 2 2
      Test/Case/View/Helper/TreeHelperTest.php
  36. 2 2
      Test/Case/View/Helper/TypographyHelperTest.php

+ 1 - 1
Test/Case/Controller/Component/Auth/DirectAuthenticateTest.php

@@ -111,7 +111,7 @@ class DirectAuthenticateTest extends CakeTestCase {
 			'user' => 'mariano',
 		));
 		$result = $this->auth->authenticate($request, $this->response);
-		debug($result);
+		//debug($result);
 		$expected = array(
 			'id' => 1,
 			'user' => 'mariano',

+ 3 - 3
Test/Case/Controller/Component/CommonComponentTest.php

@@ -99,7 +99,7 @@ class CommonComponentTest extends CakeTestCase {
 
 	public function testGetDefaultUrlParams() {
 		$is = $this->Controller->Common->defaultUrlParams();
-		debug($is);
+		//debug($is);
 		$this->assertNotEmpty($is);
 	}
 
@@ -109,7 +109,7 @@ class CommonComponentTest extends CakeTestCase {
 		//$this->assertTrue($is);
 
 		$res = Configure::read('messages');
-		debug($res);
+		//debug($res);
 		$this->assertTrue(!empty($res));
 		$this->assertTrue(isset($res['success'][0]) && $res['success'][0] === 'xyz');
 	}
@@ -121,7 +121,7 @@ class CommonComponentTest extends CakeTestCase {
 		//$this->assertTrue($is);
 
 		$res = $this->Controller->Session->read('messages');
-		debug($res);
+		//debug($res);
 		$this->assertTrue(!empty($res));
 		$this->assertTrue(isset($res['info'][0]) && $res['info'][0] === 'efg');
 	}

+ 1 - 1
Test/Case/Lib/CaptchaLibTest.php

@@ -28,7 +28,7 @@ class CaptchaLibTest extends MyCakeTestCase {
 			'checkSession' => true
 		);
 		$res = CaptchaLib::buildHash($data, $options);
-		pr($res);
+		//pr($res);
 		$this->assertTrue(strlen($res) == 40);
 	}
 

+ 2 - 2
Test/Case/Lib/EmailLibTest.php

@@ -69,7 +69,7 @@ class EmailLibTest extends MyCakeTestCase {
 		$this->Email->emailFormat('both');
 
 		$result = $this->Email->send();
-		debug($result);
+		//debug($result);
 
 		$boundary = $this->Email->getBoundary();
 		/*
@@ -107,7 +107,7 @@ class EmailLibTest extends MyCakeTestCase {
 		$this->assertContains('--rel-' . $boundary . '--', $result['message']);
 		$this->assertContains('--' . $boundary . '--', $result['message']);
 		*/
-		debug($boundary);
+		//debug($boundary);
 		die();
 	}
 

+ 1 - 1
Test/Case/Lib/ExcelReaderLibTest.php

@@ -57,7 +57,7 @@ class ExcelReaderLibTest extends MyCakeTestCase {
 		$this->assertSame($expected, $array);
 
 		$array = $this->ExcelReader->dumpToArray(1);
-		debug($array);
+		//debug($array);
 		$expected = array(
 			array('A1', '0'),
 			array('A2', '1'),

+ 21 - 21
Test/Case/Lib/GeocodeLibTest.php

@@ -38,7 +38,7 @@ class GeocodeLibTest extends MyCakeTestCase {
 		foreach ($coords as $coord) {
 			$is = $this->Geocode->distance($coord['x'], $coord['y']);
 			echo $coord['name'].':';
-			pr('is: '.$is.' - expected: '.$coord['d']);
+			//pr('is: '.$is.' - expected: '.$coord['d']);
 			$this->assertEquals($coord['d'], $is);
 		}
 
@@ -73,7 +73,7 @@ class GeocodeLibTest extends MyCakeTestCase {
 
 	public function testUrl() {
 		$is = $this->Geocode->url();
-		debug($is);
+		//debug($is);
 		$this->assertTrue(!empty($is) && strpos($is, 'http://maps.googleapis.com/maps/api/geocode/xml?') === 0);
 	}
 
@@ -103,7 +103,7 @@ class GeocodeLibTest extends MyCakeTestCase {
 		$this->assertTrue($is);
 
 		$is = $this->Geocode->getResult();
-		debug($is);
+		//debug($is);
 		$this->assertTrue(!empty($is));
 	}
 
@@ -122,49 +122,49 @@ class GeocodeLibTest extends MyCakeTestCase {
 		$address = '74523 Deutschland';
 		echo '<h2>'.$address.'</h2>';
 		$is = $this->Geocode->geocode($address);
-		debug($is);
+		//debug($is);
 		$this->assertTrue($is);
 
 		$is = $this->Geocode->getResult();
-		debug($is);
+		//debug($is);
 		$this->assertTrue(!empty($is));
 
 		$is = $this->Geocode->error();
-		debug($is);
+		//debug($is);
 		$this->assertTrue(empty($is));
 
 
 		$address = 'Leopoldstraße 100, München';
 		echo '<h2>'.$address.'</h2>';
 		$is = $this->Geocode->geocode($address);
-		debug($is);
+		//debug($is);
 		$this->assertTrue($is);
 
-		pr($this->Geocode->debug());
+		//pr($this->Geocode->debug());
 
 		$is = $this->Geocode->getResult();
-		debug($is);
+		//debug($is);
 		$this->assertTrue(!empty($is));
 
 		$is = $this->Geocode->error();
-		debug($is);
+		//debug($is);
 		$this->assertTrue(empty($is));
 
 
 		$address = 'Oranienburger Straße 87, 10178 Berlin, Deutschland';
 		echo '<h2>'.$address.'</h2>';
 		$is = $this->Geocode->geocode($address);
-		debug($is);
+		//debug($is);
 		$this->assertTrue($is);
 
-		pr($this->Geocode->debug());
+		//pr($this->Geocode->debug());
 
 		$is = $this->Geocode->getResult();
-		debug($is);
+		//debug($is);
 		$this->assertTrue(!empty($is));
 
 		$is = $this->Geocode->error();
-		debug($is);
+		//debug($is);
 		$this->assertTrue(empty($is));
 
 	}
@@ -173,13 +173,13 @@ class GeocodeLibTest extends MyCakeTestCase {
 		$address = 'Hjfjosdfhosj, 78878 Mdfkufsdfk';
 		echo '<h2>'.$address.'</h2>';
 		$is = $this->Geocode->geocode($address);
-		debug($is);
+		//debug($is);
 		$this->assertFalse($is);
 
-		pr($this->Geocode->debug());
+		//pr($this->Geocode->debug());
 
 		$is = $this->Geocode->error();
-		debug($is);
+		//debug($is);
 		$this->assertTrue(!empty($is));
 	}
 
@@ -188,11 +188,11 @@ class GeocodeLibTest extends MyCakeTestCase {
 		echo '<h2>'.$address.'</h2>';
 		$this->Geocode->setOptions(array('min_accuracy'=>3));
 		$is = $this->Geocode->geocode($address);
-		debug($is);
+		//debug($is);
 		$this->assertFalse($is);
 
 		$is = $this->Geocode->error();
-		debug($is);
+		//debug($is);
 		$this->assertTrue(!empty($is));
 	}
 
@@ -207,12 +207,12 @@ class GeocodeLibTest extends MyCakeTestCase {
 		$this->Geocode->setOptions(array('allow_inconclusive'=>true, 'min_accuracy' => GeocodeLib::ACC_LOC));
 		$is = $this->Geocode->geocode($address);
 		echo 'debug:';
-		pr($this->Geocode->debug());
+		//pr($this->Geocode->debug());
 		echo 'debug end';
 		$this->assertTrue($is);
 
 		$res = $this->Geocode->getResult();
-		pr($res);
+		//pr($res);
 		$this->assertTrue(count($res) > 4);
 
 		$is = $this->Geocode->isInconclusive();

+ 7 - 7
Test/Case/Lib/GooglLibTest.php

@@ -27,7 +27,7 @@ class GooglLibTest extends CakeTestCase {
 		$this->skipIf(true);
 
 		$is = $this->Googl->getHistory();
-		pr($is);
+		//pr($is);
 		die();
 	}
 
@@ -38,7 +38,7 @@ class GooglLibTest extends CakeTestCase {
 
 		$url = 'http://www.spiegel.de';
 		$is = $this->Googl->getShort($url);
-		pr($is);
+		//pr($is);
 		$res = $this->assertTrue(!empty($is) && is_array($is) && !empty($is['id']) && $is['kind'] === 'urlshortener#url' && $is['longUrl'] == $url.'/');
 
 
@@ -46,7 +46,7 @@ class GooglLibTest extends CakeTestCase {
 
 		$shortUrl = $is['id'];
 		$is = $this->Googl->getLong($shortUrl);
-		pr($is);
+		//pr($is);
 		$res = $this->assertTrue(!empty($is) && is_array($is) && !empty($is['id']) && $is['kind'] === 'urlshortener#url' && $is['status'] === 'OK' && $is['longUrl'] == $url.'/');
 
 	}
@@ -58,7 +58,7 @@ class GooglLibTest extends CakeTestCase {
 
 		$url = 'http://www.gmx.de';
 		$is = $this->Googl->getShort($url);
-		pr($is);
+		//pr($is);
 		$res = $this->assertTrue(!empty($is) && is_array($is) && !empty($is['id']) && $is['kind'] === 'urlshortener#url' && $is['longUrl'] == $url.'/');
 
 
@@ -66,7 +66,7 @@ class GooglLibTest extends CakeTestCase {
 
 		$shortUrl = $is['id'];
 		$is = $this->Googl->getLong($shortUrl);
-		pr($is);
+		//pr($is);
 		$res = $this->assertTrue(!empty($is) && is_array($is) && !empty($is['id']) && $is['kind'] === 'urlshortener#url' && $is['status'] === 'OK' && $is['longUrl'] == $url.'/');
 
 
@@ -74,13 +74,13 @@ class GooglLibTest extends CakeTestCase {
 
 		$url = 'http://www.web.de#123456';
 		$is = $this->Googl->getShort($url);
-		debug($is);
+		//debug($is);
 		$res = $this->assertTrue(!empty($is) && is_array($is) && !empty($is['id']) && $is['kind'] === 'urlshortener#url' && $is['longUrl'] === 'http://www.web.de/#123456');
 
 		$shortUrl = $is['id'];
 		$is = $this->Googl->getLong($shortUrl, GooglLib::PROJECTION_CLICKS);
 
-		debug($is);
+		//debug($is);
 		$res = $this->assertTrue(!empty($is) && is_array($is) && !empty($is['id']) && $is['kind'] === 'urlshortener#url' && $is['status'] === 'OK' && $is['longUrl'] === 'http://www.web.de/#123456');
 
 	}

+ 6 - 6
Test/Case/Lib/HazardLibTest.php

@@ -16,7 +16,7 @@ class HazardLibTest extends CakeTestCase {
 	public function _testParse() {
 
 		$is = $this->HazardLib->_parseXml(HazardLib::URL);
-		pr(h($is));
+		//pr(h($is));
 		$this->assertTrue(!empty($is));
 		$this->assertEquals(count($is), 113);
 	}
@@ -28,30 +28,30 @@ class HazardLibTest extends CakeTestCase {
 	public function testXssStrings() {
 
 		$is = $this->HazardLib->xssStrings(false);
-		pr(h($is));
+		//pr(h($is));
 		$this->assertTrue(!empty($is));
 
 		# cached
 		Cache::delete('security_lib_texts');
 
 		$is = $this->HazardLib->xssStrings();
-		pr(h($is));
+		//pr(h($is));
 		$this->assertTrue(!empty($is) && count($is), 113);
 
 		$is = $this->HazardLib->xssStrings();
-		pr(h($is));
+		//pr(h($is));
 		$this->assertTrue(!empty($is) && count($is), 113);
 
 	}
 
 	public function testPhp() {
 		$is = $this->HazardLib->phpStrings();
-		pr(h($is));
+		//pr(h($is));
 	}
 
 	public function testSql() {
 		$is = $this->HazardLib->sqlStrings();
-		pr(h($is));
+		//pr(h($is));
 	}
 
 

+ 3 - 3
Test/Case/Lib/IcalLibTest.php

@@ -40,7 +40,7 @@ class IcalLibTest extends CakeTestCase {
 
 		$is = $this->Ical->parse($this->file);
 		$is = $this->Ical->getCalendarInfos();
-		pr($is);
+		//pr($is);
 		$this->assertTrue(!empty($is));
 	}
 
@@ -48,7 +48,7 @@ class IcalLibTest extends CakeTestCase {
 
 		$is = $this->Ical->parse($this->file);
 		$is = $this->Ical->getEvents();
-		pr($is);
+		//pr($is);
 		$this->assertTrue(!empty($is));
 	}
 
@@ -56,7 +56,7 @@ class IcalLibTest extends CakeTestCase {
 
 		$is = $this->Ical->parse($this->file);
 		$is = $this->Ical->getTodos();
-		debug($is).BR;
+		//debug($is).BR;
 		$this->assertEmpty($is);
 	}
 

+ 3 - 3
Test/Case/Lib/ImapLibTest.php

@@ -41,7 +41,7 @@ class ImapLibTest extends MyCakeTestCase {
 
 	public function testCount() {
 		$count = $this->_count();
-		debug($count);
+		//debug($count);
 		$this->assertSame(0, $count);
 	}
 
@@ -51,7 +51,7 @@ class ImapLibTest extends MyCakeTestCase {
 		sleep(2);
 
 		$messages = $this->_read();
-		debug($messages);
+		//debug($messages);
 		$this->assertTrue(!empty($messages));
 		$message = array_shift($messages);
 		$this->assertTrue(!empty($message['subject']));
@@ -63,7 +63,7 @@ class ImapLibTest extends MyCakeTestCase {
 		sleep(2);
 
 		$messages = $this->_read();
-		debug($messages);
+		//debug($messages);
 		$this->assertTrue(!empty($messages));
 		$message = array_shift($messages);
 		$this->assertTrue(!empty($message['subject']));

+ 5 - 5
Test/Case/Lib/MimeLibTest.php

@@ -48,7 +48,7 @@ class MimeLibTest extends MyCakeTestCase {
 	public function testCorrectFileExtension() {
 		file_put_contents(TMP.'sometest.txt', 'xyz');
 		$is = $this->Mime->extractMimeType(TMP.'sometest.txt');
-		pr($is);
+		//pr($is);
 		$this->assertEquals($is, 'text/plain');
 	}
 
@@ -59,7 +59,7 @@ class MimeLibTest extends MyCakeTestCase {
 	public function testWrongFileExtension() {
 		file_put_contents(TMP.'sometest.zip', 'xyz');
 		$is = $this->Mime->extractMimeType(TMP.'sometest.zip');
-		pr($is);
+		//pr($is);
 		$this->assertEquals($is, 'text/plain');
 		//Test failes? finfo_open not availaible??
 	}
@@ -71,17 +71,17 @@ class MimeLibTest extends MyCakeTestCase {
 	public function testEncoding() {
 		file_put_contents(TMP.'sometest.txt', 'xyz');
 		$is = $this->Mime->getEncoding(TMP.'sometest.txt');
-		pr($is);
+		//pr($is);
 		$this->assertEquals($is, 'us-ascii');
 
 		file_put_contents(TMP.'sometest.zip', utf8_encode('xäääyz'));
 		$is = $this->Mime->getEncoding(TMP.'sometest.zip');
-		pr($is);
+		//pr($is);
 		$this->assertEquals($is, 'utf-8');
 
 		file_put_contents(TMP.'sometest.zip', utf8_encode('xyz'));
 		$is = $this->Mime->getEncoding(TMP.'sometest.zip');
-		pr($is);
+		//pr($is);
 		$this->assertEquals($is, 'us-ascii');
 
 		//Tests fail? finfo_open not availaible??

+ 5 - 5
Test/Case/Lib/RandomLibTest.php

@@ -7,7 +7,7 @@ class RandomLibTest extends CakeTestCase {
 
 	public function testInt() {
 		$is = RandomLib::int(2, 200);
-		pr($is);
+		//pr($is);
 		$this->assertTrue($is >= 2 && $is <= 200);
 
 	}
@@ -20,7 +20,7 @@ class RandomLibTest extends CakeTestCase {
 			'z',
 		);
 		$is = RandomLib::arrayValue($array, null, null, true);
-		pr($is);
+		//pr($is);
 		$this->assertTrue(in_array($is, $array));
 
 		# non-numerical indexes
@@ -30,7 +30,7 @@ class RandomLibTest extends CakeTestCase {
 			'g' => 'z',
 		);
 		$is = RandomLib::arrayValue($array);
-		pr($is);
+		//pr($is);
 		$this->assertTrue(in_array($is, $array));
 
 	}
@@ -38,11 +38,11 @@ class RandomLibTest extends CakeTestCase {
 
 	public function testPronounceablePwd() {
 		$is = RandomLib::pronounceablePwd(6);
-		pr($is);
+		//pr($is);
 		$this->assertTrue(strlen($is) === 6);
 
 		$is = RandomLib::pronounceablePwd(11);
-		pr($is);
+		//pr($is);
 		$this->assertTrue(strlen($is) === 11);
 	}
 

+ 4 - 4
Test/Case/Lib/SpellLibTest.php

@@ -27,12 +27,12 @@ class SpellLibTest extends MyCakeTestCase {
 
 	public function testList() {
 		$res = $this->SpellLib->listBrokers();
-		debug($res);
+		//debug($res);
 		$this->assertTrue(is_array($res) && count($res) > 1);
 		$this->assertTrue(in_array($res[0]['name'], array('ispell', 'myspell')));
 
 		$res = $this->SpellLib->listDictionaries();
-		debug($res);
+		//debug($res);
 		$this->assertTrue(is_array($res) && count($res) > 1);
 		$this->assertTrue(in_array($res[0]['lang_tag'], array('de_DE', 'en_GB')));
 	}
@@ -46,7 +46,7 @@ class SpellLibTest extends MyCakeTestCase {
 		$res = $this->SpellLib->check($word);
 		$this->assertFalse($res);
 		$suggestions = $this->SpellLib->suggestions($word);
-		debug($suggestions);
+		//debug($suggestions);
 		$this->assertTrue(is_array($suggestions) && count($suggestions) > 1);
 		$this->assertTrue(in_array('song', $suggestions));
 
@@ -66,7 +66,7 @@ class SpellLibTest extends MyCakeTestCase {
 		$res = $this->SpellLib->check($word);
 		$this->assertFalse($res);
 		$suggestions = $this->SpellLib->suggestions($word);
-		debug($suggestions);
+		//debug($suggestions);
 		$this->assertTrue(is_array($suggestions) && count($suggestions) > 1);
 		$this->assertTrue(in_array('Haus', $suggestions));
 

+ 6 - 6
Test/Case/Lib/Utility/FileLibTest.php

@@ -179,7 +179,7 @@ class FileLibTest extends CakeTestCase {
 		$is = $handler2->readCsv(1024, ',', '"');
 
 		$is = $handler2->transfer($is);
-		pr($is);
+		//pr($is);
 		$expected = array(array(
 				'first' => 'Example',
 				'last_name' => 'Firsty',
@@ -205,7 +205,7 @@ class FileLibTest extends CakeTestCase {
 				'X',
 				'Y',
 				'Z'), 'preserve_keys' => true));
-		pr($is);
+		//pr($is);
 		$expected = array(array(
 				'X' => 'Example',
 				'Y' => 'Firsty',
@@ -232,7 +232,7 @@ class FileLibTest extends CakeTestCase {
 				'X',
 				'Y',
 				'Z'), 'preserve_keys' => true));
-		pr($is);
+		//pr($is);
 		$expected = array(array(
 				'X' => 'Next',
 				'Y' => 'Secondy',
@@ -249,13 +249,13 @@ class FileLibTest extends CakeTestCase {
 
 		if ($pre !== null) {
 			echo 'pre:';
-			pr($pre);
+			//pr($pre);
 		}
 		echo 'is:';
-		pr($is);
+		//pr($is);
 		if (!$status) {
 			echo 'expected:';
-			pr($expected);
+			//pr($expected);
 		}
 	}
 }

+ 12 - 12
Test/Case/Lib/Utility/TextLibTest.php

@@ -31,16 +31,16 @@ class TextLibTest extends CakeTestCase {
 	public function testConvertToOrd() {
 		$this->TextLib = new TextLib('h H');
 		$is = $this->TextLib->convertToOrd();
-		pr($is);
+		//pr($is);
 		$this->assertEquals($is, '0-104-32-72-0');
 
 		$is = $this->TextLib->convertToOrd('x'.NL.'x'.LF.'x'.PHP_EOL.'x'.CR.'x'.TB.'x');
-		pr($is);
+		//pr($is);
 	}
 
 	public function testConvertToOrdTable() {
 		$is = $this->TextLib->convertToOrdTable('x'.NL.'x'.LF.'x'.PHP_EOL.'x'.CR.'x'.TB.'x');
-		pr($is);
+		//pr($is);
 	}
 
 	public function testMaxWords() {
@@ -52,7 +52,7 @@ class TextLibTest extends CakeTestCase {
 	public function testWords() {
 		$this->TextLib = new TextLib('Hochhaus, Unter dem Bau von ae Äußeren Einflüssen - und von Autos.');
 		$is = $this->TextLib->words(array('min_char'=>3));
-		pr($is);
+		//pr($is);
 		$this->assertTrue(!empty($is) && is_array($is) && count($is) === 9);
 
 	}
@@ -60,13 +60,13 @@ class TextLibTest extends CakeTestCase {
 	public function testWordCount() {
 		$this->TextLib = new TextLib('Hochhaus, Unter dem Bau von ae Äußeren Einflüssen - und von Autos.');
 		$is = $this->TextLib->wordCount(array('min_char'=>3));
-		pr($is);
+		//pr($is);
 		$this->assertTrue(!empty($is) && is_array($is) && count($is) === 9);
 
 
 		$this->TextLib = new TextLib('Hochhaus, Unter dem Bau von ae Äußeren Einflüssen - und von Autos.');
 		$is = $this->TextLib->wordCount(array('min_char'=>3, 'sort'=>'DESC', 'limit'=>5));
-		pr($is);
+		//pr($is);
 		$this->assertTrue(!empty($is) && is_array($is) && count($is) === 5);
 
 	}
@@ -76,32 +76,32 @@ class TextLibTest extends CakeTestCase {
 	public function testOccurances() {
 		$this->TextLib = new TextLib('Hochhaus');
 		$is = $this->TextLib->occurrences();
-		pr($is);
+		//pr($is);
 		$this->assertTrue(!empty($is) && is_array($is) && count($is) === 6);
 
 		$is = $this->TextLib->occurrences(null, true);
-		pr($is);
+		//pr($is);
 		$this->assertTrue(!empty($is) && is_array($is) && count($is) === 7);
 
 		$is = $this->TextLib->occurrences('h');
-		pr($is);
+		//pr($is);
 		$expected = 3;
 		$this->assertEquals($is, $expected);
 
 		$is = $this->TextLib->occurrences('h', true);
-		pr($is);
+		//pr($is);
 		$expected = 2;
 		$this->assertEquals($is, $expected);
 	}
 
 	public function testMaxOccurances() {
 		$is = $this->TextLib->maxOccurrences();
-		pr($is);
+		//pr($is);
 		$this->assertTrue(!empty($is) && is_array($is) && count($is) === 1);
 
 		$this->TextLib = new TextLib('Radfahren');
 		$is = $this->TextLib->maxOccurrences();
-		pr($is);
+		//pr($is);
 		$this->assertTrue(!empty($is) && is_array($is) && count($is) === 2);
 
 	}

+ 42 - 42
Test/Case/Lib/Utility/TimeLibTest.php

@@ -15,7 +15,7 @@ class TimeLibTest extends MyCakeTestCase {
 
 	public function testNiceDate() {
 		$res = setlocale(LC_TIME, 'de_DE.UTF-8', 'deu_deu');
-		debug($res);
+		//debug($res);
 
 		$values = array(
 			array('2009-12-01 00:00:00', FORMAT_NICE_YMD, '01.12.2009'),
@@ -23,14 +23,14 @@ class TimeLibTest extends MyCakeTestCase {
 		);
 		foreach ($values as $v) {
 			$ret = TimeLib::niceDate($v[0], $v[1]);
-			pr($ret);
+			//pr($ret);
 			$this->assertEquals($ret, $v[2]);
 		}
 	}
 
 	public function testLocalDate() {
 		$res = setlocale(LC_TIME, array('de_DE.UTF-8', 'deu_deu'));
-		debug($res);
+		//debug($res);
 
 		$values = array(
 			array('2009-12-01 00:00:00', FORMAT_LOCAL_YMD, '01.12.2009'),
@@ -38,7 +38,7 @@ class TimeLibTest extends MyCakeTestCase {
 		);
 		foreach ($values as $v) {
 			$ret = TimeLib::localDate($v[0], $v[1]);
-			pr($ret);
+			//pr($ret);
 			$this->assertEquals($ret, $v[2]);
 		}
 	}
@@ -48,15 +48,15 @@ class TimeLibTest extends MyCakeTestCase {
 		$this->out($this->_header(__FUNCTION__));
 
 		$ret = TimeLib::parseLocalizedDate('15-Feb-2009', 'j-M-Y', 'start');
-		pr($ret);
+		//pr($ret);
 		$this->assertEquals($ret, '2009-02-15 00:00:00');
 
 		# problem when not passing months or days as well - no way of knowing how exact the date was
 		$ret = TimeLib::parseLocalizedDate('2009', 'Y', 'start');
-		pr($ret);
+		//pr($ret);
 		//$this->assertEquals($ret, '2009-01-01 00:00:00');
 		$ret = TimeLib::parseLocalizedDate('Feb 2009', 'M Y', 'start');
-		pr($ret);
+		//pr($ret);
 		//$this->assertEquals($ret, '2009-02-01 00:00:00');
 
 
@@ -71,11 +71,11 @@ class TimeLibTest extends MyCakeTestCase {
 		);
 		foreach ($values as $v) {
 			$ret = TimeLib::parseLocalizedDate($v[0], null, 'start');
-			pr($ret);
+			//pr($ret);
 			$this->assertEquals($ret, $v[1][0]);
 
 			$ret = TimeLib::parseLocalizedDate($v[0], null, 'end');
-			pr($ret);
+			//pr($ret);
 			$this->assertEquals($ret, $v[1][1]);
 		}
 	}
@@ -99,7 +99,7 @@ class TimeLibTest extends MyCakeTestCase {
 
 		foreach ($values as $v) {
 			$ret = TimeLib::period($v[0]);
-			pr($ret);
+			//pr($ret);
 			$this->assertEquals($ret, $v[1]);
 
 		}
@@ -116,8 +116,8 @@ class TimeLibTest extends MyCakeTestCase {
 
 		foreach ($values as $v) {
 			$ret = TimeLib::periodAsSql($v[0], 'Model.field');
-			pr($v[1]);
-			pr($ret);
+			//pr($v[1]);
+			//pr($ret);
 			$this->assertSame($v[1], $ret);
 
 		}
@@ -148,11 +148,11 @@ class TimeLibTest extends MyCakeTestCase {
 		foreach ($values as $v) {
 			echo $v[0].'/'.$v[1];
 			$ret = TimeLib::ageBounds($v[0], $v[1], true, '2011-07-06'); //TODO: relative time
-			pr($ret);
+			//pr($ret);
 			if (isset($v[2])) {
 				$this->assertSame($v[2], $ret);
-				pr(TimeLib::age($v[2]['min']));
-				pr(TimeLib::age($v[2]['max']));
+				//pr(TimeLib::age($v[2]['min']));
+				//pr(TimeLib::age($v[2]['max']));
 				$this->assertEquals($v[0], TimeLib::age($v[2]['max']));
 				$this->assertEquals($v[1], TimeLib::age($v[2]['min']));
 			}
@@ -256,44 +256,44 @@ class TimeLibTest extends MyCakeTestCase {
 		$this->out($this->_header(__FUNCTION__));
 
 		$ret = TimeLib::relLengthOfTime('1990-11-20');
-		pr($ret);
+		//pr($ret);
 
 		$ret = TimeLib::relLengthOfTime('2012-11-20');
-		pr($ret);
+		//pr($ret);
 	}
 
 	public function testLengthOfTime() {
 		$this->out($this->_header(__FUNCTION__));
 
 		$ret = TimeLib::lengthOfTime(60);
-		pr($ret);
+		//pr($ret);
 
 		# FIX ME! Doesn't work!
 		$ret = TimeLib::lengthOfTime(-60);
-		pr($ret);
+		//pr($ret);
 
 		$ret = TimeLib::lengthOfTime(-121);
-		pr($ret);
+		//pr($ret);
 	}
 
 	public function testFuzzyFromOffset() {
 		$this->out($this->_header(__FUNCTION__));
 
 		$ret = TimeLib::fuzzyFromOffset(MONTH);
-		pr($ret);
+		//pr($ret);
 
 		$ret = TimeLib::fuzzyFromOffset(120);
-		pr($ret);
+		//pr($ret);
 
 		$ret = TimeLib::fuzzyFromOffset(DAY);
-		pr($ret);
+		//pr($ret);
 
 		$ret = TimeLib::fuzzyFromOffset(DAY+2*MINUTE);
-		pr($ret);
+		//pr($ret);
 
 		# FIX ME! Doesn't work!
 		$ret = TimeLib::fuzzyFromOffset(-DAY);
-		pr($ret);
+		//pr($ret);
 	}
 
 	public function testCweekMod() {
@@ -397,37 +397,37 @@ class TimeLibTest extends MyCakeTestCase {
 		App::uses('ZodiacLib', 'Tools.Misc');
 		$zodiac = new ZodiacLib();
 		$is = TimeLib::ageByHoroscope(2000, ZodiacLib::SIGN_VIRGO);
-		pr($is);
+		//pr($is);
 		$this->assertEquals($is, 11);
 		$is = TimeLib::ageByHoroscope(1991, ZodiacLib::SIGN_LIBRA);
-		pr($is);
+		//pr($is);
 		$this->assertEquals($is, 20);
 		$is = TimeLib::ageByHoroscope(1986, ZodiacLib::SIGN_CAPRICORN);
-		pr($is);
+		//pr($is);
 		$this->assertEquals($is, array(24, 25));
 		$is = TimeLib::ageByHoroscope(2000, ZodiacLib::SIGN_SCORPIO);
-		pr($is);
+		//pr($is);
 		$this->assertEquals($is, array(10, 11));
 	}
 
 	public function testAgeRange() {
 		$is = TimeLib::ageRange(2000);
-		pr($is);
+		//pr($is);
 		$this->assertEquals($is, 10);
 		$is = TimeLib::ageRange(2002, null, null, 5);
-		pr($is);
+		//pr($is);
 		$this->assertEquals($is, array(6, 10));
 		$is = TimeLib::ageRange(2000, null, null, 5);
-		pr($is);
+		//pr($is);
 		$this->assertEquals($is, array(6, 10));
 		$is = TimeLib::ageRange(1985, 23, 11);
-		pr($is);
+		//pr($is);
 		$this->assertEquals($is, 25);
 		$is = TimeLib::ageRange(1985, null, null, 6);
-		pr($is);
+		//pr($is);
 		$this->assertEquals($is, array(25, 30));
 		$is = TimeLib::ageRange(1985, 21, 11, 7);
-		pr($is);
+		//pr($is);
 		$this->assertEquals($is, array(22, 28));
 	}
 
@@ -447,7 +447,7 @@ class TimeLibTest extends MyCakeTestCase {
 		foreach ($tests as $was => $expected) {
 			$is = TimeLib::parseDate($was);
 			//pr($is);
-			pr(date(FORMAT_NICE_YMDHMS, $is));
+			//pr(date(FORMAT_NICE_YMDHMS, $is));
 			$this->assertSame($expected, $is); //, null, $was
 		}
 	}
@@ -502,14 +502,14 @@ class TimeLibTest extends MyCakeTestCase {
 		# positive
 		foreach ($tests as $was => $expected) {
 			$is = TimeLib::buildTime($was);
-			pr($is);
+			//pr($is);
 			$this->assertEquals($expected, $is);
 		}
 
 		# negative
 		foreach ($tests as $was => $expected) {
 			$is = TimeLib::buildTime(-$was);
-			pr($is);
+			//pr($is);
 			$this->assertEquals($is, '-'.$expected);
 		}
 	}
@@ -526,7 +526,7 @@ class TimeLibTest extends MyCakeTestCase {
 
 		foreach ($tests as $was => $expected) {
 			$is = TimeLib::buildDefaultTime($was);
-			pr($is);
+			//pr($is);
 			$this->assertEquals($expected, $is);
 		}
 	}
@@ -556,15 +556,15 @@ class TimeLibTest extends MyCakeTestCase {
 
 		$value = '9.5';
 		$is = TimeLib::decimalToStandardTime($value);
-		pr($is);
+		//pr($is);
 		$this->assertEquals($is, '9.3');
 
 		$is = TimeLib::decimalToStandardTime($value, 2);
-		pr($is);
+		//pr($is);
 		$this->assertEquals($is, '9.30');
 
 		$is = TimeLib::decimalToStandardTime($value, 2, ':');
-		pr($is);
+		//pr($is);
 		$this->assertEquals($is, '9:30');
 	}
 

+ 2 - 2
Test/Case/Model/Behavior/BitmaskedBehaviorTest.php

@@ -37,7 +37,7 @@ class BitmaskedBehaviorTest extends MyCakeTestCase {
 
 		$this->assertTrue(!empty($res[1]['BitmaskedComment']['statuses']) && is_array($res[1]['BitmaskedComment']['statuses']));
 
-		debug($res[count($res)-1]);
+		//debug($res[count($res)-1]);
 	}
 
 	public function testSave() {
@@ -113,7 +113,7 @@ class BitmaskedBehaviorTest extends MyCakeTestCase {
 		$this->Comment->create();
 		$this->Comment->set($data);
 		$res = $this->Comment->validates();
-		debug($this->Comment->data);
+		//debug($this->Comment->data);
 		$this->assertFalse($res);
 
 		$is = $this->Comment->data['BitmaskedComment']['status'];

+ 5 - 5
Test/Case/Model/Behavior/CaptchaBehaviorTest.php

@@ -25,7 +25,7 @@ class CaptchaBehaviorTest extends MyCakeTestCase {
 	 */
 	public function testEmpty() {
 		$is = $this->Comment->validates();
-		debug($this->Comment->invalidFields());
+		//debug($this->Comment->invalidFields());
 		$this->assertFalse($is);
 	}
 
@@ -33,13 +33,13 @@ class CaptchaBehaviorTest extends MyCakeTestCase {
 		$data = array('title'=>'xyz', 'captcha'=>'x', 'captcha_hash'=>'y', 'captcha_time'=>'123');
 		$this->Comment->set($data);
 		$is = $this->Comment->validates();
-		debug($this->Comment->invalidFields());
+		//debug($this->Comment->invalidFields());
 		$this->assertFalse($is);
 
 		$data = array('title'=>'xyz', 'captcha'=>'x', 'homepage'=>'', 'captcha_hash'=>'y', 'captcha_time'=>'123');
 		$this->Comment->set($data);
 		$is = $this->Comment->validates();
-		debug($this->Comment->invalidFields());
+		//debug($this->Comment->invalidFields());
 		$this->assertFalse($is);
 	}
 
@@ -51,7 +51,7 @@ class CaptchaBehaviorTest extends MyCakeTestCase {
 		$data = array('title'=>'xyz', 'captcha'=>'2', 'homepage'=>'', 'captcha_hash'=>$hash, 'captcha_time'=>time()-DAY);
 		$this->Comment->set($data);
 		$is = $this->Comment->validates();
-		debug($this->Comment->invalidFields());
+		//debug($this->Comment->invalidFields());
 		//$this->assertTrue($is);
 
 
@@ -61,7 +61,7 @@ class CaptchaBehaviorTest extends MyCakeTestCase {
 		$data = array('title'=>'xyz', 'captcha'=>'2', 'homepage'=>'', 'captcha_hash'=>$hash, 'captcha_time'=>time()+DAY);
 		$this->Comment->set($data);
 		$is = $this->Comment->validates();
-		debug($this->Comment->invalidFields());
+		//debug($this->Comment->invalidFields());
 		//$this->assertTrue($is);
 	}
 

+ 3 - 3
Test/Case/Model/Behavior/CustomFindsBehaviorTest.php

@@ -37,7 +37,7 @@ class CustomFindsBehaviorTest extends MyCakeTestCase {
 		);
 
 		$res = $this->Model->Behaviors->CustomFinds->beforeFind($this->Model, $query);
-		pr($res);
+		//pr($res);
 		$queryResult = $this->Model->customFinds['topSellers'];
 		$queryResult['recursive'] = 0;
 		$queryResult['conditions']['Product.count >'] = 0;
@@ -55,7 +55,7 @@ class CustomFindsBehaviorTest extends MyCakeTestCase {
 		);
 
 		$res = $this->Model->Behaviors->CustomFinds->beforeFind($this->Model, $query);
-		pr($res);
+		//pr($res);
 		$queryResult = $this->Model->customFinds['topSellers'];
 		$queryResult['conditions'] = array('Product.count >'=>0);
 
@@ -71,7 +71,7 @@ class CustomFindsBehaviorTest extends MyCakeTestCase {
 		);
 
 		$res = $this->Model->Behaviors->CustomFinds->beforeFind($this->Model, $query);
-		pr($res);
+		//pr($res);
 		$queryResult = $this->Model->customFinds['topSellers'];
 		unset($queryResult['conditions']['Product.countSeller >']);
 		$queryResult['conditions']['Product.count >'] = 0;

+ 2 - 2
Test/Case/Model/Behavior/DecimalInputBehaviorTest.php

@@ -35,7 +35,7 @@ class DecimalInputBehaviorTest extends MyCakeTestCase {
 		$this->assertTrue($res);
 
 		$res = $this->Model->data;
-		debug($res);
+		//debug($res);
 		$this->assertSame($res[$this->Model->alias]['set_rate'], 0.1);
 		$this->assertSame($res[$this->Model->alias]['rel_rate'], -0.02);
 	}
@@ -187,7 +187,7 @@ class DecimalInputBehaviorTest extends MyCakeTestCase {
 		$this->Model->Behaviors->load('Tools.DecimalInput', array('fields'=>array('rel_rate', 'set_rate'), 'transform'=>array(), 'multiply'=>0.01, 'output'=>true));
 
 		$res = $this->Model->find('first', array('conditions' => array('name' => 'multiply')));
-		debug($res);
+		//debug($res);
 		$this->assertTrue(!empty($res));
 		$this->assertSame($res[$this->Model->alias]['set_rate'], '122');
 		$this->assertSame($res[$this->Model->alias]['rel_rate'], '-2');

+ 19 - 19
Test/Case/Model/Behavior/GeocoderBehaviorTest.php

@@ -116,7 +116,7 @@ class GeocoderBehaviorTest extends CakeTestCase {
 			'city' => 'Bibersfeld'
 		);
 		$res = $this->Comment->save($data);
-		debug($res);
+		//debug($res);
 		$this->assertTrue(!empty($res['Comment']['lat']) && !empty($res['Comment']['lng']) && round($res['Comment']['lat']) === 49.0 && round($res['Comment']['lng']) === 10.0);
 		// accuracy = 4
 
@@ -129,7 +129,7 @@ class GeocoderBehaviorTest extends CakeTestCase {
 		$res = $this->Comment->save($data);
 		$this->assertEquals('', $this->Comment->Behaviors->Geocoder->Geocode->error());
 
-		debug($res);
+		//debug($res);
 		$this->assertTrue(!empty($res['Comment']['lat']) && !empty($res['Comment']['lng']));
 		$this->assertEquals('München, Deutschland', $res['Comment']['geocoder_result']['formatted_address']);
 
@@ -137,7 +137,7 @@ class GeocoderBehaviorTest extends CakeTestCase {
 			'city' => 'Bibersfeld'
 		);
 		$res = $this->Comment->save($data);
-		debug($res);
+		//debug($res);
 		$this->assertTrue(!empty($res));
 		$this->assertEquals('', $this->Comment->Behaviors->Geocoder->Geocode->error());
 	}
@@ -153,9 +153,9 @@ class GeocoderBehaviorTest extends CakeTestCase {
 			'city' => 'Deutschland'
 		);
 		$res = $this->Comment->save($data);
-		debug($this->Comment->Behaviors->Geocoder->Geocode->error()).BR;
+		//debug($this->Comment->Behaviors->Geocoder->Geocode->error()).BR;
 
-		debug($res);
+		//debug($res);
 
 		//debug($this->Comment->Behaviors->Geocoder->Geocode->debug());
 		$this->assertTrue(!empty($res['Comment']['lat']) && !empty($res['Comment']['lng']));
@@ -173,9 +173,9 @@ class GeocoderBehaviorTest extends CakeTestCase {
 			'city' => 'Deutschland'
 		);
 		$res = $this->Comment->save($data);
-		debug($this->Comment->Behaviors->Geocoder->Geocode->error()).BR;
+		//debug($this->Comment->Behaviors->Geocoder->Geocode->error()).BR;
 
-		debug($res);
+		//debug($res);
 
 		//debug($this->Comment->Behaviors->Geocoder->Geocode->debug());
 		$this->assertTrue(!isset($res['Comment']['lat']) && !isset($res['Comment']['lng']));
@@ -197,11 +197,11 @@ class GeocoderBehaviorTest extends CakeTestCase {
 			'city' => 'Neustadt'
 		);
 		$res = $this->Comment->save($data);
-		debug($this->Comment->Behaviors->Geocoder->Geocode->error()).BR;
+		//debug($this->Comment->Behaviors->Geocoder->Geocode->error()).BR;
 
-		debug($this->Comment->Behaviors->Geocoder->Geocode->getResult()).BR;
+		//debug($this->Comment->Behaviors->Geocoder->Geocode->getResult()).BR;
 
-		debug($res);
+		//debug($res);
 
 		//debug($this->Comment->Behaviors->Geocoder->Geocode->debug());
 		$this->assertTrue(!isset($res['Comment']['lat']) && !isset($res['Comment']['lng']));
@@ -219,13 +219,13 @@ class GeocoderBehaviorTest extends CakeTestCase {
 			'city' => 'Neustadt'
 		);
 		$res = $this->Comment->save($data);
-		debug($this->Comment->Behaviors->Geocoder->Geocode->error()).BR;
+		//debug($this->Comment->Behaviors->Geocoder->Geocode->error()).BR;
 
-		debug($this->Comment->Behaviors->Geocoder->Geocode->url()).BR;
+		//debug($this->Comment->Behaviors->Geocoder->Geocode->url()).BR;
 
-		debug($this->Comment->Behaviors->Geocoder->Geocode->getResult()).BR;
+		//debug($this->Comment->Behaviors->Geocoder->Geocode->getResult()).BR;
 
-		debug($res);
+		//debug($res);
 
 		//debug($this->Comment->Behaviors->Geocoder->Geocode->debug());
 		$this->assertTrue(!empty($res['Comment']['lat']) && !empty($res['Comment']['lng']));
@@ -241,11 +241,11 @@ class GeocoderBehaviorTest extends CakeTestCase {
 			'city' => 'Bibersfeld'
 		);
 		$res = $this->Comment->save($data);
-		debug($this->Comment->Behaviors->Geocoder->Geocode->error()).BR;
+		//debug($this->Comment->Behaviors->Geocoder->Geocode->error()).BR;
 
-		debug($res);
+		//debug($res);
 
-		debug($this->Comment->Behaviors->Geocoder->Geocode->debug());
+		//debug($this->Comment->Behaviors->Geocoder->Geocode->debug());
 		$this->assertTrue(empty($res['Comment']['lat']) && empty($res['Comment']['lng']));
 
 		$data = array(
@@ -253,9 +253,9 @@ class GeocoderBehaviorTest extends CakeTestCase {
 			'city' => '74523'
 		);
 		$res = $this->Comment->save($data);
-		debug($this->Comment->Behaviors->Geocoder->Geocode->error()).BR;
+		//debug($this->Comment->Behaviors->Geocoder->Geocode->error()).BR;
 
-		debug($res);
+		//debug($res);
 
 		//debug($this->Comment->Behaviors->Geocoder->Geocode->debug());
 		$this->assertTrue(!empty($res['Comment']['lat']) && !empty($res['Comment']['lng']));

+ 1 - 1
Test/Case/Model/Behavior/NumberFormatBehaviorTest.php

@@ -35,7 +35,7 @@ class NumberFormatBehaviorTest extends MyCakeTestCase {
 		$this->assertTrue($res);
 
 		$res = $this->Model->data;
-		debug($res);
+		//debug($res);
 		$this->assertSame($res[$this->Model->alias]['set_rate'], 0.1);
 		$this->assertSame($res[$this->Model->alias]['rel_rate'], -0.02);
 	}

+ 3 - 3
Test/Case/Model/Behavior/PasswordableBehaviorTest.php

@@ -99,7 +99,7 @@ class PasswordableBehaviorTest extends CakeTestCase {
 		);
 		$this->User->set($data);
 		$is = $this->User->save();
-		debug($is);
+		//debug($is);
 		$this->assertTrue(!empty($is));
 	}
 
@@ -115,7 +115,7 @@ class PasswordableBehaviorTest extends CakeTestCase {
 		);
 		$this->User->set($data);
 		$is = $this->User->save();
-		debug($this->User->validationErrors);
+		//debug($this->User->validationErrors);
 		$this->assertFalse($is);
 		$this->assertEquals(array('pwd', 'pwd_repeat'), array_keys($this->User->validationErrors));
 	}
@@ -191,7 +191,7 @@ class PasswordableBehaviorTest extends CakeTestCase {
 		);
 		$this->User->set($data);
 		$is = $this->User->save();
-		debug($this->User->validationErrors);
+		//debug($this->User->validationErrors);
 		$this->assertFalse($is);
 
 		$this->User->create();

+ 2 - 2
Test/Case/Model/Behavior/SluggedBehaviorTest.php

@@ -305,7 +305,7 @@ class SluggedBehaviorTest extends CakeTestCase {
 				$charRegex .= html_entity_decode('&#' . hexdec($code) . ';', ENT_NOQUOTES, 'UTF-8');
 			}
 		}
-		debug(array('codeRegex' => "\n$codeRegex", 'charRegex' => "\n$charRegex", 'fullString' => "\n$string")); //@ignore
+		//debug(array('codeRegex' => "\n$codeRegex", 'charRegex' => "\n$charRegex", 'fullString' => "\n$string")); //@ignore
 	}
 
 /**
@@ -527,7 +527,7 @@ class SluggedBehaviorTest extends CakeTestCase {
 				$string .= "\x{{$code}}";
 			}
 		}
-		debug(array(basename($inputFile) => "\n\t" . $string));
+		//debug(array(basename($inputFile) => "\n\t" . $string));
 	}
 
 /**

+ 3 - 3
Test/Case/Model/CodeKeyTest.php

@@ -20,7 +20,7 @@ class CodeKeyTest extends MyCakeTestCase {
 
 	public function testGenerateKey() {
 		$key = $this->CodeKey->generateKey(4);
-		pr($key);
+		//pr($key);
 		$this->assertTrue(!empty($key) && strlen($key) === 4);
 	}
 
@@ -30,11 +30,11 @@ class CodeKeyTest extends MyCakeTestCase {
 		$this->assertTrue(!empty($key));
 
 		$res = $this->CodeKey->useKey('test', $key);
-		pr($res);
+		//pr($res);
 		$this->assertTrue(!empty($res));
 
 		$res = $this->CodeKey->useKey('test', $key);
-		pr($res);
+		//pr($res);
 		$this->assertTrue(!empty($res) && !empty($res['CodeKey']['used']));
 
 		$res = $this->CodeKey->useKey('test', $key.'x');

+ 32 - 32
Test/Case/Model/MyModelTest.php

@@ -274,16 +274,16 @@ class MyModelTest extends MyCakeTestCase {
 	public function testGuaranteeFields() {
 		$this->out($this->_header(__FUNCTION__));
 		$res = $this->App->guaranteeFields(array());
-		debug($res);
+		//debug($res);
 		$this->assertTrue(empty($res));
 
 		$res = $this->App->guaranteeFields(array('x', 'y'));
-		debug($res);
+		//debug($res);
 		$this->assertTrue(!empty($res));
 		$this->assertEquals($res, array($this->modelName=>array('x'=>'', 'y'=>'')));
 
 		$res = $this->App->guaranteeFields(array('x', 'OtherModel.y'));
-		debug($res);
+		//debug($res);
 		$this->assertTrue(!empty($res));
 		$this->assertEquals($res, array($this->modelName=>array('x'=>''), 'OtherModel'=>array('y'=>'')));
 	}
@@ -382,78 +382,78 @@ class MyModelTest extends MyCakeTestCase {
 		$this->out($this->_header(__FUNCTION__));
 		$data = array('field' => '2010-01-22');
 		$res = $this->App->validateDate($data);
-		debug($res);
+		//debug($res);
 		$this->assertTrue($res);
 
 		$data = array('field' => '2010-02-29');
 		$res = $this->App->validateDate($data);
-		debug($res);
+		//debug($res);
 		$this->assertFalse($res);
 
 		$this->App->data = array($this->App->alias=>array('after'=>'2010-02-22'));
 		$data = array('field' => '2010-02-23 11:11:11');
 		$res = $this->App->validateDate($data, array('after'=>'after'));
-		debug($res);
+		//debug($res);
 		$this->assertTrue($res);
 
 		$this->App->data = array($this->App->alias=>array('after'=>'2010-02-24 11:11:11'));
 		$data = array('field' => '2010-02-23');
 		$res = $this->App->validateDate($data, array('after'=>'after'));
-		debug($res);
+		//debug($res);
 		$this->assertFalse($res);
 
 		$this->App->data = array($this->App->alias=>array('after'=>'2010-02-25'));
 		$data = array('field' => '2010-02-25');
 		$res = $this->App->validateDate($data, array('after'=>'after'));
-		debug($res);
+		//debug($res);
 		$this->assertTrue($res);
 
 		$this->App->data = array($this->App->alias=>array('after'=>'2010-02-25'));
 		$data = array('field' => '2010-02-25');
 		$res = $this->App->validateDate($data, array('after'=>'after', 'min'=>1));
-		debug($res);
+		//debug($res);
 		$this->assertFalse($res);
 
 		$this->App->data = array($this->App->alias=>array('after'=>'2010-02-24'));
 		$data = array('field' => '2010-02-25');
 		$res = $this->App->validateDate($data, array('after'=>'after', 'min'=>2));
-		debug($res);
+		//debug($res);
 		$this->assertFalse($res);
 
 		$this->App->data = array($this->App->alias=>array('after'=>'2010-02-24'));
 		$data = array('field' => '2010-02-25');
 		$res = $this->App->validateDate($data, array('after'=>'after', 'min'=>1));
-		debug($res);
+		//debug($res);
 		$this->assertTrue($res);
 
 		$this->App->data = array($this->App->alias=>array('after'=>'2010-02-24'));
 		$data = array('field' => '2010-02-25');
 		$res = $this->App->validateDate($data, array('after'=>'after', 'min'=>2));
-		debug($res);
+		//debug($res);
 		$this->assertFalse($res);
 
 		$this->App->data = array($this->App->alias=>array('before'=>'2010-02-24'));
 		$data = array('field' => '2010-02-24');
 		$res = $this->App->validateDate($data, array('before'=>'before', 'min'=>1));
-		debug($res);
+		//debug($res);
 		$this->assertFalse($res);
 
 		$this->App->data = array($this->App->alias=>array('before'=>'2010-02-25'));
 		$data = array('field' => '2010-02-24');
 		$res = $this->App->validateDate($data, array('before'=>'before', 'min'=>1));
-		debug($res);
+		//debug($res);
 		$this->assertTrue($res);
 
 		$this->App->data = array($this->App->alias=>array('before'=>'2010-02-25'));
 		$data = array('field' => '2010-02-24');
 		$res = $this->App->validateDate($data, array('before'=>'before', 'min'=>2));
-		debug($res);
+		//debug($res);
 		$this->assertFalse($res);
 
 		$this->App->data = array($this->App->alias=>array('before'=>'2010-02-26'));
 		$data = array('field' => '2010-02-24');
 		$res = $this->App->validateDate($data, array('before'=>'before', 'min'=>2));
-		debug($res);
+		//debug($res);
 		$this->assertTrue($res);
 	}
 
@@ -461,69 +461,69 @@ class MyModelTest extends MyCakeTestCase {
 		$this->out($this->_header(__FUNCTION__));
 		$data = array('field' => '2010-01-22 11:11:11');
 		$res = $this->App->validateDatetime($data);
-		debug($res);
+		//debug($res);
 		$this->assertTrue($res);
 
 		$data = array('field' => '2010-01-22 11:61:11');
 		$res = $this->App->validateDatetime($data);
-		debug($res);
+		//debug($res);
 		$this->assertFalse($res);
 
 		$data = array('field' => '2010-02-29 11:11:11');
 		$res = $this->App->validateDatetime($data);
-		debug($res);
+		//debug($res);
 		$this->assertFalse($res);
 
 		$data = array('field' => '');
 		$res = $this->App->validateDatetime($data, array('allowEmpty'=>true));
-		debug($res);
+		//debug($res);
 		$this->assertTrue($res);
 
 		$data = array('field' => '0000-00-00 00:00:00');
 		$res = $this->App->validateDatetime($data, array('allowEmpty'=>true));
-		debug($res);
+		//debug($res);
 		$this->assertTrue($res);
 
 		$this->App->data = array($this->App->alias=>array('after'=>'2010-02-22 11:11:11'));
 		$data = array('field' => '2010-02-23 11:11:11');
 		$res = $this->App->validateDatetime($data, array('after'=>'after'));
-		debug($res);
+		//debug($res);
 		$this->assertTrue($res);
 
 		$this->App->data = array($this->App->alias=>array('after'=>'2010-02-24 11:11:11'));
 		$data = array('field' => '2010-02-23 11:11:11');
 		$res = $this->App->validateDatetime($data, array('after'=>'after'));
-		debug($res);
+		//debug($res);
 		$this->assertFalse($res);
 
 		$this->App->data = array($this->App->alias=>array('after'=>'2010-02-23 11:11:11'));
 		$data = array('field' => '2010-02-23 11:11:11');
 		$res = $this->App->validateDatetime($data, array('after'=>'after'));
-		debug($res);
+		//debug($res);
 		$this->assertFalse($res);
 
 		$this->App->data = array($this->App->alias=>array('after'=>'2010-02-23 11:11:11'));
 		$data = array('field' => '2010-02-23 11:11:11');
 		$res = $this->App->validateDatetime($data, array('after'=>'after', 'min'=>1));
-		debug($res);
+		//debug($res);
 		$this->assertFalse($res);
 
 		$this->App->data = array($this->App->alias=>array('after'=>'2010-02-23 11:11:11'));
 		$data = array('field' => '2010-02-23 11:11:11');
 		$res = $this->App->validateDatetime($data, array('after'=>'after', 'min'=>0));
-		debug($res);
+		//debug($res);
 		$this->assertTrue($res);
 
 		$this->App->data = array($this->App->alias=>array('after'=>'2010-02-23 11:11:10'));
 		$data = array('field' => '2010-02-23 11:11:11');
 		$res = $this->App->validateDatetime($data, array('after'=>'after'));
-		debug($res);
+		//debug($res);
 		$this->assertTrue($res);
 
 		$this->App->data = array($this->App->alias=>array('after'=>'2010-02-23 11:11:12'));
 		$data = array('field' => '2010-02-23 11:11:11');
 		$res = $this->App->validateDatetime($data, array('after'=>'after'));
-		debug($res);
+		//debug($res);
 		$this->assertFalse($res);
 
 	}
@@ -532,24 +532,24 @@ class MyModelTest extends MyCakeTestCase {
 		$this->out($this->_header(__FUNCTION__));
 		$data = array('field' => '11:21:11');
 		$res = $this->App->validateTime($data);
-		debug($res);
+		//debug($res);
 		$this->assertTrue($res);
 
 		$data = array('field' => '11:71:11');
 		$res = $this->App->validateTime($data);
-		debug($res);
+		//debug($res);
 		$this->assertFalse($res);
 
 		$this->App->data = array($this->App->alias=>array('before'=>'2010-02-23 11:11:12'));
 		$data = array('field' => '2010-02-23 11:11:11');
 		$res = $this->App->validateTime($data, array('before'=>'before'));
-		debug($res);
+		//debug($res);
 		$this->assertTrue($res);
 
 		$this->App->data = array($this->App->alias=>array('after'=>'2010-02-23 11:11:12'));
 		$data = array('field' => '2010-02-23 11:11:11');
 		$res = $this->App->validateTime($data, array('after'=>'after'));
-		debug($res);
+		//debug($res);
 		$this->assertFalse($res);
 	}
 

+ 3 - 3
Test/Case/Model/QloginTest.php

@@ -20,16 +20,16 @@ class QloginTest extends MyCakeTestCase {
 
 	public function testGenerate() {
 		$url = Router::url(array('admin' => false, 'plugin'=>'tools', 'controller'=>'qlogin', 'action'=>'go'), true).'/';
-		debug($url);
+		//debug($url);
 		$this->assertTrue(!empty($url));
 
 		$res = $this->Qlogin->url(array('controller'=>'test', 'action'=>'foo', 'bar'), 1);
-		debug($res);
+		//debug($res);
 		$this->assertTrue(is_string($res) && !empty($res));
 		$this->assertTrue(strpos($res, $url) === 0);
 
 		$res = $this->Qlogin->url('/test/foo/bar', 2);
-		debug($res);
+		//debug($res);
 		$this->assertTrue(is_string($res) && !empty($res));
 	}
 

+ 3 - 3
Test/Case/Model/TokenTest.php

@@ -20,7 +20,7 @@ class TokenTest extends MyCakeTestCase {
 
 	public function testGenerateKey() {
 		$key = $this->Token->generateKey(4);
-		pr($key);
+		//pr($key);
 		$this->assertTrue(!empty($key) && strlen($key) === 4);
 	}
 
@@ -30,11 +30,11 @@ class TokenTest extends MyCakeTestCase {
 		$this->assertTrue(!empty($key));
 
 		$res = $this->Token->useKey('test', $key);
-		pr($res);
+		//pr($res);
 		$this->assertTrue(!empty($res));
 
 		$res = $this->Token->useKey('test', $key);
-		pr($res);
+		//pr($res);
 		$this->assertTrue(!empty($res) && !empty($res['Token']['used']));
 
 		$res = $this->Token->useKey('test', $key.'x');

+ 7 - 7
Test/Case/View/Helper/CaptchaHelperTest.php

@@ -25,23 +25,23 @@ class CaptchaHelperTest extends CakeTestCase {
 	 */
 	public function testFields() {
 		$is = $this->Captcha->active();
-		pr(h($is));
+		//pr(h($is));
 
 		$is = $this->Captcha->passive();
-		pr(h($is));
+		//pr(h($is));
 
 
 
 		$is = $this->Captcha->captcha('SomeModelName');
-		pr(h($is));
+		//pr(h($is));
 	}
 
 	public function testDataInsideHelper() {
-		debug($this->Captcha->webroot);
-		debug($this->Captcha->request->webroot);
+		//debug($this->Captcha->webroot);
+		//debug($this->Captcha->request->webroot);
 
-		debug($this->Captcha->data);
-		debug($this->Captcha->request->data);
+		//debug($this->Captcha->data);
+		//debug($this->Captcha->request->data);
 	}
 
 

+ 7 - 7
Test/Case/View/Helper/DatetimeHelperTest.php

@@ -37,11 +37,11 @@ class DatetimeHelperTest extends MyCakeTestCase {
 		$this->assertEquals('6 '.__('Minutes').', 40 '.__('Seconds'), $this->Datetime->lengthOfTime(400));
 
 		$res = $this->Datetime->lengthOfTime(400, 'i');
-		pr($res);
+		//pr($res);
 		$this->assertEquals('6 '.__('Minutes'), $res);
 
 		$res = $this->Datetime->lengthOfTime(6*DAY);
-		pr($res);
+		//pr($res);
 		$this->assertEquals('6 '.__('Days').', 0 '.__('Hours'), $res);
 
 		#TODO: more
@@ -53,20 +53,20 @@ class DatetimeHelperTest extends MyCakeTestCase {
 		echo $this->_header(__FUNCTION__);
 
 		$res = $this->Datetime->relLengthOfTime(date(FORMAT_DB_DATETIME, time()-3600));
-		pr($res);
+		//pr($res);
 		$this->assertTrue(!empty($res));
 
 		$res = $this->Datetime->relLengthOfTime(date(FORMAT_DB_DATETIME, time()-4*DAY-5*HOUR), null, array('plural'=>'n'));
-		pr($res);
+		//pr($res);
 		//$this->assertEquals($res, 'Vor 4 Tagen, 5 '.__('Hours'));
 		$this->assertEquals(__('%s ago', '4 '.__('Days').', '.'5 '.__('Hours')), $res);
 
 		$res = $this->Datetime->relLengthOfTime(date(FORMAT_DB_DATETIME, time()+4*DAY+5*HOUR), null, array('plural'=>'n'));
-		pr($res);
+		//pr($res);
 		$this->assertEquals(__('In %s', '4 '.__('Days').', '.'5 '.__('Hours')), $res);
 
 		$res = $this->Datetime->relLengthOfTime(date(FORMAT_DB_DATETIME, time()), null, array('plural'=>'n'));
-		pr($res);
+		//pr($res);
 		$this->assertEquals($res, __('justNow'));
 	}
 
@@ -75,7 +75,7 @@ class DatetimeHelperTest extends MyCakeTestCase {
 		echo $this->_header(__FUNCTION__);
 
 		$res = $this->Datetime->timeAgoInWords(date(FORMAT_DB_DATETIME, time()-4*DAY-5*HOUR));
-		pr($res);
+		//pr($res);
 	}
 
 

+ 2 - 2
Test/Case/View/Helper/FormatHelperTest.php

@@ -132,11 +132,11 @@ class FormatHelperTest extends MyCakeTestCase {
 		foreach ($data as $value => $expected) {
 			$res = $this->Format->truncate($value, 30, array('html' => true));
 
-			debug( '\''.h($value).'\' becomes \''.$res.'\'', null, false);
+			//debug( '\''.h($value).'\' becomes \''.$res.'\'', null, false);
 
 			$res = $this->Format->truncate($value, 30, array('html' => true));
 
-			debug( '\''.h($value).'\' becomes \''.$res.'\'', null, false);
+			//debug( '\''.h($value).'\' becomes \''.$res.'\'', null, false);
 
 			//$this->assertTrue(!empty($res));
 			$this->assertEquals($expected, $res);

+ 3 - 3
Test/Case/View/Helper/GoogleMapV3HelperTest.php

@@ -87,13 +87,13 @@ class GoogleMapV3HelperTest extends MyCakeTestCase {
 			)
 		);
 		$is = $this->GoogleMapV3->staticMarkers($m, array('color'=>'red', 'char'=>'C', 'shadow'=>'false'));
-		debug($is);
+		//debug($is);
 
 		$options = array(
 			'markers' => $is
 		);
 		$is = $this->GoogleMapV3->staticMap($options);
-		debug($is);
+		//debug($is);
 		echo $is;
 	}
 
@@ -122,7 +122,7 @@ class GoogleMapV3HelperTest extends MyCakeTestCase {
 		$options = array(
 			'markers' => $this->GoogleMapV3->staticMarkers($m)
 		);
-		debug($options['markers']).BR;
+		//debug($options['markers']).BR;
 
 		$is = $this->GoogleMapV3->staticMapUrl($options);
 		echo h($is);

+ 4 - 4
Test/Case/View/Helper/QrCodeHelperTest.php

@@ -39,11 +39,11 @@ class QrCodeHelperTest extends MyCakeTestCase {
 	 */
 	public function testSetSize() {
 		$is = $this->QrCode->setSize(1000);
-		pr($this->QrCode->debug());
+		//pr($this->QrCode->debug());
 		$this->assertFalse($is);
 
 		$is = $this->QrCode->setSize(300);
-		pr($this->QrCode->debug());
+		//pr($this->QrCode->debug());
 		$this->assertTrue($is);
 
 
@@ -98,7 +98,7 @@ class QrCodeHelperTest extends MyCakeTestCase {
 		$this->QrCode->setLevel('L', 1);
 		$is = $this->QrCode->image(QR_TEST_STRING);
 		echo $is;
-		pr($this->QrCode->debug());
+		//pr($this->QrCode->debug());
 		$this->assertTrue(!empty($is));
 
 		$this->QrCode->reset();
@@ -106,7 +106,7 @@ class QrCodeHelperTest extends MyCakeTestCase {
 		$this->QrCode->setLevel('H', 1);
 		$is = $this->QrCode->image(QR_TEST_STRING);
 		echo $is;
-		pr($this->QrCode->debug());
+		//pr($this->QrCode->debug());
 		$this->assertTrue(!empty($is));
 	}
 

+ 3 - 3
Test/Case/View/Helper/TextExtHelperTest.php

@@ -33,9 +33,9 @@ class TextExtHelperTest extends MyCakeTestCase {
 	document.write(\'</a>\');
 	//--></script> and more\'';
 		$result = $this->Text->autoLinkEmails($text, array('obfuscate'=>true));
-		pr($text);
+		//pr($text);
 		echo $result;
-		pr(h($result));
+		//pr(h($result));
 		$this->assertNotEquals($result, $text);
 
 	}
@@ -133,7 +133,7 @@ class TextExtHelperTest extends MyCakeTestCase {
 		$text = 'Text <i>with a url</i> www.cot.ag?id=2&sub=3 and some email@domain.com more';
 		$expected = 'Text &lt;i&gt;with a url&lt;/i&gt; <a href="http://www.cot.ag?id=2&amp;sub=3">www.cot.ag?id=2&amp;sub=3</a> and some <a href="mailto:email@domain.com">email@domain.com</a> more';
 		$result = $this->Text->autoLink($text);
-		pr(h($text));
+		//pr(h($text));
 		$this->assertEquals($result, $expected);
 	}
 

+ 2 - 2
Test/Case/View/Helper/TreeHelperTest.php

@@ -376,8 +376,8 @@ TEXT;
 TEXT;
 		$output = str_replace(array("\t", "\r", "\n"), '', $output);
 		$expected = str_replace(array("\t", "\r", "\n"), '', $expected);
-		debug($output);
-		debug($expected);
+		//debug($output);
+		//debug($expected);
 		$this->assertTextEquals($expected, $output);
 	}
 

+ 2 - 2
Test/Case/View/Helper/TypographyHelperTest.php

@@ -56,7 +56,7 @@ class TypographyHelperTest extends MyCakeTestCase {
 
 		foreach ($strs as $str => $expected) {
 			$result = $this->Typography->formatCharacters($str);
-			debug($result);
+			//debug($result);
 			$this->assertEquals($expected, $result);
 		}
 
@@ -89,7 +89,7 @@ paragraph and a
 
 		$res = $this->Typography->autoTypography($str);
 		echo pre($res);
-		debug($res);
+		//debug($res);
 	}
 
 /**