[TESTS] backport r17036 to trunk

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@17037 44c647ce-9c0f-0410-b52a-842ac1e357ba

tests/Zend/Config/IniTest.php

@@ -226,6 +226,11 @@ class Zend_Config_IniTest extends PHPUnit_Framework_TestCase
 
     public function testZF739()
     {
+        if (version_compare('5.3.0', PHP_VERSION) < 1) {
+            $this->markTestSkipped('PHP >= 5.3.0 does not allow : as a nest separator');
+            return;
+        }
+
         $config = new Zend_Config_Ini($this->_iniFileSeparatorConfig, 'all', array('nestSeparator'=>':'));
 
         $this->assertEquals('all', $config->hostname);
@@ -258,7 +263,7 @@ class Zend_Config_IniTest extends PHPUnit_Framework_TestCase
             $config = new Zend_Config_Ini($this->_iniFileInvalid);
             $this->fail('An expected Zend_Config_Exception has not been raised');
         } catch (Zend_Config_Exception $expected) {
-            $this->assertContains('Error parsing', $expected->getMessage());
+            $this->assertRegexp('/(Error parsing|syntax error, unexpected)/', $expected->getMessage());
         }
         
     }

tests/Zend/Gdata/App/FeedTest.php

@@ -121,19 +121,30 @@ class Zend_Gdata_App_FeedTest extends PHPUnit_Framework_TestCase
         // Set new service instance and test for propagation
         $s = new Zend_Gdata_App();
         $this->feed->setService($s);
+
+        $service = $this->feed->getService();
+        if (!is_object($service)) {
+            $this->fail('No feed service received');
+        }
         $this->assertEquals('Zend_Gdata_App',
-                            get_class($this->feed->getService()));
+                            get_class($service));
+
         foreach ($entries as $entry) {
+            $service = $entry->getService();
+            if (!is_object($service)) {
+                $this->fail('No entry service received');
+            }
             $this->assertEquals('Zend_Gdata_App',
-                                get_class($entry->getService()));
+                                get_class($service));
         }
         
         // Set null service instance and test for propagation
         $s = null;
         $this->feed->setService($s);
-        $this->assertEquals(null, get_class($this->feed->getService()));
+        $this->assertFalse(is_object($this->feed->getService()));
         foreach ($entries as $entry) {
-            $this->assertEquals(null, get_class($entry->getService()));
+            $service = $entry->getService();
+            $this->assertFalse(is_object($service));
         }
     }