adding tests for engine overrides

lib/Cake/Test/Case/View/Helper/NumberHelperTest.php

@@ -29,6 +29,10 @@ class NumberHelperTestObject extends NumberHelper {
 		$this->_CakeNumber = $cakeNumber;
 	}
 
+	public function engine() {
+		return $this->_CakeNumber;
+	}
+
 }
 
 /**
@@ -82,4 +86,23 @@ class NumberHelperTest extends CakeTestCase {
 		}
 	}
 
+/**
+ * test engine override
+ */
+	public function testEngineOverride() {
+		App::build(array(
+			'Utility' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Utility' . DS)
+			), APP::REGISTER);
+		$Number = new NumberHelperTestObject($this->View, array('engine' => 'TestAppEngine'));
+		$this->assertInstanceOf('TestAppEngine', $Number->engine());
+
+		App::build(array(
+			'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
+			));
+		CakePlugin::load('TestPlugin');
+		$Number = new NumberHelperTestObject($this->View, array('engine' => 'TestPlugin.TestPluginEngine'));
+		$this->assertInstanceOf('TestPluginEngine', $Number->engine());
+		CakePlugin::unload('TestPlugin');
+	}
+
 }

lib/Cake/Test/Case/View/Helper/TextHelperTest.php

@@ -26,6 +26,10 @@ class TextHelperTestObject extends TextHelper {
 		$this->_String = $string;
 	}
 
+	public function engine() {
+		return $this->_String;
+	}
+
 }
 
 /**
@@ -79,6 +83,25 @@ class TextHelperTest extends CakeTestCase {
 	}
 
 /**
+ * test engine override
+ */
+	public function testEngineOverride() {
+		App::build(array(
+			'Utility' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Utility' . DS)
+			), APP::REGISTER);
+		$Text = new TextHelperTestObject($this->View, array('engine' => 'TestAppEngine'));
+		$this->assertInstanceOf('TestAppEngine', $Text->engine());
+
+		App::build(array(
+			'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
+			));
+		CakePlugin::load('TestPlugin');
+		$Text = new TextHelperTestObject($this->View, array('engine' => 'TestPlugin.TestPluginEngine'));
+		$this->assertInstanceOf('TestPluginEngine', $Text->engine());
+		CakePlugin::unload('TestPlugin');
+	}
+
+/**
  * testAutoLink method
  *
  * @return void

lib/Cake/Test/Case/View/Helper/TimeHelperTest.php

@@ -29,6 +29,10 @@ class TimeHelperTestObject extends TimeHelper {
 		$this->_CakeTime = $cakeTime;
 	}
 
+	public function engine() {
+		return $this->_CakeTime;
+	}
+
 }
 
 /**
@@ -88,4 +92,23 @@ class TimeHelperTest extends CakeTestCase {
 		}
 	}
 
+/**
+ * test engine override
+ */
+	public function testEngineOverride() {
+		App::build(array(
+			'Utility' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Utility' . DS)
+			), APP::REGISTER);
+		$Time = new TimeHelperTestObject($this->View, array('engine' => 'TestAppEngine'));
+		$this->assertInstanceOf('TestAppEngine', $Time->engine());
+
+		App::build(array(
+			'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
+			));
+		CakePlugin::load('TestPlugin');
+		$Time = new TimeHelperTestObject($this->View, array('engine' => 'TestPlugin.TestPluginEngine'));
+		$this->assertInstanceOf('TestPluginEngine', $Time->engine());
+		CakePlugin::unload('TestPlugin');
+	}
+
 }

lib/Cake/Test/test_app/Plugin/TestPlugin/Utility/TestPluginEngine.php

@@ -0,0 +1,5 @@
+<?php
+
+class TestPluginEngine {
+
+}

lib/Cake/Test/test_app/Utility/TestAppEngine.php

@@ -0,0 +1,5 @@
+<?php
+
+class TestAppEngine {
+
+}

lib/Cake/View/Helper/NumberHelper.php

@@ -45,8 +45,8 @@ class NumberHelper extends AppHelper {
 	function __construct(View $View, $settings = array()) {
 		$settings = Set::merge(array('engine' => 'CakeNumber'), $settings);
 		parent::__construct($View, $settings);
-		$engineClass = $settings['engine'];
-		App::uses($engineClass, 'Utility');
+		list($plugin, $engineClass) = pluginSplit($settings['engine'], true);
+		App::uses($engineClass, $plugin . 'Utility');
 		if (class_exists($engineClass)) {
 			$this->_CakeNumber = new $engineClass($settings);
 		} else {

lib/Cake/View/Helper/TextHelper.php

@@ -62,8 +62,8 @@ class TextHelper extends AppHelper {
 	public function __construct(View $View, $settings = array()) {
 		$settings = Set::merge(array('engine' => 'String'), $settings);
 		parent::__construct($View, $settings);
-		$engineClass = $settings['engine'];
-		App::uses($engineClass, 'Utility');
+		list($plugin, $engineClass) = pluginSplit($settings['engine'], true);
+		App::uses($engineClass, $plugin . 'Utility');
 		if (class_exists($engineClass)) {
 			$this->_String = new $engineClass($settings);
 		} else {

lib/Cake/View/Helper/TimeHelper.php

@@ -46,8 +46,8 @@ class TimeHelper extends AppHelper {
 	public function __construct(View $View, $settings = array()) {
 		$settings = Set::merge(array('engine' => 'CakeTime'), $settings);
 		parent::__construct($View, $settings);
-		$engineClass = $settings['engine'];
-		App::uses($engineClass, 'Utility');
+		list($plugin, $engineClass) = pluginSplit($settings['engine'], true);
+		App::uses($engineClass, $plugin . 'Utility');
 		if (class_exists($engineClass)) {
 			$this->_CakeTime = new $engineClass($settings);
 		} else {