mirror of
https://github.com/brmlab/brmsklad.git
synced 2025-08-05 23:53:38 +02:00
Upgrade CakePHP from 2.2.5 to 2.9.5
This commit is contained in:
Brm Ko
parent
5a580df460
commit
235a541597
793 changed files with 60746 additions and 23753 deletions
|
|
@ -4,24 +4,24 @@
|
|||
*
|
||||
* Tree test using UUIDs
|
||||
*
|
||||
* PHP 5
|
||||
*
|
||||
* CakePHP(tm) Tests <http://book.cakephp.org/2.0/en/development/testing.html>
|
||||
* Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
|
||||
* Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
|
||||
*
|
||||
* Licensed under The MIT License
|
||||
* For full copyright and license information, please see the LICENSE.txt
|
||||
* Redistributions of files must retain the above copyright notice
|
||||
*
|
||||
* @copyright Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
|
||||
* @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
|
||||
* @link http://book.cakephp.org/2.0/en/development/testing.html CakePHP(tm) Tests
|
||||
* @package Cake.Test.Case.Model.Behavior
|
||||
* @since CakePHP(tm) v 1.2.0.5330
|
||||
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
|
||||
* @license http://www.opensource.org/licenses/mit-license.php MIT License
|
||||
*/
|
||||
|
||||
App::uses('Model', 'Model');
|
||||
App::uses('AppModel', 'Model');
|
||||
App::uses('String', 'Utility');
|
||||
App::uses('CakeText', 'Utility');
|
||||
|
||||
require_once dirname(dirname(__FILE__)) . DS . 'models.php';
|
||||
|
||||
/**
|
||||
|
|
@ -34,7 +34,7 @@ class TreeBehaviorUuidTest extends CakeTestCase {
|
|||
/**
|
||||
* Whether backup global state for each test method or not
|
||||
*
|
||||
* @var bool false
|
||||
* @var bool
|
||||
*/
|
||||
public $backupGlobals = false;
|
||||
|
||||
|
|
@ -65,6 +65,7 @@ class TreeBehaviorUuidTest extends CakeTestCase {
|
|||
public function testAddWithPreSpecifiedId() {
|
||||
extract($this->settings);
|
||||
$this->Tree = new $modelClass();
|
||||
$this->Tree->order = null;
|
||||
$this->Tree->initialize(2, 2);
|
||||
|
||||
$data = $this->Tree->find('first', array(
|
||||
|
|
@ -72,7 +73,7 @@ class TreeBehaviorUuidTest extends CakeTestCase {
|
|||
'conditions' => array($modelClass . '.name' => '1.1')
|
||||
));
|
||||
|
||||
$id = String::uuid();
|
||||
$id = CakeText::uuid();
|
||||
$this->Tree->create();
|
||||
$result = $this->Tree->save(array($modelClass => array(
|
||||
'id' => $id,
|
||||
|
|
@ -96,6 +97,7 @@ class TreeBehaviorUuidTest extends CakeTestCase {
|
|||
public function testMovePromote() {
|
||||
extract($this->settings);
|
||||
$this->Tree = new $modelClass();
|
||||
$this->Tree->order = null;
|
||||
$this->Tree->initialize(2, 2);
|
||||
$this->Tree->id = null;
|
||||
|
||||
|
|
@ -106,12 +108,12 @@ class TreeBehaviorUuidTest extends CakeTestCase {
|
|||
$this->Tree->id = $data[$modelClass]['id'];
|
||||
$this->Tree->saveField($parentField, $parentId);
|
||||
$direct = $this->Tree->children($parentId, true, array('name', $leftField, $rightField));
|
||||
$expects = array(array($modelClass => array('name' => '1.1', $leftField => 2, $rightField => 5)),
|
||||
$expected = array(array($modelClass => array('name' => '1.1', $leftField => 2, $rightField => 5)),
|
||||
array($modelClass => array('name' => '1.2', $leftField => 6, $rightField => 11)),
|
||||
array($modelClass => array('name' => '1.1.1', $leftField => 12, $rightField => 13)));
|
||||
$this->assertEquals($direct, $expects);
|
||||
$this->assertEquals($expected, $direct);
|
||||
$validTree = $this->Tree->verify();
|
||||
$this->assertSame($validTree, true);
|
||||
$this->assertTrue($validTree);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -122,6 +124,7 @@ class TreeBehaviorUuidTest extends CakeTestCase {
|
|||
public function testMoveWithWhitelist() {
|
||||
extract($this->settings);
|
||||
$this->Tree = new $modelClass();
|
||||
$this->Tree->order = null;
|
||||
$this->Tree->initialize(2, 2);
|
||||
$this->Tree->id = null;
|
||||
|
||||
|
|
@ -149,6 +152,7 @@ class TreeBehaviorUuidTest extends CakeTestCase {
|
|||
public function testRemoveNoChildren() {
|
||||
extract($this->settings);
|
||||
$this->Tree = new $modelClass();
|
||||
$this->Tree->order = null;
|
||||
$this->Tree->initialize(2, 2);
|
||||
$initialCount = $this->Tree->find('count');
|
||||
|
||||
|
|
@ -159,7 +163,7 @@ class TreeBehaviorUuidTest extends CakeTestCase {
|
|||
$this->assertEquals($initialCount, $laterCount);
|
||||
|
||||
$nodes = $this->Tree->find('list', array('order' => $leftField));
|
||||
$expects = array(
|
||||
$expected = array(
|
||||
'1. Root',
|
||||
'1.1',
|
||||
'1.1.2',
|
||||
|
|
@ -169,10 +173,10 @@ class TreeBehaviorUuidTest extends CakeTestCase {
|
|||
'1.1.1',
|
||||
);
|
||||
|
||||
$this->assertEquals(array_values($nodes), $expects);
|
||||
$this->assertEquals($expected, array_values($nodes));
|
||||
|
||||
$validTree = $this->Tree->verify();
|
||||
$this->assertSame($validTree, true);
|
||||
$this->assertTrue($validTree);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -183,6 +187,7 @@ class TreeBehaviorUuidTest extends CakeTestCase {
|
|||
public function testRemoveAndDeleteNoChildren() {
|
||||
extract($this->settings);
|
||||
$this->Tree = new $modelClass();
|
||||
$this->Tree->order = null;
|
||||
$this->Tree->initialize(2, 2);
|
||||
$initialCount = $this->Tree->find('count');
|
||||
|
||||
|
|
@ -193,7 +198,7 @@ class TreeBehaviorUuidTest extends CakeTestCase {
|
|||
$this->assertEquals($initialCount - 1, $laterCount);
|
||||
|
||||
$nodes = $this->Tree->find('list', array('order' => $leftField));
|
||||
$expects = array(
|
||||
$expected = array(
|
||||
'1. Root',
|
||||
'1.1',
|
||||
'1.1.2',
|
||||
|
|
@ -201,10 +206,10 @@ class TreeBehaviorUuidTest extends CakeTestCase {
|
|||
'1.2.1',
|
||||
'1.2.2',
|
||||
);
|
||||
$this->assertEquals(array_values($nodes), $expects);
|
||||
$this->assertEquals($expected, array_values($nodes));
|
||||
|
||||
$validTree = $this->Tree->verify();
|
||||
$this->assertSame($validTree, true);
|
||||
$this->assertTrue($validTree);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -215,24 +220,25 @@ class TreeBehaviorUuidTest extends CakeTestCase {
|
|||
public function testChildren() {
|
||||
extract($this->settings);
|
||||
$this->Tree = new $modelClass();
|
||||
$this->Tree->order = null;
|
||||
$this->Tree->initialize(2, 2);
|
||||
|
||||
$data = $this->Tree->find('first', array('conditions' => array($modelClass . '.name' => '1. Root')));
|
||||
$this->Tree->id = $data[$modelClass]['id'];
|
||||
|
||||
$direct = $this->Tree->children(null, true, array('name', $leftField, $rightField));
|
||||
$expects = array(array($modelClass => array('name' => '1.1', $leftField => 2, $rightField => 7)),
|
||||
$expected = array(array($modelClass => array('name' => '1.1', $leftField => 2, $rightField => 7)),
|
||||
array($modelClass => array('name' => '1.2', $leftField => 8, $rightField => 13)));
|
||||
$this->assertEquals($direct, $expects);
|
||||
$this->assertEquals($expected, $direct);
|
||||
|
||||
$total = $this->Tree->children(null, null, array('name', $leftField, $rightField));
|
||||
$expects = array(array($modelClass => array('name' => '1.1', $leftField => 2, $rightField => 7)),
|
||||
$expected = array(array($modelClass => array('name' => '1.1', $leftField => 2, $rightField => 7)),
|
||||
array($modelClass => array('name' => '1.1.1', $leftField => 3, $rightField => 4)),
|
||||
array($modelClass => array('name' => '1.1.2', $leftField => 5, $rightField => 6)),
|
||||
array($modelClass => array('name' => '1.2', $leftField => 8, $rightField => 13)),
|
||||
array($modelClass => array('name' => '1.2.1', $leftField => 9, $rightField => 10)),
|
||||
array($modelClass => array('name' => '1.2.2', $leftField => 11, $rightField => 12)));
|
||||
$this->assertEquals($total, $expects);
|
||||
$this->assertEquals($expected, $total);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -243,6 +249,7 @@ class TreeBehaviorUuidTest extends CakeTestCase {
|
|||
public function testNoAmbiguousColumn() {
|
||||
extract($this->settings);
|
||||
$this->Tree = new $modelClass();
|
||||
$this->Tree->order = null;
|
||||
$this->Tree->initialize(2, 2);
|
||||
|
||||
$this->Tree->bindModel(array('belongsTo' => array('Dummy' =>
|
||||
|
|
@ -255,12 +262,12 @@ class TreeBehaviorUuidTest extends CakeTestCase {
|
|||
$this->Tree->id = $data[$modelClass]['id'];
|
||||
|
||||
$direct = $this->Tree->children(null, true, array('name', $leftField, $rightField));
|
||||
$expects = array(array($modelClass => array('name' => '1.1', $leftField => 2, $rightField => 7)),
|
||||
$expected = array(array($modelClass => array('name' => '1.1', $leftField => 2, $rightField => 7)),
|
||||
array($modelClass => array('name' => '1.2', $leftField => 8, $rightField => 13)));
|
||||
$this->assertEquals($direct, $expects);
|
||||
$this->assertEquals($expected, $direct);
|
||||
|
||||
$total = $this->Tree->children(null, null, array('name', $leftField, $rightField));
|
||||
$expects = array(
|
||||
$expected = array(
|
||||
array($modelClass => array('name' => '1.1', $leftField => 2, $rightField => 7)),
|
||||
array($modelClass => array('name' => '1.1.1', $leftField => 3, $rightField => 4)),
|
||||
array($modelClass => array('name' => '1.1.2', $leftField => 5, $rightField => 6)),
|
||||
|
|
@ -268,7 +275,7 @@ class TreeBehaviorUuidTest extends CakeTestCase {
|
|||
array($modelClass => array('name' => '1.2.1', $leftField => 9, $rightField => 10)),
|
||||
array($modelClass => array('name' => '1.2.2', $leftField => 11, $rightField => 12))
|
||||
);
|
||||
$this->assertEquals($total, $expects);
|
||||
$this->assertEquals($expected, $total);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -279,12 +286,13 @@ class TreeBehaviorUuidTest extends CakeTestCase {
|
|||
public function testGenerateTreeListWithSelfJoin() {
|
||||
extract($this->settings);
|
||||
$this->Tree = new $modelClass();
|
||||
$this->Tree->order = null;
|
||||
$this->Tree->bindModel(array('belongsTo' => array('Dummy' =>
|
||||
array('className' => $modelClass, 'foreignKey' => $parentField, 'conditions' => array('Dummy.id' => null)))), false);
|
||||
$this->Tree->initialize(2, 2);
|
||||
|
||||
$result = $this->Tree->generateTreeList();
|
||||
$expected = array('1. Root', '_1.1', '__1.1.1', '__1.1.2', '_1.2', '__1.2.1', '__1.2.2');
|
||||
$this->assertSame(array_values($result), $expected);
|
||||
$this->assertSame($expected, array_values($result));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue