Mark Scherer 11 年 前
コミット
7b9d70c87a

+ 0 - 4
Test/Case/Lib/CurrencyBitcoinLibTest.php

@@ -14,7 +14,6 @@ class CurrencyBitcoinLibTest extends MyCakeTestCase {
 	/**
 	/**
 	 */
 	 */
 	public function testBitmarket() {
 	public function testBitmarket() {
-		$this->out($this->_header('bitmarket - ' . $this->CurrencyBitcoin->settings['currency']), true);
 		$is = $this->CurrencyBitcoin->bitmarket();
 		$is = $this->CurrencyBitcoin->bitmarket();
 		$this->debug($is);
 		$this->debug($is);
 		//$this->assertFalse($is);
 		//$this->assertFalse($is);
@@ -23,7 +22,6 @@ class CurrencyBitcoinLibTest extends MyCakeTestCase {
 	/**
 	/**
 	 */
 	 */
 	public function testBitcoincharts() {
 	public function testBitcoincharts() {
-		$this->debug($this->_header('bitcoincharts - ' . $this->CurrencyBitcoin->settings['currency']), true);
 		$is = $this->CurrencyBitcoin->bitcoincharts();
 		$is = $this->CurrencyBitcoin->bitcoincharts();
 		$this->debug($is);
 		$this->debug($is);
 		//$this->assertFalse($is);
 		//$this->assertFalse($is);
@@ -34,12 +32,10 @@ class CurrencyBitcoinLibTest extends MyCakeTestCase {
 	public function testRate() {
 	public function testRate() {
 		$this->skipIf(true, 'TODO!');
 		$this->skipIf(true, 'TODO!');
 
 
-		$this->debug($this->_header('rate - bitmarket - ' . $this->CurrencyBitcoin->settings['currency']), true);
 		$is = $this->CurrencyBitcoin->rate();
 		$is = $this->CurrencyBitcoin->rate();
 		$this->debug($is);
 		$this->debug($is);
 		$this->assertTrue(is_numeric($is) && $is > 0 && $is < 100);
 		$this->assertTrue(is_numeric($is) && $is > 0 && $is < 100);
 
 
-		$this->debug($this->_header('rate - bitcoincharts - ' . $this->CurrencyBitcoin->settings['currency']), true);
 		$is = $this->CurrencyBitcoin->rate(['api' => 'bitcoincharts']);
 		$is = $this->CurrencyBitcoin->rate(['api' => 'bitcoincharts']);
 		$this->debug($is);
 		$this->debug($is);
 		$this->assertTrue(is_numeric($is) && $is > 0 && $is < 100);
 		$this->assertTrue(is_numeric($is) && $is > 0 && $is < 100);

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

@@ -229,7 +229,7 @@ class TimeLibTest extends MyCakeTestCase {
 	 * @return void
 	 * @return void
 	 */
 	 */
 	public function testPeriod() {
 	public function testPeriod() {
-		$this->out($this->_header(__FUNCTION__), true);
+		//$this->out($this->_header(__FUNCTION__), true);
 		$values = [
 		$values = [
 			[__d('tools', 'Today'), [date(FORMAT_DB_DATETIME, mktime(0, 0, 0, date('m'), date('d'), date('Y'))), date(FORMAT_DB_DATETIME, mktime(23, 59, 59, date('m'), date('d'), date('Y')))]],
 			[__d('tools', 'Today'), [date(FORMAT_DB_DATETIME, mktime(0, 0, 0, date('m'), date('d'), date('Y'))), date(FORMAT_DB_DATETIME, mktime(23, 59, 59, date('m'), date('d'), date('Y')))]],
 
 
@@ -257,7 +257,7 @@ class TimeLibTest extends MyCakeTestCase {
 	 * @return void
 	 * @return void
 	 */
 	 */
 	public function testPeriodAsSql() {
 	public function testPeriodAsSql() {
-		$this->out($this->_header(__FUNCTION__), true);
+		//$this->out($this->_header(__FUNCTION__), true);
 		$values = [
 		$values = [
 			[__d('tools', 'Today'), "(Model.field >= '" . date(FORMAT_DB_DATE) . " 00:00:00') AND (Model.field <= '" . date(FORMAT_DB_DATE) . " 23:59:59')"],
 			[__d('tools', 'Today'), "(Model.field >= '" . date(FORMAT_DB_DATE) . " 00:00:00') AND (Model.field <= '" . date(FORMAT_DB_DATE) . " 23:59:59')"],
 			[__d('tools', 'Yesterday') . ' ' . __d('tools', 'until') . ' ' . __d('tools', 'Today'), "(Model.field >= '" . date(FORMAT_DB_DATE, time() - DAY) . " 00:00:00') AND (Model.field <= '" . date(FORMAT_DB_DATE) . " 23:59:59')"],
 			[__d('tools', 'Yesterday') . ' ' . __d('tools', 'until') . ' ' . __d('tools', 'Today'), "(Model.field >= '" . date(FORMAT_DB_DATE, time() - DAY) . " 00:00:00') AND (Model.field <= '" . date(FORMAT_DB_DATE) . " 23:59:59')"],
@@ -279,7 +279,7 @@ class TimeLibTest extends MyCakeTestCase {
 	 * @return void
 	 * @return void
 	 */
 	 */
 	public function testDifference() {
 	public function testDifference() {
-		$this->out($this->_header(__FUNCTION__), true);
+		//$this->out($this->_header(__FUNCTION__), true);
 		$values = [
 		$values = [
 			['2010-02-23 11:11:11', '2010-02-23 11:12:01', 50],
 			['2010-02-23 11:11:11', '2010-02-23 11:12:01', 50],
 			['2010-02-23 11:11:11', '2010-02-24 11:12:01', DAY + 50]
 			['2010-02-23 11:11:11', '2010-02-24 11:12:01', DAY + 50]
@@ -388,7 +388,7 @@ class TimeLibTest extends MyCakeTestCase {
 	 * @return void
 	 * @return void
 	 */
 	 */
 	public function testAgeBounds() {
 	public function testAgeBounds() {
-		$this->out($this->_header(__FUNCTION__), true);
+		//$this->out($this->_header(__FUNCTION__), true);
 		$values = [
 		$values = [
 			[20, 20, ['min' => '1990-07-07', 'max' => '1991-07-06']],
 			[20, 20, ['min' => '1990-07-07', 'max' => '1991-07-06']],
 			[10, 30, ['min' => '1980-07-07', 'max' => '2001-07-06']],
 			[10, 30, ['min' => '1980-07-07', 'max' => '2001-07-06']],
@@ -413,7 +413,7 @@ class TimeLibTest extends MyCakeTestCase {
 	 * @return void
 	 * @return void
 	 */
 	 */
 	public function testAgeByYear() {
 	public function testAgeByYear() {
-		$this->out($this->_header(__FUNCTION__), true);
+		//$this->out($this->_header(__FUNCTION__), true);
 
 
 		// year only
 		// year only
 		$is = TimeLib::ageByYear(2000);
 		$is = TimeLib::ageByYear(2000);
@@ -449,7 +449,7 @@ class TimeLibTest extends MyCakeTestCase {
 	 * @return void
 	 * @return void
 	 */
 	 */
 	public function testDaysInMonth() {
 	public function testDaysInMonth() {
-		$this->out($this->_header(__FUNCTION__), true);
+		//$this->out($this->_header(__FUNCTION__), true);
 
 
 		$ret = TimeLib::daysInMonth('2004', '3');
 		$ret = TimeLib::daysInMonth('2004', '3');
 		$this->assertEquals(31, $ret);
 		$this->assertEquals(31, $ret);
@@ -470,7 +470,7 @@ class TimeLibTest extends MyCakeTestCase {
 	 * @return void
 	 * @return void
 	 */
 	 */
 	public function testDay() {
 	public function testDay() {
-		$this->out($this->_header(__FUNCTION__), true);
+		//$this->out($this->_header(__FUNCTION__), true);
 		$ret = TimeLib::day('0');
 		$ret = TimeLib::day('0');
 		$this->assertEquals(__d('tools', 'Sunday'), $ret);
 		$this->assertEquals(__d('tools', 'Sunday'), $ret);
 
 
@@ -496,7 +496,7 @@ class TimeLibTest extends MyCakeTestCase {
 	 * @return void
 	 * @return void
 	 */
 	 */
 	public function testMonth() {
 	public function testMonth() {
-		$this->out($this->_header(__FUNCTION__), true);
+		//$this->out($this->_header(__FUNCTION__), true);
 		$ret = TimeLib::month('11');
 		$ret = TimeLib::month('11');
 		$this->assertEquals(__d('tools', 'November'), $ret);
 		$this->assertEquals(__d('tools', 'November'), $ret);
 
 
@@ -516,7 +516,7 @@ class TimeLibTest extends MyCakeTestCase {
 	 * @return void
 	 * @return void
 	 */
 	 */
 	public function testDays() {
 	public function testDays() {
-		$this->out($this->_header(__FUNCTION__), true);
+		//$this->out($this->_header(__FUNCTION__), true);
 		$ret = TimeLib::days();
 		$ret = TimeLib::days();
 		$this->assertTrue(count($ret) === 7);
 		$this->assertTrue(count($ret) === 7);
 	}
 	}
@@ -527,7 +527,7 @@ class TimeLibTest extends MyCakeTestCase {
 	 * @return void
 	 * @return void
 	 */
 	 */
 	public function testMonths() {
 	public function testMonths() {
-		$this->out($this->_header(__FUNCTION__), true);
+		//$this->out($this->_header(__FUNCTION__), true);
 		$ret = TimeLib::months();
 		$ret = TimeLib::months();
 		$this->assertTrue(count($ret) === 12);
 		$this->assertTrue(count($ret) === 12);
 	}
 	}
@@ -646,7 +646,7 @@ class TimeLibTest extends MyCakeTestCase {
 	 * @return void
 	 * @return void
 	 */
 	 */
 	public function testLengthOfTime() {
 	public function testLengthOfTime() {
-		$this->out($this->_header(__FUNCTION__), true);
+		//$this->out($this->_header(__FUNCTION__), true);
 
 
 		$ret = TimeLib::lengthOfTime(60);
 		$ret = TimeLib::lengthOfTime(60);
 		//pr($ret);
 		//pr($ret);
@@ -675,7 +675,7 @@ class TimeLibTest extends MyCakeTestCase {
 	 * @return void
 	 * @return void
 	 */
 	 */
 	public function testFuzzyFromOffset() {
 	public function testFuzzyFromOffset() {
-		$this->out($this->_header(__FUNCTION__), true);
+		//$this->out($this->_header(__FUNCTION__), true);
 
 
 		$ret = TimeLib::fuzzyFromOffset(MONTH);
 		$ret = TimeLib::fuzzyFromOffset(MONTH);
 		//pr($ret);
 		//pr($ret);
@@ -726,7 +726,7 @@ class TimeLibTest extends MyCakeTestCase {
 	 * @return void
 	 * @return void
 	 */
 	 */
 	public function testCweekDay() {
 	public function testCweekDay() {
-		$this->out($this->_header(__FUNCTION__), true);
+		//$this->out($this->_header(__FUNCTION__), true);
 
 
 		// wednesday
 		// wednesday
 		$ret = TimeLib::cweekDay(51, 2011, 2);
 		$ret = TimeLib::cweekDay(51, 2011, 2);
@@ -737,7 +737,7 @@ class TimeLibTest extends MyCakeTestCase {
 	}
 	}
 
 
 	public function testCweeks() {
 	public function testCweeks() {
-		$this->out($this->_header(__FUNCTION__), true);
+		//$this->out($this->_header(__FUNCTION__), true);
 		$ret = TimeLib::cweeks('2004');
 		$ret = TimeLib::cweeks('2004');
 		$this->assertEquals(53, $ret);
 		$this->assertEquals(53, $ret);
 
 
@@ -757,7 +757,7 @@ class TimeLibTest extends MyCakeTestCase {
 	}
 	}
 
 
 	public function testCweekBeginning() {
 	public function testCweekBeginning() {
-		$this->out($this->_header(__FUNCTION__), true);
+		//$this->out($this->_header(__FUNCTION__), true);
 		$values = [
 		$values = [
 			'2001' => 978303600, # Mon 01.01.2001, 00:00
 			'2001' => 978303600, # Mon 01.01.2001, 00:00
 			'2006' => 1136156400, # Mon 02.01.2006, 00:00
 			'2006' => 1136156400, # Mon 02.01.2006, 00:00
@@ -790,7 +790,7 @@ class TimeLibTest extends MyCakeTestCase {
 	}
 	}
 
 
 	public function testCweekEnding() {
 	public function testCweekEnding() {
-		$this->out($this->_header(__FUNCTION__), true);
+		//$this->out($this->_header(__FUNCTION__), true);
 
 
 		$values = [
 		$values = [
 			'2001' => 1009753199, # Sun 30.12.2001, 23:59:59
 			'2001' => 1009753199, # Sun 30.12.2001, 23:59:59

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

@@ -22,7 +22,7 @@ class TypographicBehaviorTest extends MyCakeTestCase {
 	}
 	}
 
 
 	public function testBeforeValidate() {
 	public function testBeforeValidate() {
-		$this->out($this->_header(__FUNCTION__), false);
+		//$this->out($this->_header(__FUNCTION__), false);
 		$data = [
 		$data = [
 			'title' => 'some «cool» title',
 			'title' => 'some «cool» title',
 			'body' => 'A title with normal "qotes" - should be left untouched',
 			'body' => 'A title with normal "qotes" - should be left untouched',