Skip to content
Browse files

Merge pull request #1229 from realityking/legacy

Move JObserver and JObservable to legacy.
  • Loading branch information...
2 parents 2300258 + 474ceeb commit 82411415258457d5940d366bb14ca8e07f146c4e @chdemko chdemko committed
View
3 libraries/import.legacy.php
@@ -67,5 +67,6 @@ class_exists('JLoader') or die;
JLoader::register('JSimpleCrypt', JPATH_PLATFORM . '/legacy/simplecrypt/simplecrypt.php');
JLoader::register('JTree', JPATH_PLATFORM . '/legacy/base/tree.php');
JLoader::register('JNode', JPATH_PLATFORM . '/legacy/base/node.php');
-
+JLoader::register('JObserver', JPATH_PLATFORM . '/legacy/base/observer.php');
+JLoader::register('JObservable', JPATH_PLATFORM . '/legacy/base/observable.php');
JLoader::register('LogException', JPATH_PLATFORM . '/legacy/log/logexception.php');
View
0 libraries/joomla/base/observable.php → libraries/legacy/base/observable.php
File renamed without changes.
View
0 libraries/joomla/base/observer.php → libraries/legacy/base/observer.php
File renamed without changes.
View
15 ...ites/unit/joomla/base/JObservableTest.php → tests/suites/legacy/base/JObservableTest.php
@@ -7,10 +7,6 @@
* @license GNU General Public License version 2 or later; see LICENSE
*/
-require_once JPATH_PLATFORM.'/joomla/base/observable.php';
-
-//require_once JPATH_TESTS.'/includes/mocks/JObserverMock.php';
-
/**
* General inspector class for JObservable.
*
@@ -66,7 +62,8 @@ public function __call($name, $parameters = false)
* Test class for JObservable.
* Generated by PHPUnit on 2009-10-08 at 11:45:30.
*/
-class JObservableTest extends PHPUnit_Framework_TestCase {
+class JObservableTest extends PHPUnit_Framework_TestCase
+{
/**
* @var JObservable
*/
@@ -89,6 +86,8 @@ protected function tearDown() {
/**
* Test for JObservable::getState()
+ *
+ * @covers JObservable::getState
*/
public function testGetState() {
$this->object->_state = 'test1';
@@ -101,6 +100,8 @@ public function testGetState() {
/**
* @todo Implement testNotify().
+ *
+ * @covers JObservable::notify
*/
public function testNotify() {
// Remove the following lines when you implement this test.
@@ -119,6 +120,8 @@ public function testNotify() {
/**
* @todo Implement testAttach().
+ *
+ * @covers JObservable::attach
*/
public function testAttach() {
// Remove the following lines when you implement this test.
@@ -127,6 +130,8 @@ public function testAttach() {
/**
* @todo Implement testDetach().
+ *
+ * @covers JObservable::detach
*/
public function testDetach() {
// Remove the following lines when you implement this test.
View
5 ...suites/unit/joomla/base/JObserverTest.php → tests/suites/legacy/base/JObserverTest.php
@@ -7,13 +7,12 @@
* @license GNU General Public License version 2 or later; see LICENSE
*/
-require_once JPATH_PLATFORM.'/joomla/base/observer.php';
-
/**
* Test class for JObserver.
* Generated by PHPUnit on 2009-10-08 at 11:46:14.
*/
-class JObserverTest extends PHPUnit_Framework_TestCase {
+class JObserverTest extends PHPUnit_Framework_TestCase
+{
/**
* @var JObserver
*/

0 comments on commit 8241141

Please sign in to comment.
Something went wrong with that request. Please try again.