Merge branch 'lecterror:master' into master

Test/Case/Controller/Component/FilterComponentTest.php

@@ -13,9 +13,15 @@
 
 App::uses('Router', 'Routing');
 App::uses('Component', 'Filter.Filter');
-require_once(dirname(dirname(dirname(__FILE__))) . DS . 'MockObjects.php');
-
-class FilterTestCase extends CakeTestCase
+App::uses('Document', 'Filter.Test/Case/MockObjects');
+App::uses('Document2', 'Filter.Test/Case/MockObjects');
+App::uses('Document3', 'Filter.Test/Case/MockObjects');
+App::uses('DocumentCategory', 'Filter.Test/Case/MockObjects');
+App::uses('DocumentTestsController', 'Filter.Test/Case/MockObjects');
+App::uses('Item', 'Filter.Test/Case/MockObjects');
+App::uses('Metadata', 'Filter.Test/Case/MockObjects');
+
+class FilterComponentTest extends CakeTestCase
 {
 	public $fixtures = array
 		(

Test/Case/MockObjects/Document.php

@@ -0,0 +1,9 @@
+<?php
+
+class Document extends CakeTestModel
+{
+	public $name = 'Document';
+	public $belongsTo = array('DocumentCategory');
+	public $hasMany = array('Item');
+	public $hasOne = array('Metadata');
+}

Test/Case/MockObjects/Document2.php

@@ -0,0 +1,16 @@
+<?php
+
+class Document2 extends CakeTestModel
+{
+	public $name = 'Document';
+	public $alias = 'Document';
+	public $belongsTo = array('DocumentCategory');
+	public $hasMany = array('Item');
+
+	public $returnValue = false;
+
+	public function beforeDataFilter($query, $options)
+	{
+		return $this->returnValue;
+	}
+}

Test/Case/MockObjects/Document3.php

@@ -0,0 +1,26 @@
+<?php
+
+class Document3 extends CakeTestModel
+{
+	public $name = 'Document';
+	public $alias = 'Document';
+	public $belongsTo = array('DocumentCategory');
+	public $hasMany = array('Item');
+
+	public $itemToUnset = null;
+
+	public function afterDataFilter($query, $options)
+	{
+		if (!is_string($this->itemToUnset))
+		{
+			return $query;
+		}
+
+		if (isset($query['conditions'][$this->itemToUnset]))
+		{
+			unset($query['conditions'][$this->itemToUnset]);
+		}
+
+		return $query;
+	}
+}

Test/Case/MockObjects/DocumentCategory.php

@@ -0,0 +1,15 @@
+<?php
+
+class DocumentCategory extends CakeTestModel
+{
+	public $name = 'DocumentCategory';
+	public $hasMany = array('Document');
+
+	public function customSelector($options = array())
+	{
+		$options['conditions']['DocumentCategory.title LIKE'] = '%T%';
+		$options['nofilter'] = true;
+
+		return $this->find('list', $options);
+	}
+}

Test/Case/MockObjects/DocumentTestsController.php

@@ -0,0 +1,18 @@
+<?php
+
+App::uses('Controller', 'Controller');
+
+class DocumentTestsController extends Controller
+{
+	public $name = 'DocumentTests';
+
+	public function index()
+	{
+	}
+
+	// must override this or the tests never complete..
+	// @TODO: mock partial?
+	public function redirect($url, $status = null, $exit = true)
+	{
+	}
+}

Test/Case/MockObjects/Item.php

@@ -0,0 +1,7 @@
+<?php
+
+class Item extends CakeTestModel
+{
+	public $name = 'Item';
+	public $belongsTo = array('Document');
+}

Test/Case/MockObjects/Metadata.php

@@ -0,0 +1,7 @@
+<?php
+
+class Metadata extends CakeTestModel
+{
+	public $name = 'Metadata';
+	public $hasOne = array('Document');
+}

Test/Case/Model/Behaviors/FilteredTest.php → Test/Case/Model/Behaviors/FilteredBehaviorTest.php

@@ -12,10 +12,15 @@
 */
 
 App::import('Core', array('AppModel', 'Model'));
-require_once(dirname(dirname(dirname(__FILE__))) . DS . 'MockObjects.php');
-
-
-class FilteredTestCase extends CakeTestCase
+App::uses('Document', 'Filter.Test/Case/MockObjects');
+App::uses('Document2', 'Filter.Test/Case/MockObjects');
+App::uses('Document3', 'Filter.Test/Case/MockObjects');
+App::uses('DocumentCategory', 'Filter.Test/Case/MockObjects');
+App::uses('DocumentTestsController', 'Filter.Test/Case/MockObjects');
+App::uses('Item', 'Filter.Test/Case/MockObjects');
+App::uses('Metadata', 'Filter.Test/Case/MockObjects');
+
+class FilteredBehaviorTest extends CakeTestCase
 {
 	public $fixtures = array
 		(