+ {$langs['labels']['share']} +
+';
- //echo $response;
-
- if($resultStatus['http_code'] == 200) {
- if ($output) {
- echo "\r\n".$response."\r\n\r\n";
- }
- } else {
- if ($output) {
- echo 'CALL FAILED: '.print_r($resultStatus, true).'
'.$response;
- }
- }
-
- return array('response'=>$response, 'code'=>$resultStatus['http_code']);
- }
-
- function isSuccess($jsonData='', $output=false)
- {
- $response= $this->getResponse($jsonData, $output);
-
- return ($response['code'] == 200) ? true : false;
- }
-
-}
-
-?>
\ No newline at end of file
diff --git a/tests/Api/config.php b/tests/Api/config.php
deleted file mode 100644
index 1792cddb78..0000000000
--- a/tests/Api/config.php
+++ /dev/null
@@ -1,10 +0,0 @@
- false,
- 'apiUrl' => 'http://172.20.0.1/taras/espo/api/v1',
- 'username' => 'admin',
- 'password' => '1',
-);
-
-?>
\ No newline at end of file
diff --git a/tests/Espo/Core/Upgrades/BaseTest.php b/tests/Espo/Core/Upgrades/BaseTest.php
index d2b2888249..b8eec5f4da 100644
--- a/tests/Espo/Core/Upgrades/BaseTest.php
+++ b/tests/Espo/Core/Upgrades/BaseTest.php
@@ -80,7 +80,6 @@ class BaseTest extends \PHPUnit_Framework_TestCase
$this->assertEquals( $upgradeId, $this->reflection->invokeMethod('getUpgradeId', array()) );
}
-
public function testCreateUpgradeId()
{
$upgradeId = $this->reflection->setProperty('upgradeId', null);
@@ -97,7 +96,6 @@ class BaseTest extends \PHPUnit_Framework_TestCase
$this->reflection->invokeMethod('getUpgradeId', array());
}
-
public function testGetManifestIncorrect()
{
$this->setExpectedException('\Espo\Core\Exceptions\Error');
@@ -114,7 +112,6 @@ class BaseTest extends \PHPUnit_Framework_TestCase
$this->reflection->invokeMethod('getManifest', array());
}
-
public function testGetManifest()
{
$manifest = '{
@@ -162,7 +159,6 @@ class BaseTest extends \PHPUnit_Framework_TestCase
);
}
-
/**
* @dataProvider acceptableDataFalse
*/
@@ -184,7 +180,6 @@ class BaseTest extends \PHPUnit_Framework_TestCase
);
}
-
public function testGetUpgradePath()
{
$upgradeId = $this->reflection->invokeMethod('getUpgradeId', array());
@@ -195,12 +190,6 @@ class BaseTest extends \PHPUnit_Framework_TestCase
$postfix = $this->reflection->getProperty('packagePostfix');
$this->assertEquals( $upgradePath.$postfix, $this->reflection->invokeMethod('getUpgradePath', array(true)) );
}
-
-
-
-
-
-
}
?>
diff --git a/tests/Espo/Core/Utils/ConfigTest.php b/tests/Espo/Core/Utils/ConfigTest.php
index 96dd5ee181..619a88c620 100644
--- a/tests/Espo/Core/Utils/ConfigTest.php
+++ b/tests/Espo/Core/Utils/ConfigTest.php
@@ -11,7 +11,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
protected $objects;
- protected $configPath = 'tests/testData/Utils/Config/config.php';
+ protected $configPath = 'tests/testData/Utils/Config/cache/config.php';
protected $systemConfigPath = 'tests/testData/Utils/Config/systemConfig.php';
diff --git a/tests/Espo/Core/Utils/FieldManagerTest.php b/tests/Espo/Core/Utils/FieldManagerTest.php
index c5667a1564..2c978b6f1f 100644
--- a/tests/Espo/Core/Utils/FieldManagerTest.php
+++ b/tests/Espo/Core/Utils/FieldManagerTest.php
@@ -65,14 +65,14 @@ class FieldManagerTest extends \PHPUnit_Framework_TestCase
);
$this->objects['metadata']
- ->expects($this->exactly(3))
+ ->expects($this->exactly(6))
->method('get')
->will($this->returnValue($data));
$this->assertTrue($this->object->update('name', $data, 'Account'));
}
- public function testUpdateCustomField()
+ public function testUpdateCustomFieldIsNotChanged()
{
$data = array(
"type" => "varchar",
@@ -85,11 +85,39 @@ class FieldManagerTest extends \PHPUnit_Framework_TestCase
->method('get')
->will($this->returnValue($data));
+ $this->objects['metadata']
+ ->expects($this->never())
+ ->method('set')
+ ->will($this->returnValue(true));
+
+ $this->assertTrue($this->object->update('varName', $data, 'CustomEntity'));
+ }
+
+ public function testUpdateCustomField()
+ {
+ $data = array(
+ "type" => "varchar",
+ "maxLength" => "50",
+ "isCustom" => true,
+ );
+
+ $this->objects['metadata']
+ ->expects($this->exactly(6))
+ ->method('get')
+ ->will($this->returnValue($data));
+
$this->objects['metadata']
->expects($this->once())
->method('set')
->will($this->returnValue(true));
+ $data = array(
+ "type" => "varchar",
+ "maxLength" => "150",
+ "required" => true,
+ "isCustom" => true,
+ );
+
$this->assertTrue($this->object->update('varName', $data, 'CustomEntity'));
}
diff --git a/tests/Espo/Core/Utils/SystemTest.php b/tests/Espo/Core/Utils/SystemTest.php
index bbce6ee339..9bebc3334e 100644
--- a/tests/Espo/Core/Utils/SystemTest.php
+++ b/tests/Espo/Core/Utils/SystemTest.php
@@ -32,6 +32,9 @@ class SystemTest extends \PHPUnit_Framework_TestCase
$_SERVER['SERVER_SOFTWARE'] = 'Microsoft-IIS/8.0';
$this->assertEquals( 'microsoft-iis', $this->object->getServerType());
+
+ $_SERVER['SERVER_SOFTWARE'] = 'apache/2.4.10 (win32) openssl/1.0.1i php';
+ $this->assertEquals( 'apache', $this->object->getServerType());
}
diff --git a/tests/Espo/Core/Utils/UtilTest.php b/tests/Espo/Core/Utils/UtilTest.php
index 1e78ccc98f..885adfcb6b 100644
--- a/tests/Espo/Core/Utils/UtilTest.php
+++ b/tests/Espo/Core/Utils/UtilTest.php
@@ -4,23 +4,21 @@ namespace tests\Espo\Core\Utils;
use Espo\Core\Utils\Util;
-
class UtilTest extends \PHPUnit_Framework_TestCase
{
-
- function testGetSeparator()
+ public function testGetSeparator()
{
$this->assertEquals(DIRECTORY_SEPARATOR, Util::getSeparator());
}
- function testToCamelCase()
+ public function testToCamelCase()
{
$this->assertEquals('detail', Util::toCamelCase('detail'));
$this->assertEquals('detailView', Util::toCamelCase('detail-view'));
$this->assertEquals('myDetailView', Util::toCamelCase('my-detail-view'));
}
- function testFromCamelCase()
+ public function testFromCamelCase()
{
$this->assertEquals('detail', Util::fromCamelCase('detail'));
$this->assertEquals('detail-view', Util::fromCamelCase('detailView'));
@@ -61,7 +59,6 @@ class UtilTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($result, Util::merge($array1, $array2Main));
-
$array1= array(
'datetime' =>
array (
@@ -114,436 +111,383 @@ class UtilTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($result, Util::merge($array1, $array2Main));
}
- public function testMergeLevel1()
+ public function testMergeWithAppend()
{
- $basicArr = array(
- 'useCache' => 111,
- 'useCache1' => 111,
- 'sub' => array (
- 'subV' => '1111',
- 'subV1' => '1111',
- 'subO' => array(
- 'subOV' => '11111',
- 'subOV1' => '11111',
- 'subOT' => array(
- 'subOTT' => '11111',
- 'subOT1' => '11111',
- ),
- ),
- ),
- );
-
- $advArr = array(
- 'useCache' => 222,
- 'useCache2' => 222,
- 'sub' => array (
- 'subV' => '222222',
- 'subV2' => '222222',
- 'subO' => array(
- 'subOV' => '22222',
- 'subOV2' => '22222',
- 'subOT' => array(
- 'subOTT' => '22222',
- 'subOT2' => '22222',
- ),
- ),
- ),
- );
-
- $result = array (
- 'useCache' => 222,
- 'useCache1' => 111,
- 'useCache2' => 222,
- 'sub' => array (
- 'subV' => '222222',
- 'subV2' => '222222',
- 'subO' => array(
- 'subOV' => '22222',
- 'subOV2' => '22222',
- 'subOT' => array(
- 'subOTT' => '22222',
- 'subOT2' => '22222',
- ),
- ),
- ),
- );
-
- $this->assertEquals($result, Util::merge($basicArr, $advArr, 1));
- $this->assertEquals($result, Util::merge($basicArr, $advArr, array(1)));
- }
-
-
- public function testMergeLevel1WithMergeKeyName()
- {
- $basicArr = array(
- 'useCache' => 111,
- 'useCache1' => 111,
- 'sub' => array (
- 'subV' => '1111',
- 'subV1' => '1111',
- 'subO' => array(
- 'subOV' => '11111',
- 'subOV1' => '11111',
- 'subOT' => array(
- 'subOTT' => '11111',
- 'subOT1' => '11111',
- ),
- ),
- ),
- );
-
- $advArr = array(
- 'useCache' => 222,
- 'useCache2' => 222,
- 'sub' => array (
- 'subV' => '222222',
- 'subV2' => '222222',
- 'subO' => array(
- 'subOV' => '22222',
- 'subOV2' => '22222',
- 'subOT' => array(
- 'subOTT' => '22222',
- 'subOT2' => '22222',
- ),
- ),
- ),
- );
-
- $result = array (
- 'useCache' => 222,
- 'useCache1' => 111,
- 'sub' =>
- array (
- 'subV' => '222222',
- 'subV1' => '1111',
- 'subO' =>
- array (
- 'subOV' => '22222',
- 'subOV1' => '11111',
- 'subOT' =>
+ $currentArray = array(
+ 'entityDefs' =>
array (
- 'subOTT' => '22222',
- 'subOT1' => '11111',
- 'subOT2' => '22222',
- ),
- 'subOV2' => '22222',
- ),
- 'subV2' => '222222',
- ),
- 'useCache2' => 222,
- );
-
- $this->assertEquals($result, Util::merge($basicArr, $advArr, 1, 'useCache'));
- $this->assertEquals( $result, Util::merge($basicArr, $advArr, array(1, 'useCache')) );
-
- $result = array (
- 'useCache' => 222,
- 'useCache1' => 111,
- 'sub' =>
- array (
- 'subV' => '222222',
- 'subV2' => '222222',
- 'subO' => array(
- 'subOV' => '22222',
- 'subOV2' => '22222',
- 'subOT' => array(
- 'subOTT' => '22222',
- 'subOT2' => '22222',
- ),
- ),
- ),
- 'useCache2' => 222,
- );
-
- $this->assertEquals($result, Util::merge($basicArr, $advArr, 1, 'sub'));
- $this->assertEquals( $result, Util::merge($basicArr, $advArr, array(1, 'sub')) );
- }
-
- public function testMergeLevel2()
- {
- $basicArr = array(
- 'useCache' => 111,
- 'useCache1' => 111,
- 'sub' => array (
- 'subV' => '1111',
- 'subV1' => '1111',
- 'subO' => array(
- 'subOV' => '11111',
- 'subOV1' => '11111',
- 'subOT' => array(
- 'subOTT' => '11111',
- 'subOT1' => '11111',
+ 'Attachment' =>
+ array (
+ 'fields' =>
+ array (
+ 'name' =>
+ array (
+ 'type' => 'varchar',
+ 'required' => true,
),
- ),
- ),
- );
-
- $advArr = array(
- 'useCache' => 222,
- 'useCache2' => 222,
- 'sub' => array (
- 'subV' => '222222',
- 'subV2' => '222222',
- 'subO' => array(
- 'subOV' => '22222',
- 'subOV2' => '22222',
- 'subOT' => array(
- 'subOTT' => '22222',
- 'subOT2' => '22222',
+ 'type' =>
+ array (
+ 'type' => 'varchar',
+ 'maxLength' => 36,
),
+ 'size' =>
+ array (
+ 'type' => 'enum',
+ 'value' => ["v1", "v2", "v3"],
+ ),
+ 'sizeInt' =>
+ array (
+ 'type' => 'enum',
+ 'value' => [0, 1, 2],
+ ),
+ 'merged' =>
+ array (
+ 'type' => 'enum',
+ 'value' => ["v1", "v2", "v3"],
+ ),
+ 'mergedInt' =>
+ array (
+ 'type' => 'enum',
+ 'value' => [0, 1, 2],
+ ),
+ ),
+ ),
+ 'Contact' =>
+ array (
+ 'fields' =>
+ array (
+ 'name' =>
+ array (
+ 'type' => 'varchar',
+ 'required' => true,
+ ),
+ 'type' =>
+ array (
+ 'type' => 'varchar',
+ 'maxLength' => 36,
+ ),
+ 'size' =>
+ array (
+ 'type' => 'enum',
+ 'value' => ["v1", "v2", "v3"],
+ ),
+ 'merged' =>
+ array (
+ 'type' => 'enum',
+ 'value' => ["v1", "v2", "v3"],
+ ),
+ ),
),
),
- );
-
- $result = array (
- 'useCache' => 222,
- 'useCache1' => 111,
- 'sub' =>
- array (
- 'subV' => '222222',
- 'subV1' => '1111',
- 'subO' =>
+ 'MyCustom' =>
array (
- 'subOV' => '22222',
- 'subOV2' => '22222',
- 'subOT' =>
+ 'fields' =>
array (
- 'subOTT' => '22222',
- 'subOT2' => '22222',
+ 'name' =>
+ array (
+ 'type' => 'varchar',
+ 'required' => true,
+ ),
),
),
- 'subV2' => '222222',
- ),
- 'useCache2' => 222,
);
- $this->assertEquals($result, Util::merge($basicArr, $advArr, 2));
- $this->assertEquals($result, Util::merge($basicArr, $advArr, array(2)));
+ $newArray = array(
+ 'entityDefs' =>
+ array (
+ 'Attachment' =>
+ array (
+ 'fields' =>
+ array (
+ 'name' =>
+ array (
+ 'type' => 'varchar',
+ 'required' => false,
+ 'NEW' => 'NEWVAL',
+ ),
+ 'type' =>
+ array (
+ 'type' => 'NETYPE',
+ ),
+ 'size' =>
+ array (
+ 'type' => 'enum',
+ 'value' => ["B1", "B2", "B3"],
+ ),
+ 'sizeInt' =>
+ array (
+ 'type' => 'enum',
+ 'value' => [5, 8, 9],
+ ),
+ 'merged' =>
+ array (
+ 'type' => 'enum',
+ 'value' => ["__APPEND__", "B1", "B2", "B3"],
+ ),
+ 'mergedInt' =>
+ array (
+ 'type' => 'enum',
+ 'value' => ['__APPEND__', 5, 8, 9],
+ ),
+ ),
+ 'list' =>
+ array (
+ 'test' => 'Here',
+ ),
+ ),
+ 'Contact' =>
+ array (
+ 'fields' =>
+ array (
+ 'name' =>
+ array (
+ 'type' => 'varchar',
+ 'required' => false,
+ 'NEW' => 'NEWVAL',
+ ),
+ 'type' =>
+ array (
+ 'type' => 'NEW',
+ 'maxLength' => 1000000,
+ ),
+ 'size' =>
+ array (
+ 'type' => 'enum',
+ 'value' => ["B1", "B2", "B3"],
+ ),
+ 'merged' =>
+ array (
+ 'type' => 'enum',
+ 'value' => ["__APPEND__", "B1", "B2", "B3"],
+ ),
+ ),
+ ),
+ ),
+ );
+
+
+ $result = array (
+ 'entityDefs' =>
+ array (
+ 'Attachment' =>
+ array (
+ 'fields' =>
+ array (
+ 'name' =>
+ array (
+ 'type' => 'varchar',
+ 'required' => false,
+ 'NEW' => 'NEWVAL',
+ ),
+ 'type' =>
+ array (
+ 'type' => 'NETYPE',
+ 'maxLength' => 36,
+ ),
+ 'size' =>
+ array (
+ 'type' => 'enum',
+ 'value' =>
+ array (
+ 0 => 'B1',
+ 1 => 'B2',
+ 2 => 'B3',
+ ),
+ ),
+ 'sizeInt' =>
+ array (
+ 'type' => 'enum',
+ 'value' =>
+ array (
+ 0 => 5,
+ 1 => 8,
+ 2 => 9,
+ ),
+ ),
+ 'merged' =>
+ array (
+ 'type' => 'enum',
+ 'value' =>
+ array (
+ 0 => 'v1',
+ 1 => 'v2',
+ 2 => 'v3',
+ 3 => 'B1',
+ 4 => 'B2',
+ 5 => 'B3',
+ ),
+ ),
+ 'mergedInt' =>
+ array (
+ 'type' => 'enum',
+ 'value' =>
+ array (
+ 0 => 0,
+ 1 => 1,
+ 2 => 2,
+ 3 => 5,
+ 4 => 8,
+ 5 => 9,
+ ),
+ ),
+ ),
+ 'list' =>
+ array (
+ 'test' => 'Here',
+ ),
+ ),
+ 'Contact' =>
+ array (
+ 'fields' =>
+ array (
+ 'name' =>
+ array (
+ 'type' => 'varchar',
+ 'required' => false,
+ 'NEW' => 'NEWVAL',
+ ),
+ 'type' =>
+ array (
+ 'type' => 'NEW',
+ 'maxLength' => 1000000,
+ ),
+ 'size' =>
+ array (
+ 'type' => 'enum',
+ 'value' =>
+ array (
+ 0 => 'B1',
+ 1 => 'B2',
+ 2 => 'B3',
+ ),
+ ),
+ 'merged' =>
+ array (
+ 'type' => 'enum',
+ 'value' =>
+ array (
+ 0 => 'v1',
+ 1 => 'v2',
+ 2 => 'v3',
+ 3 => 'B1',
+ 4 => 'B2',
+ 5 => 'B3',
+ ),
+ ),
+ ),
+ ),
+ ),
+ 'MyCustom' =>
+ array (
+ 'fields' =>
+ array (
+ 'name' =>
+ array (
+ 'type' => 'varchar',
+ 'required' => true,
+ ),
+ ),
+ ),
+ );
+
+ $this->assertEquals($result, Util::merge($currentArray, $newArray));
}
- public function testMergeLevel2WithMergeKeyName()
+ public function testMergeWithBool()
{
- $basicArr = array(
- 'useCache' => 111,
- 'useCache1' => 111,
- 'sub' => array (
- 'subV' => '1111',
- 'subV1' => '1111',
- 'subO' => array(
- 'subOV' => '11111',
- 'subOV1' => '11111',
- 'subOT' => array(
- 'subOTT' => '11111',
- 'subOT1' => '11111',
- ),
- ),
+ $currentArray = array (
+ 'fields' =>
+ array (
+ 'accountId' =>
+ array (
+ 'type' => 'varchar',
+ 'where' =>
+ array (
+ '=' => 'contact.id IN ({value})',
+ ),
+ 'len' => 255,
),
+ 'deleted' =>
+ array (
+ 'type' => 'bool',
+ 'default' => false,
+ 'trueValue' => true,
+ ),
+ ),
+ 'relations' =>
+ array (
+ ),
);
- $advArr = array(
- 'useCache' => 222,
- 'useCache2' => 222,
- 'sub' => array (
- 'subV' => '222222',
- 'subV2' => '222222',
- 'subO' => array(
- 'subOV' => '22222',
- 'subOV2' => '22222',
- 'subOT' => array(
- 'subOTT' => '22222',
- 'subOT2' => '22222',
- ),
- ),
+ $newArray = array (
+ 'fields' =>
+ array (
+ 'accountName' =>
+ array (
+ 'type' => 'foreign',
+ 'relation' => 'account',
+ 'foreign' => 'name',
),
+ 'accountId' =>
+ array (
+ 'type' => 'foreignId',
+ 'index' => true,
+ ),
+ ),
+ 'relations' =>
+ array (
+ 'createdBy' =>
+ array (
+ 'type' => 'belongsTo',
+ 'entity' => 'User',
+ 'key' => 'createdById',
+ 'foreignKey' => 'id',
+ ),
+ ),
);
$result = array (
- 'useCache' => 222,
- 'useCache1' => 111,
- 'sub' =>
+ 'fields' =>
array (
- 'subV' => '222222',
- 'subV1' => '1111',
- 'subO' =>
- array (
- 'subOV' => '22222',
- 'subOV1' => '11111',
- 'subOT' =>
- array (
- 'subOTT' => '22222',
- 'subOT1' => '11111',
- 'subOT2' => '22222',
- ),
- 'subOV2' => '22222',
- ),
- 'subV2' => '222222',
+ 'accountName' =>
+ array (
+ 'type' => 'foreign',
+ 'relation' => 'account',
+ 'foreign' => 'name',
+ ),
+ 'accountId' =>
+ array (
+ 'type' => 'foreignId',
+ 'index' => true,
+ 'where' =>
+ array (
+ '=' => 'contact.id IN ({value})',
+ ),
+ 'len' => 255,
+ ),
+ 'deleted' =>
+ array (
+ 'type' => 'bool',
+ 'default' => false,
+ 'trueValue' => true,
+ ),
+ ),
+ 'relations' =>
+ array (
+ 'createdBy' =>
+ array (
+ 'type' => 'belongsTo',
+ 'entity' => 'User',
+ 'key' => 'createdById',
+ 'foreignKey' => 'id',
+ ),
),
- 'useCache2' => 222,
);
- $this->assertEquals($result, Util::merge($basicArr, $advArr, 2, 'subOV'));
- $this->assertEquals( $result, Util::merge($basicArr, $advArr, array(2, 'subOV')) );
-
- $result = array (
- 'useCache' => 222,
- 'useCache1' => 111,
- 'sub' =>
- array (
- 'subV' => '222222',
- 'subV1' => '1111',
- 'subO' =>
- array (
- 'subOV' => '22222',
- 'subOV2' => '22222',
- 'subOT' =>
- array (
- 'subOTT' => '22222',
- 'subOT2' => '22222',
- ),
- ),
- 'subV2' => '222222',
- ),
- 'useCache2' => 222,
- );
-
- $this->assertEquals($result, Util::merge($basicArr, $advArr, 2, 'subO'));
- $this->assertEquals( $result, Util::merge($basicArr, $advArr, array(2, 'subO')) );
+ $this->assertEquals($result, Util::merge($currentArray, $newArray));
}
-
- public function testMergeLevel3()
- {
- $basicArr = array(
- 'useCache' => 111,
- 'useCache1' => 111,
- 'sub' => array (
- 'subV' => '1111',
- 'subV1' => '1111',
- 'subO' => array(
- 'subOV' => '11111',
- 'subOV1' => '11111',
- 'subOT' => array(
- 'subOTT' => '11111',
- 'subOT1' => '11111',
- ),
- ),
- ),
- );
-
- $advArr = array(
- 'useCache' => 222,
- 'useCache2' => 222,
- 'sub' => array (
- 'subV' => '222222',
- 'subV2' => '222222',
- 'subO' => array(
- 'subOV' => '22222',
- 'subOV2' => '22222',
- 'subOT' => array(
- 'subOTT' => '22222',
- 'subOT2' => '22222',
- ),
- ),
- ),
- );
-
- $result = array (
- 'useCache' => 222,
- 'useCache1' => 111,
- 'sub' =>
- array (
- 'subV' => '222222',
- 'subV1' => '1111',
- 'subO' =>
- array (
- 'subOV' => '22222',
- 'subOV1' => '11111',
- 'subOT' =>
- array (
- 'subOTT' => '22222',
- 'subOT2' => '22222',
- ),
- 'subOV2' => '22222',
- ),
- 'subV2' => '222222',
- ),
- 'useCache2' => 222,
- );
-
- $this->assertEquals($result, Util::merge($basicArr, $advArr, 3));
- }
-
- public function testMergeLevel4Plus()
- {
- $basicArr = array(
- 'useCache' => 111,
- 'useCache1' => 111,
- 'sub' => array (
- 'subV' => '1111',
- 'subV1' => '1111',
- 'subO' => array(
- 'subOV' => '11111',
- 'subOV1' => '11111',
- 'subOT' => array(
- 'subOTT' => '11111',
- 'subOT1' => '11111',
- ),
- ),
- ),
- );
-
- $advArr = array(
- 'useCache' => 222,
- 'useCache2' => 222,
- 'sub' => array (
- 'subV' => '222222',
- 'subV2' => '222222',
- 'subO' => array(
- 'subOV' => '22222',
- 'subOV2' => '22222',
- 'subOT' => array(
- 'subOTT' => '22222',
- 'subOT2' => '22222',
- ),
- ),
- ),
- );
-
- $result = array (
- 'useCache' => 222,
- 'useCache1' => 111,
- 'sub' =>
- array (
- 'subV' => '222222',
- 'subV1' => '1111',
- 'subO' =>
- array (
- 'subOV' => '22222',
- 'subOV1' => '11111',
- 'subOT' =>
- array (
- 'subOTT' => '22222',
- 'subOT1' => '11111',
- 'subOT2' => '22222',
- ),
- 'subOV2' => '22222',
- ),
- 'subV2' => '222222',
- ),
- 'useCache2' => 222,
- );
-
- $this->assertEquals($result, Util::merge($basicArr, $advArr, 4));
-
- $this->assertEquals($result, Util::merge($basicArr, $advArr, 5));
-
- $this->assertEquals($result, Util::merge($basicArr, $advArr, 6));
-
- $this->assertEquals($result, Util::merge($basicArr, $advArr));
- }
-
-
- function testToFormat()
+ public function testToFormat()
{
$this->assertEquals('/Espo/Core/Utils', Util::toFormat('/Espo/Core/Utils', '/'));
$this->assertEquals('\Espo\Core\Utils', Util::toFormat('/Espo/Core/Utils', '\\'));
@@ -552,7 +496,7 @@ class UtilTest extends \PHPUnit_Framework_TestCase
$this->assertEquals('\Espo\Core\Utils', Util::toFormat('\Espo\Core\Utils', '\\'));
}
- function testConcatPath()
+ public function testConcatPath()
{
$result= 'dir1/dir2/file1.json';
$this->assertEquals($result, Util::concatPath('dir1/dir2', 'file1.json'));
@@ -573,7 +517,7 @@ class UtilTest extends \PHPUnit_Framework_TestCase
}
- function testArrayToObject()
+ public function testArrayToObject()
{
$testArr= array(
'useCache' => true,
@@ -599,7 +543,7 @@ class UtilTest extends \PHPUnit_Framework_TestCase
}
- function testObjectToArray()
+ public function testObjectToArray()
{
$testObj= (object) array(
'useCache' => true,
@@ -624,7 +568,7 @@ class UtilTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($testResult, Util::objectToArray($testObj));
}
- function testGetNaming()
+ public function testGetNaming()
{
$this->assertEquals('myPrefixMyName', Util::getNaming('myName', 'myPrefix', 'prefix'));
@@ -633,7 +577,7 @@ class UtilTest extends \PHPUnit_Framework_TestCase
$this->assertEquals('myNameMyPostfix', Util::getNaming('my_name', 'my_postfix', 'postfix', '_'));
}
- function testReplaceInArray()
+ public function testReplaceInArray()
{
$testArray = array(
'option' => array(
@@ -657,7 +601,7 @@ class UtilTest extends \PHPUnit_Framework_TestCase
}
- function testGetClassName()
+ public function testGetClassName()
{
$this->assertEquals('\Espo\EntryPoints\Donwload', Util::getClassName('application/Espo/EntryPoints/Donwload.php'));
$this->assertEquals('\Espo\EntryPoints\Donwload', Util::getClassName('custom/Espo/EntryPoints/Donwload.php'));
@@ -665,7 +609,7 @@ class UtilTest extends \PHPUnit_Framework_TestCase
$this->assertEquals('\Espo\EntryPoints\Donwload', Util::getClassName('application/Espo/EntryPoints/Donwload'));
}
- function testUnsetInArrayNotSingle()
+ public function testUnsetInArrayNotSingle()
{
$input = array(
'Account' => array(
@@ -700,7 +644,7 @@ class UtilTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($result, Util::unsetInArray($input, $unsets));
}
- function testUnsetInArraySingle()
+ public function testUnsetInArraySingle()
{
$input = array(
'Account' => array(
@@ -734,7 +678,7 @@ class UtilTest extends \PHPUnit_Framework_TestCase
}
- function testUnsetInArrayTogether()
+ public function testUnsetInArrayTogether()
{
$input = array(
'Account' => array(
@@ -771,7 +715,7 @@ class UtilTest extends \PHPUnit_Framework_TestCase
}
- function testUnsetInArray()
+ public function testUnsetInArray()
{
$input = array(
'Account' => array(
@@ -826,7 +770,7 @@ class UtilTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($result, Util::unsetInArray($input, $unsets));
}
- function testGetValueByKey()
+ public function testGetValueByKey()
{
$inputArray = array(
'Account' => array(
@@ -858,41 +802,6 @@ class UtilTest extends \PHPUnit_Framework_TestCase
$this->assertEquals('customReturns', Util::getValueByKey($inputArray, 'Contact.notExists', 'customReturns'));
$this->assertNotEquals('customReturns', Util::getValueByKey($inputArray, 'Contact.useCache', 'customReturns'));
}
-
-
-
- /*function testGetScopeModuleName()
- {
- $this->assertEquals('Crm', $this->fixture->getScopeModuleName('Account'));
- $this->assertEquals('Crm', $this->fixture->getScopeModuleName('account'));
- $this->assertNotEquals('crm', $this->fixture->getScopeModuleName('account'));
-
- $this->assertEquals('', $this->fixture->getScopeModuleName('User'));
- $this->assertEquals('', $this->fixture->getScopeModuleName('user'));
- $this->assertNotEquals('Crm', $this->fixture->getScopeModuleName('User'));
- }
-
-
- function testGetScopePath()
- {
- $this->assertEquals('Modules/Crm', $this->fixture->getScopePath('Account', '/'));
- $this->assertEquals('Modules\Crm', $this->fixture->getScopePath('Account', '\\'));
- $this->assertEquals('Modules\Crm', $this->fixture->getScopePath('account', '\\'));
-
- $this->assertEquals('Espo', $this->fixture->getScopePath('User', '/'));
- $this->assertEquals('Espo', $this->fixture->getScopePath('User', '\\'));
- $this->assertEquals('Espo', $this->fixture->getScopePath('user', '\\'));
- }
-
-
- function testGetScopes()
- {
- $this->assertArrayHasKey('User', $this->fixture->getScopes() );
- } */
-
-
-
-
}
?>
\ No newline at end of file
diff --git a/tests/testData/Utils/Config/config.php b/tests/testData/Utils/Config/cache/config.php
similarity index 97%
rename from tests/testData/Utils/Config/config.php
rename to tests/testData/Utils/Config/cache/config.php
index bba9d3119b..846ec89553 100644
--- a/tests/testData/Utils/Config/config.php
+++ b/tests/testData/Utils/Config/cache/config.php
@@ -1,6 +1,10 @@
1412600573,
+ 'removeOption' => 'Test',
+ 'testOption' => 'Another Wrong Value',
+ 'testOption2' => 'Test2',
'database' =>
array (
'driver' => 'pdo_mysql',
@@ -102,9 +106,6 @@ return array (
8 => 'Prospect',
),
'isInstalled' => true,
- 'cacheTimestamp' => 1404901977,
- 'testOption' => 'Another Wrong Value',
- 'testOption2' => 'Test2',
);
?>
\ No newline at end of file