// 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';
{
parent::__construct();
- $authorNick1 = 'activitygenerationtestsuser' . common_good_rand(4);
- $authorNick2 = 'activitygenerationtestsuser' . common_good_rand(4);
+ $authorNick1 = 'activitygenerationtestsuser' . common_random_hexstr(4);
+ $authorNick2 = 'activitygenerationtestsuser' . common_random_hexstr(4);
- $targetNick1 = 'activitygenerationteststarget' . common_good_rand(4);
- $targetNick2 = 'activitygenerationteststarget' . common_good_rand(4);
+ $targetNick1 = 'activitygenerationteststarget' . common_random_hexstr(4);
+ $targetNick2 = 'activitygenerationteststarget' . common_random_hexstr(4);
- $groupNick1 = 'activitygenerationtestsgroup' . common_good_rand(4);
- $groupNick2 = 'activitygenerationtestsgroup' . common_good_rand(4);
+ $groupNick1 = 'activitygenerationtestsgroup' . common_random_hexstr(4);
+ $groupNick2 = 'activitygenerationtestsgroup' . common_random_hexstr(4);
$this->author1 = User::register(array('nickname' => $authorNick1,
'email' => $authorNick1 . '@example.net',
$element = $this->_entryToElement($entry, false);
- $this->assertEquals($notice->uri, ActivityUtils::childContent($element, 'id'));
+ $this->assertEquals($notice->getUri(), ActivityUtils::childContent($element, 'id'));
$this->assertEquals($notice->content, ActivityUtils::childContent($element, 'title'));
$this->assertEquals($notice->rendered, ActivityUtils::childContent($element, 'content'));
$this->assertEquals(strtotime($notice->created), strtotime(ActivityUtils::childContent($element, 'published')));
$this->assertEquals($atomUrl, ActivityUtils::childContent($source, 'id'));
$this->assertEquals($atomUrl, ActivityUtils::getLink($source, 'self', 'application/atom+xml'));
$this->assertEquals($profile->profileurl, ActivityUtils::getPermalink($source));
- $this->assertEquals($notice2->created, strtotime(ActivityUtils::childContent($source, 'updated')));
+ $this->assertEquals(strtotime($notice2->created), strtotime(ActivityUtils::childContent($source, 'updated')));
// XXX: do we care here?
$this->assertFalse(is_null(ActivityUtils::childContent($source, 'title')));
$this->assertEquals(common_config('license', 'url'), ActivityUtils::getLink($source, 'license'));
$actor = ActivityUtils::child($element, 'actor', Activity::SPEC);
$this->assertFalse(is_null($author));
- $this->assertFalse(is_null($actor));
+ $this->assertTrue(is_null($actor)); // <activity:actor> is obsolete, no longer added
}
- public function testCurArgument()
+ public function testAuthorContent()
{
- $this->assertTrue(FALSE);
+ $notice = $this->_fakeNotice();
+
+ // Test with author
+
+ $entry = $notice->asAtomEntry(false, false, true);
+
+ $element = $this->_entryToElement($entry, true);
+
+ $author = ActivityUtils::child($element, 'author');
+
+ $this->assertEquals($this->author1->getNickname(), ActivityUtils::childContent($author, 'name'));
+ $this->assertEquals($this->author1->getUri(), ActivityUtils::childContent($author, 'uri'));
+ }
+
+ /**
+ * We no longer create <activity:actor> entries, they have merged to <atom:author>
+ */
+ public function testActorContent()
+ {
+ $notice = $this->_fakeNotice();
+
+ // Test with author
+
+ $entry = $notice->asAtomEntry(false, false, true);
+
+ $element = $this->_entryToElement($entry, true);
+
+ $actor = ActivityUtils::child($element, 'actor', Activity::SPEC);
+
+ $this->assertEquals($actor, null);
}
public function testReplyLink()
{
$orig = $this->_fakeNotice($this->targetUser1);
- $text = "@" . $this->targetUser1->nickname . " reply text " . common_good_rand(4);
+ $text = "@" . $this->targetUser1->nickname . " reply text " . common_random_hexstr(4);
$reply = Notice::saveNew($this->author1->id, $text, 'test', array('uri' => null, 'reply_to' => $orig->id));
$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);
- $text = "@" . $this->targetUser1->nickname . " reply text " . common_good_rand(4);
+ $text = "@" . $this->targetUser1->nickname . " reply text " . common_random_hexstr(4);
$reply = Notice::saveNew($this->author1->id, $text, 'test', array('uri' => null, 'reply_to' => $orig->id));
$element = $this->_entryToElement($entry, true);
- $this->assertEquals($this->targetUser1->uri, ActivityUtils::getLink($element, 'ostatus:attention'));
+ $this->assertEquals($this->targetUser1->getUri(), ActivityUtils::getLink($element, 'mentioned'));
}
public function testMultipleReplyAttention()
{
$orig = $this->_fakeNotice($this->targetUser1);
- $text = "@" . $this->targetUser1->nickname . " reply text " . common_good_rand(4);
+ $text = "@" . $this->targetUser1->nickname . " reply text " . common_random_hexstr(4);
$reply = Notice::saveNew($this->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 = "@" . $this->targetUser1->nickname . " @" . $this->targetUser2->nickname . " reply text " . common_random_hexstr(4);
$reply2 = Notice::saveNew($this->author1->id, $text, 'test', array('uri' => null, 'reply_to' => $reply->id));
$element = $this->_entryToElement($entry, true);
- $links = ActivityUtils::getLinks($element, 'ostatus:attention');
+ $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->getUri(), $hrefs));
+ $this->assertTrue(in_array($this->targetUser2->getUri(), $hrefs));
+
+ $links = ActivityUtils::getLinks($element, 'mentioned');
$this->assertEquals(2, count($links));
$hrefs[] = $link->getAttribute('href');
}
- $this->assertTrue(in_array($this->targetUser1->uri, $hrefs));
- $this->assertTrue(in_array($this->targetUser2->uri, $hrefs));
+ $this->assertTrue(in_array($this->targetUser1->getUri(), $hrefs));
+ $this->assertTrue(in_array($this->targetUser2->getUri(), $hrefs));
}
public function testGroupPostAttention()
{
- $text = "!" . $this->targetGroup1->nickname . " reply text " . common_good_rand(4);
+ $text = "!" . $this->targetGroup1->nickname . " reply text " . common_random_hexstr(4);
$notice = Notice::saveNew($this->author1->id, $text, 'test', array('uri' => null));
$element = $this->_entryToElement($entry, true);
- $this->assertEquals($this->targetGroup1->uri, ActivityUtils::getLink($element, 'ostatus:attention'));
+ $this->assertEquals($this->targetGroup1->getUri(), ActivityUtils::getLink($element, 'mentioned'));
}
public function testMultipleGroupPostAttention()
{
- $text = "!" . $this->targetGroup1->nickname . " !" . $this->targetGroup2->nickname . " reply text " . common_good_rand(4);
+ $text = "!" . $this->targetGroup1->nickname . " !" . $this->targetGroup2->nickname . " reply text " . common_random_hexstr(4);
$notice = Notice::saveNew($this->author1->id, $text, 'test', array('uri' => null));
$element = $this->_entryToElement($entry, true);
- $links = ActivityUtils::getLinks($element, 'ostatus:attention');
+ $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->getUri(), $hrefs));
+ $this->assertTrue(in_array($this->targetGroup2->getUri(), $hrefs));
+
+ $links = ActivityUtils::getLinks($element, 'mentioned');
$this->assertEquals(2, count($links));
$hrefs[] = $link->getAttribute('href');
}
- $this->assertTrue(in_array($this->targetGroup1->uri, $hrefs));
- $this->assertTrue(in_array($this->targetGroup2->uri, $hrefs));
+ $this->assertTrue(in_array($this->targetGroup1->getUri(), $hrefs));
+ $this->assertTrue(in_array($this->targetGroup2->getUri(), $hrefs));
}
public function testRepeatLink()
{
- $this->assertTrue(FALSE);
+ $notice = $this->_fakeNotice($this->author1);
+ $repeat = $notice->repeat($this->author2->getProfile(), 'test');
+
+ $entry = $repeat->asAtomEntry();
+
+ $element = $this->_entryToElement($entry, true);
+
+ $forward = ActivityUtils::child($element, 'forward', "http://ostatus.org/schema/1.0");
+
+ $this->assertNotNull($forward);
+ $this->assertEquals($notice->getUri(), $forward->getAttribute('ref'));
+ $this->assertEquals($notice->getUrl(), $forward->getAttribute('href'));
}
- public function testTaggedActivity()
+ public function testTag()
{
- $this->assertTrue(FALSE);
+ $tag1 = common_random_hexstr(4);
+
+ $notice = $this->_fakeNotice($this->author1, '#' . $tag1);
+
+ $entry = $notice->asAtomEntry();
+
+ $element = $this->_entryToElement($entry, true);
+
+ $category = ActivityUtils::child($element, 'category');
+
+ $this->assertNotNull($category);
+ $this->assertEquals($tag1, $category->getAttribute('term'));
+ }
+
+ public function testMultiTag()
+ {
+ $tag1 = common_random_hexstr(4);
+ $tag2 = common_random_hexstr(4);
+
+ $notice = $this->_fakeNotice($this->author1, '#' . $tag1 . ' #' . $tag2);
+
+ $entry = $notice->asAtomEntry();
+
+ $element = $this->_entryToElement($entry, true);
+
+ $categories = $element->getElementsByTagName('category');
+
+ $this->assertNotNull($categories);
+ $this->assertEquals(2, $categories->length);
+
+ $terms = array();
+
+ for ($i = 0; $i < $categories->length; $i++) {
+ $cat = $categories->item($i);
+ $terms[] = $cat->getAttribute('term');
+ }
+
+ $this->assertTrue(in_array($tag1, $terms));
+ $this->assertTrue(in_array($tag2, $terms));
}
public function testGeotaggedActivity()
{
- $this->assertTrue(FALSE);
+ $notice = Notice::saveNew($this->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"));
}
public function testNoticeInfo()
{
- $this->assertTrue(FALSE);
+ $notice = $this->_fakeNotice();
+
+ $entry = $notice->asAtomEntry();
+
+ $element = $this->_entryToElement($entry, true);
+
+ $noticeInfo = ActivityUtils::child($element, 'notice_info', "http://status.net/schema/api/1/");
+
+ $this->assertEquals($notice->id, $noticeInfo->getAttribute('local_id'));
+ $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('source_link'));
+ }
+
+ public function testNoticeInfoRepeatOf()
+ {
+ $notice = $this->_fakeNotice();
+
+ $repeat = $notice->repeat($this->author2->getProfile(), 'test');
+
+ $entry = $repeat->asAtomEntry();
+
+ $element = $this->_entryToElement($entry, true);
+
+ $noticeInfo = ActivityUtils::child($element, 'notice_info', "http://status.net/schema/api/1/");
+
+ $this->assertEquals($notice->id, $noticeInfo->getAttribute('repeat_of'));
+ }
+
+ public function testNoticeInfoRepeated()
+ {
+ $notice = $this->_fakeNotice();
+
+ $repeat = $notice->repeat($this->author2->getProfile(), 'test');
+
+ $entry = $notice->asAtomEntry(false, false, false, $this->author2);
+
+ $element = $this->_entryToElement($entry, true);
+
+ $noticeInfo = ActivityUtils::child($element, 'notice_info', "http://status.net/schema/api/1/");
+
+ $this->assertEquals('true', $noticeInfo->getAttribute('repeated'));
+
+ $entry = $notice->asAtomEntry(false, false, false, $this->targetUser1);
+
+ $element = $this->_entryToElement($entry, true);
+
+ $noticeInfo = ActivityUtils::child($element, 'notice_info', "http://status.net/schema/api/1/");
+
+ $this->assertEquals('false', $noticeInfo->getAttribute('repeated'));
+ }
+
+/* public function testNoticeInfoFave()
+ {
+ $notice = $this->_fakeNotice();
+
+ $fave = Fave::addNew($this->author2->getProfile(), $notice);
+
+ // Should be set if user has faved
+
+ $entry = $notice->asAtomEntry(false, false, false, $this->author2);
+
+ $element = $this->_entryToElement($entry, true);
+
+ $noticeInfo = ActivityUtils::child($element, 'notice_info', "http://status.net/schema/api/1/");
+
+ $this->assertEquals('true', $noticeInfo->getAttribute('favorite'));
+
+ // Shouldn't be set if user has not faved
+
+ $entry = $notice->asAtomEntry(false, false, false, $this->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);
+
+ $text = "@" . $this->targetUser1->nickname . " reply text " . common_random_hexstr(4);
+
+ $reply = Notice::saveNew($this->author1->id, $text, 'test', array('uri' => null, 'reply_to' => $orig->id));
+
+ $conv = Conversation::getKV('id', $reply->conversation);
+
+ $entry = $reply->asAtomEntry();
+
+ $element = $this->_entryToElement($entry, true);
+
+ $this->assertEquals($conv->getUri(), ActivityUtils::getLink($element, 'ostatus:conversation'));
}
function __destruct()
}
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));
projects / quix0rs-gnu-social.git / blobdiff