Author: ihabunek
Date: Tue Jan 11 07:50:49 2011
New Revision: 1057511
URL: http://svn.apache.org/viewvc?rev=1057511&view=rev
Log:
Replaced calls to deprecated PHPUnit method assertTypeOf() with
assertInternalType() and assertInstanceOf().
Modified:
logging/log4php/trunk/src/changes/changes.xml
logging/log4php/trunk/src/test/php/LoggerLoggingEventTest.php
logging/log4php/trunk/src/test/php/LoggerThrowableInformationTest.php
logging/log4php/trunk/src/test/php/configurators/LoggerConfiguratorBasicTest.php
logging/log4php/trunk/src/test/php/renderers/LoggerRendererObjectTest.php
Modified: logging/log4php/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/changes/changes.xml?rev=1057511&r1=1057510&r2=1057511&view=diff
==============================================================================
--- logging/log4php/trunk/src/changes/changes.xml (original)
+++ logging/log4php/trunk/src/changes/changes.xml Tue Jan 11 07:50:49 2011
@@ -24,6 +24,7 @@
</properties>
<body>
<release version="2.1" description="Stabilizing">
+ <action type="fix" by="Ivan Habunek">Replaced calls to
deprecated PHPUnit method assertTypeOf() with assertInternalType() and
assertInstanceOf().</action>
<action type="fix" issue="LOG4PHP-104" by="Ivan
Habunek">Refactored LoggerNDC and added tests</action>
<action type="fix" issue="LOG4PHP-105" by="Ivan
Habunek">LoggerMDC needs refactoring + tests</action>
<action type="update" by="Ivan Habunek">Added __toString magic
method to LoggerLevel.</action>
Modified: logging/log4php/trunk/src/test/php/LoggerLoggingEventTest.php
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/LoggerLoggingEventTest.php?rev=1057511&r1=1057510&r2=1057511&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/LoggerLoggingEventTest.php (original)
+++ logging/log4php/trunk/src/test/php/LoggerLoggingEventTest.php Tue Jan 11
07:50:49 2011
@@ -65,7 +65,7 @@ class LoggerLoggingEventTest extends PHP
public function testGetStartTime() {
$time = LoggerLoggingEvent :: getStartTime();
- self::assertType('float', $time);
+ self::assertInternalType('float', $time);
$time2 = LoggerLoggingEvent :: getStartTime();
self::assertEquals($time, $time2);
}
@@ -127,6 +127,6 @@ class LoggerLoggingEventTest extends PHP
self::assertTrue($ti instanceof LoggerThrowableInformation);
$result = $ti->getStringRepresentation();
- self::assertType('array', $result);
+ self::assertInternalType('array', $result);
}
}
Modified: logging/log4php/trunk/src/test/php/LoggerThrowableInformationTest.php
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/LoggerThrowableInformationTest.php?rev=1057511&r1=1057510&r2=1057511&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/LoggerThrowableInformationTest.php
(original)
+++ logging/log4php/trunk/src/test/php/LoggerThrowableInformationTest.php Tue
Jan 11 07:50:49 2011
@@ -39,7 +39,7 @@ class LoggerThrowableInformationTest ext
$tInfo = new LoggerThrowableInformation($ex);
$result = $tInfo->getStringRepresentation();
- $this->assertType('array', $result);
+ $this->assertInternalType('array', $result);
}
public function testExceptionChain() {
@@ -49,7 +49,7 @@ class LoggerThrowableInformationTest ext
$tInfo = new LoggerThrowableInformation($ex3);
$result = $tInfo->getStringRepresentation();
- $this->assertType('array', $result);
+ $this->assertInternalType('array', $result);
}
public function testGetThrowable() {
Modified:
logging/log4php/trunk/src/test/php/configurators/LoggerConfiguratorBasicTest.php
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/configurators/LoggerConfiguratorBasicTest.php?rev=1057511&r1=1057510&r2=1057511&view=diff
==============================================================================
---
logging/log4php/trunk/src/test/php/configurators/LoggerConfiguratorBasicTest.php
(original)
+++
logging/log4php/trunk/src/test/php/configurators/LoggerConfiguratorBasicTest.php
Tue Jan 11 07:50:49 2011
@@ -35,9 +35,9 @@ class LoggerConfiguratorBasicTest extend
public function testConfigure() {
$root = Logger::getRootLogger();
$appender = $root->getAppender('A1');
- self::assertType('LoggerAppenderConsole', $appender);
+ self::assertInstanceOf('LoggerAppenderConsole', $appender);
$layout = $appender->getLayout();
- self::assertType('LoggerLayoutTTCC', $layout);
+ self::assertInstanceOf('LoggerLayoutTTCC', $layout);
$event = new LoggerLoggingEvent('LoggerAppenderConsoleTest',
new
Logger('mycategory'),
@@ -56,9 +56,9 @@ class LoggerConfiguratorBasicTest extend
public function testResetConfiguration() {
$root = Logger::getRootLogger();
$appender = $root->getAppender('A1');
- self::assertType('LoggerAppenderConsole', $appender);
+ self::assertInstanceOf('LoggerAppenderConsole', $appender);
$layout = $appender->getLayout();
- self::assertType('LoggerLayoutTTCC', $layout);
+ self::assertInstanceOf('LoggerLayoutTTCC', $layout);
// As PHPUnit runs all tests in one run, there might be some
loggers left over
// from previous runs. ResetConfiguration() only clears the
appenders, it does
Modified:
logging/log4php/trunk/src/test/php/renderers/LoggerRendererObjectTest.php
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/renderers/LoggerRendererObjectTest.php?rev=1057511&r1=1057510&r2=1057511&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/renderers/LoggerRendererObjectTest.php
(original)
+++ logging/log4php/trunk/src/test/php/renderers/LoggerRendererObjectTest.php
Tue Jan 11 07:50:49 2011
@@ -27,7 +27,7 @@ class LoggerRendererObjectTest extends P
public function testFactory() {
$renderer =
LoggerReflectionUtils::createObject('LoggerRendererDefault');
- self::assertType('LoggerRendererDefault', $renderer);
+ self::assertInstanceOf('LoggerRendererDefault', $renderer);
}
}
