[xoops-svn] SF.net SVN: xoops-svn:[11797] XoopsCore/branches/2.6.x/2.6.0_alain091/ UnitTestXoops

[<al...@us...>]

Revision: 11797
          http://sourceforge.net/p/xoops/svn/11797
Author:   alain91
Date:     2013-06-28 19:01:17 +0000 (Fri, 28 Jun 2013)
Log Message:
-----------
add tests to improve code coverage

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/common_simpletest.php
    XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/xoops_lib/XoopsTest.php

Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/common_simpletest.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/common_simpletest.php	2013-06-28 10:29:48 UTC (rev 11796)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/common_simpletest.php	2013-06-28 19:01:17 UTC (rev 11797)
@@ -11,7 +11,6 @@
 		return $this->assertIdentical($arg1, $arg2, $msg);
 	}
 	
-	
 	function assertEquals($arg1, $arg2)
 	{
 		return $this->assertEqual($arg2, $arg1);

Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/xoops_lib/XoopsTest.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/xoops_lib/XoopsTest.php	2013-06-28 10:29:48 UTC (rev 11796)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/xoops_lib/XoopsTest.php	2013-06-28 19:01:17 UTC (rev 11797)
@@ -153,9 +153,6 @@
 		$value = $instance->url('http://localhost/tmp/');
 		$this->assertSame('http://localhost/tmp/', $value);
 		
-		$value = $instance->url('http://localhost/tmp');
-		$this->assertSame('http://localhost/tmp', $value);
-		
 		$value = $instance->url('tmp');
 		$this->assertSame(XOOPS_URL.'/tmp', $value);
 	}
@@ -167,8 +164,24 @@
 		$value = $instance->buildUrl('http://localhost/tmp/');
 		$this->assertSame('http://localhost/tmp/', $value);
 		
-		$value = $instance->url('.');
-		$this->assertSame(XOOPS_URL.'/.', $value);
+		$value = $instance->buildUrl('.');
+		$this->assertSame($_SERVER['REQUEST_URI'], $value);
+		
+		$url = 'http://localhost/tmp/test.php?toto=1';
+		$value = $instance->buildUrl($url);
+		$this->assertSame($url, $value);
+		
+		$url = 'http://localhost/tmp/test.php?toto=1';
+		$value = $instance->buildUrl($url,array('titi'=>2));
+		$this->assertSame($url.'&titi=2', $value);
+		
+		$url = 'http://localhost/tmp/test.php?toto=1';
+		$value = $instance->buildUrl($url,array('titi'=>'space space'));
+		$this->assertSame($url.'&titi=space%20space', $value);
+		
+		$url = 'http://localhost/tmp/test.php?toto=1';
+		$value = $instance->buildUrl($url,array('toto'=>2));
+		$this->assertSame('http://localhost/tmp/test.php?toto=2', $value);
 	}
 	
     public function test_1100()
@@ -214,16 +227,26 @@
 	{
         $instance=Xoops::getInstance();
 		
-		$save1 = isset($_SERVER['xoopsUserTheme']) ? $_SERVER['xoopsUserTheme'] : null;
+		$save1 = isset($_SESSION['xoopsUserTheme']) ? $_SESSION['xoopsUserTheme'] : null;
 		$save2 = isset($_POST['xoops_theme_select']) ? $_POST['xoops_theme_select'] : null;
-		$_SERVER['xoopsUserTheme'] = null;
+		$_SESSION['xoopsUserTheme'] = null;
 		$_POST['xoops_theme_select'] = 'default';
 		$instance->themeSelect();
 		$value = $instance->getConfig('theme_set');
 		$this->assertSame($_POST['xoops_theme_select'], $value);
-		//$this->assertSame($_SERVER['xoopsUserTheme'], $value);
-		$_SERVER['xoopsUserTheme'] = $save1;
+		$this->assertSame($_SESSION['xoopsUserTheme'], $value);
+		$_SESSION['xoopsUserTheme'] = $save1;
 		$_POST['xoops_theme_select'] = $save2;
+		
+		$save1 = isset($_SESSION['xoopsUserTheme']) ? $_SESSION['xoopsUserTheme'] : null;
+		$save2 = isset($_POST['xoops_theme_select']) ? $_POST['xoops_theme_select'] : null;
+		$_SESSION['xoopsUserTheme'] = 'default';
+		$_POST['xoops_theme_select'] = null;
+		$instance->themeSelect();
+		$value = $instance->getConfig('theme_set');
+		$this->assertSame($_SESSION['xoopsUserTheme'], $value);
+		$_SESSION['xoopsUserTheme'] = $save1;
+		$_POST['xoops_theme_select'] = $save2;
 
 	}
 	
