Misses this file to merge. I like the comments.

[quix0rs-gnu-social.git] / tests / ActivityGenerationTests.php

diff --git a/tests/ActivityGenerationTests.php b/tests/ActivityGenerationTests.php
index c9f27cbde0ebe88f18032393a5ef28451cf90836..f5ea3ad442374f308ab6acff43ffd22cd9bfeb65 100644 (file)
--- a/tests/ActivityGenerationTests.php
+++ b/tests/ActivityGenerationTests.php
@@ -362,7 +362,7 @@ class ActivityGenerationTests extends PHPUnit_Framework_TestCase
     public function testRepeatLink()
     {
         $notice = $this->_fakeNotice($this->author1);
-        $repeat = $notice->repeat($this->author2->id, 'test');
+        $repeat = $notice->repeat($this->author2->getProfile(), 'test');
 
         $entry = $repeat->asAtomEntry();
 
@@ -372,7 +372,7 @@ class ActivityGenerationTests extends PHPUnit_Framework_TestCase
 
         $this->assertNotNull($forward);
         $this->assertEquals($notice->getUri(), $forward->getAttribute('ref'));
-        $this->assertEquals($notice->bestUrl(), $forward->getAttribute('href'));
+        $this->assertEquals($notice->getUrl(), $forward->getAttribute('href'));
     }
 
     public function testTag()
@@ -443,7 +443,7 @@ class ActivityGenerationTests extends PHPUnit_Framework_TestCase
         $this->assertEquals($notice->source, $noticeInfo->getAttribute('source'));
         $this->assertEquals('', $noticeInfo->getAttribute('repeat_of'));
         $this->assertEquals('', $noticeInfo->getAttribute('repeated'));
-        $this->assertEquals('', $noticeInfo->getAttribute('favorite'));
+//        $this->assertEquals('', $noticeInfo->getAttribute('favorite'));
         $this->assertEquals('', $noticeInfo->getAttribute('source_link'));
     }
 
@@ -451,7 +451,7 @@ class ActivityGenerationTests extends PHPUnit_Framework_TestCase
     {
         $notice = $this->_fakeNotice();
 
-        $repeat = $notice->repeat($this->author2->id, 'test');
+        $repeat = $notice->repeat($this->author2->getProfile(), 'test');
 
         $entry = $repeat->asAtomEntry();
 
@@ -466,7 +466,7 @@ class ActivityGenerationTests extends PHPUnit_Framework_TestCase
     {
         $notice = $this->_fakeNotice();
 
-        $repeat = $notice->repeat($this->author2->id, 'test');
+        $repeat = $notice->repeat($this->author2->getProfile(), 'test');
 
         $entry = $notice->asAtomEntry(false, false, false, $this->author2);
 
@@ -485,7 +485,7 @@ class ActivityGenerationTests extends PHPUnit_Framework_TestCase
         $this->assertEquals('false', $noticeInfo->getAttribute('repeated'));
     }
 
-    public function testNoticeInfoFave()
+/*    public function testNoticeInfoFave()
     {
         $notice = $this->_fakeNotice();
 
@@ -510,7 +510,7 @@ class ActivityGenerationTests extends PHPUnit_Framework_TestCase
         $noticeInfo = ActivityUtils::child($element, 'notice_info', "http://status.net/schema/api/1/");
 
         $this->assertEquals('false', $noticeInfo->getAttribute('favorite'));
-    }
+    }*/
 
     public function testConversationLink()
     {
@@ -526,7 +526,7 @@ class ActivityGenerationTests extends PHPUnit_Framework_TestCase
 
         $element = $this->_entryToElement($entry, true);
 
-        $this->assertEquals($conv->uri, ActivityUtils::getLink($element, 'ostatus:conversation'));
+        $this->assertEquals($conv->getUri(), ActivityUtils::getLink($element, 'ostatus:conversation'));
     }
 
     function __destruct()