Skip to content

EspoCRM – Open Source CRM Application

fix timezone in tests

Yuriid7438f02bf6c
diff --git a/tests/unit/Espo/Core/Field/Date/DateTest.php b/tests/unit/Espo/Core/Field/Date/DateTest.php
index 42e794a309..689f2d8d23 100644
--- a/tests/unit/Espo/Core/Field/Date/DateTest.php
+++ b/tests/unit/Espo/Core/Field/Date/DateTest.php
@@ -143,7 +143,7 @@ class DateTest extends \PHPUnit\Framework\TestCase
public function testToday(): void
{
$value1 = Date::createToday();
- $value2 = Date::createToday(new DateTimeZone('Europe/Kiev'));
+ $value2 = Date::createToday(new DateTimeZone('Europe/Kyiv'));
$this->assertEquals(0, $value1->diff($value2)->invert);
}
diff --git a/tests/unit/Espo/Core/Field/DateTime/DateTimeTest.php b/tests/unit/Espo/Core/Field/DateTime/DateTimeTest.php
index 1345c67d05..8b7c1cdbd8 100644
--- a/tests/unit/Espo/Core/Field/DateTime/DateTimeTest.php
+++ b/tests/unit/Espo/Core/Field/DateTime/DateTimeTest.php
@@ -63,7 +63,7 @@ class DateTimeTest extends \PHPUnit\Framework\TestCase
public function testFromDateTime2()
{
- $dt = new DateTimeImmutable('2021-05-01 10:20:30', new DateTimeZone('Europe/Kiev'));
+ $dt = new DateTimeImmutable('2021-05-01 10:20:30', new DateTimeZone('Europe/Kyiv'));
$value = DateTime::fromDateTime($dt);
@@ -152,7 +152,7 @@ class DateTimeTest extends \PHPUnit\Framework\TestCase
{
$value = DateTime
::fromString('2021-05-01 10:20:30')
- ->withTimezone(new DateTimeZone('Europe/Kiev'));
+ ->withTimezone(new DateTimeZone('Europe/Kyiv'));
$this->assertEquals('2021-05-01 10:20:30', $value->toString());
@@ -163,9 +163,9 @@ class DateTimeTest extends \PHPUnit\Framework\TestCase
{
$value = DateTime
::fromString('2021-05-01 10:20:30')
- ->withTimezone(new DateTimeZone('Europe/Kiev'));
+ ->withTimezone(new DateTimeZone('Europe/Kyiv'));
- $this->assertEquals(new DateTimeZone('Europe/Kiev'), $value->getTimezone());
+ $this->assertEquals(new DateTimeZone('Europe/Kyiv'), $value->getTimezone());
}
public function testDiff(): void
@@ -212,7 +212,7 @@ class DateTimeTest extends \PHPUnit\Framework\TestCase
public function testComparison(): void
{
$value = DateTime::fromString('2021-05-01 10:10:30')
- ->withTimezone(new DateTimeZone('Europe/Kiev'));
+ ->withTimezone(new DateTimeZone('Europe/Kyiv'));
$this->assertTrue(
$value->isEqualTo(
diff --git a/tests/unit/Espo/Core/Field/DateTimeOptional/DateTimeOptionalDateTest.php b/tests/unit/Espo/Core/Field/DateTimeOptional/DateTimeOptionalDateTest.php
index 833a8523e4..8f775252b0 100644
--- a/tests/unit/Espo/Core/Field/DateTimeOptional/DateTimeOptionalDateTest.php
+++ b/tests/unit/Espo/Core/Field/DateTimeOptional/DateTimeOptionalDateTest.php
@@ -144,11 +144,11 @@ class DateTimeOptionalDateTest extends \PHPUnit\Framework\TestCase
{
$value = DateTimeOptional
::fromString('2021-05-01')
- ->withTimezone(new DateTimeZone('Europe/Kiev'));
+ ->withTimezone(new DateTimeZone('Europe/Kyiv'));
$this->assertEquals('2021-05-01 00:00:00', $value->toString());
- $this->assertEquals(new DateTimeZone('Europe/Kiev'), $value->getTimezone());
+ $this->assertEquals(new DateTimeZone('Europe/Kyiv'), $value->getTimezone());
$this->assertFalse($value->isAllDay());
}
@@ -165,7 +165,7 @@ class DateTimeOptionalDateTest extends \PHPUnit\Framework\TestCase
public function testToday(): void
{
$value1 = DateTimeOptional::createToday();
- $value2 = DateTimeOptional::createToday(new DateTimeZone('Europe/Kiev'));
+ $value2 = DateTimeOptional::createToday(new DateTimeZone('Europe/Kyiv'));
$this->assertEquals(0, $value1->diff($value2)->invert);
}
diff --git a/tests/unit/Espo/Core/Field/DateTimeOptional/DateTimeOptionalTest.php b/tests/unit/Espo/Core/Field/DateTimeOptional/DateTimeOptionalTest.php
index f3e54d409a..1c6b16dedc 100644
--- a/tests/unit/Espo/Core/Field/DateTimeOptional/DateTimeOptionalTest.php
+++ b/tests/unit/Espo/Core/Field/DateTimeOptional/DateTimeOptionalTest.php
@@ -69,7 +69,7 @@ class DateTimeOptionalTest extends \PHPUnit\Framework\TestCase
public function testFromDateTime2()
{
- $dt = new DateTimeImmutable('2021-05-01 10:20:30', new DateTimeZone('Europe/Kiev'));
+ $dt = new DateTimeImmutable('2021-05-01 10:20:30', new DateTimeZone('Europe/Kyiv'));
$value = DateTimeOptional::fromDateTime($dt);
@@ -158,7 +158,7 @@ class DateTimeOptionalTest extends \PHPUnit\Framework\TestCase
{
$value = DateTimeOptional
::fromString('2021-05-01 10:20:30')
- ->withTimezone(new DateTimeZone('Europe/Kiev'));
+ ->withTimezone(new DateTimeZone('Europe/Kyiv'));
$this->assertEquals('2021-05-01 10:20:30', $value->toString());
@@ -169,9 +169,9 @@ class DateTimeOptionalTest extends \PHPUnit\Framework\TestCase
{
$value = DateTimeOptional
::fromString('2021-05-01 10:20:30')
- ->withTimezone(new DateTimeZone('Europe/Kiev'));
+ ->withTimezone(new DateTimeZone('Europe/Kyiv'));
- $this->assertEquals(new DateTimeZone('Europe/Kiev'), $value->getTimezone());
+ $this->assertEquals(new DateTimeZone('Europe/Kyiv'), $value->getTimezone());
}
public function testDiff(): void
@@ -244,7 +244,7 @@ class DateTimeOptionalTest extends \PHPUnit\Framework\TestCase
public function testComparison(): void
{
$value = DateTimeOptional::fromString('2021-05-01 10:10:30')
- ->withTimezone(new DateTimeZone('Europe/Kiev'));
+ ->withTimezone(new DateTimeZone('Europe/Kyiv'));
$this->assertTrue(
$value->isEqualTo(
diff --git a/tests/unit/Espo/Core/Formula/FormulaTest.php b/tests/unit/Espo/Core/Formula/FormulaTest.php
index fe4e059659..b639d559ea 100644
--- a/tests/unit/Espo/Core/Formula/FormulaTest.php
+++ b/tests/unit/Espo/Core/Formula/FormulaTest.php
@@ -1708,7 +1708,7 @@ class FormulaTest extends TestCase
},
{
"type": "value",
- "value": "Europe/Kiev"
+ "value": "Europe/Kyiv"
}
]
}
@@ -1757,7 +1757,7 @@ class FormulaTest extends TestCase
},
{
"type": "value",
- "value": "Europe/Kiev"
+ "value": "Europe/Kyiv"
}
]
}
@@ -1806,7 +1806,7 @@ class FormulaTest extends TestCase
},
{
"type": "value",
- "value": "Europe/Kiev"
+ "value": "Europe/Kyiv"
}
]
}
@@ -1855,7 +1855,7 @@ class FormulaTest extends TestCase
},
{
"type": "value",
- "value": "Europe/Kiev"
+ "value": "Europe/Kyiv"
}
]
}
@@ -1904,7 +1904,7 @@ class FormulaTest extends TestCase
},
{
"type": "value",
- "value": "Europe/Kiev"
+ "value": "Europe/Kyiv"
}
]
}
@@ -1981,7 +1981,7 @@ class FormulaTest extends TestCase
},
{
"type": "value",
- "value": "Europe/Kiev"
+ "value": "Europe/Kyiv"
}
]
}
diff --git a/tests/unit/Espo/Core/Htmlizer/HtmlizerTest.php b/tests/unit/Espo/Core/Htmlizer/HtmlizerTest.php
index 53412d7ef1..0a36f98498 100644
--- a/tests/unit/Espo/Core/Htmlizer/HtmlizerTest.php
+++ b/tests/unit/Espo/Core/Htmlizer/HtmlizerTest.php
@@ -93,7 +93,7 @@ class HtmlizerTest extends TestCase
$this->entityManager = $this->createMock(EntityManager::class);
- $this->dateTime = new DateTime('MM/DD/YYYY', 'hh:mm A', 'Europe/Kiev');
+ $this->dateTime = new DateTime('MM/DD/YYYY', 'hh:mm A', 'Europe/Kyiv');
$this->number = new NumberUtil('.', ',');
$this->htmlizer = new Htmlizer(
$this->dateTime,
diff --git a/tests/unit/Espo/Core/Select/Where/ConverterTest.php b/tests/unit/Espo/Core/Select/Where/ConverterTest.php
index 03098192ab..7db94f941e 100644
--- a/tests/unit/Espo/Core/Select/Where/ConverterTest.php
+++ b/tests/unit/Espo/Core/Select/Where/ConverterTest.php
@@ -239,7 +239,7 @@ class ConverterTest extends TestCase
'attribute' => 'test',
'value' => '2020-12-20',
'dateTime' => true,
- 'timeZone' => 'Europe/Kiev',
+ 'timeZone' => 'Europe/Kyiv',
],
],
]);
diff --git a/tests/unit/Espo/Core/Utils/DateTimeTest.php b/tests/unit/Espo/Core/Utils/DateTimeTest.php
index d980216f5e..a08156c495 100644
--- a/tests/unit/Espo/Core/Utils/DateTimeTest.php
+++ b/tests/unit/Espo/Core/Utils/DateTimeTest.php
@@ -66,7 +66,7 @@ class DateTimeTest extends \PHPUnit\Framework\TestCase
public function testConvertGetFormat(): void
{
- $util = new DateTime('YYYY-MM-DD', 'HH:mm', 'Europe/Kiev');
+ $util = new DateTime('YYYY-MM-DD', 'HH:mm', 'Europe/Kyiv');
$this->assertEquals('YYYY-MM-DD HH:mm', $util->getDateTimeFormat());
@@ -75,7 +75,7 @@ class DateTimeTest extends \PHPUnit\Framework\TestCase
public function testConvertSystemDateTime1(): void
{
- $util = new DateTime('DD-MM-YYYY', 'HH:mm', 'Europe/Kiev');
+ $util = new DateTime('DD-MM-YYYY', 'HH:mm', 'Europe/Kyiv');
$this->assertEquals(
'20-05-2021 13:00',
@@ -85,7 +85,7 @@ class DateTimeTest extends \PHPUnit\Framework\TestCase
public function testConvertSystemDateTime2(): void
{
- $util = new DateTime('DD-MM-YYYY', 'HH:mm', 'Europe/Kiev');
+ $util = new DateTime('DD-MM-YYYY', 'HH:mm', 'Europe/Kyiv');
$this->assertEquals(
'2021-05-20 10:00am',
@@ -95,7 +95,7 @@ class DateTimeTest extends \PHPUnit\Framework\TestCase
public function testConvertSystemDate1(): void
{
- $util = new DateTime('DD-MM-YYYY', 'HH:mm', 'Europe/Kiev');
+ $util = new DateTime('DD-MM-YYYY', 'HH:mm', 'Europe/Kyiv');
$this->assertEquals(
'20-05-2021',