@@ -237,6 +260,13 @@
 		$this->assertSame('system', $value['module']);
 		$this->assertSame('path', $value['file']);
 		$this->assertSame('admin:system|path', $value['tpl_name']);
+		
+		$path = 'db:path';
+		$value = $instance->getTplInfo($path);
+		$this->assertSame('admin', $value['type']);
+		$this->assertSame('system', $value['module']);
+		$this->assertSame('path', $value['file']);
+		$this->assertSame('admin:system|path', $value['tpl_name']);
 	}
 	
     public function test_1600()
@@ -510,6 +540,10 @@
 		
 		$value = $instance->getActiveModules();
 		$this->assertTrue(is_array($value) AND count($value)>0);
+		
+		$instance->_activeModules = null;
+		$value = $instance->getActiveModules();
+		$this->assertTrue(is_array($value) AND count($value)>0);
 	}
 	
     public function test_4900()
@@ -526,6 +560,9 @@
 		
 		$value = $instance->isActiveModule('page');
 		$this->assertSame(true, $value);
+		
+		$value = $instance->isActiveModule(null);
+		$this->assertSame(false, $value);
 	}
 	
     public function test_5100()
@@ -535,6 +572,9 @@
 		$value = $instance->getModuleByDirname('page');
 		$this->assertinstanceOf('XoopsModule', $value);
 		$this->assertSame('Page', $value->name());
+		
+		$value = $instance->getModuleByDirname('dummy');
+		$this->assertSame(false, $value);
 	}
 	
     public function test_5200()
@@ -542,7 +582,10 @@
         $instance=Xoops::getInstance();
 		
 		$value = $instance->getModuleById(1);
-		$this->assertinstanceOf('XoopsModule', $value);
+		$this->assertInstanceOf('XoopsModule', $value);
+		
+		$value = $instance->getModuleById(-1);
+		$this->assertSame(false, $value);
 	}
 	
     public function test_5300()
@@ -569,8 +612,29 @@
 	{
         $instance=Xoops::getInstance();
 		
-		$value = $instance->alert('');
-		$this->assertSame('', $value);
+		$msg = 'alert_info';
+		$value = $instance->alert($msg);
+		$this->assertTrue(is_string($value) AND strlen($value)>0);
+		
+		$msg = 'alert_error';
+		$value = $instance->alert($msg, 'error');
+		$this->assertTrue(is_string($value) AND strlen($value)>0);
+		
+		$msg = 'alert_success';
+		$value = $instance->alert($msg, 'success');
+		$this->assertTrue(is_string($value) AND strlen($value)>0);
+		
+		$msg = 'alert_warning';
+		$value = $instance->alert($msg, 'warning');
+		$this->assertTrue(is_string($value) AND strlen($value)>0);
+		
+		$msg = new XoopsModule();
+		$value = $instance->alert($msg);
+		$this->assertTrue(is_string($value) AND strlen($value)>0);
+		
+		$msg = array('text_1', 'text_2');
+		$value = $instance->alert($msg);
+		$this->assertTrue(is_string($value) AND strlen($value)>0);
 	}
 	
     public function test_5600()
@@ -636,9 +700,28 @@
 	{
         $instance=Xoops::getInstance();
 		
+		$value = $instance->checkEmail(null);
+		$this->assertSame(false, $value);
+		
 		$email = 'te...@te...';
 		$value = $instance->checkEmail($email);
 		$this->assertSame($email, $value);
+		
+		$email = 'te...@te...';
+		$value = $instance->checkEmail($email, true);
+		$this->assertSame('test at test dot com', $value);
+		
+		$email = 'test\tot...@te...';
+		$value = $instance->checkEmail($email);
+		$this->assertSame(false, $value);
+		
+		$email = 'test@test';
+		$value = $instance->checkEmail($email);
+		$this->assertSame(false, $value);
+		
+		$email = 'test@test\titi.com';
+		$value = $instance->checkEmail($email);
+		$this->assertSame(false, $value);
 	}
 	
     public function test_6300()
