|
From: <al...@us...> - 2013-06-25 19:47:46
|
Revision: 11783
http://sourceforge.net/p/xoops/svn/11783
Author: alain91
Date: 2013-06-25 19:47:44 +0000 (Tue, 25 Jun 2013)
Log Message:
-----------
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/xoops_lib/XoopsTest.php
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/xoops_lib.xml
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-25 19:24:11 UTC (rev 11782)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/xoops_lib/XoopsTest.php 2013-06-25 19:47:44 UTC (rev 11783)
@@ -1,9 +1,6 @@
<?php
require_once(dirname(__FILE__).'/../init_mini.php');
-require_once XOOPS_ROOT_PATH . '/locale/en_US/en_US.php';
-require_once XOOPS_ROOT_PATH . '/locale/en_US/locale.php';
-
class XoopsTest extends MY_UnitTestCase
{
@@ -19,6 +16,12 @@
$instance2=Xoops::getInstance();
$this->assertSame($instance, $instance2);
+ // First initialization in first test
+ if (!class_exists('Xoops_Locale',false)) {
+ $value = $instance->loadLocale();
+ $this->assertSame(true, $value);
+ }
+
$this->assertSame(array(XOOPS_PATH, XOOPS_URL . 'browse.php'), $instance->paths['XOOPS']);
$this->assertSame(array(XOOPS_ROOT_PATH, XOOPS_URL), $instance->paths['www']);
$this->assertSame(array(XOOPS_VAR_PATH, null), $instance->paths['var']);
@@ -111,15 +114,27 @@
$value = $instance->theme();
$this->assertSame($theme, $value);
-
- require_once XOOPS_ROOT_PATH . '/modules/system/themes/default/locale/en_US/en_US.php';
- require_once XOOPS_ROOT_PATH . '/modules/system/themes/default/locale/en_US/locale.php';
+
+ $instance->_theme = null;
$value = $instance->theme('default');
- $this->assertSame($theme, $value);
-
+ $this->assertInstanceOf('XoopsTheme', $value);
+
+ $value = $instance->loadLocale('system');
+ $this->assertSame(true, $value);
+
+ $value = $instance->loadLocale('system/themes/default');
+ $this->assertSame(true, $value);
+
+ require_once XOOPS_ROOT_PATH . '/modules/system/themes/default/locale/en_US/en_US.php';
+ require_once XOOPS_ROOT_PATH . '/modules/system/themes/default/locale/en_US/locale.php';
+
+ $instance->_theme = null;
$instance->isAdminSide = true;
$value = $instance->theme();
- $this->assertSame($theme, $value);
+ $this->assertInstanceOf('XoopsTheme', $value);
+
+ $value = $instance->theme('default');
+ $this->assertInstanceOf('XoopsTheme', $value);
}
public function test_800()
@@ -127,7 +142,7 @@
$instance=Xoops::getInstance();
$value = $instance->path('class');
- $this->assertTrue(basename($value));
+ $this->assertEquals('class', basename($value));
$this->assertEquals(XOOPS_ROOT_PATH, dirname($value));
}
@@ -161,11 +176,11 @@
$instance=Xoops::getInstance();
$this->expectError();
- $value = $instance->pathExists('',E_USER_WARNING);
+ $value = $instance->pathExists('', E_USER_WARNING);
$this->assertSame(false, $value);
- $value = $instance->pathExists('class',E_USER_WARNING);
- $this->assertSame(false, $value);
+ $value = $instance->pathExists(XOOPS_ROOT_PATH, E_USER_WARNING);
+ $this->assertEquals(XOOPS_ROOT_PATH, $value);
}
public function test_1200()
@@ -198,10 +213,10 @@
$path = 'path';
$value = $instance->getTplInfo($path);
- $this->assertSame('module', $value['type']);
+ $this->assertSame('admin', $value['type']);
$this->assertSame('system', $value['module']);
$this->assertSame('path', $value['file']);
- $this->assertSame('module:system|path', $value['tpl_name']);
+ $this->assertSame('admin:system|path', $value['tpl_name']);
}
public function test_1600()
@@ -210,6 +225,9 @@
$value = $instance->header();
$this->assertSame(true, $value);
+
+ $value = $instance->header();
+ $this->assertSame(false, $value);
}
public function test_1700()
@@ -417,7 +435,7 @@
$instance=Xoops::getInstance();
$value = $instance->getModuleHandler();
- $this->assertSame('', $value);
+ $this->assertSame(false, $value);
}
public function test_4300()
@@ -724,14 +742,18 @@
{
$instance=Xoops::getInstance();
- $value = $instance->setConfig('dummy');
+ $instance->setConfig('dummy', 1);
+ $value = $instance->getConfig('dummy');
+ $this->assertSame(1, $value);
}
public function test_7600()
{
$instance=Xoops::getInstance();
- $instance->appendConfig('dummy', array());
+ $instance->appendConfig('dummy', array('test'=>1), true);
+ $value = $instance->getConfig('dummy');
+ $this->assertSame(1, $value['test']);
}
public function test_7700()
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/xoops_lib.xml
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/xoops_lib.xml (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/xoops_lib.xml 2013-06-25 19:47:44 UTC (rev 11783)
@@ -0,0 +1,38 @@
+<phpunit
+ colors="false"
+ verbose="false"
+ stopOnError="false"
+ stopOnFailure="false"
+ stopOnIncomplete="false"
+ stopOnSkipped="false"
+ bootstrap="bootstrap.php"
+ >
+
+<testsuites>
+ <testsuite name="My Test Suite">
+ <directory>xoops_lib</directory>
+ </testsuite>
+</testsuites>
+
+<groups>
+ <exclude>
+ <group>slow</group>
+ </exclude>
+</groups>
+
+<filter>
+ <whitelist>
+ <directory suffix=".php">../htdocs/xoops_lib</directory>
+ <exclude>
+ <directory suffix=".php">../htdocs/xoops_lib/HTMLPurifier</directory>
+ <directory suffix=".php">../htdocs/xoops_lib/modules</directory>
+ <directory suffix=".php">../htdocs/xoops_lib/smarty</directory>
+ </exclude>
+ </whitelist>
+</filter>
+
+<logging>
+ <log type="coverage-html" target="xoops_lib-test-report" charset="UTF-8" yui="true" />
+</logging>
+
+</phpunit>
\ No newline at end of file
|