incubator-zeta-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sebast...@apache.org
Subject [zeta-commits] svn commit: r1050593 - in /incubator/zetacomponents/trunk: Archive/tests/ Base/tests/ Cache/tests/ ConsoleTools/tests/ Debug/tests/ Document/tests/odt/ ImageConversion/tests/ Mail/tests/ Mail/tests/parser/ PersistentObject/tests/persistent_session/ Per...
Date Sat, 18 Dec 2010 07:35:30 GMT
Author: sebastian
Date: Sat Dec 18 07:35:28 2010
New Revision: 1050593

URL: http://svn.apache.org/viewvc?rev=1050593&view=rev
Log:
- Use assertInstanceOf() instead of assertType().

Modified:
    incubator/zetacomponents/trunk/Archive/tests/archive_options_test.php
    incubator/zetacomponents/trunk/Base/tests/metadata_pear_test.php
    incubator/zetacomponents/trunk/Cache/tests/storage_memcache_plain_test.php
    incubator/zetacomponents/trunk/ConsoleTools/tests/dialog_options_test.php
    incubator/zetacomponents/trunk/ConsoleTools/tests/menu_dialog_options_test.php
    incubator/zetacomponents/trunk/ConsoleTools/tests/question_dialog_options_test.php
    incubator/zetacomponents/trunk/ConsoleTools/tests/question_dialog_test.php
    incubator/zetacomponents/trunk/ConsoleTools/tests/table_row_test.php
    incubator/zetacomponents/trunk/Debug/tests/debug_test.php
    incubator/zetacomponents/trunk/Document/tests/odt/style_extractor_test.php
    incubator/zetacomponents/trunk/Document/tests/odt/style_parser_test.php
    incubator/zetacomponents/trunk/ImageConversion/tests/converter_test.php
    incubator/zetacomponents/trunk/Mail/tests/parser/parser_test.php
    incubator/zetacomponents/trunk/Mail/tests/tools_test.php
    incubator/zetacomponents/trunk/PersistentObject/tests/persistent_session/load_test.php
    incubator/zetacomponents/trunk/PersistentObject/tests/persistent_session/save_test.php
    incubator/zetacomponents/trunk/PersistentObject/tests/persistent_session_identity_decorator/save_test.php
    incubator/zetacomponents/trunk/Reflection/tests/annotation_factory_test.php
    incubator/zetacomponents/trunk/Reflection/tests/class_test.php
    incubator/zetacomponents/trunk/Reflection/tests/extension_test.php
    incubator/zetacomponents/trunk/Reflection/tests/function_test.php
    incubator/zetacomponents/trunk/Reflection/tests/method_test.php
    incubator/zetacomponents/trunk/Reflection/tests/mixed_type_test.php
    incubator/zetacomponents/trunk/Reflection/tests/parameter_test.php
    incubator/zetacomponents/trunk/Reflection/tests/parser_test.php
    incubator/zetacomponents/trunk/Reflection/tests/property_test.php
    incubator/zetacomponents/trunk/Reflection/tests/reflection_test.php
    incubator/zetacomponents/trunk/Reflection/tests/test_helper.php
    incubator/zetacomponents/trunk/Reflection/tests/type_factory_test.php
    incubator/zetacomponents/trunk/Search/tests/handlers/solr_test.php
    incubator/zetacomponents/trunk/TemplateTranslationTiein/tests/configuration.php
    incubator/zetacomponents/trunk/Tree/tests/memory_tree.php
    incubator/zetacomponents/trunk/Tree/tests/tree.php
    incubator/zetacomponents/trunk/Tree/tests/xml_tree.php
    incubator/zetacomponents/trunk/TreeDatabaseTiein/tests/db_tree.php
    incubator/zetacomponents/trunk/TreePersistentObjectTiein/tests/po_store.php
    incubator/zetacomponents/trunk/Webdav/tests/backend_simple_test.php
    incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/001_lock_resource_success_assertions.php
    incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/002_lock_collection_success_assertions.php
    incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/003_lock_null_resource_success_assertions.php
    incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/004_lock_null_collection_success_assertions.php
    incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/005_lock_resource_failure_locked_assertions.php
    incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/006_lock_collection_failure_locked_assertions.php
    incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/007_lock_collection_failure_deep_locked_assertions.php
    incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/008_unlock_resource_success_assertions.php
    incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/009_unlock_collection_success_assertions.php
    incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/010_unlock_collection_deep_success_assertions.php
    incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/011_unlock_lock_purged_success_assertions.php
    incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/012_unlock_locknull_remove_success_assertions.php
    incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/013_unlock_wrong_token_success_assertions.php
    incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/014_move_resource_both_locked_success_assertions.php
    incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/020_copy_resource_both_locked_success_assertions.php
    incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/021_copy_resource_destination_not_locked_success_assertions.php
    incubator/zetacomponents/trunk/Workflow/tests/condition_test.php
    incubator/zetacomponents/trunk/Workflow/tests/node_test.php

Modified: incubator/zetacomponents/trunk/Archive/tests/archive_options_test.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/Archive/tests/archive_options_test.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/Archive/tests/archive_options_test.php (original)
+++ incubator/zetacomponents/trunk/Archive/tests/archive_options_test.php Sat Dec 18 07:35:28 2010
@@ -64,7 +64,7 @@ class ezcArchiveOptionsTest extends ezcT
         self::assertNull( $options->extractCallback );
 
         $options->extractCallback = new testExtractCallback;
-        self::assertType( 'ezcArchiveCallback', $options->extractCallback );
+        self::assertInstanceOf( 'ezcArchiveCallback', $options->extractCallback );
     }
 
     public function testCallbackWrong()

Modified: incubator/zetacomponents/trunk/Base/tests/metadata_pear_test.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/Base/tests/metadata_pear_test.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/Base/tests/metadata_pear_test.php (original)
+++ incubator/zetacomponents/trunk/Base/tests/metadata_pear_test.php Sat Dec 18 07:35:28 2010
@@ -32,8 +32,8 @@ class ezcBaseMetaDataPearTest extends ez
     public static function testConstruct()
     {
         $r = new ezcBaseMetaData( 'pear' );
-        self::assertType( 'ezcBaseMetaData', $r );
-        self::assertType( 'ezcBaseMetaDataPearReader', self::readAttribute( $r, 'reader' ) );
+        self::assertInstanceOf( 'ezcBaseMetaData', $r );
+        self::assertInstanceOf( 'ezcBaseMetaDataPearReader', self::readAttribute( $r, 'reader' ) );
     }
 
     public static function testGetBundleVersion()

Modified: incubator/zetacomponents/trunk/Cache/tests/storage_memcache_plain_test.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/Cache/tests/storage_memcache_plain_test.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/Cache/tests/storage_memcache_plain_test.php (original)
+++ incubator/zetacomponents/trunk/Cache/tests/storage_memcache_plain_test.php Sat Dec 18 07:35:28 2010
@@ -396,7 +396,7 @@ class ezcCacheStorageMemcachePlainTest e
         $storage->reset();
 
         $this->assertTrue( isset( $storage->options ) );
-        $this->assertType(
+        $this->assertInstanceOf(
             'ezcCacheStorageMemcacheOptions',
             $storage->options
         );

Modified: incubator/zetacomponents/trunk/ConsoleTools/tests/dialog_options_test.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/ConsoleTools/tests/dialog_options_test.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/ConsoleTools/tests/dialog_options_test.php (original)
+++ incubator/zetacomponents/trunk/ConsoleTools/tests/dialog_options_test.php Sat Dec 18 07:35:28 2010
@@ -53,7 +53,7 @@ class ezcConsoleDialogOptionsTest extend
                 "format"            => "test",
             )
         );
-        $this->assertType( "ezcConsoleQuestionDialogCollectionValidator", $opts->validator );
+        $this->assertInstanceOf( "ezcConsoleQuestionDialogCollectionValidator", $opts->validator );
         $this->assertEquals( "test", $opts->format );
     }
 
@@ -78,7 +78,7 @@ class ezcConsoleDialogOptionsTest extend
         $opts->validator   = new ezcConsoleQuestionDialogCollectionValidator( array( "a", "b" ) );
         $opts->format      = "test";
         
-        $this->assertType( "ezcConsoleQuestionDialogCollectionValidator", $opts->validator );
+        $this->assertInstanceOf( "ezcConsoleQuestionDialogCollectionValidator", $opts->validator );
         $this->assertEquals( "test", $opts->format );
     }
 

Modified: incubator/zetacomponents/trunk/ConsoleTools/tests/menu_dialog_options_test.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/ConsoleTools/tests/menu_dialog_options_test.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/ConsoleTools/tests/menu_dialog_options_test.php (original)
+++ incubator/zetacomponents/trunk/ConsoleTools/tests/menu_dialog_options_test.php Sat Dec 18 07:35:28 2010
@@ -44,7 +44,7 @@ class ezcConsoleMenuDialogOptionsTest ex
         $this->assertEquals( "Please choose an item.", $opts->text );
         $this->assertEquals( "%3s) %s\n", $opts->formatString );
         $this->assertEquals( "Select: ", $opts->selectText );