@@ -694,8 +777,15 @@
 	{
         $instance=Xoops::getInstance();
 		
-		$value = $instance->getEnv('REQUEST_URI');
-		$this->assertTrue(is_string($value));
+		$_SERVER['DUMMY'] = 'dummy';
+		$value = $instance->getEnv('DUMMY');
+		$this->assertSame('dummy', $value);
+		unset($_SERVER['DUMMY']);
+		
+		$_ENV['DUMMY'] = 'dummy';
+		$value = $instance->getEnv('DUMMY');
+		$this->assertSame('dummy', $value);
+		unset($_ENV['DUMMY']);
 	}
 	
     public function test_6700()
@@ -704,6 +794,14 @@
 		
 		$value = $instance->getCss();
 		$this->assertTrue(is_string($value));
+		
+		$_ENV['HTTP_USER_AGENT'] = 'mac';
+		$value = $instance->getCss();
+		$this->assertSame(XOOPS_THEME_URL . '/default/css/style.css', $value);
+		
+		$_ENV['HTTP_USER_AGENT'] = 'MSIE 1.2';
+		$value = $instance->getCss();
+		$this->assertSame(XOOPS_THEME_URL . '/default/css/style.css', $value);
 	}
 	
     public function test_6800()
@@ -711,7 +809,7 @@
         $instance=Xoops::getInstance();
 		
 		$value = $instance->getMailer();
-		$this->assertInstanceOf('XoopsMailerLocale', $value);
+		$this->assertTrue($value instanceOf XoopsMailerLocale OR $value instanceOf XoopsMailer);
 	}
 	
     public function test_6900()
@@ -720,6 +818,9 @@
 		
 		$value = $instance->getRank();
 		$this->assertTrue(is_array($value));
+		
+		$value = $instance->getRank(1);
+		$this->assertTrue(is_array($value));
 	}
 	
     public function test_7000()
@@ -763,7 +864,15 @@
 	{
         $instance=Xoops::getInstance();
 		
-		$instance->addConfigs(array());
+		$instance->addConfigs(array('dummy' => 1));
+		$value = $instance->getConfigs();
+		$this->assertTrue(is_array($value));
+		$this->assertTrue(isset($value['dummy']) AND $value['dummy'] = 1);
+		
+		$instance->addConfigs(array('dummy' => 1), null);
+		$value = $instance->getConfigs();
+		$this->assertTrue(is_array($value));
+		$this->assertTrue(isset($value['dummy']) AND $value['dummy'] = 1);
 	}
 	
     public function test_7500()
@@ -773,6 +882,10 @@
 		$instance->setConfig('dummy', 1);
 		$value = $instance->getConfig('dummy');
 		$this->assertSame(1, $value);
+		
+		$instance->setConfig('dummy', 1, null);
+		$value = $instance->getConfig('dummy');
+		$this->assertSame(1, $value);
 	}
 	
     public function test_7600()
@@ -782,13 +895,21 @@
 		$instance->appendConfig('dummy', array('test'=>1), true);
 		$value = $instance->getConfig('dummy');
 		$this->assertSame(1, $value['test']);
+		
+		$instance->appendConfig('dummy', array('test'=>1), false);
+		$value = $instance->getConfig('dummy');
+		
+		$instance->appendConfig('dummy', array('test'=>1), true, null);
+		$value = $instance->getConfig('dummy');
+		var_dump($value);exit;
+		$this->assertSame(1, $value['test']);
 	}
 	
     public function test_7700()
 	{
         $instance=Xoops::getInstance();
 		
-		$value = $instance->getModuleConfig('dummy');
+		$value = $instance->getModuleConfig(uniqid());
 		$this->assertFalse($value);
 	}