From e2e26696f8dd96a528048a7bd479509b34c20448 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Thu, 24 Jun 2010 23:57:41 -0400
Subject: [PATCH 1/2] Moving 'group' files to top of the list.

---
 cake/tests/cases/libs/{controller => }/all_controllers.test.php | 0
 cake/tests/cases/libs/{view => }/all_helpers.test.php           | 0
 cake/tests/cases/libs/{view => }/all_js_helpers.test.php        | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename cake/tests/cases/libs/{controller => }/all_controllers.test.php (100%)
 rename cake/tests/cases/libs/{view => }/all_helpers.test.php (100%)
 rename cake/tests/cases/libs/{view => }/all_js_helpers.test.php (100%)

diff --git a/cake/tests/cases/libs/controller/all_controllers.test.php b/cake/tests/cases/libs/all_controllers.test.php
similarity index 100%
rename from cake/tests/cases/libs/controller/all_controllers.test.php
rename to cake/tests/cases/libs/all_controllers.test.php
diff --git a/cake/tests/cases/libs/view/all_helpers.test.php b/cake/tests/cases/libs/all_helpers.test.php
similarity index 100%
rename from cake/tests/cases/libs/view/all_helpers.test.php
rename to cake/tests/cases/libs/all_helpers.test.php
diff --git a/cake/tests/cases/libs/view/all_js_helpers.test.php b/cake/tests/cases/libs/all_js_helpers.test.php
similarity index 100%
rename from cake/tests/cases/libs/view/all_js_helpers.test.php
rename to cake/tests/cases/libs/all_js_helpers.test.php

From 0fb9a9c481f5afa7e6c257d66ff37dc896192484 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Thu, 24 Jun 2010 23:58:10 -0400
Subject: [PATCH 2/2] Porting Behavior group to PHPUnit. Containable is
 commented out because its test crashes the group.

---
 cake/tests/cases/libs/all_behaviors.test.php | 47 +++++++++++++++++++
 cake/tests/groups/behaviors.group.php        | 48 --------------------
 2 files changed, 47 insertions(+), 48 deletions(-)
 create mode 100644 cake/tests/cases/libs/all_behaviors.test.php
 delete mode 100644 cake/tests/groups/behaviors.group.php

diff --git a/cake/tests/cases/libs/all_behaviors.test.php b/cake/tests/cases/libs/all_behaviors.test.php
new file mode 100644
index 000000000..1fd3a100d
--- /dev/null
+++ b/cake/tests/cases/libs/all_behaviors.test.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * AllBehaviorsTest file
+ *
+ * PHP 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.tests.cases
+ * @since         CakePHP(tm) v 2.0
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+/**
+ * AllBehaviorsTest class
+ *
+ * This test group will run all test in the cases/libs/models/behaviors directory
+ *
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ */
+class AllBehaviorsTest extends PHPUnit_Framework_TestSuite {
+
+/**
+ * Suite define the tests for this suite
+ *
+ * @return void
+ */
+	public static function suite() {
+		$suite = new PHPUnit_Framework_TestSuite('Model Behavior and all behaviors');
+
+		$path = CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'behaviors' . DS;
+		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'model_behavior.test.php');
+
+		$suite->addTestFile($path . 'acl.test.php');
+		// $suite->addTestFile($path . 'containable.test.php');
+		$suite->addTestFile($path . 'translate.test.php');
+		$suite->addTestFile($path . 'tree.test.php');
+		return $suite;
+	}
+}
diff --git a/cake/tests/groups/behaviors.group.php b/cake/tests/groups/behaviors.group.php
deleted file mode 100644
index 39a34339e..000000000
--- a/cake/tests/groups/behaviors.group.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * BehaviorsGroupTest file
- *
- * PHP versions 4 and 5
- *
- * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
- * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- *  Licensed under The Open Group Test Suite License
- *  Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.groups
- * @since         CakePHP(tm) v 1.3
- * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
- */
-
-/**
- * BehaviorsGroupTest class
- *
- * This test group will run all tests related to i18n/l10n and multibyte
- *
- * @package       cake
- * @subpackage    cake.tests.groups
- */
-class BehaviorsGroupTest extends TestSuite {
-
-/**
- * label property
- *
- * @var string
- * @access public
- */
-	public $label = 'All core behavior test cases.';
-
-/**
- * BehaviorsGroupTest method
- *
- * @access public
- * @return void
- */
-	function BehaviorsGroupTest() {
-		TestManager::addTestCasesFromDirectory($this, CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'behaviors');
-	}
-}