X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=tests%2FActivityGenerationTests.php;h=21fe32a58b3c884e46fe13ad4c727b170d77fd5a;hb=9cc7df51d64bb9b829e4a54ee2449c542209550d;hp=8cf1b009ed6ed5379e98d68c6d0e50f5b6d20a52;hpb=ea8b086cb2b9ae42eb2a165786ee7aa7f3224283;p=quix0rs-gnu-social.git

diff --git a/tests/ActivityGenerationTests.php b/tests/ActivityGenerationTests.php
index 8cf1b009ed..21fe32a58b 100644
--- a/tests/ActivityGenerationTests.php
+++ b/tests/ActivityGenerationTests.php
@@ -8,52 +8,52 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
 // XXX: we should probably have some common source for this stuff
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-define('STATUSNET', true);
+define('GNUSOCIAL', true);
+define('STATUSNET', true);  // compatibility
 
 require_once INSTALLDIR . '/lib/common.php';
 
 class ActivityGenerationTests extends PHPUnit_Framework_TestCase
 {
-    var $author1 = null;
-    var $author2 = null;
+    static $author1 = null;
+    static $author2 = null;
 
-    var $targetUser1 = null;
-    var $targetUser2 = null;
+    static $targetUser1 = null;
+    static $targetUser2 = null;
 
-    var $targetGroup1 = null;
-    var $targetGroup2 = null;
+    static $targetGroup1 = null;
+    static $targetGroup2 = null;
 
-    function __construct()
+    public static function setUpBeforeClass()
     {
-        parent::__construct();
+        $authorNick1 = 'activitygenerationtestsuser' . common_random_hexstr(4);
+        $authorNick2 = 'activitygenerationtestsuser' . common_random_hexstr(4);
 
-        $authorNick1 = 'activitygenerationtestsuser' . common_good_rand(4);
-        $authorNick2 = 'activitygenerationtestsuser' . common_good_rand(4);
+        $targetNick1 = 'activitygenerationteststarget' . common_random_hexstr(4);
+        $targetNick2 = 'activitygenerationteststarget' . common_random_hexstr(4);
 
-        $targetNick1 = 'activitygenerationteststarget' . common_good_rand(4);
-        $targetNick2 = 'activitygenerationteststarget' . common_good_rand(4);
+        $groupNick1 = 'activitygenerationtestsgroup' . common_random_hexstr(4);
+        $groupNick2 = 'activitygenerationtestsgroup' . common_random_hexstr(4);
 
-        $groupNick1 = 'activitygenerationtestsgroup' . common_good_rand(4);
-        $groupNick2 = 'activitygenerationtestsgroup' . common_good_rand(4);
-
-        $this->author1 = User::register(array('nickname' => $authorNick1,
+        try{
+        	self::$author1 = User::register(array('nickname' => $authorNick1,
                                               'email' => $authorNick1 . '@example.net',
                                               'email_confirmed' => true));
 
-        $this->author2 = User::register(array('nickname' => $authorNick2,
+        	self::$author2 = User::register(array('nickname' => $authorNick2,
                                               'email' => $authorNick2 . '@example.net',
                                               'email_confirmed' => true));
 
-        $this->targetUser1 = User::register(array('nickname' => $targetNick1,
+        	self::$targetUser1 = User::register(array('nickname' => $targetNick1,
                                                   'email' => $targetNick1 . '@example.net',
                                                   'email_confirmed' => true));
 
-        $this->targetUser2 = User::register(array('nickname' => $targetNick2,
+        	self::$targetUser2 = User::register(array('nickname' => $targetNick2,
                                                   'email' => $targetNick2 . '@example.net',
                                                   'email_confirmed' => true));
 
-        $this->targetGroup1 = User_group::register(array('nickname' => $groupNick1,
-                                                         'userid' => $this->author1->id,
+        	self::$targetGroup1 = User_group::register(array('nickname' => $groupNick1,
+                                                         'userid' => self::$author1->id,
                                                          'aliases' => array(),
                                                          'local' => true,
                                                          'location' => null,
@@ -61,8 +61,8 @@ class ActivityGenerationTests extends PHPUnit_Framework_TestCase
                                                          'fullname' => null,
                                                          'homepage' => null,
                                                          'mainpage' => null));
-        $this->targetGroup2 = User_group::register(array('nickname' => $groupNick2,
-                                                         'userid' => $this->author1->id,
+        	self::$targetGroup2 = User_group::register(array('nickname' => $groupNick2,
+                                                         'userid' => self::$author1->id,
                                                          'aliases' => array(),
                                                          'local' => true,
                                                          'location' => null,
@@ -70,6 +70,10 @@ class ActivityGenerationTests extends PHPUnit_Framework_TestCase
                                                          'fullname' => null,
                                                          'homepage' => null,
                                                          'mainpage' => null));
+        } catch (Exception $e) {
+        	self::tearDownAfterClass();
+        	throw $e;
+        }
     }
 
     public function testBasicNoticeActivity()
@@ -80,8 +84,8 @@ class ActivityGenerationTests extends PHPUnit_Framework_TestCase
 
         $element = $this->_entryToElement($entry, false);
 
-        $this->assertEquals($notice->uri, ActivityUtils::childContent($element, 'id'));
-        $this->assertEquals($notice->content, ActivityUtils::childContent($element, 'title'));
+        $this->assertEquals($notice->getUri(), ActivityUtils::childContent($element, 'id'));
+        $this->assertEquals('New note by '. self::$author1->nickname, ActivityUtils::childContent($element, 'title'));
         $this->assertEquals($notice->rendered, ActivityUtils::childContent($element, 'content'));
         $this->assertEquals(strtotime($notice->created), strtotime(ActivityUtils::childContent($element, 'published')));
         $this->assertEquals(strtotime($notice->created), strtotime(ActivityUtils::childContent($element, 'updated')));
@@ -158,9 +162,9 @@ class ActivityGenerationTests extends PHPUnit_Framework_TestCase
 
         $source = ActivityUtils::child($element, 'source');
 
-        $atomUrl = common_local_url('ApiTimelineUser', array('id' => $this->author1->id, 'format' => 'atom'));
+        $atomUrl = common_local_url('ApiTimelineUser', array('id' => self::$author1->id, 'format' => 'atom'));
 
-        $profile = $this->author1->getProfile();
+        $profile = self::$author1->getProfile();
 
         $this->assertEquals($atomUrl, ActivityUtils::childContent($source, 'id'));
         $this->assertEquals($atomUrl, ActivityUtils::getLink($source, 'self', 'application/atom+xml'));
@@ -209,8 +213,8 @@ class ActivityGenerationTests extends PHPUnit_Framework_TestCase
 
         $author = ActivityUtils::child($element, 'author');
 
-        $this->assertEquals($this->author1->nickname, ActivityUtils::childContent($author, 'name'));
-        $this->assertEquals($this->author1->uri, ActivityUtils::childContent($author, 'uri'));
+        $this->assertEquals(self::$author1->getNickname(), ActivityUtils::childContent($author, 'name'));
+        $this->assertEquals(self::$author1->getUri(), ActivityUtils::childContent($author, 'uri'));
     }
 
     /**
@@ -233,11 +237,11 @@ class ActivityGenerationTests extends PHPUnit_Framework_TestCase
 
     public function testReplyLink()
     {
-        $orig = $this->_fakeNotice($this->targetUser1);
+        $orig = $this->_fakeNotice(self::$targetUser1);
 
-        $text = "@" . $this->targetUser1->nickname . " reply text " . common_good_rand(4);
+        $text = "@" . self::$targetUser1->nickname . " reply text " . common_random_hexstr(4);
 
-        $reply = Notice::saveNew($this->author1->id, $text, 'test', array('uri' => null, 'reply_to' => $orig->id));
+        $reply = Notice::saveNew(self::$author1->id, $text, 'test', array('uri' => null, 'reply_to' => $orig->id));
 
         $entry = $reply->asAtomEntry();
 
@@ -246,141 +250,110 @@ class ActivityGenerationTests extends PHPUnit_Framework_TestCase
         $irt = ActivityUtils::child($element, 'in-reply-to', 'http://purl.org/syndication/thread/1.0');
 
         $this->assertNotNull($irt);
-        $this->assertEquals($orig->uri, $irt->getAttribute('ref'));
-        $this->assertEquals($orig->bestUrl(), $irt->getAttribute('href'));
+        $this->assertEquals($orig->getUri(), $irt->getAttribute('ref'));
+        $this->assertEquals($orig->getUrl(), $irt->getAttribute('href'));
     }
 
     public function testReplyAttention()
     {
-        $orig = $this->_fakeNotice($this->targetUser1);
+        $orig = $this->_fakeNotice(self::$targetUser1);
 
-        $text = "@" . $this->targetUser1->nickname . " reply text " . common_good_rand(4);
+        $text = "@" . self::$targetUser1->nickname . " reply text " . common_random_hexstr(4);
 
-        $reply = Notice::saveNew($this->author1->id, $text, 'test', array('uri' => null, 'reply_to' => $orig->id));
+        $reply = Notice::saveNew(self::$author1->id, $text, 'test', array('uri' => null, 'reply_to' => $orig->id));
 
         $entry = $reply->asAtomEntry();
 
         $element = $this->_entryToElement($entry, true);
 
-        $this->assertEquals($this->targetUser1->uri, ActivityUtils::getLink($element, 'ostatus:attention'));
-        $this->assertEquals($this->targetUser1->uri, ActivityUtils::getLink($element, 'mentioned'));
+        $this->assertEquals(self::$targetUser1->getUri(), ActivityUtils::getLink($element, 'mentioned'));
     }
 
     public function testMultipleReplyAttention()
     {
-        $orig = $this->_fakeNotice($this->targetUser1);
+        $orig = $this->_fakeNotice(self::$targetUser1);
 
-        $text = "@" . $this->targetUser1->nickname . " reply text " . common_good_rand(4);
+        $text = "@" . self::$targetUser1->nickname . " reply text " . common_random_hexstr(4);
 
-        $reply = Notice::saveNew($this->targetUser2->id, $text, 'test', array('uri' => null, 'reply_to' => $orig->id));
+        $reply = Notice::saveNew(self::$targetUser2->id, $text, 'test', array('uri' => null, 'reply_to' => $orig->id));
 
-        $text = "@" . $this->targetUser1->nickname . " @" . $this->targetUser2->nickname . " reply text " . common_good_rand(4);
+        $text = "@" . self::$targetUser1->nickname . " @" . self::$targetUser2->nickname . " reply text " . common_random_hexstr(4);
 
-        $reply2 = Notice::saveNew($this->author1->id, $text, 'test', array('uri' => null, 'reply_to' => $reply->id));
+        $reply2 = Notice::saveNew(self::$author1->id, $text, 'test', array('uri' => null, 'reply_to' => $reply->id));
 
         $entry = $reply2->asAtomEntry();
 
         $element = $this->_entryToElement($entry, true);
 
-        $links = ActivityUtils::getLinks($element, 'ostatus:attention');
-
-        $this->assertEquals(2, count($links));
-
-        $hrefs = array();
-
-        foreach ($links as $link) {
-            $hrefs[] = $link->getAttribute('href');
-        }
-
-        $this->assertTrue(in_array($this->targetUser1->uri, $hrefs));
-        $this->assertTrue(in_array($this->targetUser2->uri, $hrefs));
-
         $links = ActivityUtils::getLinks($element, 'mentioned');
 
-        $this->assertEquals(2, count($links));
-
         $hrefs = array();
 
         foreach ($links as $link) {
             $hrefs[] = $link->getAttribute('href');
         }
 
-        $this->assertTrue(in_array($this->targetUser1->uri, $hrefs));
-        $this->assertTrue(in_array($this->targetUser2->uri, $hrefs));
+        $this->assertTrue(in_array(self::$targetUser1->getUri(), $hrefs));
+        $this->assertTrue(in_array(self::$targetUser2->getUri(), $hrefs));
     }
 
     public function testGroupPostAttention()
     {
-        $text = "!" . $this->targetGroup1->nickname . " reply text " . common_good_rand(4);
+        $text = "!" . self::$targetGroup1->nickname . " reply text " . common_random_hexstr(4);
 
-        $notice = Notice::saveNew($this->author1->id, $text, 'test', array('uri' => null));
+        $notice = Notice::saveNew(self::$author1->id, $text, 'test', array('uri' => null));
 
         $entry = $notice->asAtomEntry();
 
         $element = $this->_entryToElement($entry, true);
 
-        $this->assertEquals($this->targetGroup1->uri, ActivityUtils::getLink($element, 'ostatus:attention'));
-        $this->assertEquals($this->targetGroup1->uri, ActivityUtils::getLink($element, 'mentioned'));
+        $this->assertEquals(self::$targetGroup1->getUri(), ActivityUtils::getLink($element, 'mentioned'));
     }
 
     public function testMultipleGroupPostAttention()
     {
-        $text = "!" . $this->targetGroup1->nickname . " !" . $this->targetGroup2->nickname . " reply text " . common_good_rand(4);
+        $text = "!" . self::$targetGroup1->nickname . " !" . self::$targetGroup2->nickname . " reply text " . common_random_hexstr(4);
 
-        $notice = Notice::saveNew($this->author1->id, $text, 'test', array('uri' => null));
+        $notice = Notice::saveNew(self::$author1->id, $text, 'test', array('uri' => null));
 
         $entry = $notice->asAtomEntry();
 
         $element = $this->_entryToElement($entry, true);
 
-        $links = ActivityUtils::getLinks($element, 'ostatus:attention');
-
-        $this->assertEquals(2, count($links));
-
-        $hrefs = array();
-
-        foreach ($links as $link) {
-            $hrefs[] = $link->getAttribute('href');
-        }
-
-        $this->assertTrue(in_array($this->targetGroup1->uri, $hrefs));
-        $this->assertTrue(in_array($this->targetGroup2->uri, $hrefs));
-
         $links = ActivityUtils::getLinks($element, 'mentioned');
 
-        $this->assertEquals(2, count($links));
-
         $hrefs = array();
 
         foreach ($links as $link) {
             $hrefs[] = $link->getAttribute('href');
         }
 
-        $this->assertTrue(in_array($this->targetGroup1->uri, $hrefs));
-        $this->assertTrue(in_array($this->targetGroup2->uri, $hrefs));
+        $this->assertTrue(in_array(self::$targetGroup1->getUri(), $hrefs));
+        $this->assertTrue(in_array(self::$targetGroup2->getUri(), $hrefs));
+
     }
 
     public function testRepeatLink()
     {
-        $notice = $this->_fakeNotice($this->author1);
-        $repeat = $notice->repeat($this->author2->id, 'test');
+        $notice = $this->_fakeNotice(self::$author1);
+        $repeat = $notice->repeat(self::$author2->getProfile(), 'test');
 
         $entry = $repeat->asAtomEntry();
 
         $element = $this->_entryToElement($entry, true);
 
-        $forward = ActivityUtils::child($element, 'forward', "http://ostatus.org/schema/1.0");
+        $noticeInfo = ActivityUtils::child($element, 'notice_info', 'http://status.net/schema/api/1/');
 
-        $this->assertNotNull($forward);
-        $this->assertEquals($notice->uri, $forward->getAttribute('ref'));
-        $this->assertEquals($notice->bestUrl(), $forward->getAttribute('href'));
+        $this->assertNotNull($noticeInfo);
+        $this->assertEquals($notice->id, $noticeInfo->getAttribute('repeat_of'));
+        $this->assertEquals($repeat->id, $noticeInfo->getAttribute('local_id'));
     }
 
     public function testTag()
     {
-        $tag1 = common_good_rand(4);
+        $tag1 = common_random_hexstr(4);
 
-        $notice = $this->_fakeNotice($this->author1, '#' . $tag1);
+        $notice = $this->_fakeNotice(self::$author1, '#' . $tag1);
 
         $entry = $notice->asAtomEntry();
 
@@ -394,10 +367,10 @@ class ActivityGenerationTests extends PHPUnit_Framework_TestCase
 
     public function testMultiTag()
     {
-        $tag1 = common_good_rand(4);
-        $tag2 = common_good_rand(4);
+        $tag1 = common_random_hexstr(4);
+        $tag2 = common_random_hexstr(4);
 
-        $notice = $this->_fakeNotice($this->author1, '#' . $tag1 . ' #' . $tag2);
+        $notice = $this->_fakeNotice(self::$author1, '#' . $tag1 . ' #' . $tag2);
 
         $entry = $notice->asAtomEntry();
 
@@ -421,13 +394,13 @@ class ActivityGenerationTests extends PHPUnit_Framework_TestCase
 
     public function testGeotaggedActivity()
     {
-        $notice = Notice::saveNew($this->author1->id, common_good_rand(4), 'test', array('uri' => null, 'lat' => 45.5, 'lon' => -73.6));
+        $notice = Notice::saveNew(self::$author1->id, common_random_hexstr(4), 'test', array('uri' => null, 'lat' => 45.5, 'lon' => -73.6));
 
         $entry = $notice->asAtomEntry();
 
         $element = $this->_entryToElement($entry, true);
 
-        $this->assertEquals('45.5 -73.6', ActivityUtils::childContent($element, 'point', "http://www.georss.org/georss"));
+        $this->assertEquals('45.5000000 -73.6000000', ActivityUtils::childContent($element, 'point', "http://www.georss.org/georss"));
     }
 
     public function testNoticeInfo()
@@ -444,7 +417,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'));
     }
 
@@ -452,7 +425,7 @@ class ActivityGenerationTests extends PHPUnit_Framework_TestCase
     {
         $notice = $this->_fakeNotice();
 
-        $repeat = $notice->repeat($this->author2->id, 'test');
+        $repeat = $notice->repeat(self::$author2->getProfile(), 'test');
 
         $entry = $repeat->asAtomEntry();
 
@@ -467,9 +440,9 @@ class ActivityGenerationTests extends PHPUnit_Framework_TestCase
     {
         $notice = $this->_fakeNotice();
 
-        $repeat = $notice->repeat($this->author2->id, 'test');
+        $repeat = $notice->repeat(self::$author2->getProfile(), 'test');
 
-        $entry = $notice->asAtomEntry(false, false, false, $this->author2);
+        $entry = $notice->asAtomEntry(false, false, false, self::$author2->getProfile());
 
         $element = $this->_entryToElement($entry, true);
 
@@ -477,7 +450,7 @@ class ActivityGenerationTests extends PHPUnit_Framework_TestCase
 
         $this->assertEquals('true', $noticeInfo->getAttribute('repeated'));
 
-        $entry = $notice->asAtomEntry(false, false, false, $this->targetUser1);
+        $entry = $notice->asAtomEntry(false, false, false, self::$targetUser1->getProfile());
 
         $element = $this->_entryToElement($entry, true);
 
@@ -486,15 +459,15 @@ class ActivityGenerationTests extends PHPUnit_Framework_TestCase
         $this->assertEquals('false', $noticeInfo->getAttribute('repeated'));
     }
 
-    public function testNoticeInfoFave()
+/*    public function testNoticeInfoFave()
     {
         $notice = $this->_fakeNotice();
 
-        $fave = Fave::addNew($this->author2->getProfile(), $notice);
+        $fave = Fave::addNew(self::$author2->getProfile(), $notice);
 
         // Should be set if user has faved
 
-        $entry = $notice->asAtomEntry(false, false, false, $this->author2);
+        $entry = $notice->asAtomEntry(false, false, false, self::$author2);
 
         $element = $this->_entryToElement($entry, true);
 
@@ -504,67 +477,67 @@ class ActivityGenerationTests extends PHPUnit_Framework_TestCase
 
         // Shouldn't be set if user has not faved
 
-        $entry = $notice->asAtomEntry(false, false, false, $this->targetUser1);
+        $entry = $notice->asAtomEntry(false, false, false, self::$targetUser1);
 
         $element = $this->_entryToElement($entry, true);
 
         $noticeInfo = ActivityUtils::child($element, 'notice_info', "http://status.net/schema/api/1/");
 
         $this->assertEquals('false', $noticeInfo->getAttribute('favorite'));
-    }
+    }*/
 
     public function testConversationLink()
     {
-        $orig = $this->_fakeNotice($this->targetUser1);
+        $orig = $this->_fakeNotice(self::$targetUser1);
 
-        $text = "@" . $this->targetUser1->nickname . " reply text " . common_good_rand(4);
+        $text = "@" . self::$targetUser1->nickname . " reply text " . common_random_hexstr(4);
 
-        $reply = Notice::saveNew($this->author1->id, $text, 'test', array('uri' => null, 'reply_to' => $orig->id));
+        $reply = Notice::saveNew(self::$author1->id, $text, 'test', array('uri' => null, 'reply_to' => $orig->id));
 
-        $conv = Conversation::staticGet('id', $reply->conversation);
+        $conv = Conversation::getKV('id', $reply->conversation);
 
         $entry = $reply->asAtomEntry();
 
         $element = $this->_entryToElement($entry, true);
 
-        $this->assertEquals($conv->uri, ActivityUtils::getLink($element, 'ostatus:conversation'));
+        $this->assertEquals($conv->getUrl(), ActivityUtils::getLink($element, 'ostatus:conversation'));
     }
 
-    function __destruct()
+    public static function tearDownAfterClass()
     {
-        if (!is_null($this->author1)) {
-            $this->author1->delete();
+        if (!is_null(self::$author1)) {
+            self::$author1->getProfile()->delete();
         }
 
-        if (!is_null($this->author2)) {
-            $this->author2->delete();
+        if (!is_null(self::$author2)) {
+            self::$author2->getProfile()->delete();
         }
 
-        if (!is_null($this->targetUser1)) {
-            $this->targetUser1->delete();
+        if (!is_null(self::$targetUser1)) {
+            self::$targetUser1->getProfile()->delete();
         }
 
-        if (!is_null($this->targetUser2)) {
-            $this->targetUser2->delete();
+        if (!is_null(self::$targetUser2)) {
+            self::$targetUser2->getProfile()->delete();
         }
 
-        if (!is_null($this->targetGroup1)) {
-            $this->targetGroup1->delete();
+        if (!is_null(self::$targetGroup1)) {
+            self::$targetGroup1->delete();
         }
 
-        if (!is_null($this->targetGroup2)) {
-            $this->targetGroup2->delete();
+        if (!is_null(self::$targetGroup2)) {
+            self::$targetGroup2->delete();
         }
     }
 
     private function _fakeNotice($user = null, $text = null)
     {
         if (empty($user)) {
-            $user = $this->author1;
+            $user = self::$author1;
         }
 
         if (empty($text)) {
-            $text = "fake-o text-o " . common_good_rand(32);
+            $text = "fake-o text-o " . common_random_hexstr(32);
         }
 
         return Notice::saveNew($user->id, $text, 'test', array('uri' => null));