ZF-11177: backport from 1.11 release branch

ensure tests reflect new https urls:
- Updated failing tests due to failure to change expected URLs to https variants

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

tests/Zend/Gdata/Calendar/EventQueryTest.php

@@ -48,7 +48,7 @@ class Zend_Gdata_Calendar_EventQueryTest extends PHPUnit_Framework_TestCase
     public function testDefaultBaseUrlForQuery()
     {
         $queryUrl = $this->query->getQueryUrl();
-        $this->assertEquals('http://www.google.com/calendar/feeds/default/public/full',
+        $this->assertEquals('https://www.google.com/calendar/feeds/default/public/full',
                 $queryUrl);
     }
 
@@ -245,7 +245,7 @@ class Zend_Gdata_Calendar_EventQueryTest extends PHPUnit_Framework_TestCase
         $this->query->setProjection("composite");
         $this->query->setEvent(self::ZEND_CONFERENCE_EVENT);
         $this->query->setComments(self::ZEND_CONFERENCE_EVENT_COMMENT);
-        $this->assertEquals("http://www.google.com/calendar/feeds/developer-calendar@google.com/private/composite/" .
+        $this->assertEquals("https://www.google.com/calendar/feeds/developer-calendar@google.com/private/composite/" .
                 self::ZEND_CONFERENCE_EVENT . "/comments/" . self::ZEND_CONFERENCE_EVENT_COMMENT,
                 $this->query->getQueryUrl());
     }
@@ -253,7 +253,7 @@ class Zend_Gdata_Calendar_EventQueryTest extends PHPUnit_Framework_TestCase
     public function testDefaultQueryURIGeneration()
     {
         $this->query->resetParameters();
-        $this->assertEquals("http://www.google.com/calendar/feeds/default/public/full",
+        $this->assertEquals("https://www.google.com/calendar/feeds/default/public/full",
                 $this->query->getQueryUrl());
     }
 

tests/Zend/Gdata/Photos/PhotosAlbumQueryTest.php

@@ -42,7 +42,7 @@ class Zend_Gdata_Photos_PhotosAlbumQueryTest extends PHPUnit_Framework_TestCase
       */
     public function testSimpleAlbumQuery()
     {
-        $queryString = "http://picasaweb.google.com/data/feed/api/user/sample.user/albumid/1";
+        $queryString = "https://picasaweb.google.com/data/feed/api/user/sample.user/albumid/1";
 
         $query = new Zend_Gdata_Photos_AlbumQuery();
         $query->setUser("sample.user");
@@ -53,7 +53,7 @@ class Zend_Gdata_Photos_PhotosAlbumQueryTest extends PHPUnit_Framework_TestCase
         // Assert that the generated query matches the correct one
         $this->assertEquals($queryString, $generatedString);
 
-        $queryString = "http://picasaweb.google.com/data/feed/api/user/sample.user/album/test";
+        $queryString = "https://picasaweb.google.com/data/feed/api/user/sample.user/album/test";
 
         $query->setAlbumId(null);
         $query->setAlbumName("test");
@@ -94,7 +94,7 @@ class Zend_Gdata_Photos_PhotosAlbumQueryTest extends PHPUnit_Framework_TestCase
       */
     public function testBaseAlbumQuery()
     {
-        $queryString = "http://picasaweb.google.com/data/feed/base/user/sample.user/albumid/1";
+        $queryString = "https://picasaweb.google.com/data/feed/base/user/sample.user/albumid/1";
 
         $query = new Zend_Gdata_Photos_AlbumQuery();
         $query->setUser("sample.user");
@@ -113,7 +113,7 @@ class Zend_Gdata_Photos_PhotosAlbumQueryTest extends PHPUnit_Framework_TestCase
       */
     public function testTagFilterAlbumQuery()
     {
-        $queryString = "http://picasaweb.google.com/data/feed/api/user/sample.user/albumid/1?tag=test";
+        $queryString = "https://picasaweb.google.com/data/feed/api/user/sample.user/albumid/1?tag=test";
 
         $query = new Zend_Gdata_Photos_AlbumQuery();
         $query->setUser("sample.user");
@@ -131,7 +131,7 @@ class Zend_Gdata_Photos_PhotosAlbumQueryTest extends PHPUnit_Framework_TestCase
       */
     public function testPrivateAlbumQuery()
     {
-        $queryString = "http://picasaweb.google.com/data/feed/api/user/sample.user/albumid/1?access=private";
+        $queryString = "https://picasaweb.google.com/data/feed/api/user/sample.user/albumid/1?access=private";
 
         $query = new Zend_Gdata_Photos_AlbumQuery();
         $query->setUser("sample.user");
@@ -149,7 +149,7 @@ class Zend_Gdata_Photos_PhotosAlbumQueryTest extends PHPUnit_Framework_TestCase
       */
     public function testThumbnailAlbumQuery()
     {
-        $queryString = "http://picasaweb.google.com/data/feed/api/user/sample.user/albumid/1?thumbsize=72";
+        $queryString = "https://picasaweb.google.com/data/feed/api/user/sample.user/albumid/1?thumbsize=72";
 
         $query = new Zend_Gdata_Photos_AlbumQuery();
         $query->setUser("sample.user");
@@ -170,7 +170,7 @@ class Zend_Gdata_Photos_PhotosAlbumQueryTest extends PHPUnit_Framework_TestCase
       */
     public function testImgAlbumQuery()
     {
-        $queryString = "http://picasaweb.google.com/data/feed/api/user/sample.user/albumid/1?imgmax=800";
+        $queryString = "https://picasaweb.google.com/data/feed/api/user/sample.user/albumid/1?imgmax=800";
 
         $query = new Zend_Gdata_Photos_AlbumQuery();
         $query->setUser("sample.user");
@@ -186,7 +186,7 @@ class Zend_Gdata_Photos_PhotosAlbumQueryTest extends PHPUnit_Framework_TestCase
         $this->assertEquals($queryString, $generatedString);
 
         // Check that ImgMax is set back to null
-        $queryString = "http://picasaweb.google.com/data/feed/api/user/sample.user/albumid/1";
+        $queryString = "https://picasaweb.google.com/data/feed/api/user/sample.user/albumid/1";
         $query->setImgMax(null);
 
         $generatedString = $query->getQueryUrl();

tests/Zend/Gdata/Photos/PhotosPhotoQueryTest.php

@@ -42,7 +42,7 @@ class Zend_Gdata_Photos_PhotosPhotoQueryTest extends PHPUnit_Framework_TestCase
       */
     public function testSimplePhotoQuery()
     {
-        $queryString = "http://picasaweb.google.com/data/feed/api/user/sample.user/albumid/1/photoid/1";
+        $queryString = "https://picasaweb.google.com/data/feed/api/user/sample.user/albumid/1/photoid/1";
 
         $query = new Zend_Gdata_Photos_PhotoQuery();
         $query->setUser("sample.user");
@@ -61,7 +61,7 @@ class Zend_Gdata_Photos_PhotosPhotoQueryTest extends PHPUnit_Framework_TestCase
       */
     public function testBasePhotoQuery()
     {
-        $queryString = "http://picasaweb.google.com/data/feed/base/user/sample.user/albumid/1/photoid/1";
+        $queryString = "https://picasaweb.google.com/data/feed/base/user/sample.user/albumid/1/photoid/1";
 
         $query = new Zend_Gdata_Photos_PhotoQuery();
         $query->setUser("sample.user");
@@ -97,7 +97,7 @@ class Zend_Gdata_Photos_PhotosPhotoQueryTest extends PHPUnit_Framework_TestCase
       */
     public function testTagFilterPhotoQuery()
     {
-        $queryString = "http://picasaweb.google.com/data/feed/api/user/sample.user/albumid/1/photoid/1?tag=test";
+        $queryString = "https://picasaweb.google.com/data/feed/api/user/sample.user/albumid/1/photoid/1?tag=test";
 
         $query = new Zend_Gdata_Photos_PhotoQuery();
         $query->setUser("sample.user");
@@ -116,7 +116,7 @@ class Zend_Gdata_Photos_PhotosPhotoQueryTest extends PHPUnit_Framework_TestCase
       */
     public function testPrivatePhotoQuery()
     {
-        $queryString = "http://picasaweb.google.com/data/feed/api/user/sample.user/albumid/1/photoid/1?access=private";
+        $queryString = "https://picasaweb.google.com/data/feed/api/user/sample.user/albumid/1/photoid/1?access=private";
 
         $query = new Zend_Gdata_Photos_PhotoQuery();
         $query->setUser("sample.user");

tests/Zend/Gdata/Photos/PhotosUserQueryTest.php

@@ -42,7 +42,7 @@ class Zend_Gdata_Photos_PhotosUserQueryTest extends PHPUnit_Framework_TestCase
       */
     public function testSimpleUserQuery()
     {
-        $queryString = "http://picasaweb.google.com/data/feed/api/user/sample.user";
+        $queryString = "https://picasaweb.google.com/data/feed/api/user/sample.user";
 
         $query = new Zend_Gdata_Photos_UserQuery();
         $query->setUser("sample.user");
@@ -59,7 +59,7 @@ class Zend_Gdata_Photos_PhotosUserQueryTest extends PHPUnit_Framework_TestCase
       */
     public function testBaseUserQuery()
     {
-        $queryString = "http://picasaweb.google.com/data/feed/base/user/sample.user";
+        $queryString = "https://picasaweb.google.com/data/feed/base/user/sample.user";
 
         $query = new Zend_Gdata_Photos_UserQuery();
         $query->setUser("sample.user");
@@ -102,7 +102,7 @@ class Zend_Gdata_Photos_PhotosUserQueryTest extends PHPUnit_Framework_TestCase
       */
     public function testTagFilterUserQuery()
     {
-        $queryString = "http://picasaweb.google.com/data/feed/api/user/sample.user?tag=test";
+        $queryString = "https://picasaweb.google.com/data/feed/api/user/sample.user?tag=test";
 
         $query = new Zend_Gdata_Photos_UserQuery();
         $query->setUser("sample.user");
@@ -119,7 +119,7 @@ class Zend_Gdata_Photos_PhotosUserQueryTest extends PHPUnit_Framework_TestCase
       */
     public function testPrivateUserQuery()
     {
-        $queryString = "http://picasaweb.google.com/data/feed/api/user/sample.user?access=private";
+        $queryString = "https://picasaweb.google.com/data/feed/api/user/sample.user?access=private";
 
         $query = new Zend_Gdata_Photos_UserQuery();
         $query->setUser("sample.user");