|
@@ -669,10 +669,19 @@ class StubNumberFormatterTest extends LocaleTestCase
|
|
|
$this->assertSame($expected, $parsedValue, $message);
|
|
|
|
|
|
if ($expected === false) {
|
|
|
- $this->assertSame(StubIntl::U_PARSE_ERROR, $formatter->getErrorCode());
|
|
|
+ $errorCode = StubIntl::U_PARSE_ERROR;
|
|
|
+ $errorMessage = 'Number parsing failed: U_PARSE_ERROR';
|
|
|
} else {
|
|
|
- $this->assertEquals(StubIntl::U_ZERO_ERROR, $formatter->getErrorCode());
|
|
|
+ $errorCode = StubIntl::U_ZERO_ERROR;
|
|
|
+ $errorMessage = 'U_ZERO_ERROR';
|
|
|
}
|
|
|
+
|
|
|
+ $this->assertSame($errorMessage, StubIntl::getErrorMessage());
|
|
|
+ $this->assertSame($errorCode, StubIntl::getErrorCode());
|
|
|
+ $this->assertSame($errorCode != 0, StubIntl::isFailure(StubIntl::getErrorCode()));
|
|
|
+ $this->assertSame($errorMessage, $formatter->getErrorMessage());
|
|
|
+ $this->assertSame($errorCode, $formatter->getErrorCode());
|
|
|
+ $this->assertSame($errorCode != 0, StubIntl::isFailure($formatter->getErrorCode()));
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -682,15 +691,25 @@ class StubNumberFormatterTest extends LocaleTestCase
|
|
|
{
|
|
|
$this->skipIfIntlExtensionIsNotLoaded();
|
|
|
$this->skipIfICUVersionIsTooOld();
|
|
|
+
|
|
|
$formatter = $this->getIntlFormatterWithDecimalStyle();
|
|
|
$parsedValue = $formatter->parse($value, \NumberFormatter::TYPE_DOUBLE);
|
|
|
$this->assertSame($expected, $parsedValue, $message);
|
|
|
|
|
|
if ($expected === false) {
|
|
|
- $this->assertSame(U_PARSE_ERROR, $formatter->getErrorCode());
|
|
|
+ $errorCode = StubIntl::U_PARSE_ERROR;
|
|
|
+ $errorMessage = 'Number parsing failed: U_PARSE_ERROR';
|
|
|
} else {
|
|
|
- $this->assertEquals(U_ZERO_ERROR, $formatter->getErrorCode());
|
|
|
+ $errorCode = StubIntl::U_ZERO_ERROR;
|
|
|
+ $errorMessage = 'U_ZERO_ERROR';
|
|
|
}
|
|
|
+
|
|
|
+ $this->assertSame($errorMessage, intl_get_error_message());
|
|
|
+ $this->assertSame($errorCode, intl_get_error_code());
|
|
|
+ $this->assertSame($errorCode != 0, intl_is_failure(intl_get_error_code()));
|
|
|
+ $this->assertSame($errorMessage, $formatter->getErrorMessage());
|
|
|
+ $this->assertSame($errorCode, $formatter->getErrorCode());
|
|
|
+ $this->assertSame($errorCode != 0, intl_is_failure($formatter->getErrorCode()));
|
|
|
}
|
|
|
|
|
|
public function parseProvider()
|