Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions tests/apitest.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@
use OCA\Activity\Tests\Mock\Extension;
use OCP\Activity\IExtension;

/**
* Class ApiTest
*
* @group DB
* @package OCA\Activity\Tests
*/
class ApiTest extends TestCase {
protected $originalWEBROOT;

Expand Down
6 changes: 6 additions & 0 deletions tests/appinfo/applicationtest.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@
use OCA\Activity\AppInfo\Application;
use OCA\Activity\Tests\TestCase;

/**
* Class ApplicationTest
*
* @group DB
* @package OCA\Activity\Tests\AppInfo
*/
class ApplicationTest extends TestCase {
/** @var \OCA\Activity\AppInfo\Application */
protected $app;
Expand Down
6 changes: 6 additions & 0 deletions tests/appinfo/updatetest.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@

use OCA\Activity\Tests\TestCase;

/**
* Class UpdateTest
*
* @group DB
* @package OCA\Activity\Tests\AppInfo
*/
class UpdateTest extends TestCase {
public function testJobList() {
/** @var \OCP\BackgroundJob\IJobList|\PHPUnit_Framework_MockObject_MockObject $jobList */
Expand Down
6 changes: 6 additions & 0 deletions tests/backgroundjob/emailnotificationtest.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@
use OCA\Activity\BackgroundJob\EmailNotification;
use OCA\Activity\Tests\TestCase;

/**
* Class EmailNotificationTest
*
* @group DB
* @package OCA\Activity\Tests\BackgroundJob
*/
class EmailNotificationTest extends TestCase {
public function constructAndRunData() {
return [
Expand Down
6 changes: 6 additions & 0 deletions tests/backgroundjob/expireactivitiestest.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@
use OCA\Activity\Tests\TestCase;
use OCP\IConfig;

/**
* Class ExpireActivitiesTest
*
* @group DB
* @package OCA\Activity\Tests\BackgroundJob
*/
class ExpireActivitiesTest extends TestCase {
public function dataExecute() {
return [
Expand Down
6 changes: 6 additions & 0 deletions tests/consumertest.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@
use OCP\Activity\IConsumer;
use OCP\DB;

/**
* Class ConsumerTest
*
* @group DB
* @package OCA\Activity\Tests
*/
class ConsumerTest extends TestCase {
/** @var \OCA\Activity\Consumer */
protected $consumer;
Expand Down
30 changes: 30 additions & 0 deletions tests/controller/activitiestest.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@
use OCA\Activity\Tests\TestCase;
use OCP\Template;

/**
* Class ActivitiesTest
*
* @group DB
* @package OCA\Activity\Tests\Controller
*/
class ActivitiesTest extends TestCase {
/** @var \PHPUnit_Framework_MockObject_MockObject */
protected $request;
Expand Down Expand Up @@ -51,6 +57,9 @@ class ActivitiesTest extends TestCase {
/** @var \OCA\Activity\ViewInfoCache|\PHPUnit_Framework_MockObject_MockObject */
protected $infoCache;

/** @var \OCP\IAvatarManager|\PHPUnit_Framework_MockObject_MockObject */
protected $avatarManager;

/** @var \OCP\IL10N */
protected $l10n;

Expand Down Expand Up @@ -90,10 +99,21 @@ protected function setUp() {
$this->infoCache = $this->getMockBuilder('OCA\Activity\ViewInfoCache')
->disableOriginalConstructor()
->getMock();
$this->avatarManager = $this->getMockBuilder('OCP\IAvatarManager')
->disableOriginalConstructor()
->getMock();

$this->request = $this->getMock('OCP\IRequest');

$this->controller = $this->getController();

$this->overwriteService('AvatarManager', $this->avatarManager);
}

public function tearDown() {

$this->restoreService('AvatarManager');
parent::tearDown();
}

protected function getController(array $methods = []) {
Expand Down Expand Up @@ -144,6 +164,16 @@ public function testShowList() {
->method('getTemplate')
->willReturn($template);

$avatar = $this->getMockBuilder('OCP\IAvatar')
->disableOriginalConstructor()
->getMock();
$this->avatarManager->expects($this->once())
->method('getAvatar')
->willReturn($avatar);
$avatar->expects($this->once())
->method('exists')
->willReturn(false);

$templateResponse = $this->controller->showList();
$this->assertInstanceOf('\OCP\AppFramework\Http\TemplateResponse', $templateResponse, 'Asserting type of return is \OCP\AppFramework\Http\TemplateResponse');

Expand Down
6 changes: 6 additions & 0 deletions tests/datadeleteactivitestest.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@
use OCA\Activity\Data;
use OCP\Activity\IExtension;

/**
* Class DataDeleteActivitiesTest
*
* @group DB
* @package OCA\Activity\Tests
*/
class DataDeleteActivitiesTest extends TestCase {
/** @var \OCA\Activity\Data */
protected $data;
Expand Down
6 changes: 6 additions & 0 deletions tests/datatest.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@
use OCP\Activity\IExtension;
use OCP\IUser;

/**
* Class DataTest
*
* @group DB
* @package OCA\Activity\Tests
*/
class DataTest extends TestCase {
/** @var \OCA\Activity\Data */
protected $data;
Expand Down
4 changes: 4 additions & 0 deletions tests/fileshookstest.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,11 @@
use OCP\Share;

/**
* Class FilesHooksTest
* Testing the public methods with internals being mocked out
*
* @group DB
* @package OCA\Activity
*/
class FilesHooksTest extends TestCase {
/** @var \OCA\Activity\FilesHooks */
Expand Down
6 changes: 6 additions & 0 deletions tests/hooksdeleteusertest.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@
use OCA\Activity\Hooks;
use OCP\Activity\IExtension;

/**
* Class HooksDeleteUserTest
*
* @group DB
* @package OCA\Activity\Tests
*/
class HooksDeleteUserTest extends TestCase {
protected function setUp() {
parent::setUp();
Expand Down
6 changes: 6 additions & 0 deletions tests/mailqueuehandlertest.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@
use OCA\Activity\MailQueueHandler;
use OCA\Activity\UserSettings;

/**
* Class MailQueueHandlerTest
*
* @group DB
* @package OCA\Activity\Tests
*/
class MailQueueHandlerTest extends TestCase {
/** @var MailQueueHandler */
protected $mailQueueHandler;
Expand Down
6 changes: 6 additions & 0 deletions tests/personaltest.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@

namespace OCA\Activity\Tests;

/**
* Class PersonalTest
*
* @group DB
* @package OCA\Activity\Tests
*/
class PersonalTest extends TestCase {
public function testInclude() {
$settingsPage = include '../personal.php';
Expand Down