-        $this->assertType( "ezcConsoleMenuDialogDefaultValidator", $opts->validator );
+        $this->assertInstanceOf( "ezcConsoleMenuDialogDefaultValidator", $opts->validator );
         $this->assertEquals( "default", $opts->format );
     }
 
@@ -67,7 +67,7 @@ class ezcConsoleMenuDialogOptionsTest ex
         );
         $this->assertEquals( "Please select a fitting mode:\n", $opts->text );
         $this->assertEquals( "%10s] %s\n", $opts->formatString );
-        $this->assertType( "ezcConsoleMenuDialogDefaultValidator", $opts->validator );
+        $this->assertInstanceOf( "ezcConsoleMenuDialogDefaultValidator", $opts->validator );
         $this->assertEquals( $menuElements, $opts->validator->elements );
         $this->assertEquals( "Select a mode: ", $opts->selectText );
         $this->assertEquals( "test", $opts->format );
@@ -103,7 +103,7 @@ class ezcConsoleMenuDialogOptionsTest ex
         
         $this->assertEquals( "Please select a fitting mode:\n", $opts->text );
         $this->assertEquals( "%10s] %s\n", $opts->formatString );
-        $this->assertType( "ezcConsoleMenuDialogDefaultValidator", $opts->validator );
+        $this->assertInstanceOf( "ezcConsoleMenuDialogDefaultValidator", $opts->validator );
         $this->assertEquals( $menuElements, $opts->validator->elements );
         $this->assertEquals( "Select a mode: ", $opts->selectText );
         $this->assertEquals( "test", $opts->format );

Modified: incubator/zetacomponents/trunk/ConsoleTools/tests/question_dialog_options_test.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/ConsoleTools/tests/question_dialog_options_test.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/ConsoleTools/tests/question_dialog_options_test.php (original)
+++ incubator/zetacomponents/trunk/ConsoleTools/tests/question_dialog_options_test.php Sat Dec 18 07:35:28 2010
@@ -42,7 +42,7 @@ class ezcConsoleQuestionDialogOptionsTes
     {
         $opts = new ezcConsoleQuestionDialogOptions();
         $this->assertEquals( "Please enter a value: ", $opts->text );
-        $this->assertType( "ezcConsoleQuestionDialogTypeValidator", $opts->validator );
+        $this->assertInstanceOf( "ezcConsoleQuestionDialogTypeValidator", $opts->validator );
         $this->assertFalse( $opts->showResults );
         $this->assertEquals( "default", $opts->format );
     }
@@ -58,7 +58,7 @@ class ezcConsoleQuestionDialogOptionsTes
             )
         );
         $this->assertEquals( "Do you have a question?", $opts->text );
-        $this->assertType( "ezcConsoleQuestionDialogCollectionValidator", $opts->validator );
+        $this->assertInstanceOf( "ezcConsoleQuestionDialogCollectionValidator", $opts->validator );
         $this->assertTrue( $opts->showResults );
         $this->assertEquals( "test", $opts->format );
     }
@@ -87,7 +87,7 @@ class ezcConsoleQuestionDialogOptionsTes
         $opts->format      = "test";
         
         $this->assertEquals( "Do you have a question?", $opts->text );
-        $this->assertType( "ezcConsoleQuestionDialogCollectionValidator", $opts->validator );
+        $this->assertInstanceOf( "ezcConsoleQuestionDialogCollectionValidator", $opts->validator );
         $this->assertTrue( $opts->showResults );
         $this->assertEquals( "test", $opts->format );
     }

Modified: incubator/zetacomponents/trunk/ConsoleTools/tests/question_dialog_test.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/ConsoleTools/tests/question_dialog_test.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/ConsoleTools/tests/question_dialog_test.php (original)
+++ incubator/zetacomponents/trunk/ConsoleTools/tests/question_dialog_test.php Sat Dec 18 07:35:28 2010
@@ -174,10 +174,10 @@ class ezcConsoleQuestionDialogTest exten
         $output = new ezcConsoleOutput();
         $dialog  = ezcConsoleQuestionDialog::YesNoQuestion( $output, "Is Jean-Luc a borg?", "y" );
 
-        $this->assertType( "ezcConsoleQuestionDialogOptions", $dialog->options );
+        $this->assertInstanceOf( "ezcConsoleQuestionDialogOptions", $dialog->options );
         $this->assertEquals( "Is Jean-Luc a borg?", $dialog->options->text );
         $this->assertTrue( $dialog->options->showResults );
-        $this->assertType( "ezcConsoleQuestionDialogCollectionValidator", $dialog->options->validator );
+        $this->assertInstanceOf( "ezcConsoleQuestionDialogCollectionValidator", $dialog->options->validator );
         $this->assertEquals( array( "y", "n" ), $dialog->options->validator->collection );
         $this->assertEquals( "y", $dialog->options->validator->default );
         $this->assertEquals( ezcConsoleQuestionDialogCollectionValidator::CONVERT_LOWER, $dialog->options->validator->conversion );

Modified: incubator/zetacomponents/trunk/ConsoleTools/tests/table_row_test.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/ConsoleTools/tests/table_row_test.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/ConsoleTools/tests/table_row_test.php (original)
+++ incubator/zetacomponents/trunk/ConsoleTools/tests/table_row_test.php Sat Dec 18 07:35:28 2010
@@ -375,9 +375,9 @@ class ezcConsoleTableRowTest extends ezc
     public function testOffsetGetSuccess()
     {
         $row = new ezcConsoleTableRow( new ezcConsoleTableCell(), new ezcConsoleTableCell(), new ezcConsoleTableCell() );
-        $this->assertType( "ezcConsoleTableCell", $row[0] );
-        $this->assertType( "ezcConsoleTableCell", $row[1] );
-        $this->assertType( "ezcConsoleTableCell", $row[2] );
+        $this->assertInstanceOf( "ezcConsoleTableCell", $row[0] );
+        $this->assertInstanceOf( "ezcConsoleTableCell", $row[1] );
+        $this->assertInstanceOf( "ezcConsoleTableCell", $row[2] );
     }
     
     public function testOffsetGetFailure()

Modified: incubator/zetacomponents/trunk/Debug/tests/debug_test.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/Debug/tests/debug_test.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/Debug/tests/debug_test.php (original)
+++ incubator/zetacomponents/trunk/Debug/tests/debug_test.php Sat Dec 18 07:35:28 2010
@@ -224,7 +224,7 @@ class ezcDebugTest extends ezcTestCase
 
         $struct = $dbg->generateOutput();
 
-        $this->assertType(
+        $this->assertInstanceOf(
             'ezcDebugStacktraceIterator',
             $struct[0][0]->stackTrace
         );

Modified: incubator/zetacomponents/trunk/Document/tests/odt/style_extractor_test.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/Document/tests/odt/style_extractor_test.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/Document/tests/odt/style_extractor_test.php (original)
+++ incubator/zetacomponents/trunk/Document/tests/odt/style_extractor_test.php Sat Dec 18 07:35:28 2010
@@ -56,7 +56,7 @@ class ezcDocumentOdtStyleExtractorTest e
             $extr
         );
 
