Adding tests for loading classes from the libs folder

lib/Cake/Core/App.php

@@ -513,8 +513,8 @@ class App {
 
 			if (empty($plugin)) {
 				$appLibs = empty(self::$__packages['Lib']) ? APPLIBS : current(self::$__packages['Lib']);
-				$paths[] =  $appLibs . self::$__classMap[$className] . DS;
-				$paths[] = LIBS . self::$__classMap[$className] . DS;
+				$paths[] =  $appLibs . $package . DS;
+				$paths[] = LIBS . $package . DS;
 			}
 
 			foreach ($paths as $path) {

lib/Cake/tests/cases/libs/app.test.php

@@ -657,4 +657,24 @@ class AppImportTest extends CakeTestCase {
 		$this->assertTrue($result);
 		$this->assertEqual($text, 'This is the welcome.php file in test_plugin/vendors directory');
 	}
+
+/**
+ * Tests that the automatic class loader will also find in "libs" folder for both
+ * app and plugins if it does not find the class in other configured paths
+ *
+ */
+	public function testLoadClassInLibs() {
+		App::build(array(
+			'libs' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'libs' . DS),
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+		), true);
+
+		$this->assertFalse(class_exists('CustomLibClass', false));
+		App::uses('CustomLibClass', 'TestPlugin.Custom/Package');
+		$this->assertTrue(class_exists('CustomLibClass'));
+
+		$this->assertFalse(class_exists('TestUtilityClass', false));
+		App::uses('TestUtilityClass', 'Utility');
+		$this->assertTrue(class_exists('CustomLibClass'));
+	}
 }