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

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

Revision: 11714
          http://sourceforge.net/p/xoops/svn/11714
Author:   alain91
Date:     2013-06-17 19:05:31 +0000 (Mon, 17 Jun 2013)
Log Message:
-----------
add tests
fix some bugs

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/ConfigoptionTest.php
    XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/phpunit.xml
    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/kernel/ConfigitemHandlerTest.php
    XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/ConfigitemTest.php

Added: XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/ConfigitemHandlerTest.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/ConfigitemHandlerTest.php	                        (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/ConfigitemHandlerTest.php	2013-06-17 19:05:31 UTC (rev 11714)
@@ -0,0 +1,20 @@
+<?php
+require_once(dirname(__FILE__).'/../init.php');
+
+class ConfigItemHandlerTest extends MY_UnitTestCase
+{
+    var $myclass='XoopsConfigItemHandler';
+    
+    public function SetUp() {
+    }
+    
+    public function test_100() {
+        $instance=new $this->myclass();
+        $this->assertInstanceOf($this->myclass, $instance);
+		$this->assertRegExp('/^.*config$/', $instance->table);
+		$this->assertSame('XoopsConfigItem', $instance->className);
+		$this->assertSame('conf_id', $instance->keyName);
+		$this->assertSame('conf_name', $instance->identifierName);
+    }
+    
+}
\ No newline at end of file

Added: XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/ConfigitemTest.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/ConfigitemTest.php	                        (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/ConfigitemTest.php	2013-06-17 19:05:31 UTC (rev 11714)
@@ -0,0 +1,93 @@
+<?php
+require_once(dirname(__FILE__).'/../init.php');
+
+class ConfigItemTest extends MY_UnitTestCase
+{
+    var $myclass='XoopsConfigItem';
+
+    public function SetUp() {
+    }
+
+    public function test_100() {
+        $instance=new $this->myclass();
+        $this->assertInstanceOf($this->myclass, $instance);
+		$value=$instance->getVars();
+		$this->assertTrue(isset($value['conf_id']));
+		$this->assertTrue(isset($value['conf_modid']));
+		$this->assertTrue(isset($value['conf_catid']));
+		$this->assertTrue(isset($value['conf_name']));
+		$this->assertTrue(isset($value['conf_title']));
+		$this->assertTrue(isset($value['conf_value']));
+		$this->assertTrue(isset($value['conf_desc']));
+		$this->assertTrue(isset($value['conf_formtype']));
+		$this->assertTrue(isset($value['conf_valuetype']));
+		$this->assertTrue(isset($value['conf_order']));
+    }
+
+    public function test_120() {
+        $instance=new $this->myclass();
+        $value = $instance->id();
+        $this->assertSame(null, $value);
+    }
+	
+    public function test_140() {
+        $instance=new $this->myclass();
+        $value = $instance->conf_id();
+        $this->assertSame(null, $value);
+    }
+	
+    public function test_160() {
+        $instance=new $this->myclass();
+        $value = $instance->conf_modid();
+        $this->assertSame(null, $value);
+    }
+	
+    public function test_180() {
+        $instance=new $this->myclass();
+        $value = $instance->conf_catid();
+        $this->assertSame(null, $value);
+    }
+	
+    public function test_200() {
+        $instance=new $this->myclass();
+        $value = $instance->conf_name();
+        $this->assertSame(null, $value);
+    }
+	
+    public function test_220() {
+        $instance=new $this->myclass();
+        $value = $instance->conf_title();
+        $this->assertSame(null, $value);
+    }
+	
+    public function test_240() {
+        $instance=new $this->myclass();
+        $value = $instance->conf_value();
+        $this->assertSame(null, $value);
+    }
+	
+    public function test_260() {
+        $instance=new $this->myclass();
+        $value = $instance->conf_desc();
+        $this->assertSame(null, $value);
+    }
+	
+    public function test_280() {
+        $instance=new $this->myclass();
+        $value = $instance->conf_formtype();
+        $this->assertSame(null, $value);
+    }
+	
+    public function test_300() {
+        $instance=new $this->myclass();
+        $value = $instance->conf_valuetype();
+        $this->assertSame(null, $value);
+    }
+	
+    public function test_320() {
+        $instance=new $this->myclass();
+        $value = $instance->conf_order();
+        $this->assertSame(null, $value);
+    }
+	
+}

Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/ConfigoptionTest.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/ConfigoptionTest.php	2013-06-17 17:21:19 UTC (rev 11713)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/ConfigoptionTest.php	2013-06-17 19:05:31 UTC (rev 11714)
@@ -41,5 +41,11 @@
         $value = $instance->conf_id();
         $this->assertSame(0,$value);
     }
+	
+    public function test_150() {
+        $instance=new $this->myclass();
+        $value = $instance->confop_value();
+        $this->assertSame(null,$value);
+    }
 
 }

Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/phpunit.xml
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/phpunit.xml	2013-06-17 17:21:19 UTC (rev 11713)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/phpunit.xml	2013-06-17 19:05:31 UTC (rev 11714)
@@ -12,6 +12,7 @@
  <testsuite name="My Test Suite">
 	<directory>class</directory>
 	<directory>kernel</directory>
+	<directory>xoops_lib</directory>
  </testsuite>
 </testsuites>
  
@@ -21,8 +22,10 @@
  </exclude>
 </groups>
  
+<!--
 <logging>
  <log type="coverage-html" target="test-reports" charset="UTF-8" yui="true" />
 </logging>
+-->
  
 </phpunit>
\ No newline at end of file

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-17 17:21:19 UTC (rev 11713)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/xoops_lib/XoopsTest.php	2013-06-17 19:05:31 UTC (rev 11714)
@@ -24,12 +24,12 @@
 		$this->assertSame(array(XOOPS_PATH, XOOPS_URL . 'browse.php'), $instance->paths['XOOPS']);
 		$this->assertSame(array(XOOPS_PATH, XOOPS_URL . 'browse.php'), $instance->paths['XOOPS']);
 		
-		$this->assertSame(null, $instance->sess_handler);
-		$this->assertSame(null, $instance->module);
+		$this->assertTrue(is_null($instance->sess_handler));
+		$this->assertTrue(is_null($instance->module));
 		$this->assertTrue(is_array($instance->config));
 		$this->assertTrue(is_array($instance->moduleConfig));
 		$this->assertTrue(is_string($instance->moduleDirname));
-		$this->assertInstanceOf('XoopsUser', $instance->user);
+		$this->assertTrue(is_string($instance->user) OR is_object($instance->user));
 		$this->assertTrue(is_bool($instance->userIsAdmin));
 		$this->assertTrue(is_null($instance->option) OR is_array($instance->option));	
 		$this->assertTrue(is_string($instance->tpl_name));