test case updates

Test/Case/Lib/Utility/DatetimeLibTest.php

@@ -16,6 +16,38 @@ class DatetimeLibTest extends MyCakeTestCase {
 	public function tearDown() {
 		unset($this->Datetime);
 	}
+	
+	public function testNiceDate() {
+		$res = setlocale(LC_TIME, 'de_DE.UTF-8', 'deu_deu');
+		echo returns($res);
+		
+		$values = array(
+			array('2009-12-01 00:00:00', FORMAT_NICE_YMD, '01.12.2009'),
+			array('2009-12-01 00:00:00', FORMAT_NICE_M_FULL, 'December'),
+		);
+		foreach ($values as $v) {
+			$ret = $this->Datetime->niceDate($v[0], $v[1]);
+			pr($ret); ob_flush();
+			$this->assertEquals($ret, $v[2]);
+		}
+		
+	}
+	
+	public function testLocalDate() {
+		$res = setlocale(LC_TIME, array('de_DE.UTF-8', 'deu_deu'));
+		echo returns($res);
+		
+		$values = array(
+			array('2009-12-01 00:00:00', FORMAT_LOCAL_YMD, '01.12.2009'),
+			array('2009-12-01 00:00:00', FORMAT_LOCAL_M_FULL, 'Dezember'),
+		);
+		foreach ($values as $v) {
+			$ret = $this->Datetime->localDate($v[0], $v[1]);
+			pr($ret); ob_flush();		
+			$this->assertEquals($ret, $v[2]);
+		}
+	}
+	
 
 	public function testParseLocalizedDate() {
 		$this->out($this->_header(__FUNCTION__));

Test/Case/Model/CodeKeyTest.php

@@ -1,11 +1,13 @@
 <?php
 
-App::import('Model', 'Tools.CodeKey');
+App::import('CodeKey', 'Tools.Model');
 App::uses('MyCakeTestCase', 'Tools.Lib');
 
 class CodeKeyTest extends MyCakeTestCase {
+	
 	public $CodeKey = null;
-	//public $fixtures = array('app.code_key');
+	
+	public $fixtures = array('plugin.tools.code_key');
 
 	public function startTest() {
 		$this->CodeKey = ClassRegistry::init('Tools.CodeKey');

Test/Case/Model/ContactFormTest.php

@@ -1,6 +1,6 @@
 <?php
 
-//App::import('Model', 'Tools.ContactForm');
+//App::uses('ContactForm', 'Tools.Model');
 
 class ContactFormTest extends CakeTestCase {
 	public $ContactForm = null;

Test/Case/Model/QloginTest.php

@@ -1,12 +1,14 @@
 <?php
 
-App::import('Model', 'Tools.Qlogin');
+App::uses('Qlogin', 'Tools.Model');
 App::uses('MyCakeTestCase', 'Tools.Lib');
 App::uses('Router', 'Routing');
 
 class QloginTest extends MyCakeTestCase {
+	
 	public $Qlogin = null;
-	//public $fixtures = array('app.code_key');
+	
+	public $fixtures = array('plugin.tools.code_key');
 
 	public function startTest() {
 		$this->Qlogin = ClassRegistry::init('Tools.Qlogin');
@@ -19,6 +21,8 @@ class QloginTest extends MyCakeTestCase {
 	public function testGenerate() {
 		$url = Router::url(array('admin'=>'', 'plugin'=>'tools', 'controller'=>'qlogin', 'action'=>'go'), true).'/';
 		pr($url);
+		$this->assertIsNotEmpty($url);
+		
 		$res = $this->Qlogin->url(array('controller'=>'test', 'action'=>'foo', 'bar'), 1);
 		pr($res);
 		$this->assertTrue(is_string($res) && !empty($res));
@@ -32,13 +36,14 @@ class QloginTest extends MyCakeTestCase {
 	public function testUse() {
 		$key = $this->Qlogin->generate(array('controller'=>'test', 'action'=>'foo', 'bar'), 1);
 		$res = $this->Qlogin->translate($key);
-		echo returns($res);
-		pr($res);
+		$this->assertTrue(is_array($res) && !empty($res));
 		
 		$key = $this->Qlogin->generate('/test/foo/bar', 2);
 		$res = $this->Qlogin->translate($key);
-		echo returns($res);
-		pr($res);
+		$this->assertTrue(is_array($res) && !empty($res));
+		
+		$res = $this->Qlogin->translate('foobar');
+		$this->assertFalse($res);
 	}
 	
 	//TODO