Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[11749] XoopsCore/branches/2.6.x/2.6.0_alain091/ UnitTestXoops
|
From: <al...@us...> - 2013-06-22 20:01:21
|
Revision: 11749
http://sourceforge.net/p/xoops/svn/11749
Author: alain91
Date: 2013-06-22 20:01:17 +0000 (Sat, 22 Jun 2013)
Log Message:
-----------
add tests and other corrections
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/common_phpunit.php
XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/common_simpletest.php
XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/init.php
XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/BlockHandlerTest.php
XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/BlockTest.php
XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/ConfigcategoryHandlerTest.php
XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/GrouppermHandlerTest.php
XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/ObjectTest.php
XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/OnlineHandlerTest.php
XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/RanksHandlerTest.php
XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/SessionHandlerTest.php
XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/TplfileHandlerTest.php
XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/TplsetHandlerTest.php
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/common_phpunit.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/common_phpunit.php 2013-06-22 19:20:33 UTC (rev 11748)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/common_phpunit.php 2013-06-22 20:01:17 UTC (rev 11749)
@@ -1,8 +1,4 @@
<?php
-// Avoid check proxy (include/common.php line 88) to define constant XOOPS_DB_PROXY
-// because it implies a readonly database connection
-$_SERVER['REQUEST_METHOD'] = 'POST';
-define('XOOPS_XMLRPC',0);
// needed for phpunit => initializing $_SERVER values
if (empty($_SERVER["HTTP_HOST"])) {
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-22 19:20:33 UTC (rev 11748)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/common_simpletest.php 2013-06-22 20:01:17 UTC (rev 11749)
@@ -3,26 +3,6 @@
defined('DS') or define('DS', DIRECTORY_SEPARATOR);
-// Avoid check proxy (include/common.php line 88) to define constant XOOPS_DB_PROXY
-// because it implies a readonly database connection
-$_SERVER['REQUEST_METHOD'] = 'POST';
-define('XOOPS_XMLRPC',0);
-
-if (!defined('XOOPS_ROOT_PATH')) {
- // Physical path to the XOOPS documents (served) directory WITHOUT trailing slash
- define('XOOPS_ROOT_PATH', dirname(__FILE__).'/../htdocs');
-
- // For forward compatibility
- // Physical path to the XOOPS library directory WITHOUT trailing slash
- define('XOOPS_PATH', XOOPS_ROOT_PATH.'/xoops_lib');
- // Physical path to the XOOPS datafiles (writable) directory WITHOUT trailing slash
- define('XOOPS_VAR_PATH', XOOPS_ROOT_PATH.'/xoops_data');
- // Alias of XOOPS_PATH, for compatibility, temporary solution
- define("XOOPS_TRUST_PATH", XOOPS_PATH);
-
- define('XOOPS_URL', 'http://localhost/xoops/htdocs');
-}
-
defined('SIMPLETEST_ROOT_PATH') OR define('SIMPLETEST_ROOT_PATH',XOOPS_ROOT_PATH.'/../simpletest');
error_reporting(E_ALL);
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/init.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/init.php 2013-06-22 19:20:33 UTC (rev 11748)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/init.php 2013-06-22 20:01:17 UTC (rev 11749)
@@ -7,6 +7,11 @@
if (defined('IS_PHPUNIT')) {
require_once dirname(__FILE__) . '/common_phpunit.php';
+} else {
+ // Avoid check proxy (include/common.php line 88) to define constant XOOPS_DB_PROXY
+ // because it implies a readonly database connection
+ $_SERVER['REQUEST_METHOD'] = 'POST';
+ define('XOOPS_XMLRPC',0);
}
require_once dirname(__FILE__) . '/../htdocs/mainfile.php';
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/BlockHandlerTest.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/BlockHandlerTest.php 2013-06-22 19:20:33 UTC (rev 11748)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/BlockHandlerTest.php 2013-06-22 20:01:17 UTC (rev 11749)
@@ -8,7 +8,7 @@
}
public function test_100() {
- $instance=new XoopsBlockHandler();
+ $instance = new XoopsBlockHandler();
$this->assertInstanceOf('XoopsBlockHandler',$instance);
$this->assertRegExp('/^.*newblocks$/',$instance->table);
$this->assertSame('bid',$instance->keyName);
@@ -21,11 +21,11 @@
}
public function test_120() {
- $block=new XoopsBlock();
+ $block = new XoopsBlock();
$block->setNew();
- $instance=new XoopsBlockHandler();
+ $instance = new XoopsBlockHandler();
$value = $instance->insertBlock($block);
- $bid=$block->bid();
+ $bid = $block->bid();
$this->assertEquals($bid,$value);
$value = $instance->get($bid);
$this->assertEquals($bid,$value->bid());
@@ -36,79 +36,151 @@
}
public function test_160() {
- $instance=new XoopsBlockHandler();
+ $instance = new XoopsBlockHandler();
$value = $instance->getDistinctObjects();
$this->assertTrue(is_array($value));
}
+ public function test_180() {
+ $instance = new XoopsBlockHandler();
+ $criteria = new Criteria('bid');
+ $value = $instance->getDistinctObjects($criteria);
+ $this->assertTrue(is_array($value));
+ }
+
public function test_200() {
- $instance=new XoopsBlockHandler();
+ $instance = new XoopsBlockHandler();
$value = $instance->getNameList();
$this->assertTrue(is_array($value));
}
public function test_220() {
- $instance=new XoopsBlockHandler();
+ $instance = new XoopsBlockHandler();
$value = $instance->getAllBlocksByGroup(1);
$this->assertTrue(is_array($value));
+
+ $value = $instance->getAllBlocksByGroup(1, false);
+ $this->assertTrue(is_array($value));
+
+ $value = $instance->getAllBlocksByGroup(array(1,1,1), false);
+ $this->assertTrue(is_array($value));
+
+ $value = $instance->getAllBlocksByGroup(1, true, XOOPS_SIDEBLOCK_BOTH);
+ $this->assertTrue(is_array($value));
+
+ $value = $instance->getAllBlocksByGroup(1, true, XOOPS_CENTERBLOCK_ALL);
+ $this->assertTrue(is_array($value));
+
+ $value = $instance->getAllBlocksByGroup(1, true, -1);
+ $this->assertTrue(is_array($value));
+
+ $value = $instance->getAllBlocksByGroup(1, true, null, 1);
+ $this->assertTrue(is_array($value));
}
public function test_240() {
- $instance=new XoopsBlockHandler();
+ $instance = new XoopsBlockHandler();
$value = $instance->getAllBlocks();
$this->assertTrue(is_array($value));
+
+ $value = $instance->getAllBlocks('object', true, XOOPS_SIDEBLOCK_BOTH);
+ $this->assertTrue(is_array($value));
+
+ $value = $instance->getAllBlocks('object', true, XOOPS_CENTERBLOCK_ALL);
+ $this->assertTrue(is_array($value));
+
+ $value = $instance->getAllBlocks('object', true, -1);
+ $this->assertTrue(is_array($value));
+
+ $value = $instance->getAllBlocks('object', true, null, 1);
+ $this->assertTrue(is_array($value));
+
+ $value = $instance->getAllBlocks('list');
+ $this->assertTrue(is_array($value));
+
+ $value = $instance->getAllBlocks('id');
+ $this->assertTrue(is_array($value));
}
public function test_260() {
- $block=new XoopsBlock();
$instance=new XoopsBlockHandler();
$value = $instance->getByModule('module');
$this->assertTrue(is_array($value));
+
+ $value = $instance->getByModule('module', false);
+ $this->assertTrue(is_array($value));
}
public function test_280() {
- $instance=new XoopsBlockHandler();
+ $instance = new XoopsBlockHandler();
$value = $instance->getAllByGroupModule(1);
$this->assertTrue(is_array($value));
+
+ $value = $instance->getAllByGroupModule(array(1,1,1));
+ $this->assertTrue(is_array($value));
+
+ $value = $instance->getAllByGroupModule(1, 1);
+ $this->assertTrue(is_array($value));
+
+ $value = $instance->getAllByGroupModule(1, 1, true);
+ $this->assertTrue(is_array($value));
}
public function test_300() {
- $instance=new XoopsBlockHandler();
+ $instance = new XoopsBlockHandler();
$value = $instance->getNonGroupedBlocks();
$this->assertTrue(is_array($value));
+
+ $value = $instance->getNonGroupedBlocks(1);
+ $this->assertTrue(is_array($value));
+
+ $value = $instance->getNonGroupedBlocks(1, true);
+ $this->assertTrue(is_array($value));
+
+ $value = $instance->getNonGroupedBlocks(0, false, true);
+ $this->assertTrue(is_array($value));
}
public function test_320() {
- $instance=new XoopsBlockHandler();
- $value = $instance->countSimilarBlocks('module',1);
- $this->assertSame(0,$value);
+ $instance = new XoopsBlockHandler();
+ $value = $instance->countSimilarBlocks(1, 1);
+ $this->assertEquals(1 ,$value);
+
+ $value = $instance->countSimilarBlocks(1, 1, 'shows_func');
+ $this->assertEquals(0 ,$value);
}
public function test_340() {
- $instance=new XoopsBlockHandler();
- $value = $instance->buildContent(0);
+ $instance = new XoopsBlockHandler();
+ $value = $instance->buildContent(0, 'titi', 'toto');
+ $this->assertSame('tototiti',$value);
+
+ $value = $instance->buildContent(1, 'titi', 'toto');
+ $this->assertSame('tititoto',$value);
+
+ $value = $instance->buildContent(2, 'titi', 'toto');
$this->assertSame('',$value);
}
public function test_360() {
- $instance=new XoopsBlockHandler();
- $title='original';
+ $instance = new XoopsBlockHandler();
+ $title = 'original';
$value = $instance->buildTitle($title);
$this->assertEquals($title,$value);
- $title='original2';
- $new='new';
+ $title = 'original2';
+ $new = 'new';
$value = $instance->buildTitle($title,$new);
$this->assertEquals($new,$value);
}
public function test_380() {
- $instance=new XoopsBlockHandler();
+ $instance = new XoopsBlockHandler();
$value = $instance->getBlockByPerm(null);
$this->assertTrue(empty($value) AND is_array($value));
}
public function test_400() {
- $instance=new XoopsBlockHandler();
+ $instance = new XoopsBlockHandler();
$value = $instance->getBlockByPerm(1);
$this->assertTrue(is_array($value));
}
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/BlockTest.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/BlockTest.php 2013-06-22 19:20:33 UTC (rev 11748)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/BlockTest.php 2013-06-22 20:01:17 UTC (rev 11749)
@@ -4,11 +4,13 @@
class BlockTest extends MY_UnitTestCase
{
- public function SetUp() {
+ public function SetUp()
+ {
}
- public function test_100() {
- $instance=new XoopsBlock();
+ public function test_100()
+ {
+ $instance = new XoopsBlock();
$this->assertInstanceOf('XoopsBlock',$instance);
$value=$instance->getVars();
$this->assertTrue(isset($value['bid']));
@@ -33,97 +35,113 @@
$this->assertTrue(isset($value['last_modified']));
}
- public function test_110() {
- $instance=new XoopsBlock(1);
+ public function test_110()
+ {
+ $instance = new XoopsBlock(1);
$this->assertInstanceOf('XoopsBlock',$instance);
}
- public function test_120() {
- $instance=new XoopsBlock();
+ public function test_120()
+ {
+ $instance = new XoopsBlock();
$value = $instance->id();
$this->assertSame(null,$value);
}
- public function test_140() {
- $instance=new XoopsBlock();
+ public function test_140()
+ {
+ $instance = new XoopsBlock();
$value = $instance->bid();
$this->assertSame(null,$value);
}
- public function test_160() {
- $instance=new XoopsBlock();
+ public function test_160()
+ {
+ $instance = new XoopsBlock();
$value = $instance->mid();
$this->assertSame(0,$value);
}
- public function test_180() {
- $instance=new XoopsBlock();
+ public function test_180()
+ {
+ $instance = new XoopsBlock();
$value = $instance->func_num();
$this->assertSame(0,$value);
}
- public function test_200() {
- $instance=new XoopsBlock();
+ public function test_200()
+ {
+ $instance = new XoopsBlock();
$value = $instance->options();
$this->assertSame(null,$value);
}
- public function test_220() {
- $instance=new XoopsBlock();
+ public function test_220()
+ {
+ $instance = new XoopsBlock();
$value = $instance->name();
$this->assertSame(null,$value);
}
- public function test_240() {
- $instance=new XoopsBlock();
+ public function test_240()
+ {
+ $instance = new XoopsBlock();
$value = $instance->title();
$this->assertSame(null,$value);
}
- public function test_260() {
- $instance=new XoopsBlock();
+ public function test_260()
+ {
+ $instance = new XoopsBlock();
$value = $instance->content();
$this->assertSame(null,$value);
}
- public function test_280() {
- $instance=new XoopsBlock();
+ public function test_280()
+ {
+ $instance = new XoopsBlock();
$value = $instance->side();
$this->assertSame(0,$value);
}
- public function test_300() {
- $instance=new XoopsBlock();
+ public function test_300()
+ {
+ $instance = new XoopsBlock();
$value = $instance->weight();
$this->assertSame(0,$value);
}
- public function test_320() {
- $instance=new XoopsBlock();
+ public function test_320()
+ {
+ $instance = new XoopsBlock();
$value = $instance->visible();
$this->assertSame(0,$value);
}
- public function test_340() {
- $instance=new XoopsBlock();
+ public function test_340()
+ {
+ $instance = new XoopsBlock();
$value = $instance->block_type();
$this->assertSame(null,$value);
}
- public function test_360() {
- $instance=new XoopsBlock();
+ public function test_360()
+ {
+ $instance = new XoopsBlock();
$value = $instance->c_type();
$this->assertSame(null,$value);
}
- public function test_380() {
- $instance=new XoopsBlock();
+ public function test_380()
+ {
+ $instance = new XoopsBlock();
$value = $instance->isactive();
$this->assertSame(null,$value);
}
- public function test_400() {
- $instance=new XoopsBlock();
+ public function test_400()
+ {
+ $instance = new XoopsBlock();
$value = $instance->dirname();
$this->assertSame(null,$value);
}
@@ -134,38 +152,44 @@
$this->assertSame(null,$value);
}
- public function test_440() {
- $instance=new XoopsBlock();
+ public function test_440()
+ {
+ $instance = new XoopsBlock();
$value = $instance->show_func();
$this->assertSame(null,$value);
}
- public function test_460() {
- $instance=new XoopsBlock();
+ public function test_460()
+ {
+ $instance = new XoopsBlock();
$value = $instance->edit_func();
$this->assertSame(null,$value);
}
- public function test_480() {
- $instance=new XoopsBlock();
+ public function test_480()
+ {
+ $instance = new XoopsBlock();
$value = $instance->template();
$this->assertSame($value,null);
}
- public function test_500() {
- $instance=new XoopsBlock();
+ public function test_500()
+ {
+ $instance = new XoopsBlock();
$value = $instance->bcachetime();
$this->assertSame(0,$value);
}
- public function test_520() {
- $instance=new XoopsBlock();
+ public function test_520()
+ {
+ $instance = new XoopsBlock();
$value = $instance->last_modified();
$this->assertSame(0,$value);
}
- public function test_540() {
- $instance=new XoopsBlock();
+ public function test_540()
+ {
+ $instance = new XoopsBlock();
$value = $instance->getContent();
$this->assertSame('',$value);
$value = $instance->getContent('s','T');
@@ -176,36 +200,94 @@
$this->assertSame('',$value);
$value = $instance->getContent('s','S');
$this->assertSame('',$value);
+ $value = $instance->getContent('e');
+ $this->assertSame('',$value);
+ $value = $instance->getContent('default');
+ $this->assertSame(null,$value);
}
- public function test_560() {
- $instance=new XoopsBlock();
+ public function test_560()
+ {
+ $instance = new XoopsBlock();
$value = $instance->getOptions();
$this->assertSame(false,$value);
+
+ require_once XOOPS_ROOT_PATH.'\modules\page\locale\en_US\en_US.php';
+ require_once XOOPS_ROOT_PATH.'\modules\page\locale\en_US\locale.php';
- $instance->assignVar('block_type','C');
+ $instance->setVar('dirname', 'page');
+ $instance->setVar('func_file', 'page_blocks.php');
+ $instance->setVar('edit_func', 'page_blocks_edit');
+ $instance->setVar('options', 'a|b|c|d|e');
$value = $instance->getOptions();
- $this->assertSame(false,$value);
+ $this->assertTrue(isset($value['text']));
+
+ $instance->setVar('dirname', 'page');
+ $instance->setVar('func_file', 'page_blocks.php');
+ $instance->setVar('edit_func', 'function_not_exists');
+ $instance->setVar('options', 'a|b|c|d|e');
+ $value = $instance->getOptions();
+ $this->assertSame(false, $value);
+
+ $instance->setVar('dirname', 'page');
+ $instance->setVar('func_file', 'file_not_found.php');
+ $instance->setVar('edit_func', 'page_blocks_edit');
+ $instance->setVar('options', 'a|b|c|d|e');
+ $value = $instance->getOptions();
+ $this->assertSame(false, $value);
}
- public function test_580() {
- $instance=new XoopsBlock();
+ public function test_580()
+ {
+ $instance = new XoopsBlock();
$value = $instance->isCustom();
$this->assertFalse($value);
- $instance->assignVar('block_type','C');
+ $instance->setVar('block_type','C');
$value = $instance->isCustom();
$this->assertTrue($value);
- $instance->assignVar('block_type','E');
+ $instance->setVar('block_type','E');
$value = $instance->isCustom();
$this->assertTrue($value);
}
- public function test_600() {
- $instance=new XoopsBlock();
+ public function test_600()
+ {
+ $instance = new XoopsBlock();
$value = $instance->buildBlock();
$this->assertSame(false,$value);
+
+ $instance->setVar('block_type','');
+ $value = $instance->isCustom();
+ $this->assertFalse($value);
+ $value = $instance->buildBlock();
+ $this->assertSame(false,$value);
+
+ $instance->setVar('block_type','C');
+ $value = $instance->isCustom();
+ $this->assertTrue($value);
+
+ $instance->setVar('dirname', 'page');
+ $instance->setVar('func_file', 'page_blocks.php');
+ $instance->setVar('show_func', 'page_blocks_show');
+ $instance->setVar('options', 'a|b|c|d|e');
+ $value = $instance->buildBlock();
+ $this->assertSame(false, $value);
+
+ $instance->setVar('dirname', 'page');
+ $instance->setVar('func_file', 'page_blocks.php');
+ $instance->setVar('show_func', 'function_not_exists');
+ $instance->setVar('options', 'a|b|c|d|e');
+ $value = $instance->buildBlock();
+ $this->assertSame(false, $value);
+
+ $instance->setVar('dirname', 'page');
+ $instance->setVar('func_file', 'file_not_found.php');
+ $instance->setVar('show_func', 'page_blocks_show');
+ $instance->setVar('options', 'a|b|c|d|e');
+ $value = $instance->buildBlock();
+ $this->assertSame(false, $value);
}
}
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/ConfigcategoryHandlerTest.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/ConfigcategoryHandlerTest.php 2013-06-22 19:20:33 UTC (rev 11748)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/ConfigcategoryHandlerTest.php 2013-06-22 20:01:17 UTC (rev 11749)
@@ -9,7 +9,7 @@
}
public function test_100() {
- $instance=new $this->myclass();
+ $instance = new $this->myclass();
$this->assertInstanceOf($this->myclass,$instance);
$this->assertRegExp('/^.*configcategory$/',$instance->table);
$this->assertSame('XoopsConfigCategory',$instance->className);
@@ -22,5 +22,12 @@
$value=$instance->getCategoryObjects();
$this->assertTrue(is_array($value));
}
+
+ public function test_140() {
+ $instance = new $this->myclass();
+ $criteria = new Criteria('confcat_id');
+ $value=$instance->getCategoryObjects($criteria);
+ $this->assertTrue(is_array($value));
+ }
}
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/GrouppermHandlerTest.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/GrouppermHandlerTest.php 2013-06-22 19:20:33 UTC (rev 11748)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/GrouppermHandlerTest.php 2013-06-22 20:01:17 UTC (rev 11749)
@@ -22,6 +22,9 @@
$groupid=1;
$value=$instance->deleteByGroup($groupid);
$this->assertSame(1,$value);
+
+ $value=$instance->deleteByGroup($groupid,1);
+ $this->assertSame(0,$value);
}
public function test_140() {
@@ -29,6 +32,12 @@
$modid=1;
$value=$instance->deleteByModule($modid);
$this->assertSame(0,$value);
+
+ $value=$instance->deleteByModule($modid,'module');
+ $this->assertSame(0,$value);
+
+ $value=$instance->deleteByModule($modid,'module',1);
+ $this->assertSame(0,$value);
}
public function test_160() {
@@ -38,6 +47,15 @@
$groupid=1;
$value=$instance->checkRight($name,$itemid,$groupid);
$this->assertSame(true,$value);
+
+ $value=$instance->checkRight($name,$itemid,$groupid,1,false);
+ $this->assertSame(false,$value);
+
+ $value=$instance->checkRight($name,$itemid,array($groupid,$groupid,$groupid));
+ $this->assertSame(true,$value);
+
+ $value=$instance->checkRight($name,$itemid,array($groupid,$groupid,$groupid), 1 , false);;
+ $this->assertSame(false,$value);
}
public function test_180() {
@@ -55,6 +73,9 @@
$groupid=1;
$value=$instance->getItemIds($name,$groupid);
$this->assertTrue(is_array($value));
+
+ $value=$instance->getItemIds($name,array($groupid,$groupid,$groupid));
+ $this->assertTrue(is_array($value));
}
public function test_220() {
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/ObjectTest.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/ObjectTest.php 2013-06-22 19:20:33 UTC (rev 11748)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/ObjectTest.php 2013-06-22 20:01:17 UTC (rev 11749)
@@ -5,27 +5,147 @@
{
var $myclass='XoopsObject';
- public function SetUp() {
+ public function SetUp()
+ {
}
- public function test_120() {
- $instance=new $this->myclass();
- $value=$instance->isNew();
+ public function test_120()
+ {
+ $instance = new $this->myclass();
+ $value = $instance->isNew();
$this->assertSame(false,$value);
- $value=$instance->setNew();
+ $value = $instance->setNew();
$this->assertSame(null,$value);
- $value=$instance->unsetNew();
+ $value = $instance->unsetNew();
$this->assertSame(null,$value);
}
- public function test_140() {
- $instance=new $this->myclass();
- $value=$instance->isDirty();
+ public function test_140()
+ {
+ $instance = new $this->myclass();
+ $value = $instance->isDirty();
$this->assertSame(false,$value);
- $value=$instance->setDirty();
+ $value = $instance->setDirty();
$this->assertSame(null,$value);
- $value=$instance->unsetDirty();
+ $value = $instance->unsetDirty();
$this->assertSame(null,$value);
}
-
+
+ public function test_160()
+ {
+ $instance = new $this->myclass();
+ $instance->initVar('dummyVar', XOBJ_DTYPE_INT, 0);
+ $value = &$instance->vars['dummyVar'];
+ $this->assertSame(XOBJ_DTYPE_INT, $value['data_type']);
+ $this->assertSame(0, $value['value']);
+ $this->assertSame(false, $value['required']);
+ $this->assertSame(null, $value['maxlength']);
+ $this->assertSame(false, $value['changed']);
+ $this->assertSame('', $value['options']);
+
+ $instance->initVar('dummyVar', XOBJ_DTYPE_INT);
+ $this->assertSame(null, $value['value']);
+
+ $instance->initVar('dummyVar', XOBJ_DTYPE_INT, null, true);
+ $this->assertSame(null, $value['value']);
+ $this->assertSame(true, $value['required']);
+
+ $instance->initVar('dummyVar', XOBJ_DTYPE_INT, null, true, 10);
+ $this->assertSame(10, $value['maxlength']);
+ $this->assertSame(false, $value['changed']);
+
+ $instance->initVar('dummyVar', XOBJ_DTYPE_INT, null, false, null, 'options');
+ $this->assertSame('options', $value['options']);
+ $this->assertSame(false, $value['changed']);
+ }
+
+ public function test_180()
+ {
+ $instance = new $this->myclass();
+ $instance->initVar('dummyVar', XOBJ_DTYPE_INT, 0);
+ $value = &$instance->vars['dummyVar'];
+
+ $this->assertSame(0, $value['value']);
+ $instance->assignVar('dummyVar', 1);
+ $this->assertSame(1, $value['value']);
+ $instance->assignVar(null, 1);
+ $this->assertSame(1, $value['value']);
+ $instance->assignVar('dummyVar_not_found', null);
+ $this->assertTrue(!isset($instance->vars['dummyVar_not_found']));
+ }
+
+ public function test_200()
+ {
+ $instance = new $this->myclass();
+ $instance->initVar('dummyVar1', XOBJ_DTYPE_INT, 0);
+ $instance->initVar('dummyVar2', XOBJ_DTYPE_INT, 0);
+ $instance->initVar('dummyVar3', XOBJ_DTYPE_INT, 0);
+
+ $instance->assignVars(array(
+ 'dummyVar1' => 1,
+ 'dummyVar2' => 2,
+ 'dummyVar3' => 3
+ ));
+
+ $this->assertEquals(1, $instance->vars['dummyVar1']['value']);
+ $this->assertEquals(2, $instance->vars['dummyVar2']['value']);
+ $this->assertEquals(3, $instance->vars['dummyVar3']['value']);
+ }
+
+ public function test_220()
+ {
+ $instance = new $this->myclass();
+ $instance->initVar('dummyVar', XOBJ_DTYPE_INT, 0);
+ $value = &$instance->vars['dummyVar'];
+ $this->assertSame(0, $value['value']);
+
+ $instance->setVar('dummyVar', 1);
+ $this->assertSame(1, $value['value']);
+ $this->assertTrue($instance->isDirty());
+
+ $instance->setVar(null, 2);
+ $this->assertSame(1, $value['value']);
+
+ $instance->setVar('dummyVar', null);
+ $this->assertSame(1, $value['value']);
+
+ $instance->setVar('dummyVar', 3, true);
+ $this->assertSame(3, $value['value']);
+ $this->assertSame(true, $value['not_gpc']);
+
+ }
+
+ public function test_240()
+ {
+ $instance = new $this->myclass();
+ $instance->initVar('dummyVar1', XOBJ_DTYPE_INT, 0);
+ $instance->initVar('dummyVar2', XOBJ_DTYPE_INT, 0);
+ $instance->initVar('dummyVar3', XOBJ_DTYPE_INT, 0);
+
+ $instance->setVars(array(
+ 'dummyVar1' => 1,
+ 'dummyVar2' => 2,
+ 'dummyVar3' => 3
+ ));
+
+ $this->assertEquals(1, $instance->vars['dummyVar1']['value']);
+ $this->assertEquals(false, $instance->vars['dummyVar1']['not_gpc']);
+ $this->assertEquals(2, $instance->vars['dummyVar2']['value']);
+ $this->assertEquals(false, $instance->vars['dummyVar2']['not_gpc']);
+ $this->assertEquals(3, $instance->vars['dummyVar3']['value']);
+ $this->assertEquals(false, $instance->vars['dummyVar2']['not_gpc']);
+
+ $instance->setVars(array(
+ 'dummyVar1' => 11,
+ 'dummyVar2' => 22,
+ 'dummyVar3' => 33
+ ), true);
+
+ $this->assertEquals(11, $instance->vars['dummyVar1']['value']);
+ $this->assertEquals(true, $instance->vars['dummyVar1']['not_gpc']);
+ $this->assertEquals(22, $instance->vars['dummyVar2']['value']);
+ $this->assertEquals(true, $instance->vars['dummyVar2']['not_gpc']);
+ $this->assertEquals(33, $instance->vars['dummyVar3']['value']);
+ $this->assertEquals(true, $instance->vars['dummyVar2']['not_gpc']);
+ }
}
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/OnlineHandlerTest.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/OnlineHandlerTest.php 2013-06-22 19:20:33 UTC (rev 11748)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/OnlineHandlerTest.php 2013-06-22 20:01:17 UTC (rev 11749)
@@ -3,12 +3,15 @@
class OnlineHandlerTest extends MY_UnitTestCase
{
- var $myclass='XoopsOnlineHandler';
+ protected $myclass='XoopsOnlineHandler';
+ protected $myId = null;
- public function SetUp() {
+ public function SetUp()
+ {
}
- public function test_100() {
+ public function test_100()
+ {
$instance=new $this->myclass();
$this->assertInstanceOf($this->myclass,$instance);
$this->assertRegExp('/^.*online$/',$instance->table);
@@ -17,4 +20,31 @@
$this->assertSame('online_uname',$instance->identifierName);
}
+ public function test_200()
+ {
+ $instance=new $this->myclass();
+ $this->assertInstanceOf($this->myclass,$instance);
+
+ $this->myId = (int)(microtime(true)%10000000);
+ $value = $instance->write($this->myId, 'name', time(), 'module', 'localhost');
+ $this->assertSame(true, $value);
+ }
+
+ public function test_300()
+ {
+ $instance=new $this->myclass();
+ $this->assertInstanceOf($this->myclass,$instance);
+
+ $value = $instance->destroy($this->myId);
+ $this->assertSame(true, $value);
+ }
+
+ public function test_400()
+ {
+ $instance=new $this->myclass();
+ $this->assertInstanceOf($this->myclass,$instance);
+
+ $value = $instance->gc(time()+10);
+ $this->assertSame(false, $value);
+ }
}
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/RanksHandlerTest.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/RanksHandlerTest.php 2013-06-22 19:20:33 UTC (rev 11748)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/RanksHandlerTest.php 2013-06-22 20:01:17 UTC (rev 11749)
@@ -69,7 +69,7 @@
$db=XoopsDatabaseFactory::getDatabaseConnection();
$instance=new $this->myclass($db);
$value=$instance->deleteAll();
- $this->assertSame(0,$value);
+ $this->assertSame(1,$value);
}
public function test_260() {
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/SessionHandlerTest.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/SessionHandlerTest.php 2013-06-22 19:20:33 UTC (rev 11748)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/SessionHandlerTest.php 2013-06-22 20:01:17 UTC (rev 11749)
@@ -5,90 +5,102 @@
{
var $myclass='XoopsSessionHandler';
- public function SetUp() {
+ public function SetUp()
+ {
}
- public function test_100() {
- $db=XoopsDatabaseFactory::getDatabaseConnection();
- $instance=new $this->myclass($db);
+ public function test_100()
+ {
+ $db = XoopsDatabaseFactory::getDatabaseConnection();
+ $instance = new $this->myclass($db);
$this->assertInstanceOf($this->myclass,$instance);
}
- public function test_120() {
- $db=XoopsDatabaseFactory::getDatabaseConnection();
- $instance=new $this->myclass($db);
- $value=$instance->open('save_path','session_name');
+ public function test_120()
+ {
+ $db = XoopsDatabaseFactory::getDatabaseConnection();
+ $instance = new $this->myclass($db);
+ $value = $instance->open('save_path','session_name');
$this->assertSame(true,$value);
}
- public function test_140() {
- $db=XoopsDatabaseFactory::getDatabaseConnection();
- $instance=new $this->myclass($db);
- $value=$instance->close();
+ public function test_140()
+ {
+ $db = XoopsDatabaseFactory::getDatabaseConnection();
+ $instance = new $this->myclass($db);
+ $value = $instance->close();
$this->assertSame(true,$value);
}
- public function test_160() {
- $db=XoopsDatabaseFactory::getDatabaseConnection();
- $instance=new $this->myclass($db);
- $sess_id=1;
- $value=$instance->read($sess_id);
+ public function test_160()
+ {
+ $db = XoopsDatabaseFactory::getDatabaseConnection();
+ $instance = new $this->myclass($db);
+ $sess_id = 1;
+ $value = $instance->read($sess_id);
$this->assertSame('',$value);
}
- public function test_180() {
- $db=XoopsDatabaseFactory::getDatabaseConnection();
- $instance=new $this->myclass($db);
- $sess_id=1;
- $sess_data='data';
- $value=$instance->write($sess_id,$sess_data);
+ public function test_180()
+ {
+ $db = XoopsDatabaseFactory::getDatabaseConnection();
+ $instance = new $this->myclass($db);
+ $sess_id = 1;
+ $sess_data = 'data';
+ $value = $instance->write($sess_id,$sess_data);
$this->assertSame(true,$value);
}
- public function test_200() {
- $db=XoopsDatabaseFactory::getDatabaseConnection();
- $instance=new $this->myclass($db);
- $sess_id=1;
- $value=$instance->destroy($sess_id);
+ public function test_200()
+ {
+ $db = XoopsDatabaseFactory::getDatabaseConnection();
+ $instance = new $this->myclass($db);
+ $sess_id = 1;
+ $value = $instance->destroy($sess_id);
$this->assertSame(true,$value);
}
- public function test_220() {
- $db=XoopsDatabaseFactory::getDatabaseConnection();
- $instance=new $this->myclass($db);
- $expire=null;
- $value=$instance->gc($expire);
+ public function test_220()
+ {
+ $db = XoopsDatabaseFactory::getDatabaseConnection();
+ $instance = new $this->myclass($db);
+ $expire = null;
+ $value = $instance->gc($expire);
$this->assertSame(true,$value);
}
- public function test_230() {
- $db=XoopsDatabaseFactory::getDatabaseConnection();
- $instance=new $this->myclass($db);
- $expire=time()+10;
- $value=$instance->gc($expire);
+ public function test_230()
+ {
+ $db = XoopsDatabaseFactory::getDatabaseConnection();
+ $instance = new $this->myclass($db);
+ $expire = time()+10;
+ $value = $instance->gc($expire);
$this->assertSame(true,$value);
}
- public function test_240() {
- $db=XoopsDatabaseFactory::getDatabaseConnection();
- $instance=new $this->myclass($db);
- for ($i=1; $i<=20; $i++) {
+ public function test_240()
+ {
+ $db = XoopsDatabaseFactory::getDatabaseConnection();
+ $instance = new $this->myclass($db);
+ for ($i = 1; $i <= 20; $i++) {
$instance->gc_force();
}
$this->assertTrue(true);
}
- public function test_260() {
+ public function test_260()
+ {
$db=XoopsDatabaseFactory::getDatabaseConnection();
- $instance=new $this->myclass($db);
- $value=$instance->regenerate_id();
+ $instance = new $this->myclass($db);
+ $value = $instance->regenerate_id();
$this->assertSame(true,$value);
}
- public function test_280() {
+ public function test_280()
+ {
$db=XoopsDatabaseFactory::getDatabaseConnection();
- $instance=new $this->myclass($db);
- $value=$instance->update_cookie();
+ $instance = new $this->myclass($db);
+ $value = $instance->update_cookie();
$this->assertSame(null,$value);
}
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/TplfileHandlerTest.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/TplfileHandlerTest.php 2013-06-22 19:20:33 UTC (rev 11748)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/TplfileHandlerTest.php 2013-06-22 20:01:17 UTC (rev 11749)
@@ -5,11 +5,13 @@
{
var $myclass='XoopsTplfileHandler';
- public function SetUp() {
+ public function SetUp()
+ {
}
- public function test_100() {
- $instance=new $this->myclass();
+ public function test_100()
+ {
+ $instance = new $this->myclass();
$this->assertInstanceOf($this->myclass,$instance);
$this->assertRegExp('/^.*tplfile$/',$instance->table);
$this->assertSame('XoopsTplfile',$instance->className);
@@ -17,63 +19,115 @@
$this->assertSame('tpl_refid',$instance->identifierName);
}
- public function test_120() {
- $instance=new $this->myclass();
- $id=1;
- $value=$instance->getById($id);
+ public function test_120()
+ {
+ $instance = new $this->myclass();
+ $id = 1;
+ $value = $instance->getById($id);
$this->assertInstanceOf('XoopsTplfile',$value);
+
+ $value = $instance->getById($id, true);
+ $this->assertInstanceOf('XoopsTplfile',$value);
}
- public function test_140() {
- $instance=new $this->myclass();
- $source=new XoopsTplfile();
- $value=$instance->loadSource($source);
- $this->assertSame(false,$value);
+ public function test_140()
+ {
+ $instance = new $this->myclass();
+ $source = new XoopsTplfile();
+ $value = $instance->loadSource($source);
+ $this->assertSame(false, $value);
+
+ $source->setVar('tpl_id',1);
+ $value = $instance->loadSource($source);
+ $this->assertSame(true, $value);
+ $tmp = $source->tpl_source();
+ $this->assertTrue(!empty($tmp));
}
- public function test_160() {
- $instance=new $this->myclass();
- $source=new XoopsTplfile();
- $value=$instance->insertTpl($source);
+ public function test_160()
+ {
+ $instance = new $this->myclass();
+ $source = new XoopsTplfile();
+ $value = $instance->insertTpl($source);
$this->assertSame(true,$value);
}
- public function test_180() {
- $instance=new $this->myclass();
- $source=new XoopsTplfile();
- $value=$instance->forceUpdate($source);
+ public function test_180()
+ {
+ $instance = new $this->myclass();
+ $source = new XoopsTplfile();
+ $value = $instance->forceUpdate($source);
$this->assertSame(true,$value);
}
- public function test_200() {
- $instance=new $this->myclass();
- $source=new XoopsTplfile();
- $value=$instance->deleteTpl($source);
+ public function test_200()
+ {
+ $instance = new $this->myclass();
+ $source = new XoopsTplfile();
+ $value = $instance->deleteTpl($source);
$this->assertSame(true,$value);
}
- public function test_220() {
- $instance=new $this->myclass();
- $value=$instance->getTplObjects();
+ public function test_220()
+ {
+ $instance = new $this->myclass();
+ $value = $instance->getTplObjects();
$this->assertTrue(is_array($value));
+
+ $value = $instance->getTplObjects(null, true);
+ $this->assertTrue(is_array($value));
+
+ $value = $instance->getTplObjects(null, false, true);
+ $this->assertTrue(is_array($value));
+
+ $criteria = new Criteria('tpl_type', 'dummy');
+ $value = $instance->getTplObjects($criteria);
+ $this->assertTrue(is_array($value) AND empty($value));
}
- public function test_240() {
- $instance=new $this->myclass();
- $value=$instance->getModuleTplCount("toto");
- $this->assertTrue(is_array($value));
+ public function test_240()
+ {
+ $instance = new $this->myclass();
+ $value = $instance->getModuleTplCount('toto');
+ $this->assertTrue(empty($value));
+
+ $value = $instance->getModuleTplCount('default');
+ $this->assertTrue(is_array($value) AND count($value) > 0);
}
- public function test_260() {
- $instance=new $this->myclass();
- $value=$instance->find();
+ public function test_260()
+ {
+ $instance = new $this->myclass();
+ $value = $instance->find();
$this->assertTrue(is_array($value));
+
+ $value = $instance->find('tpl_set');
+ $this->assertTrue(is_array($value));
+
+ $value = $instance->find(null, null, null, 'module');
+ $this->assertTrue(is_array($value));
+
+ $value = $instance->find(null, null, 1);
+ $this->assertTrue(is_array($value));
+
+ $value = $instance->find(null, null, null, null, 'file');
+ $this->assertTrue(is_array($value));
+
+ $value = $instance->find(null, 1);
+ $this->assertTrue(is_array($value));
+
+ $value = $instance->find(null, array(1,2,3));
}
- public function test_280() {
- $instance=new $this->myclass();
- $value=$instance->templateExists('tpl_name','tpl_set');
+ public function test_280()
+ {
+ $instance = new $this->myclass();
+
+ $value = $instance->templateExists('dummy.html','dummy');
$this->assertSame(false, $value);
+
+ $value = $instance->templateExists('system_block_user.html','default');
+ $this->assertSame(true, $value);
}
}
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/TplsetHandlerTest.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/TplsetHandlerTest.php 2013-06-22 19:20:33 UTC (rev 11748)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/TplsetHandlerTest.php 2013-06-22 20:01:17 UTC (rev 11749)
@@ -5,11 +5,13 @@
{
var $myclass='XoopsTplsetHandler';
- public function SetUp() {
+ public function SetUp()
+ {
}
- public function test_100() {
- $instance=new $this->myclass();
+ public function test_100()
+ {
+ $instance = new $this->myclass();
$this->assertInstanceOf($this->myclass,$instance);
$this->assertRegExp('/^.*tplset$/',$instance->table);
$this->assertSame('XoopsTplset',$instance->className);
@@ -17,15 +19,17 @@
$this->assertSame('tplset_name',$instance->identifierName);
}
- public function test_120() {
- $instance=new $this->myclass();
- $value=$instance->getByname(1);
+ public function test_120()
+ {
+ $instance = new $this->myclass();
+ $value = $instance->getByname(1);
$this->assertSame(false,$value);
}
- public function test_140() {
- $instance=new $this->myclass();
- $value=$instance->getNameList();
+ public function test_140()
+ {
+ $instance = new $this->myclass();
+ $value = $instance->getNameList();
$this->assertTrue(is_array($value));
}
|
