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

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

Revision: 11694
          http://sourceforge.net/p/xoops/svn/11694
Author:   alain91
Date:     2013-06-16 09:41:36 +0000 (Sun, 16 Jun 2013)
Log Message:
-----------
adapt tests to phpunit only

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/class/ModuleMytextsanitizerTest.php
    XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/class/TemplateTest.php
    XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/TplfileHandlerTest.php

Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/class/ModuleMytextsanitizerTest.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/class/ModuleMytextsanitizerTest.php	2013-06-16 09:40:56 UTC (rev 11693)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/class/ModuleMytextsanitizerTest.php	2013-06-16 09:41:36 UTC (rev 11694)
@@ -307,6 +307,9 @@
 		$this->markTestSkipped('');
     }
     
+	/**
+	* @expectedException PHPUnit_Framework_Error
+	*/
     public function test_620() {
         $sanitizer = MyTextSanitizer::getInstance();
         $text = 'toto titi tutu tata';

Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/class/TemplateTest.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/class/TemplateTest.php	2013-06-16 09:40:56 UTC (rev 11693)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/class/TemplateTest.php	2013-06-16 09:41:36 UTC (rev 11694)
@@ -29,7 +29,7 @@
 	
     public function test_120() {
 		$object = new $this->myclass();
-		$this->assertIsA($object, $this->myclass);
+		$this->assertInstanceOf($this->myclass, $object);
 		$value = $object->fetchFromData('toto');
 		$this->assertSame('toto', $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-16 09:40:56 UTC (rev 11693)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/kernel/TplfileHandlerTest.php	2013-06-16 09:41:36 UTC (rev 11694)
@@ -73,7 +73,7 @@
     public function test_280() {
         $instance=new $this->myclass();
         $value=$instance->templateExists('tpl_name','tpl_set');
-        $this->assertIdentical($value,false);
+        $this->assertSame(false, $value);
     }
 
 }
\ No newline at end of file