-        $this->assertType(
+        $this->assertInstanceOf(
             'DOMXpath',
             $this->readAttribute( $extr, 'xpath' )
         );
@@ -68,7 +68,7 @@ class ezcDocumentOdtStyleExtractorTest e
 
         $style = $extr->extractStyle( 'paragraph', 'Text_20_body' );
 
-        $this->assertType(
+        $this->assertInstanceOf(
             'DOMElement',
             $style
         );
@@ -91,7 +91,7 @@ class ezcDocumentOdtStyleExtractorTest e
 
         $style = $extr->extractStyle( 'paragraph' );
 
-        $this->assertType(
+        $this->assertInstanceOf(
             'DOMElement',
             $style
         );

Modified: incubator/zetacomponents/trunk/Document/tests/odt/style_parser_test.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/Document/tests/odt/style_parser_test.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/Document/tests/odt/style_parser_test.php (original)
+++ incubator/zetacomponents/trunk/Document/tests/odt/style_parser_test.php Sat Dec 18 07:35:28 2010
@@ -65,7 +65,7 @@ class ezcDocumentOdtStyleParserTest exte
 
         $style = $this->parser->parseStyle( $dom, $family, $name );
 
-        $this->assertType(
+        $this->assertInstanceOf(
             'ezcDocumentOdtStyle',
             $style
         );
@@ -112,7 +112,7 @@ class ezcDocumentOdtStyleParserTest exte
             10,
             count( $style->listLevels )
         );
-        $this->assertType(
+        $this->assertInstanceOf(
             'ezcDocumentOdtListLevelStyleNumber',
             $style->listLevels[1]
         );
@@ -139,7 +139,7 @@ class ezcDocumentOdtStyleParserTest exte
             10,
             count( $style->listLevels )
         );
-        $this->assertType(
+        $this->assertInstanceOf(
             'ezcDocumentOdtListLevelStyleBullet',
             $style->listLevels[1]
         );

Modified: incubator/zetacomponents/trunk/ImageConversion/tests/converter_test.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/ImageConversion/tests/converter_test.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/ImageConversion/tests/converter_test.php (original)
+++ incubator/zetacomponents/trunk/ImageConversion/tests/converter_test.php Sat Dec 18 07:35:28 2010
@@ -99,7 +99,7 @@ class ezcImageConversionConverterTest ex
         $handlers = $this->readAttribute( $converter, "handlers" );
         $settings = $this->readAttribute( $converter, "settings" );
 
-        $this->assertType(
+        $this->assertInstanceOf(
             "ezcImageGdHandler",
             $handlers["GD"],
             "Handler <GD> is not an instance of ezcImageGdHandler."
@@ -207,7 +207,7 @@ class ezcImageConversionConverterTest ex
     public function testCreateTransformation()
     {
         $transformation = $this->converter->createTransformation( "thumbnail", array(), array() );
-        $this->assertType(
+        $this->assertInstanceOf(
             "ezcImageTransformation",
             $transformation,
             "Converter does not return created transformation."
@@ -458,7 +458,7 @@ class ezcImageConversionConverterTest ex
 
     public function testGetHandlerSuccessNoFilterNoInNoOut()
     {
-        $this->assertType(
+        $this->assertInstanceOf(
             "ezcImageHandler",
             $this->converter->getHandler(),
             "Returned object is not an ezcImageHandler."
@@ -467,7 +467,7 @@ class ezcImageConversionConverterTest ex
 
     public function testGetHandlerSuccessFilterNoInNoOut()
     {
-        $this->assertType(
+        $this->assertInstanceOf(
             "ezcImageHandler",
             $this->converter->getHandler( "scale" ),
             "Returned object is not an ezcImageHandler."
@@ -476,7 +476,7 @@ class ezcImageConversionConverterTest ex
 
     public function testGetHandlerSuccessNoFilterInNoOut()
     {
-        $this->assertType(
+        $this->assertInstanceOf(
             "ezcImageHandler",
             $this->converter->getHandler( null, "image/jpeg" ),
             "Returned object is not an ezcImageHandler."
@@ -485,7 +485,7 @@ class ezcImageConversionConverterTest ex
 
     public function testGetHandlerSuccessNoFilterNoInOut()
     {
-        $this->assertType(
+        $this->assertInstanceOf(
             "ezcImageHandler",
             $this->converter->getHandler( null, null, "image/jpeg" ),
             "Returned object is not an ezcImageHandler."
@@ -494,7 +494,7 @@ class ezcImageConversionConverterTest ex
 
     public function testGetHandlerSuccessFilterInOut()
     {
-        $this->assertType(
+        $this->assertInstanceOf(
             "ezcImageHandler",
             $this->converter->getHandler( "scale", "image/jpeg", "image/jpeg" ),
             "Returned object is not an ezcImageHandler."

Modified: incubator/zetacomponents/trunk/Mail/tests/parser/parser_test.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/Mail/tests/parser/parser_test.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/Mail/tests/parser/parser_test.php (original)
+++ incubator/zetacomponents/trunk/Mail/tests/parser/parser_test.php Sat Dec 18 07:35:28 2010
@@ -861,7 +861,7 @@ END;
         $mail = $parser->parseMail( $set, "ExtendedMail" );
         foreach ( $set as $mail )
         {
-            $this->assertType(
+            $this->assertInstanceOf(
                 "ExtendedMail",
                 $mail,
                 "Parser did not create instance of extended mail class."
@@ -875,7 +875,7 @@ END;
         $parser = new ezcMailParser();
         $set = new SingleFileSet( 'kmail/simple_mail_with_text_subject_and_body.mail' );
         $mail = $parser->parseMail( $set );
-        $this->assertType(
+        $this->assertInstanceOf(
             "ezcMailHeadersHolder",
             $mail[0]->headers
         );

Modified: incubator/zetacomponents/trunk/Mail/tests/tools_test.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/Mail/tests/tools_test.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/Mail/tests/tools_test.php (original)
+++ incubator/zetacomponents/trunk/Mail/tests/tools_test.php Sat Dec 18 07:35:28 2010
@@ -380,7 +380,7 @@ class ezcMailToolsTest extends ezcTestCa
             "ezcMailExtended"
         );
 
-        $this->assertType(
+        $this->assertInstanceOf(
             "ezcMailExtended",
             $reply,
             "replyToMail created incorrect class instance."

Modified: incubator/zetacomponents/trunk/PersistentObject/tests/persistent_session/load_test.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/PersistentObject/tests/persistent_session/load_test.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/PersistentObject/tests/persistent_session/load_test.php (original)
+++ incubator/zetacomponents/trunk/PersistentObject/tests/persistent_session/load_test.php Sat Dec 18 07:35:28 2010
@@ -114,7 +114,7 @@ class ezcPersistentSessionLoadTest exten
             $arr[4]
         );
 
-        $this->assertType(
+        $this->assertInstanceOf(
             'DateTime',
             $arr[4]->integer
         );

Modified: incubator/zetacomponents/trunk/PersistentObject/tests/persistent_session/save_test.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/PersistentObject/tests/persistent_session/save_test.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/PersistentObject/tests/persistent_session/save_test.php (original)
+++ incubator/zetacomponents/trunk/PersistentObject/tests/persistent_session/save_test.php Sat Dec 18 07:35:28 2010
@@ -132,7 +132,7 @@ class ezcPersistentSessionSaveTest exten
         );
         $this->assertTrue( isset( $arr[5] ) );
 
-        $this->assertType(
+        $this->assertInstanceOf(
             'DateTime',
             $arr[5]->integer
         );
@@ -203,7 +203,7 @@ class ezcPersistentSessionSaveTest exten
         );
         $this->assertTrue( isset( $arr[5] ) );
         
-        $this->assertType(
+        $this->assertInstanceOf(
             'DateTime',
             $arr[5]->integer
         );
@@ -327,7 +327,7 @@ class ezcPersistentSessionSaveTest exten
         );
         $this->assertTrue( isset( $arr[5] ) );
 
-        $this->assertType(
+        $this->assertInstanceOf(
             'DateTime',
             $arr[5]->integer
         );

Modified: incubator/zetacomponents/trunk/PersistentObject/tests/persistent_session_identity_decorator/save_test.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/PersistentObject/tests/persistent_session_identity_decorator/save_test.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/PersistentObject/tests/persistent_session_identity_decorator/save_test.php (original)
+++ incubator/zetacomponents/trunk/PersistentObject/tests/persistent_session_identity_decorator/save_test.php Sat Dec 18 07:35:28 2010
@@ -128,7 +128,7 @@ class ezcPersistentSessionIdentityDecora
         );
         $this->assertTrue( isset( $arr[5] ) );
 
-        $this->assertType(
+        $this->assertInstanceOf(
             'DateTime',
             $arr[5]->integer
         );
@@ -184,7 +184,7 @@ class ezcPersistentSessionIdentityDecora
         );
         $this->assertTrue( isset( $arr[5] ) );
 
-        $this->assertType(
+        $this->assertInstanceOf(
             'DateTime',
             $arr[5]->integer
         );
@@ -352,7 +352,7 @@ class ezcPersistentSessionIdentityDecora
         );
         $this->assertTrue( isset( $arr[5] ) );
 
-        $this->assertType(
+        $this->assertInstanceOf(
             'DateTime',
             $arr[5]->integer
         );

Modified: incubator/zetacomponents/trunk/Reflection/tests/annotation_factory_test.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/Reflection/tests/annotation_factory_test.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/Reflection/tests/annotation_factory_test.php (original)
+++ incubator/zetacomponents/trunk/Reflection/tests/annotation_factory_test.php Sat Dec 18 07:35:28 2010
@@ -30,13 +30,13 @@ class ezcReflectionAnnotationFactoryTest
     public function testCreateAnnotation() {
         $param  = ezcReflectionAnnotationFactory::createAnnotation('param', array('param', 'string', 'param'));
 
-        self::assertType('ezcReflectionAnnotationParam', $param);
+        self::assertInstanceOf('ezcReflectionAnnotationParam', $param);
 
         $var    = ezcReflectionAnnotationFactory::createAnnotation('var', array('var', 'string'));
-        self::assertType('ezcReflectionAnnotationVar', $var);
+        self::assertInstanceOf('ezcReflectionAnnotationVar', $var);
 
         $return = ezcReflectionAnnotationFactory::createAnnotation('return', array('return', 'string', 'hello', 'world'));
-        self::assertType('ezcReflectionAnnotationReturn', $return);
+        self::assertInstanceOf('ezcReflectionAnnotationReturn', $return);
     }
 
     public static function suite()

Modified: incubator/zetacomponents/trunk/Reflection/tests/class_test.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/Reflection/tests/class_test.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/Reflection/tests/class_test.php (original)
+++ incubator/zetacomponents/trunk/Reflection/tests/class_test.php Sat Dec 18 07:35:28 2010
@@ -80,18 +80,18 @@ class ezcReflectionClassTest extends ezc
 
     public function testGetMethod() {
         $method = $this->class->getMethod('helloWorld');
-        self::assertType('ezcReflectionMethod', $method);
+        self::assertInstanceOf('ezcReflectionMethod', $method);
         self::assertEquals('helloWorld', $method->getName());
     }
 
     public function testGetConstructor() {
         $method = $this->class->getConstructor();
-        self::assertType('ezcReflectionMethod', $method);
+        self::assertInstanceOf('ezcReflectionMethod', $method);
         self::assertEquals('__construct', $method->getName());
         self::assertEquals('SomeClass', $method->getDeclaringClass()->getName());
         
         $method = $this->classReflectionFunction->getConstructor();
-        self::assertType('ezcReflectionMethod', $method);
+        self::assertInstanceOf('ezcReflectionMethod', $method);
         self::assertEquals('__construct', $method->getName());
         self::assertEquals('ReflectionFunction', $method->getDeclaringClass()->getName());
     }
@@ -103,7 +103,7 @@ class ezcReflectionClassTest extends ezc
 	public function testGetInterfaces() {
         $ifaces = $this->class->getInterfaces();
 
-        self::assertType('ezcReflectionClass', $ifaces[0]);
+        self::assertInstanceOf('ezcReflectionClass', $ifaces[0]);
         self::assertEquals('IInterface', $ifaces[0]->getName());
         self::assertEquals(1, count($ifaces));
     }
@@ -117,7 +117,7 @@ class ezcReflectionClassTest extends ezc
         $expectedMethods = array('__construct', 'helloWorld', 'doSomeMetaProgramming');
         self::assertEquals(count($expectedMethods), count($methods));
         foreach ($methods as $method) {
-            self::assertType('ezcReflectionMethod', $method);
+            self::assertInstanceOf('ezcReflectionMethod', $method);
             self::assertContains($method->getName(), $expectedMethods);
 
             ReflectionTestHelper::deleteFromArray($method->getName(), $expectedMethods);
@@ -128,7 +128,7 @@ class ezcReflectionClassTest extends ezc
     public function testGetParentClass() {
         $parent = $this->class->getParentClass();
 
-        self::assertType('ezcReflectionClass', $parent);
+        self::assertInstanceOf('ezcReflectionClass', $parent);
         self::assertEquals('BaseClass', $parent->getName());
     }
 
@@ -139,7 +139,7 @@ class ezcReflectionClassTest extends ezc
     public function testGetProperty() {
         $prop = $this->class->getProperty('fields');
 
-        self::assertType('ezcReflectionProperty', $prop);
+        self::assertInstanceOf('ezcReflectionProperty', $prop);
         self::assertEquals('fields', $prop->getName());
 
         try {
@@ -157,7 +157,7 @@ class ezcReflectionClassTest extends ezc
         $expected = array('prop1', 'prop2', 'prop3');
 
         foreach ($properties as $prop) {
-            self::assertType('ezcReflectionProperty', $prop);
+            self::assertInstanceOf('ezcReflectionProperty', $prop);
             self::assertContains($prop->getName(), $expected);
 
             ReflectionTestHelper::deleteFromArray($prop->getName(), $expected);
@@ -200,14 +200,14 @@ class ezcReflectionClassTest extends ezc
         self::assertTrue( is_array( $annotations ) );
         self::assertEquals( 1, count( $annotations ) );
         foreach ( $annotations as $annotation ) {
-            $this->assertType( 'ezcReflectionAnnotation', $annotation );
+            $this->assertInstanceOf( 'ezcReflectionAnnotation', $annotation );
             $this->assertContains( $annotation->getName(), 'licence' );
         }
     }
 
     public function testGetExtension() {
         $ext = $this->classReflectionFunction->getExtension();
-        self::assertType('ezcReflectionExtension', $ext);
+        self::assertInstanceOf('ezcReflectionExtension', $ext);
         self::assertEquals('Reflection', $ext->getName());
 
         $ext = $this->class->getExtension();

Modified: incubator/zetacomponents/trunk/Reflection/tests/extension_test.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/Reflection/tests/extension_test.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/Reflection/tests/extension_test.php (original)
+++ incubator/zetacomponents/trunk/Reflection/tests/extension_test.php Sat Dec 18 07:35:28 2010
@@ -56,7 +56,7 @@ class ezcReflectionExtensionTest extends
     public function testGetFunctions() {
         $functs = $this->extRef->getFunctions();
         foreach ($functs as $func) {
-            self::assertType('ezcReflectionFunction', $func);
+            self::assertInstanceOf('ezcReflectionFunction', $func);
         }
         self::assertEquals(0, count($functs));
     }
@@ -65,7 +65,7 @@ class ezcReflectionExtensionTest extends
         $classes = $this->extRef->getClasses();
 
         foreach ($classes as $class) {
-            self::assertType('ezcReflectionClass', $class);
+            self::assertInstanceOf('ezcReflectionClass', $class);
         }
     }
 

Modified: incubator/zetacomponents/trunk/Reflection/tests/function_test.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/Reflection/tests/function_test.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/Reflection/tests/function_test.php (original)
+++ incubator/zetacomponents/trunk/Reflection/tests/function_test.php Sat Dec 18 07:35:28 2010
@@ -90,7 +90,7 @@ class ezcReflectionFunctionTest extends 
         self::assertTrue( is_array( $annotations ) );
         self::assertEquals( 3, count( $annotations ) );
         foreach ( $annotations as $annotation ) {
-            $this->assertType( 'ezcReflectionAnnotation', $annotation );
+            $this->assertInstanceOf( 'ezcReflectionAnnotation', $annotation );
             $this->assertContains( $annotation->getName(), $annotationName );
         }
     }
@@ -167,7 +167,7 @@ class ezcReflectionFunctionTest extends 
     public function testGetReturnType() {
         $func = new ezcReflectionFunction('m1');
         $type = $func->getReturnType();
-        self::assertType('ezcReflectionType', $type);
+        self::assertInstanceOf('ezcReflectionType', $type);
         self::assertEquals('string', $type->getTypeName());
 
         $func = new ezcReflectionFunction('m4');

Modified: incubator/zetacomponents/trunk/Reflection/tests/method_test.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/Reflection/tests/method_test.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/Reflection/tests/method_test.php (original)
+++ incubator/zetacomponents/trunk/Reflection/tests/method_test.php Sat Dec 18 07:35:28 2010
@@ -112,7 +112,7 @@ class ezcReflectionMethodTest extends ez
 
     public function testGetReturnType() {
         $type = $this->fctM4->getReturnType();
-        self::assertType('ezcReflectionType', $type);
+        self::assertInstanceOf('ezcReflectionType', $type);
         self::assertEquals('string', $type->getTypeName());
     }
 
@@ -121,7 +121,7 @@ class ezcReflectionMethodTest extends ez
 
         $expectedParams = array('name');
         foreach ($params as $param) {
-            self::assertType('ezcReflectionParameter', $param);
+            self::assertInstanceOf('ezcReflectionParameter', $param);
             self::assertContains($param->getName(), $expectedParams);
 
             ReflectionTestHelper::deleteFromArray($param->getName(), $expectedParams);
@@ -341,7 +341,7 @@ class ezcReflectionMethodTest extends ez
      */
     public function testGetDeclaringClass( $method, $expectedDeclaringClassName ) {
         $declaringClass = $this->$method->getDeclaringClass();
-        self::assertType( 'ezcReflectionClass', $declaringClass );
+        self::assertInstanceOf( 'ezcReflectionClass', $declaringClass );
         self::assertEquals( $expectedDeclaringClassName, $declaringClass->getName() );
     }
 

Modified: incubator/zetacomponents/trunk/Reflection/tests/mixed_type_test.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/Reflection/tests/mixed_type_test.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/Reflection/tests/mixed_type_test.php (original)
+++ incubator/zetacomponents/trunk/Reflection/tests/mixed_type_test.php Sat Dec 18 07:35:28 2010
@@ -71,7 +71,7 @@ class ezcReflectionMixedTypeTest extends
         $this->assertTrue( $types[0]->isScalarType() );
         $this->assertTrue( $types[1]->isArray() );
         $this->assertTrue( $types[1]->isList() );
-        $this->assertType( 'ezcReflectionMixedType', $types[1]->getValueType() );
+        $this->assertInstanceOf( 'ezcReflectionMixedType', $types[1]->getValueType() );
         $this->assertTrue( $types[2]->isObject() );
         $this->assertEquals( 'string',  $types[0]->getTypeName() );
         $this->assertEquals( 'mixed[]', $types[1]->getTypeName() );

Modified: incubator/zetacomponents/trunk/Reflection/tests/parameter_test.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/Reflection/tests/parameter_test.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/Reflection/tests/parameter_test.php (original)
+++ incubator/zetacomponents/trunk/Reflection/tests/parameter_test.php Sat Dec 18 07:35:28 2010
@@ -132,25 +132,25 @@ class ezcReflectionParameterTest extends
 
     public function testGetType() {
         $type = $this->actualParamsOfM1[0]->getType();
-        self::assertType('ezcReflectionType', $type);
+        self::assertInstanceOf('ezcReflectionType', $type);
         self::assertEquals('string', $type->getTypeName());
 
         $type = $this->actualParamsOfM1[1]->getType();
-        self::assertType('ezcReflectionType', $type);
+        self::assertInstanceOf('ezcReflectionType', $type);
         self::assertEquals('ezcReflection', $type->getTypeName());
 
         $type = $this->actualParamsOfM1[2]->getType();
-        self::assertType('ezcReflectionType', $type);
+        self::assertInstanceOf('ezcReflectionType', $type);
         self::assertEquals('ReflectionClass', $type->getTypeName());
 
         // this method has both a type hint and a type annotation
         $type = $this->actualParamsOf_ezcReflection_setReflectionTypeFactory[0]->getType();
-        self::assertType('ezcReflectionType', $type);
+        self::assertInstanceOf('ezcReflectionType', $type);
         self::assertEquals('ezcReflectionTypeFactory', $type->getTypeName());
 
         // testing a param that only has a type hint
         $type = $this->actualParamsOf_functionWithTypeHint[0]->getType();
-        self::assertType('ezcReflectionType', $type);
+        self::assertInstanceOf('ezcReflectionType', $type);
         self::assertEquals('ReflectionClass', $type->getTypeName());
 
         self::assertNull($this->actualParamsOf_TestMethods_m3[0]->getType());
@@ -173,17 +173,17 @@ class ezcReflectionParameterTest extends
         self::assertEquals('m1', $decFunc->getName());
 
         $decFunc = $this->actual['TestMethods::m3'][0]->getDeclaringFunction();
-        self::assertType('ezcReflectionMethod', $decFunc);
+        self::assertInstanceOf('ezcReflectionMethod', $decFunc);
         self::assertEquals('TestMethods', $decFunc->getDeclaringClass()->getName());
         self::assertEquals('m3', $decFunc->getName());
         
         $decFunc = $this->actual['ezcReflection::setReflectionTypeFactory'][0]->getDeclaringFunction();
-        self::assertType('ezcReflectionMethod', $decFunc);
+        self::assertInstanceOf('ezcReflectionMethod', $decFunc);
         self::assertEquals('ezcReflection', $decFunc->getDeclaringClass()->getName());
         self::assertEquals('setReflectionTypeFactory', $decFunc->getName());
 
         $decFunc = $this->actual['functionWithTypeHint'][0]->getDeclaringFunction();
-        self::assertType('ezcReflectionFunction', $decFunc);
+        self::assertInstanceOf('ezcReflectionFunction', $decFunc);
         self::assertEquals('functionWithTypeHint', $decFunc->getName());
     }
 

Modified: incubator/zetacomponents/trunk/Reflection/tests/parser_test.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/Reflection/tests/parser_test.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/Reflection/tests/parser_test.php (original)
+++ incubator/zetacomponents/trunk/Reflection/tests/parser_test.php Sat Dec 18 07:35:28 2010
@@ -159,7 +159,7 @@ EOF;
         $parser->parse($comment);
 		$annotations = $parser->getVarAnnotations();
 		self::assertEquals(1, count($annotations));
-		self::assertType('ezcReflectionAnnotationVar', $annotations[0]);
+		self::assertInstanceOf('ezcReflectionAnnotationVar', $annotations[0]);
 		self::assertEquals('string', $annotations[0]->getTypeName());
 		self::assertEquals('', $annotations[0]->getDescription());
         
@@ -173,14 +173,14 @@ EOF;
         $parser->parse($comment);
 		$annotations = $parser->getVarAnnotations();
 		self::assertEquals(1, count($annotations));
-		self::assertType('ezcReflectionAnnotationVar', $annotations[0]);
+		self::assertInstanceOf('ezcReflectionAnnotationVar', $annotations[0]);
         self::assertEquals("An array of\nboolean values.", $annotations[0]->getDescription());
         self::assertEquals('bool[]', $annotations[0]->getTypeName());
         $type = ezcReflection::getReflectionTypeFactory()->getType($annotations[0]->getTypeName());
-		self::assertType('ezcReflectionArrayType', $type);
+		self::assertInstanceOf('ezcReflectionArrayType', $type);
         self::assertTrue($type->isArray());
         $arrayType = $type->getValueType();
-		self::assertType('ezcReflectionPrimitiveType', $arrayType);
+		self::assertInstanceOf('ezcReflectionPrimitiveType', $arrayType);
         self::assertTrue($arrayType->isPrimitive());
         self::assertTrue($arrayType->isScalarType());
         self::assertEquals('boolean', $arrayType->getTypeName());

Modified: incubator/zetacomponents/trunk/Reflection/tests/property_test.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/Reflection/tests/property_test.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/Reflection/tests/property_test.php (original)
+++ incubator/zetacomponents/trunk/Reflection/tests/property_test.php Sat Dec 18 07:35:28 2010
@@ -72,7 +72,7 @@ class ezcReflectionPropertyTest extends 
 
     public function testGetType() {
         $type = $this->refProp->getType();
-        self::assertType('ezcReflectionArrayType', $type);
+        self::assertInstanceOf('ezcReflectionArrayType', $type);
         self::assertEquals('integer[]', $type->getTypeName());
         
         self::assertNull( $this->actual['SomeClass']['undocumentedProperty']->getType() );
@@ -80,7 +80,7 @@ class ezcReflectionPropertyTest extends 
 
     public function testGetDeclaringClass() {
         $class = $this->refProp->getDeclaringClass();
-        self::assertType('ezcReflectionClass', $class);
+        self::assertInstanceOf('ezcReflectionClass', $class);
         self::assertEquals('SomeClass', $class->getName());
     }
 

Modified: incubator/zetacomponents/trunk/Reflection/tests/reflection_test.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/Reflection/tests/reflection_test.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/Reflection/tests/reflection_test.php (original)
+++ incubator/zetacomponents/trunk/Reflection/tests/reflection_test.php Sat Dec 18 07:35:28 2010
@@ -135,7 +135,7 @@ class ezcReflectionTest extends ezcTestC
     }
 
     public function testGetDocCommentParser() {
-        self::assertType( 'ezcReflectionDocCommentParser', ezcReflection::getDocCommentParser() );
+        self::assertInstanceOf( 'ezcReflectionDocCommentParser', ezcReflection::getDocCommentParser() );
     }
 
     public function testSetDocCommentParser() {
@@ -145,7 +145,7 @@ class ezcReflectionTest extends ezcTestC
     }
 
     public function testGetReflectionTypeFactory() {
-        self::assertType( 'ezcReflectionTypeFactory', ezcReflection::getReflectionTypeFactory() );
+        self::assertInstanceOf( 'ezcReflectionTypeFactory', ezcReflection::getReflectionTypeFactory() );
     }
 
     public function testSetReflectionTypeFactory() {

Modified: incubator/zetacomponents/trunk/Reflection/tests/test_helper.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/Reflection/tests/test_helper.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/Reflection/tests/test_helper.php (original)
+++ incubator/zetacomponents/trunk/Reflection/tests/test_helper.php Sat Dec 18 07:35:28 2010
@@ -51,7 +51,7 @@ class ReflectionTestHelper {
      */
     static public function expectedAnnotations($expectedAnnotations, $annotations, $test) {
         foreach ($annotations as $annotation) {
-            $test->assertType('ezcReflectionAnnotation', $annotation);
+            $test->assertInstanceOf('ezcReflectionAnnotation', $annotation);
             $test->assertContains($annotation->getName(), $expectedAnnotations);
 
             self::deleteFromArray($annotation->getName(), $expectedAnnotations);
@@ -69,7 +69,7 @@ class ReflectionTestHelper {
      */
     static public function expectedParams($expectedParams, $params, $test) {
         foreach ($params as $param) {
-            $test->assertType('ezcReflectionParameter', $param);
+            $test->assertInstanceOf('ezcReflectionParameter', $param);
             $test->assertContains($param->getName(), $expectedParams);
 
             self::deleteFromArray($param->getName(), $expectedParams);
@@ -79,4 +79,4 @@ class ReflectionTestHelper {
 
 }
 
-?>
\ No newline at end of file
+?>

Modified: incubator/zetacomponents/trunk/Reflection/tests/type_factory_test.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/Reflection/tests/type_factory_test.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/Reflection/tests/type_factory_test.php (original)
+++ incubator/zetacomponents/trunk/Reflection/tests/type_factory_test.php Sat Dec 18 07:35:28 2010
@@ -48,8 +48,8 @@ class ezcReflectionTypeFactoryTest exten
                                 'string', 'bool', 'boolean', 'void', 'object');
         foreach ($ezcReflectionPrimitiveTypes as $prim) {
         	$type = $this->factory->getType($prim);
-        	self::assertType('ezcReflectionType', $type);
-            self::assertType('ezcReflectionPrimitiveType', $type);
+        	self::assertInstanceOf('ezcReflectionType', $type);
+            self::assertInstanceOf('ezcReflectionPrimitiveType', $type);
         }
     }
 
@@ -61,13 +61,13 @@ class ezcReflectionTypeFactoryTest exten
         $classes = array('ReflectionClass', 'ezcTestClass');
         foreach ($classes as $class) {
         	$type = $this->factory->getType($class);
-        	self::assertType('ezcReflectionType', $type);
-            self::assertType('ezcReflectionObjectType', $type);
-            self::assertType( 'ReflectionClass', $type->getClass() );
+        	self::assertInstanceOf('ezcReflectionType', $type);
+            self::assertInstanceOf('ezcReflectionObjectType', $type);
+            self::assertInstanceOf( 'ReflectionClass', $type->getClass() );
         }
 
 		$type = $this->factory->getType('NoneExistingClass');
-		self::assertType( 'ReflectionClass', $type->getClass() );
+		self::assertInstanceOf( 'ReflectionClass', $type->getClass() );
     }
     
     public function testGetTypeReturnsNullOnEmptyArgument()
@@ -79,10 +79,10 @@ class ezcReflectionTypeFactoryTest exten
     {
         $class = new ReflectionClass( 'stdClass' );
     	$type = $this->factory->getType( $class );
-    	self::assertType('ezcReflectionType', $type);
-    	self::assertType('ezcReflectionObjectType', $type);
+    	self::assertInstanceOf('ezcReflectionType', $type);
+    	self::assertInstanceOf('ezcReflectionObjectType', $type);
     	$actualClass = $type->getClass();
-    	self::assertType( 'ReflectionClass', $actualClass );
+    	self::assertInstanceOf( 'ReflectionClass', $actualClass );
     	self::assertSame( $class, $actualClass );
     }
     
@@ -128,10 +128,10 @@ class ezcReflectionTypeFactoryTest exten
             $canonicalName = $arrayTypeName;
         }
         $type = $this->factory->getType($arrayTypeName);
-        self::assertType('ezcReflectionType', $type);
-        self::assertType('ezcReflectionArrayType', $type);
-        self::assertType('ezcReflectionType', $type->getKeyType());
-        self::assertType('ezcReflectionType', $type->getValueType());
+        self::assertInstanceOf('ezcReflectionType', $type);
+        self::assertInstanceOf('ezcReflectionArrayType', $type);
+        self::assertInstanceOf('ezcReflectionType', $type->getKeyType());
+        self::assertInstanceOf('ezcReflectionType', $type->getValueType());
         self::assertEquals($canonicalName, $type->getTypeName());
         self::assertEquals($indexTypeName, $type->getKeyType()->getTypeName());
         self::assertEquals($valueTypeName, $type->getValueType()->getTypeName());

Modified: incubator/zetacomponents/trunk/Search/tests/handlers/solr_test.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/Search/tests/handlers/solr_test.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/Search/tests/handlers/solr_test.php (original)
+++ incubator/zetacomponents/trunk/Search/tests/handlers/solr_test.php Sat Dec 18 07:35:28 2010
@@ -102,7 +102,7 @@ class ezcSearchHandlerSolrTest extends e
     function testSearchEmptyResults()
     {
         $r = $this->solr->search( 'solr', 'name_s' );
-        self::assertType( 'stdClass', $r );
+        self::assertInstanceOf( 'stdClass', $r );
         self::assertEquals( 0, $r->response->numFound );
         self::assertEquals( 0, $r->response->start );
         self::assertEquals( 0, $r->responseHeader->status );

Modified: incubator/zetacomponents/trunk/TemplateTranslationTiein/tests/configuration.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/TemplateTranslationTiein/tests/configuration.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/TemplateTranslationTiein/tests/configuration.php (original)
+++ incubator/zetacomponents/trunk/TemplateTranslationTiein/tests/configuration.php Sat Dec 18 07:35:28 2010
@@ -103,7 +103,7 @@ class ezcTemplateTranslationConfiguratio
         $t = ezcTemplateTranslationConfiguration::getInstance();
         $t->manager = null;
         $t->manager = new ezcTranslationManager( new ezcTranslationTsBackend( '.' ) );
-        self::assertType( 'ezcTranslationManager', $t->manager );
+        self::assertInstanceOf( 'ezcTranslationManager', $t->manager );
     }
 
     public function testGetManagerException()
@@ -130,7 +130,7 @@ class ezcTemplateTranslationConfiguratio
         self::assertEquals( true, isset( $t->locale ) );
 
         $t->manager = new ezcTranslationManager( new ezcTranslationTsBackend( '.' ) );
-        self::assertType( 'ezcTranslationManager', $t->manager );
+        self::assertInstanceOf( 'ezcTranslationManager', $t->manager );
         self::assertEquals( true, isset( $t->manager ) );
     }
 

Modified: incubator/zetacomponents/trunk/Tree/tests/memory_tree.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/Tree/tests/memory_tree.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/Tree/tests/memory_tree.php (original)
+++ incubator/zetacomponents/trunk/Tree/tests/memory_tree.php Sat Dec 18 07:35:28 2010
@@ -67,7 +67,7 @@ class ezcTreeMemoryTest extends ezcTreeT
         self::assertSame( false, $tree->nodeExists( '3' ) );
 
         $node = $tree->createNode( 1, "Root Node" );
-        self::assertType( 'ezcTreeNode', $node );
+        self::assertInstanceOf( 'ezcTreeNode', $node );
         self::assertSame( '1', $node->id );
         $tree->setRootNode( $node );
         self::assertSame( true, $tree->nodeExists( '1' ) );

Modified: incubator/zetacomponents/trunk/Tree/tests/tree.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/Tree/tests/tree.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/Tree/tests/tree.php (original)
+++ incubator/zetacomponents/trunk/Tree/tests/tree.php Sat Dec 18 07:35:28 2010
@@ -41,7 +41,7 @@ abstract class ezcTreeTest extends ezcTe
         $tree = $this->setUpTestTree();
 
         $node = $tree->getRootNode();
-        self::assertType( 'ezcTreeNode', $node );
+        self::assertInstanceOf( 'ezcTreeNode', $node );
         self::assertSame( '1', $node->id );
         self::assertSame( 'Node 1', $node->data );
     }
@@ -60,12 +60,12 @@ abstract class ezcTreeTest extends ezcTe
         self::assertSame( true, $tree->nodeExists( '1' ) );
 
         $node8 = $tree->fetchNodeById( 8 ); // returns 8
-        self::assertType( 'ezcTreeNode', $node8 );
+        self::assertInstanceOf( 'ezcTreeNode', $node8 );
         self::assertSame( '8', $node8->id );
         self::assertSame( 'Node 8', $node8->data );
 
         $node3 = $tree->fetchNodeById( '3' ); // returns 3
-        self::assertType( 'ezcTreeNode', $node3 );
+        self::assertInstanceOf( 'ezcTreeNode', $node3 );
         self::assertSame( '3', $node3->id );
         self::assertSame( 'Node 3', $node3->data );
     }
@@ -518,7 +518,7 @@ abstract class ezcTreeTest extends ezcTe
         $tree = $this->setUpTestTree();
 
         $node = $tree->fetchParent( '3' );
-        self::assertType( 'ezcTreeNode', $node );
+        self::assertInstanceOf( 'ezcTreeNode', $node );
         self::assertSame( '1', $node->id );
         self::assertSame( 'Node 1', $node->data );
 
@@ -533,7 +533,7 @@ abstract class ezcTreeTest extends ezcTe
     {
         $tree = $this->setUpTestTree();
         $node = $tree->fetchNodeById( '3' )->fetchParent();
-        self::assertType( 'ezcTreeNode', $node );
+        self::assertInstanceOf( 'ezcTreeNode', $node );
         self::assertSame( '1', $node->id );
         self::assertSame( 'Node 1', $node->data );
 
@@ -965,7 +965,7 @@ abstract class ezcTreeTest extends ezcTe
         reset( $nodes );
         foreach( $expected as $key )
         {
-            self::assertType( 'ezcTreeNode', current( $nodes ) );
+            self::assertInstanceOf( 'ezcTreeNode', current( $nodes ) );
             self::assertSame( current( $nodes )->id, $key );
             next( $nodes );
         }
@@ -998,7 +998,7 @@ abstract class ezcTreeTest extends ezcTe
         reset( $nodes );
         foreach( $expected as $key )
         {
-            self::assertType( 'ezcTreeNode', current( $nodes ) );
+            self::assertInstanceOf( 'ezcTreeNode', current( $nodes ) );
             self::assertSame( current( $nodes )->id, $key );
             next( $nodes );
         }

Modified: incubator/zetacomponents/trunk/Tree/tests/xml_tree.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/Tree/tests/xml_tree.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/Tree/tests/xml_tree.php (original)
+++ incubator/zetacomponents/trunk/Tree/tests/xml_tree.php Sat Dec 18 07:35:28 2010
@@ -122,7 +122,7 @@ class ezcTreeXmlTest extends ezcTreeTest
         self::assertSame( false, $tree->nodeExists( '3' ) );
 
         $node = $tree->createNode( 1, "Root Node" );
-        self::assertType( 'ezcTreeNode', $node );
+        self::assertInstanceOf( 'ezcTreeNode', $node );
         self::assertSame( '1', $node->id );
         $tree->setRootNode( $node );
         self::assertSame( true, $tree->nodeExists( '1' ) );
@@ -153,7 +153,7 @@ class ezcTreeXmlTest extends ezcTreeTest
         self::assertSame( false, $tree->nodeExists( '3' ) );
 
         $node = $tree->createNode( 1, "Root Node" );
-        self::assertType( 'ezcTreeNode', $node );
+        self::assertInstanceOf( 'ezcTreeNode', $node );
         self::assertSame( '1', $node->id );
         $tree->setRootNode( $node );
         self::assertSame( true, $tree->nodeExists( '1' ) );

Modified: incubator/zetacomponents/trunk/TreeDatabaseTiein/tests/db_tree.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/TreeDatabaseTiein/tests/db_tree.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/TreeDatabaseTiein/tests/db_tree.php (original)
+++ incubator/zetacomponents/trunk/TreeDatabaseTiein/tests/db_tree.php Sat Dec 18 07:35:28 2010
@@ -100,7 +100,7 @@ abstract class ezcDbTreeTest extends ezc
         self::assertSame( false, $tree->nodeExists( '3' ) );
 
         $node = $tree->createNode( 1, "Root Node" );
-        self::assertType( 'ezcTreeNode', $node );
+        self::assertInstanceOf( 'ezcTreeNode', $node );
         self::assertSame( '1', $node->id );
         $tree->setRootNode( $node );
         self::assertSame( true, $tree->nodeExists( '1' ) );
@@ -241,7 +241,7 @@ abstract class ezcDbTreeTest extends ezc
         $tree = $this->setUpTestTree( 'data', null );
 
         $node8 = $tree->fetchNodeById( 8 ); // returns 8
-        self::assertType( 'ezcTreeNode', $node8 );
+        self::assertInstanceOf( 'ezcTreeNode', $node8 );
         self::assertSame( '8', $node8->id );
         self::assertSame( array( 'data' => 'Node 8' ), $node8->data );
     }

Modified: incubator/zetacomponents/trunk/TreePersistentObjectTiein/tests/po_store.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/TreePersistentObjectTiein/tests/po_store.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/TreePersistentObjectTiein/tests/po_store.php (original)
+++ incubator/zetacomponents/trunk/TreePersistentObjectTiein/tests/po_store.php Sat Dec 18 07:35:28 2010
@@ -165,7 +165,7 @@ class ezcTreePersistentObjectStore exten
 
         $entry = new FileEntry( ':root:', FileEntry::ROOT, 60639255 );
         $node = $tree->createNode( 1, $entry );
-        self::assertType( 'ezcTreeNode', $node );
+        self::assertInstanceOf( 'ezcTreeNode', $node );
         self::assertSame( '1', $node->id );
         $tree->setRootNode( $node );
         self::assertSame( true, $tree->nodeExists( '1' ) );

Modified: incubator/zetacomponents/trunk/Webdav/tests/backend_simple_test.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/Webdav/tests/backend_simple_test.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/Webdav/tests/backend_simple_test.php (original)
+++ incubator/zetacomponents/trunk/Webdav/tests/backend_simple_test.php Sat Dec 18 07:35:28 2010
@@ -694,7 +694,7 @@ class ezcWebdavSimpleBackendTest extends
         $fakeRes = $backend->propFind( $req );
 
         // Ensure no error occurred
-        $this->assertType(
+        $this->assertInstanceOf(
             'ezcWebdavMultistatusResponse',
             $fakeRes,
             'Generation of expected response failed.'

Modified: incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/001_lock_resource_success_assertions.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/001_lock_resource_success_assertions.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/001_lock_resource_success_assertions.php (original)
+++ incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/001_lock_resource_success_assertions.php Sat Dec 18 07:35:28 2010
@@ -9,7 +9,7 @@ class ezcWebdavLockPluginClientTestAsser
             $prop,
             'Lock discovery property not set.'
         );
-        PHPUnit_Framework_Assert::assertType(
+        PHPUnit_Framework_Assert::assertInstanceOf(
             'ezcWebdavLockDiscoveryProperty',
             $prop,
             'Lock discovery property has incorrect type.'

Modified: incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/002_lock_collection_success_assertions.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/002_lock_collection_success_assertions.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/002_lock_collection_success_assertions.php (original)
+++ incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/002_lock_collection_success_assertions.php Sat Dec 18 07:35:28 2010
@@ -9,7 +9,7 @@ class ezcWebdavLockPluginClientTestAsser
             $prop,
             'Lock discovery property not set.'
         );
-        PHPUnit_Framework_Assert::assertType(
+        PHPUnit_Framework_Assert::assertInstanceOf(
             'ezcWebdavLockDiscoveryProperty',
             $prop,
             'Lock discovery property has incorrect type.'
@@ -33,7 +33,7 @@ class ezcWebdavLockPluginClientTestAsser
             $prop,
             'Lock discovery property not set.'
         );
-        PHPUnit_Framework_Assert::assertType(
+        PHPUnit_Framework_Assert::assertInstanceOf(
             'ezcWebdavLockDiscoveryProperty',
             $prop,
             'Lock discovery property has incorrect type.'

Modified: incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/003_lock_null_resource_success_assertions.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/003_lock_null_resource_success_assertions.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/003_lock_null_resource_success_assertions.php (original)
+++ incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/003_lock_null_resource_success_assertions.php Sat Dec 18 07:35:28 2010
@@ -9,7 +9,7 @@ class ezcWebdavLockPluginClientTestAsser
             $prop,
             'Lock discovery property not set.'
         );
-        PHPUnit_Framework_Assert::assertType(
+        PHPUnit_Framework_Assert::assertInstanceOf(
             'ezcWebdavLockDiscoveryProperty',
             $prop,
             'Lock discovery property has incorrect type.'

Modified: incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/004_lock_null_collection_success_assertions.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/004_lock_null_collection_success_assertions.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/004_lock_null_collection_success_assertions.php (original)
+++ incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/004_lock_null_collection_success_assertions.php Sat Dec 18 07:35:28 2010
@@ -9,7 +9,7 @@ class ezcWebdavLockPluginClientTestAsser
             $prop,
             'Lock discovery property not set.'
         );
-        PHPUnit_Framework_Assert::assertType(
+        PHPUnit_Framework_Assert::assertInstanceOf(
             'ezcWebdavLockDiscoveryProperty',
             $prop,
             'Lock discovery property has incorrect type.'

Modified: incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/005_lock_resource_failure_locked_assertions.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/005_lock_resource_failure_locked_assertions.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/005_lock_resource_failure_locked_assertions.php (original)
+++ incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/005_lock_resource_failure_locked_assertions.php Sat Dec 18 07:35:28 2010
@@ -9,7 +9,7 @@ class ezcWebdavLockPluginClientTestAsser
             $prop,
             'Lock discovery property not set.'
         );
-        PHPUnit_Framework_Assert::assertType(
+        PHPUnit_Framework_Assert::assertInstanceOf(
             'ezcWebdavLockDiscoveryProperty',
             $prop,
             'Lock discovery property has incorrect type.'

Modified: incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/006_lock_collection_failure_locked_assertions.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/006_lock_collection_failure_locked_assertions.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/006_lock_collection_failure_locked_assertions.php (original)
+++ incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/006_lock_collection_failure_locked_assertions.php Sat Dec 18 07:35:28 2010
@@ -9,7 +9,7 @@ class ezcWebdavLockPluginClientTestAsser
             $prop,
             'Lock discovery property not set.'
         );
-        PHPUnit_Framework_Assert::assertType(
+        PHPUnit_Framework_Assert::assertInstanceOf(
             'ezcWebdavLockDiscoveryProperty',
             $prop,
             'Lock discovery property has incorrect type.'

Modified: incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/007_lock_collection_failure_deep_locked_assertions.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/007_lock_collection_failure_deep_locked_assertions.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/007_lock_collection_failure_deep_locked_assertions.php (original)
+++ incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/007_lock_collection_failure_deep_locked_assertions.php Sat Dec 18 07:35:28 2010
@@ -9,7 +9,7 @@ class ezcWebdavLockPluginClientTestAsser
             $prop,
             'Lock discovery property not set.'
         );
-        PHPUnit_Framework_Assert::assertType(
+        PHPUnit_Framework_Assert::assertInstanceOf(
             'ezcWebdavLockDiscoveryProperty',
             $prop,
             'Lock discovery property has incorrect type.'

Modified: incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/008_unlock_resource_success_assertions.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/008_unlock_resource_success_assertions.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/008_unlock_resource_success_assertions.php (original)
+++ incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/008_unlock_resource_success_assertions.php Sat Dec 18 07:35:28 2010
@@ -12,7 +12,7 @@ class ezcWebdavLockPluginClientTestAsser
 
         $prop = $backend->getProperty( '/collection/resource.html', 'lockdiscovery' );
 
-        PHPUnit_Framework_Assert::assertType(
+        PHPUnit_Framework_Assert::assertInstanceOf(
             'ezcWebdavLockDiscoveryProperty',
             $prop,
             'Property has incorrect type.'

Modified: incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/009_unlock_collection_success_assertions.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/009_unlock_collection_success_assertions.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/009_unlock_collection_success_assertions.php (original)
+++ incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/009_unlock_collection_success_assertions.php Sat Dec 18 07:35:28 2010
@@ -6,7 +6,7 @@ class ezcWebdavLockPluginClientTestAsser
     {
         $prop = $backend->getProperty( '/collection', 'lockdiscovery' );
 
-        PHPUnit_Framework_Assert::assertType(
+        PHPUnit_Framework_Assert::assertInstanceOf(
             'ezcWebdavLockDiscoveryProperty',
             $prop,
             'Property has incorrect type.'

Modified: incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/010_unlock_collection_deep_success_assertions.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/010_unlock_collection_deep_success_assertions.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/010_unlock_collection_deep_success_assertions.php (original)
+++ incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/010_unlock_collection_deep_success_assertions.php Sat Dec 18 07:35:28 2010
@@ -6,7 +6,7 @@ class ezcWebdavLockPluginClientTestAsser
     {
         $prop = $backend->getProperty( '/collection', 'lockdiscovery' );
 
-        PHPUnit_Framework_Assert::assertType(
+        PHPUnit_Framework_Assert::assertInstanceOf(
             'ezcWebdavLockDiscoveryProperty',
             $prop,
             'Property has incorrect type.'
@@ -19,7 +19,7 @@ class ezcWebdavLockPluginClientTestAsser
 
         $prop = $backend->getProperty( '/collection/resource.html', 'lockdiscovery' );
 
-        PHPUnit_Framework_Assert::assertType(
+        PHPUnit_Framework_Assert::assertInstanceOf(
             'ezcWebdavLockDiscoveryProperty',
             $prop,
             'Property has incorrect type.'

Modified: incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/011_unlock_lock_purged_success_assertions.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/011_unlock_lock_purged_success_assertions.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/011_unlock_lock_purged_success_assertions.php (original)
+++ incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/011_unlock_lock_purged_success_assertions.php Sat Dec 18 07:35:28 2010
@@ -6,7 +6,7 @@ class ezcWebdavLockPluginClientTestAsser
     {
         $prop = $backend->getProperty( '/collection', 'lockdiscovery' );
 
-        PHPUnit_Framework_Assert::assertType(
+        PHPUnit_Framework_Assert::assertInstanceOf(
             'ezcWebdavLockDiscoveryProperty',
             $prop,
             'Property has incorrect type.'
@@ -19,7 +19,7 @@ class ezcWebdavLockPluginClientTestAsser
 
         $prop = $backend->getProperty( '/collection/resource.html', 'lockdiscovery' );
 
-        PHPUnit_Framework_Assert::assertType(
+        PHPUnit_Framework_Assert::assertInstanceOf(
             'ezcWebdavLockDiscoveryProperty',
             $prop,
             'Property has incorrect type.'

Modified: incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/012_unlock_locknull_remove_success_assertions.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/012_unlock_locknull_remove_success_assertions.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/012_unlock_locknull_remove_success_assertions.php (original)
+++ incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/012_unlock_locknull_remove_success_assertions.php Sat Dec 18 07:35:28 2010
@@ -18,7 +18,7 @@ class ezcWebdavLockPluginClientTestAsser
     {
         $prop = $backend->getProperty( '/collection', 'lockdiscovery' );
 
-        PHPUnit_Framework_Assert::assertType(
+        PHPUnit_Framework_Assert::assertInstanceOf(
             'ezcWebdavLockDiscoveryProperty',
             $prop,
             'Property has incorrect type.'

Modified: incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/013_unlock_wrong_token_success_assertions.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/013_unlock_wrong_token_success_assertions.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/013_unlock_wrong_token_success_assertions.php (original)
+++ incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/013_unlock_wrong_token_success_assertions.php Sat Dec 18 07:35:28 2010
@@ -18,7 +18,7 @@ class ezcWebdavLockPluginClientTestAsser
     {
         $prop = $backend->getProperty( '/collection', 'lockdiscovery' );
 
-        PHPUnit_Framework_Assert::assertType(
+        PHPUnit_Framework_Assert::assertInstanceOf(
             'ezcWebdavLockDiscoveryProperty',
             $prop,
             'Property has incorrect type.'
@@ -31,7 +31,7 @@ class ezcWebdavLockPluginClientTestAsser
 
         $prop = $backend->getProperty( '/collection/resource.html', 'lockdiscovery' );
 
-        PHPUnit_Framework_Assert::assertType(
+        PHPUnit_Framework_Assert::assertInstanceOf(
             'ezcWebdavLockDiscoveryProperty',
             $prop,
             'Property has incorrect type.'

Modified: incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/014_move_resource_both_locked_success_assertions.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/014_move_resource_both_locked_success_assertions.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/014_move_resource_both_locked_success_assertions.php (original)
+++ incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/014_move_resource_both_locked_success_assertions.php Sat Dec 18 07:35:28 2010
@@ -17,7 +17,7 @@ class ezcWebdavLockPluginClientTestAsser
             $prop,
             'Lock discovery property removed from destination parent.'
         );
-        PHPUnit_Framework_Assert::assertType(
+        PHPUnit_Framework_Assert::assertInstanceOf(
             'ezcWebdavLockDiscoveryProperty',
             $prop
         );
@@ -45,7 +45,7 @@ class ezcWebdavLockPluginClientTestAsser
             $prop,
             'Lock discovery property not available on destination.'
         );
-        PHPUnit_Framework_Assert::assertType(
+        PHPUnit_Framework_Assert::assertInstanceOf(
             'ezcWebdavLockDiscoveryProperty',
             $prop
         );

Modified: incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/020_copy_resource_both_locked_success_assertions.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/020_copy_resource_both_locked_success_assertions.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/020_copy_resource_both_locked_success_assertions.php (original)
+++ incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/020_copy_resource_both_locked_success_assertions.php Sat Dec 18 07:35:28 2010
@@ -14,7 +14,7 @@ class ezcWebdavLockPluginClientTestAsser
             $prop,
             'Lock discovery property removed from source.'
         );
-        PHPUnit_Framework_Assert::assertType(
+        PHPUnit_Framework_Assert::assertInstanceOf(
             'ezcWebdavLockDiscoveryProperty',
             $prop
         );
@@ -38,7 +38,7 @@ class ezcWebdavLockPluginClientTestAsser
             $prop,
             'Lock discovery property removed from destination parent.'
         );
-        PHPUnit_Framework_Assert::assertType(
+        PHPUnit_Framework_Assert::assertInstanceOf(
             'ezcWebdavLockDiscoveryProperty',
             $prop
         );
@@ -66,7 +66,7 @@ class ezcWebdavLockPluginClientTestAsser
             $prop,
             'Lock discovery property not available on destination.'
         );
-        PHPUnit_Framework_Assert::assertType(
+        PHPUnit_Framework_Assert::assertInstanceOf(
             'ezcWebdavLockDiscoveryProperty',
             $prop
         );

Modified: incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/021_copy_resource_destination_not_locked_success_assertions.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/021_copy_resource_destination_not_locked_success_assertions.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/021_copy_resource_destination_not_locked_success_assertions.php (original)
+++ incubator/zetacomponents/trunk/Webdav/tests/lock_plugin/021_copy_resource_destination_not_locked_success_assertions.php Sat Dec 18 07:35:28 2010
@@ -14,7 +14,7 @@ class ezcWebdavLockPluginClientTestAsser
             $prop,
             'Lock discovery property removed from source.'
         );
-        PHPUnit_Framework_Assert::assertType(
+        PHPUnit_Framework_Assert::assertInstanceOf(
             'ezcWebdavLockDiscoveryProperty',
             $prop
         );

Modified: incubator/zetacomponents/trunk/Workflow/tests/condition_test.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/Workflow/tests/condition_test.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/Workflow/tests/condition_test.php (original)
+++ incubator/zetacomponents/trunk/Workflow/tests/condition_test.php Sat Dec 18 07:35:28 2010
@@ -160,7 +160,7 @@ class ezcWorkflowConditionTest extends e
         $this->assertTrue( $condition->evaluate( 2204 ) );
         $this->assertFalse( $condition->evaluate( 1978 ) );
         $this->assertEquals( '! < 2204', (string)$condition );
-        $this->assertType( 'ezcWorkflowConditionIsLessThan', $condition->getCondition() );
+        $this->assertInstanceOf( 'ezcWorkflowConditionIsLessThan', $condition->getCondition() );
     }
 
     public function testIsGreaterThan()
@@ -181,7 +181,7 @@ class ezcWorkflowConditionTest extends e
         $this->assertTrue( $condition->evaluate( 1978 ) );
         $this->assertFalse( $condition->evaluate( 2204 ) );
         $this->assertEquals( '! > 1978', (string)$condition );
-        $this->assertType( 'ezcWorkflowConditionIsGreaterThan', $condition->getCondition() );
+        $this->assertInstanceOf( 'ezcWorkflowConditionIsGreaterThan', $condition->getCondition() );
     }
 
     public function testIsEqualOrGreaterThan()

Modified: incubator/zetacomponents/trunk/Workflow/tests/node_test.php
URL: http://svn.apache.org/viewvc/incubator/zetacomponents/trunk/Workflow/tests/node_test.php?rev=1050593&r1=1050592&r2=1050593&view=diff
==============================================================================
--- incubator/zetacomponents/trunk/Workflow/tests/node_test.php (original)
+++ incubator/zetacomponents/trunk/Workflow/tests/node_test.php Sat Dec 18 07:35:28 2010
@@ -100,7 +100,7 @@ class ezcWorkflowNodeTest extends ezcWor
         $configuration = $input->getConfiguration();
 
         $this->assertArrayHasKey( 'variable', $configuration );
-        $this->assertType( 'ezcWorkflowConditionIsAnything', $configuration['variable'] );
+        $this->assertInstanceOf( 'ezcWorkflowConditionIsAnything', $configuration['variable'] );
     }
 
     public function testVariableSetConstructor()



Mime
View raw message