Merge pull request #24380 from owncloud/move-activity-manager-to-namespace
Move activity manager to the namespace
This commit is contained in:
commit
c87bd0432a
|
@ -33,7 +33,7 @@ use Test\TestCase;
|
||||||
*/
|
*/
|
||||||
class ActivityTest extends TestCase {
|
class ActivityTest extends TestCase {
|
||||||
|
|
||||||
/** @var \OC\ActivityManager */
|
/** @var \OCP\Activity\IManager */
|
||||||
private $activityManager;
|
private $activityManager;
|
||||||
|
|
||||||
/** @var \OCP\IRequest|\PHPUnit_Framework_MockObject_MockObject */
|
/** @var \OCP\IRequest|\PHPUnit_Framework_MockObject_MockObject */
|
||||||
|
@ -70,7 +70,7 @@ class ActivityTest extends TestCase {
|
||||||
->disableOriginalConstructor()
|
->disableOriginalConstructor()
|
||||||
->getMock();
|
->getMock();
|
||||||
|
|
||||||
$this->activityManager = new \OC\ActivityManager(
|
$this->activityManager = new \OC\Activity\Manager(
|
||||||
$this->request,
|
$this->request,
|
||||||
$this->session,
|
$this->session,
|
||||||
$this->config
|
$this->config
|
||||||
|
|
|
@ -20,10 +20,9 @@
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
namespace OC;
|
namespace OC\Activity;
|
||||||
|
|
||||||
|
|
||||||
use OC\Activity\Event;
|
|
||||||
use OCP\Activity\IConsumer;
|
use OCP\Activity\IConsumer;
|
||||||
use OCP\Activity\IEvent;
|
use OCP\Activity\IEvent;
|
||||||
use OCP\Activity\IExtension;
|
use OCP\Activity\IExtension;
|
||||||
|
@ -33,7 +32,7 @@ use OCP\IRequest;
|
||||||
use OCP\IUser;
|
use OCP\IUser;
|
||||||
use OCP\IUserSession;
|
use OCP\IUserSession;
|
||||||
|
|
||||||
class ActivityManager implements IManager {
|
class Manager implements IManager {
|
||||||
/** @var IRequest */
|
/** @var IRequest */
|
||||||
protected $request;
|
protected $request;
|
||||||
|
|
|
@ -313,7 +313,7 @@ class Server extends ServerContainer implements IServerContainer {
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
$this->registerService('ActivityManager', function (Server $c) {
|
$this->registerService('ActivityManager', function (Server $c) {
|
||||||
return new ActivityManager(
|
return new \OC\Activity\Manager(
|
||||||
$c->getRequest(),
|
$c->getRequest(),
|
||||||
$c->getUserSession(),
|
$c->getUserSession(),
|
||||||
$c->getConfig()
|
$c->getConfig()
|
||||||
|
|
|
@ -8,18 +8,22 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
class Test_ActivityManager extends \Test\TestCase {
|
namespace Test\Activity;
|
||||||
|
|
||||||
/** @var \OC\ActivityManager */
|
use Test\TestCase;
|
||||||
|
|
||||||
|
class ManagerTest extends TestCase {
|
||||||
|
|
||||||
|
/** @var \OC\Activity\Manager */
|
||||||
private $activityManager;
|
private $activityManager;
|
||||||
|
|
||||||
/** @var \PHPUnit_Framework_MockObject_MockObject */
|
/** @var \OCP\IRequest|\PHPUnit_Framework_MockObject_MockObject */
|
||||||
protected $request;
|
protected $request;
|
||||||
|
|
||||||
/** @var \PHPUnit_Framework_MockObject_MockObject */
|
/** @var \OCP\IUserSession|\PHPUnit_Framework_MockObject_MockObject */
|
||||||
protected $session;
|
protected $session;
|
||||||
|
|
||||||
/** @var \PHPUnit_Framework_MockObject_MockObject */
|
/** @var \OCP\IConfig|\PHPUnit_Framework_MockObject_MockObject */
|
||||||
protected $config;
|
protected $config;
|
||||||
|
|
||||||
protected function setUp() {
|
protected function setUp() {
|
||||||
|
@ -35,7 +39,7 @@ class Test_ActivityManager extends \Test\TestCase {
|
||||||
->disableOriginalConstructor()
|
->disableOriginalConstructor()
|
||||||
->getMock();
|
->getMock();
|
||||||
|
|
||||||
$this->activityManager = new \OC\ActivityManager(
|
$this->activityManager = new \OC\Activity\Manager(
|
||||||
$this->request,
|
$this->request,
|
||||||
$this->session,
|
$this->session,
|
||||||
$this->config
|
$this->config
|
||||||
|
@ -71,7 +75,7 @@ class Test_ActivityManager extends \Test\TestCase {
|
||||||
*/
|
*/
|
||||||
public function testGetConsumersInvalidConsumer() {
|
public function testGetConsumersInvalidConsumer() {
|
||||||
$this->activityManager->registerConsumer(function() {
|
$this->activityManager->registerConsumer(function() {
|
||||||
return new StdClass();
|
return new \stdClass();
|
||||||
});
|
});
|
||||||
|
|
||||||
$this->invokePrivate($this->activityManager, 'getConsumers');
|
$this->invokePrivate($this->activityManager, 'getConsumers');
|
||||||
|
@ -88,7 +92,7 @@ class Test_ActivityManager extends \Test\TestCase {
|
||||||
*/
|
*/
|
||||||
public function testGetExtensionsInvalidExtension() {
|
public function testGetExtensionsInvalidExtension() {
|
||||||
$this->activityManager->registerExtension(function() {
|
$this->activityManager->registerExtension(function() {
|
||||||
return new StdClass();
|
return new \stdClass();
|
||||||
});
|
});
|
||||||
|
|
||||||
$this->invokePrivate($this->activityManager, 'getExtensions');
|
$this->invokePrivate($this->activityManager, 'getExtensions');
|
||||||
|
@ -119,10 +123,10 @@ class Test_ActivityManager extends \Test\TestCase {
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testTranslate() {
|
public function testTranslate() {
|
||||||
$result = $this->activityManager->translate('APP0', '', '', array(), false, false, 'en');
|
$result = $this->activityManager->translate('APP0', '', array(), false, false, 'en');
|
||||||
$this->assertEquals('Stupid translation', $result);
|
$this->assertEquals('Stupid translation', $result);
|
||||||
|
|
||||||
$result = $this->activityManager->translate('APP1', '', '', array(), false, false, 'en');
|
$result = $this->activityManager->translate('APP1', '', array(), false, false, 'en');
|
||||||
$this->assertFalse($result);
|
$this->assertFalse($result);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -259,7 +263,7 @@ class Test_ActivityManager extends \Test\TestCase {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @expectedException BadMethodCallException
|
* @expectedException \BadMethodCallException
|
||||||
* @expectedExceptionMessage App not set
|
* @expectedExceptionMessage App not set
|
||||||
* @expectedExceptionCode 10
|
* @expectedExceptionCode 10
|
||||||
*/
|
*/
|
||||||
|
@ -269,7 +273,7 @@ class Test_ActivityManager extends \Test\TestCase {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @expectedException BadMethodCallException
|
* @expectedException \BadMethodCallException
|
||||||
* @expectedExceptionMessage Type not set
|
* @expectedExceptionMessage Type not set
|
||||||
* @expectedExceptionCode 11
|
* @expectedExceptionCode 11
|
||||||
*/
|
*/
|
||||||
|
@ -280,7 +284,7 @@ class Test_ActivityManager extends \Test\TestCase {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @expectedException BadMethodCallException
|
* @expectedException \BadMethodCallException
|
||||||
* @expectedExceptionMessage Affected user not set
|
* @expectedExceptionMessage Affected user not set
|
||||||
* @expectedExceptionCode 12
|
* @expectedExceptionCode 12
|
||||||
*/
|
*/
|
||||||
|
@ -292,7 +296,7 @@ class Test_ActivityManager extends \Test\TestCase {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @expectedException BadMethodCallException
|
* @expectedException \BadMethodCallException
|
||||||
* @expectedExceptionMessage Subject not set
|
* @expectedExceptionMessage Subject not set
|
||||||
* @expectedExceptionCode 13
|
* @expectedExceptionCode 13
|
||||||
*/
|
*/
|
|
@ -44,7 +44,7 @@ class Server extends \Test\TestCase {
|
||||||
|
|
||||||
public function dataTestQuery() {
|
public function dataTestQuery() {
|
||||||
return [
|
return [
|
||||||
['ActivityManager', '\OC\ActivityManager'],
|
['ActivityManager', '\OC\Activity\Manager'],
|
||||||
['ActivityManager', '\OCP\Activity\IManager'],
|
['ActivityManager', '\OCP\Activity\IManager'],
|
||||||
['AllConfig', '\OC\AllConfig'],
|
['AllConfig', '\OC\AllConfig'],
|
||||||
['AllConfig', '\OCP\IConfig'],
|
['AllConfig', '\OCP\IConfig'],
|
||||||
|
|
Loading…
Reference in New Issue