mirror of
https://github.com/unicode-org/icu.git
synced 2025-04-10 15:42:14 +00:00
ICU-22781 Data generated with the concentr/perbillion on, code update
Following the steps in docs/processes/release/tasks/updating-measure-unit.md
This commit is contained in:
Mihai Nita
parent
fe4549dc62
commit
339ebb368f
6 changed files with 650 additions and 19 deletions
|
|
@ -41,26 +41,26 @@ static const int32_t gOffsets[] = {
|
|||
2,
|
||||
7,
|
||||
17,
|
||||
27,
|
||||
31,
|
||||
333,
|
||||
344,
|
||||
362,
|
||||
366,
|
||||
375,
|
||||
378,
|
||||
382,
|
||||
390,
|
||||
412,
|
||||
416,
|
||||
431,
|
||||
28,
|
||||
32,
|
||||
334,
|
||||
345,
|
||||
363,
|
||||
367,
|
||||
376,
|
||||
379,
|
||||
383,
|
||||
391,
|
||||
413,
|
||||
417,
|
||||
432,
|
||||
438,
|
||||
449,
|
||||
455,
|
||||
459,
|
||||
461,
|
||||
495
|
||||
433,
|
||||
439,
|
||||
450,
|
||||
456,
|
||||
460,
|
||||
462,
|
||||
496
|
||||
};
|
||||
|
||||
static const int32_t kCurrencyOffset = 5;
|
||||
|
|
@ -121,6 +121,7 @@ static const char * const gSubTypes[] = {
|
|||
"permille",
|
||||
"permillion",
|
||||
"permyriad",
|
||||
"portion-per-1e9",
|
||||
"liter-per-100-kilometer",
|
||||
"liter-per-kilometer",
|
||||
"mile-per-gallon",
|
||||
|
|
@ -811,6 +812,14 @@ MeasureUnit MeasureUnit::getPermyriad() {
|
|||
return MeasureUnit(3, 9);
|
||||
}
|
||||
|
||||
MeasureUnit *MeasureUnit::createPortionPer1E9(UErrorCode &status) {
|
||||
return MeasureUnit::create(3, 10, status);
|
||||
}
|
||||
|
||||
MeasureUnit MeasureUnit::getPortionPer1E9() {
|
||||
return MeasureUnit(3, 10);
|
||||
}
|
||||
|
||||
MeasureUnit *MeasureUnit::createLiterPer100Kilometers(UErrorCode &status) {
|
||||
return MeasureUnit::create(4, 0, status);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1195,6 +1195,24 @@ class U_I18N_API MeasureUnit: public UObject {
|
|||
*/
|
||||
static MeasureUnit getPermyriad();
|
||||
|
||||
#ifndef U_HIDE_DRAFT_API
|
||||
/**
|
||||
* Returns by pointer, unit of concentr: portion-per-1e9.
|
||||
* Caller owns returned value and must free it.
|
||||
* Also see {@link #getPortionPer1E9()}.
|
||||
* @param status ICU error code.
|
||||
* @draft ICU 77
|
||||
*/
|
||||
static MeasureUnit *createPortionPer1E9(UErrorCode &status);
|
||||
|
||||
/**
|
||||
* Returns by value, unit of concentr: portion-per-1e9.
|
||||
* Also see {@link #createPortionPer1E9()}.
|
||||
* @draft ICU 77
|
||||
*/
|
||||
static MeasureUnit getPortionPer1E9();
|
||||
#endif /* U_HIDE_DRAFT_API */
|
||||
|
||||
/**
|
||||
* Returns by pointer, unit of consumption: liter-per-100-kilometer.
|
||||
* Caller owns returned value and must free it.
|
||||
|
|
|
|||
|
|
@ -67,6 +67,7 @@ private:
|
|||
void TestCompatible72();
|
||||
void TestCompatible73();
|
||||
void TestCompatible74();
|
||||
void TestCompatible77();
|
||||
void TestGetAvailable();
|
||||
void TestExamplesInDocs();
|
||||
void TestFormatPeriodEn();
|
||||
|
|
@ -205,6 +206,7 @@ void MeasureFormatTest::runIndexedTest(
|
|||
TESTCASE_AUTO(TestCompatible72);
|
||||
TESTCASE_AUTO(TestCompatible73);
|
||||
TESTCASE_AUTO(TestCompatible74);
|
||||
TESTCASE_AUTO(TestCompatible77);
|
||||
TESTCASE_AUTO(TestGetAvailable);
|
||||
TESTCASE_AUTO(TestExamplesInDocs);
|
||||
TESTCASE_AUTO(TestFormatPeriodEn);
|
||||
|
|
@ -4235,6 +4237,399 @@ void MeasureFormatTest::TestCompatible74() {
|
|||
assertSuccess("", status);
|
||||
}
|
||||
|
||||
void MeasureFormatTest::TestCompatible77() {
|
||||
UErrorCode status = U_ZERO_ERROR;
|
||||
LocalPointer<MeasureUnit> measureUnit;
|
||||
MeasureUnit measureUnitValue;
|
||||
measureUnit.adoptInstead(MeasureUnit::createGForce(status));
|
||||
measureUnitValue = MeasureUnit::getGForce();
|
||||
measureUnit.adoptInstead(MeasureUnit::createMeterPerSecondSquared(status));
|
||||
measureUnitValue = MeasureUnit::getMeterPerSecondSquared();
|
||||
measureUnit.adoptInstead(MeasureUnit::createArcMinute(status));
|
||||
measureUnitValue = MeasureUnit::getArcMinute();
|
||||
measureUnit.adoptInstead(MeasureUnit::createArcSecond(status));
|
||||
measureUnitValue = MeasureUnit::getArcSecond();
|
||||
measureUnit.adoptInstead(MeasureUnit::createDegree(status));
|
||||
measureUnitValue = MeasureUnit::getDegree();
|
||||
measureUnit.adoptInstead(MeasureUnit::createRadian(status));
|
||||
measureUnitValue = MeasureUnit::getRadian();
|
||||
measureUnit.adoptInstead(MeasureUnit::createRevolutionAngle(status));
|
||||
measureUnitValue = MeasureUnit::getRevolutionAngle();
|
||||
measureUnit.adoptInstead(MeasureUnit::createAcre(status));
|
||||
measureUnitValue = MeasureUnit::getAcre();
|
||||
measureUnit.adoptInstead(MeasureUnit::createDunam(status));
|
||||
measureUnitValue = MeasureUnit::getDunam();
|
||||
measureUnit.adoptInstead(MeasureUnit::createHectare(status));
|
||||
measureUnitValue = MeasureUnit::getHectare();
|
||||
measureUnit.adoptInstead(MeasureUnit::createSquareCentimeter(status));
|
||||
measureUnitValue = MeasureUnit::getSquareCentimeter();
|
||||
measureUnit.adoptInstead(MeasureUnit::createSquareFoot(status));
|
||||
measureUnitValue = MeasureUnit::getSquareFoot();
|
||||
measureUnit.adoptInstead(MeasureUnit::createSquareInch(status));
|
||||
measureUnitValue = MeasureUnit::getSquareInch();
|
||||
measureUnit.adoptInstead(MeasureUnit::createSquareKilometer(status));
|
||||
measureUnitValue = MeasureUnit::getSquareKilometer();
|
||||
measureUnit.adoptInstead(MeasureUnit::createSquareMeter(status));
|
||||
measureUnitValue = MeasureUnit::getSquareMeter();
|
||||
measureUnit.adoptInstead(MeasureUnit::createSquareMile(status));
|
||||
measureUnitValue = MeasureUnit::getSquareMile();
|
||||
measureUnit.adoptInstead(MeasureUnit::createSquareYard(status));
|
||||
measureUnitValue = MeasureUnit::getSquareYard();
|
||||
measureUnit.adoptInstead(MeasureUnit::createItem(status));
|
||||
measureUnitValue = MeasureUnit::getItem();
|
||||
measureUnit.adoptInstead(MeasureUnit::createKarat(status));
|
||||
measureUnitValue = MeasureUnit::getKarat();
|
||||
measureUnit.adoptInstead(MeasureUnit::createMilligramOfglucosePerDeciliter(status));
|
||||
measureUnitValue = MeasureUnit::getMilligramOfglucosePerDeciliter();
|
||||
measureUnit.adoptInstead(MeasureUnit::createMilligramPerDeciliter(status));
|
||||
measureUnitValue = MeasureUnit::getMilligramPerDeciliter();
|
||||
measureUnit.adoptInstead(MeasureUnit::createMillimolePerLiter(status));
|
||||
measureUnitValue = MeasureUnit::getMillimolePerLiter();
|
||||
measureUnit.adoptInstead(MeasureUnit::createMole(status));
|
||||
measureUnitValue = MeasureUnit::getMole();
|
||||
measureUnit.adoptInstead(MeasureUnit::createPercent(status));
|
||||
measureUnitValue = MeasureUnit::getPercent();
|
||||
measureUnit.adoptInstead(MeasureUnit::createPermille(status));
|
||||
measureUnitValue = MeasureUnit::getPermille();
|
||||
measureUnit.adoptInstead(MeasureUnit::createPartPerMillion(status));
|
||||
measureUnitValue = MeasureUnit::getPartPerMillion();
|
||||
measureUnit.adoptInstead(MeasureUnit::createPermyriad(status));
|
||||
measureUnitValue = MeasureUnit::getPermyriad();
|
||||
measureUnit.adoptInstead(MeasureUnit::createPortionPer1E9(status));
|
||||
measureUnitValue = MeasureUnit::getPortionPer1E9();
|
||||
measureUnit.adoptInstead(MeasureUnit::createLiterPer100Kilometers(status));
|
||||
measureUnitValue = MeasureUnit::getLiterPer100Kilometers();
|
||||
measureUnit.adoptInstead(MeasureUnit::createLiterPerKilometer(status));
|
||||
measureUnitValue = MeasureUnit::getLiterPerKilometer();
|
||||
measureUnit.adoptInstead(MeasureUnit::createMilePerGallon(status));
|
||||
measureUnitValue = MeasureUnit::getMilePerGallon();
|
||||
measureUnit.adoptInstead(MeasureUnit::createMilePerGallonImperial(status));
|
||||
measureUnitValue = MeasureUnit::getMilePerGallonImperial();
|
||||
measureUnit.adoptInstead(MeasureUnit::createBit(status));
|
||||
measureUnitValue = MeasureUnit::getBit();
|
||||
measureUnit.adoptInstead(MeasureUnit::createByte(status));
|
||||
measureUnitValue = MeasureUnit::getByte();
|
||||
measureUnit.adoptInstead(MeasureUnit::createGigabit(status));
|
||||
measureUnitValue = MeasureUnit::getGigabit();
|
||||
measureUnit.adoptInstead(MeasureUnit::createGigabyte(status));
|
||||
measureUnitValue = MeasureUnit::getGigabyte();
|
||||
measureUnit.adoptInstead(MeasureUnit::createKilobit(status));
|
||||
measureUnitValue = MeasureUnit::getKilobit();
|
||||
measureUnit.adoptInstead(MeasureUnit::createKilobyte(status));
|
||||
measureUnitValue = MeasureUnit::getKilobyte();
|
||||
measureUnit.adoptInstead(MeasureUnit::createMegabit(status));
|
||||
measureUnitValue = MeasureUnit::getMegabit();
|
||||
measureUnit.adoptInstead(MeasureUnit::createMegabyte(status));
|
||||
measureUnitValue = MeasureUnit::getMegabyte();
|
||||
measureUnit.adoptInstead(MeasureUnit::createPetabyte(status));
|
||||
measureUnitValue = MeasureUnit::getPetabyte();
|
||||
measureUnit.adoptInstead(MeasureUnit::createTerabit(status));
|
||||
measureUnitValue = MeasureUnit::getTerabit();
|
||||
measureUnit.adoptInstead(MeasureUnit::createTerabyte(status));
|
||||
measureUnitValue = MeasureUnit::getTerabyte();
|
||||
measureUnit.adoptInstead(MeasureUnit::createCentury(status));
|
||||
measureUnitValue = MeasureUnit::getCentury();
|
||||
measureUnit.adoptInstead(MeasureUnit::createDay(status));
|
||||
measureUnitValue = MeasureUnit::getDay();
|
||||
measureUnit.adoptInstead(MeasureUnit::createDayPerson(status));
|
||||
measureUnitValue = MeasureUnit::getDayPerson();
|
||||
measureUnit.adoptInstead(MeasureUnit::createDecade(status));
|
||||
measureUnitValue = MeasureUnit::getDecade();
|
||||
measureUnit.adoptInstead(MeasureUnit::createHour(status));
|
||||
measureUnitValue = MeasureUnit::getHour();
|
||||
measureUnit.adoptInstead(MeasureUnit::createMicrosecond(status));
|
||||
measureUnitValue = MeasureUnit::getMicrosecond();
|
||||
measureUnit.adoptInstead(MeasureUnit::createMillisecond(status));
|
||||
measureUnitValue = MeasureUnit::getMillisecond();
|
||||
measureUnit.adoptInstead(MeasureUnit::createMinute(status));
|
||||
measureUnitValue = MeasureUnit::getMinute();
|
||||
measureUnit.adoptInstead(MeasureUnit::createMonth(status));
|
||||
measureUnitValue = MeasureUnit::getMonth();
|
||||
measureUnit.adoptInstead(MeasureUnit::createMonthPerson(status));
|
||||
measureUnitValue = MeasureUnit::getMonthPerson();
|
||||
measureUnit.adoptInstead(MeasureUnit::createNanosecond(status));
|
||||
measureUnitValue = MeasureUnit::getNanosecond();
|
||||
measureUnit.adoptInstead(MeasureUnit::createNight(status));
|
||||
measureUnitValue = MeasureUnit::getNight();
|
||||
measureUnit.adoptInstead(MeasureUnit::createQuarter(status));
|
||||
measureUnitValue = MeasureUnit::getQuarter();
|
||||
measureUnit.adoptInstead(MeasureUnit::createSecond(status));
|
||||
measureUnitValue = MeasureUnit::getSecond();
|
||||
measureUnit.adoptInstead(MeasureUnit::createWeek(status));
|
||||
measureUnitValue = MeasureUnit::getWeek();
|
||||
measureUnit.adoptInstead(MeasureUnit::createWeekPerson(status));
|
||||
measureUnitValue = MeasureUnit::getWeekPerson();
|
||||
measureUnit.adoptInstead(MeasureUnit::createYear(status));
|
||||
measureUnitValue = MeasureUnit::getYear();
|
||||
measureUnit.adoptInstead(MeasureUnit::createYearPerson(status));
|
||||
measureUnitValue = MeasureUnit::getYearPerson();
|
||||
measureUnit.adoptInstead(MeasureUnit::createAmpere(status));
|
||||
measureUnitValue = MeasureUnit::getAmpere();
|
||||
measureUnit.adoptInstead(MeasureUnit::createMilliampere(status));
|
||||
measureUnitValue = MeasureUnit::getMilliampere();
|
||||
measureUnit.adoptInstead(MeasureUnit::createOhm(status));
|
||||
measureUnitValue = MeasureUnit::getOhm();
|
||||
measureUnit.adoptInstead(MeasureUnit::createVolt(status));
|
||||
measureUnitValue = MeasureUnit::getVolt();
|
||||
measureUnit.adoptInstead(MeasureUnit::createBritishThermalUnit(status));
|
||||
measureUnitValue = MeasureUnit::getBritishThermalUnit();
|
||||
measureUnit.adoptInstead(MeasureUnit::createCalorie(status));
|
||||
measureUnitValue = MeasureUnit::getCalorie();
|
||||
measureUnit.adoptInstead(MeasureUnit::createElectronvolt(status));
|
||||
measureUnitValue = MeasureUnit::getElectronvolt();
|
||||
measureUnit.adoptInstead(MeasureUnit::createFoodcalorie(status));
|
||||
measureUnitValue = MeasureUnit::getFoodcalorie();
|
||||
measureUnit.adoptInstead(MeasureUnit::createJoule(status));
|
||||
measureUnitValue = MeasureUnit::getJoule();
|
||||
measureUnit.adoptInstead(MeasureUnit::createKilocalorie(status));
|
||||
measureUnitValue = MeasureUnit::getKilocalorie();
|
||||
measureUnit.adoptInstead(MeasureUnit::createKilojoule(status));
|
||||
measureUnitValue = MeasureUnit::getKilojoule();
|
||||
measureUnit.adoptInstead(MeasureUnit::createKilowattHour(status));
|
||||
measureUnitValue = MeasureUnit::getKilowattHour();
|
||||
measureUnit.adoptInstead(MeasureUnit::createThermUs(status));
|
||||
measureUnitValue = MeasureUnit::getThermUs();
|
||||
measureUnit.adoptInstead(MeasureUnit::createKilowattHourPer100Kilometer(status));
|
||||
measureUnitValue = MeasureUnit::getKilowattHourPer100Kilometer();
|
||||
measureUnit.adoptInstead(MeasureUnit::createNewton(status));
|
||||
measureUnitValue = MeasureUnit::getNewton();
|
||||
measureUnit.adoptInstead(MeasureUnit::createPoundForce(status));
|
||||
measureUnitValue = MeasureUnit::getPoundForce();
|
||||
measureUnit.adoptInstead(MeasureUnit::createGigahertz(status));
|
||||
measureUnitValue = MeasureUnit::getGigahertz();
|
||||
measureUnit.adoptInstead(MeasureUnit::createHertz(status));
|
||||
measureUnitValue = MeasureUnit::getHertz();
|
||||
measureUnit.adoptInstead(MeasureUnit::createKilohertz(status));
|
||||
measureUnitValue = MeasureUnit::getKilohertz();
|
||||
measureUnit.adoptInstead(MeasureUnit::createMegahertz(status));
|
||||
measureUnitValue = MeasureUnit::getMegahertz();
|
||||
measureUnit.adoptInstead(MeasureUnit::createDot(status));
|
||||
measureUnitValue = MeasureUnit::getDot();
|
||||
measureUnit.adoptInstead(MeasureUnit::createDotPerCentimeter(status));
|
||||
measureUnitValue = MeasureUnit::getDotPerCentimeter();
|
||||
measureUnit.adoptInstead(MeasureUnit::createDotPerInch(status));
|
||||
measureUnitValue = MeasureUnit::getDotPerInch();
|
||||
measureUnit.adoptInstead(MeasureUnit::createEm(status));
|
||||
measureUnitValue = MeasureUnit::getEm();
|
||||
measureUnit.adoptInstead(MeasureUnit::createMegapixel(status));
|
||||
measureUnitValue = MeasureUnit::getMegapixel();
|
||||
measureUnit.adoptInstead(MeasureUnit::createPixel(status));
|
||||
measureUnitValue = MeasureUnit::getPixel();
|
||||
measureUnit.adoptInstead(MeasureUnit::createPixelPerCentimeter(status));
|
||||
measureUnitValue = MeasureUnit::getPixelPerCentimeter();
|
||||
measureUnit.adoptInstead(MeasureUnit::createPixelPerInch(status));
|
||||
measureUnitValue = MeasureUnit::getPixelPerInch();
|
||||
measureUnit.adoptInstead(MeasureUnit::createAstronomicalUnit(status));
|
||||
measureUnitValue = MeasureUnit::getAstronomicalUnit();
|
||||
measureUnit.adoptInstead(MeasureUnit::createCentimeter(status));
|
||||
measureUnitValue = MeasureUnit::getCentimeter();
|
||||
measureUnit.adoptInstead(MeasureUnit::createDecimeter(status));
|
||||
measureUnitValue = MeasureUnit::getDecimeter();
|
||||
measureUnit.adoptInstead(MeasureUnit::createEarthRadius(status));
|
||||
measureUnitValue = MeasureUnit::getEarthRadius();
|
||||
measureUnit.adoptInstead(MeasureUnit::createFathom(status));
|
||||
measureUnitValue = MeasureUnit::getFathom();
|
||||
measureUnit.adoptInstead(MeasureUnit::createFoot(status));
|
||||
measureUnitValue = MeasureUnit::getFoot();
|
||||
measureUnit.adoptInstead(MeasureUnit::createFurlong(status));
|
||||
measureUnitValue = MeasureUnit::getFurlong();
|
||||
measureUnit.adoptInstead(MeasureUnit::createInch(status));
|
||||
measureUnitValue = MeasureUnit::getInch();
|
||||
measureUnit.adoptInstead(MeasureUnit::createKilometer(status));
|
||||
measureUnitValue = MeasureUnit::getKilometer();
|
||||
measureUnit.adoptInstead(MeasureUnit::createLightYear(status));
|
||||
measureUnitValue = MeasureUnit::getLightYear();
|
||||
measureUnit.adoptInstead(MeasureUnit::createMeter(status));
|
||||
measureUnitValue = MeasureUnit::getMeter();
|
||||
measureUnit.adoptInstead(MeasureUnit::createMicrometer(status));
|
||||
measureUnitValue = MeasureUnit::getMicrometer();
|
||||
measureUnit.adoptInstead(MeasureUnit::createMile(status));
|
||||
measureUnitValue = MeasureUnit::getMile();
|
||||
measureUnit.adoptInstead(MeasureUnit::createMileScandinavian(status));
|
||||
measureUnitValue = MeasureUnit::getMileScandinavian();
|
||||
measureUnit.adoptInstead(MeasureUnit::createMillimeter(status));
|
||||
measureUnitValue = MeasureUnit::getMillimeter();
|
||||
measureUnit.adoptInstead(MeasureUnit::createNanometer(status));
|
||||
measureUnitValue = MeasureUnit::getNanometer();
|
||||
measureUnit.adoptInstead(MeasureUnit::createNauticalMile(status));
|
||||
measureUnitValue = MeasureUnit::getNauticalMile();
|
||||
measureUnit.adoptInstead(MeasureUnit::createParsec(status));
|
||||
measureUnitValue = MeasureUnit::getParsec();
|
||||
measureUnit.adoptInstead(MeasureUnit::createPicometer(status));
|
||||
measureUnitValue = MeasureUnit::getPicometer();
|
||||
measureUnit.adoptInstead(MeasureUnit::createPoint(status));
|
||||
measureUnitValue = MeasureUnit::getPoint();
|
||||
measureUnit.adoptInstead(MeasureUnit::createSolarRadius(status));
|
||||
measureUnitValue = MeasureUnit::getSolarRadius();
|
||||
measureUnit.adoptInstead(MeasureUnit::createYard(status));
|
||||
measureUnitValue = MeasureUnit::getYard();
|
||||
measureUnit.adoptInstead(MeasureUnit::createCandela(status));
|
||||
measureUnitValue = MeasureUnit::getCandela();
|
||||
measureUnit.adoptInstead(MeasureUnit::createLumen(status));
|
||||
measureUnitValue = MeasureUnit::getLumen();
|
||||
measureUnit.adoptInstead(MeasureUnit::createLux(status));
|
||||
measureUnitValue = MeasureUnit::getLux();
|
||||
measureUnit.adoptInstead(MeasureUnit::createSolarLuminosity(status));
|
||||
measureUnitValue = MeasureUnit::getSolarLuminosity();
|
||||
measureUnit.adoptInstead(MeasureUnit::createCarat(status));
|
||||
measureUnitValue = MeasureUnit::getCarat();
|
||||
measureUnit.adoptInstead(MeasureUnit::createDalton(status));
|
||||
measureUnitValue = MeasureUnit::getDalton();
|
||||
measureUnit.adoptInstead(MeasureUnit::createEarthMass(status));
|
||||
measureUnitValue = MeasureUnit::getEarthMass();
|
||||
measureUnit.adoptInstead(MeasureUnit::createGrain(status));
|
||||
measureUnitValue = MeasureUnit::getGrain();
|
||||
measureUnit.adoptInstead(MeasureUnit::createGram(status));
|
||||
measureUnitValue = MeasureUnit::getGram();
|
||||
measureUnit.adoptInstead(MeasureUnit::createKilogram(status));
|
||||
measureUnitValue = MeasureUnit::getKilogram();
|
||||
measureUnit.adoptInstead(MeasureUnit::createMicrogram(status));
|
||||
measureUnitValue = MeasureUnit::getMicrogram();
|
||||
measureUnit.adoptInstead(MeasureUnit::createMilligram(status));
|
||||
measureUnitValue = MeasureUnit::getMilligram();
|
||||
measureUnit.adoptInstead(MeasureUnit::createOunce(status));
|
||||
measureUnitValue = MeasureUnit::getOunce();
|
||||
measureUnit.adoptInstead(MeasureUnit::createOunceTroy(status));
|
||||
measureUnitValue = MeasureUnit::getOunceTroy();
|
||||
measureUnit.adoptInstead(MeasureUnit::createPound(status));
|
||||
measureUnitValue = MeasureUnit::getPound();
|
||||
measureUnit.adoptInstead(MeasureUnit::createSolarMass(status));
|
||||
measureUnitValue = MeasureUnit::getSolarMass();
|
||||
measureUnit.adoptInstead(MeasureUnit::createStone(status));
|
||||
measureUnitValue = MeasureUnit::getStone();
|
||||
measureUnit.adoptInstead(MeasureUnit::createTon(status));
|
||||
measureUnitValue = MeasureUnit::getTon();
|
||||
measureUnit.adoptInstead(MeasureUnit::createTonne(status));
|
||||
measureUnitValue = MeasureUnit::getTonne();
|
||||
measureUnit.adoptInstead(MeasureUnit::createGigawatt(status));
|
||||
measureUnitValue = MeasureUnit::getGigawatt();
|
||||
measureUnit.adoptInstead(MeasureUnit::createHorsepower(status));
|
||||
measureUnitValue = MeasureUnit::getHorsepower();
|
||||
measureUnit.adoptInstead(MeasureUnit::createKilowatt(status));
|
||||
measureUnitValue = MeasureUnit::getKilowatt();
|
||||
measureUnit.adoptInstead(MeasureUnit::createMegawatt(status));
|
||||
measureUnitValue = MeasureUnit::getMegawatt();
|
||||
measureUnit.adoptInstead(MeasureUnit::createMilliwatt(status));
|
||||
measureUnitValue = MeasureUnit::getMilliwatt();
|
||||
measureUnit.adoptInstead(MeasureUnit::createWatt(status));
|
||||
measureUnitValue = MeasureUnit::getWatt();
|
||||
measureUnit.adoptInstead(MeasureUnit::createAtmosphere(status));
|
||||
measureUnitValue = MeasureUnit::getAtmosphere();
|
||||
measureUnit.adoptInstead(MeasureUnit::createBar(status));
|
||||
measureUnitValue = MeasureUnit::getBar();
|
||||
measureUnit.adoptInstead(MeasureUnit::createGasolineEnergyDensity(status));
|
||||
measureUnitValue = MeasureUnit::getGasolineEnergyDensity();
|
||||
measureUnit.adoptInstead(MeasureUnit::createHectopascal(status));
|
||||
measureUnitValue = MeasureUnit::getHectopascal();
|
||||
measureUnit.adoptInstead(MeasureUnit::createInchHg(status));
|
||||
measureUnitValue = MeasureUnit::getInchHg();
|
||||
measureUnit.adoptInstead(MeasureUnit::createKilopascal(status));
|
||||
measureUnitValue = MeasureUnit::getKilopascal();
|
||||
measureUnit.adoptInstead(MeasureUnit::createMegapascal(status));
|
||||
measureUnitValue = MeasureUnit::getMegapascal();
|
||||
measureUnit.adoptInstead(MeasureUnit::createMillibar(status));
|
||||
measureUnitValue = MeasureUnit::getMillibar();
|
||||
measureUnit.adoptInstead(MeasureUnit::createMillimeterOfMercury(status));
|
||||
measureUnitValue = MeasureUnit::getMillimeterOfMercury();
|
||||
measureUnit.adoptInstead(MeasureUnit::createPascal(status));
|
||||
measureUnitValue = MeasureUnit::getPascal();
|
||||
measureUnit.adoptInstead(MeasureUnit::createPoundPerSquareInch(status));
|
||||
measureUnitValue = MeasureUnit::getPoundPerSquareInch();
|
||||
measureUnit.adoptInstead(MeasureUnit::createBeaufort(status));
|
||||
measureUnitValue = MeasureUnit::getBeaufort();
|
||||
measureUnit.adoptInstead(MeasureUnit::createKilometerPerHour(status));
|
||||
measureUnitValue = MeasureUnit::getKilometerPerHour();
|
||||
measureUnit.adoptInstead(MeasureUnit::createKnot(status));
|
||||
measureUnitValue = MeasureUnit::getKnot();
|
||||
measureUnit.adoptInstead(MeasureUnit::createLightSpeed(status));
|
||||
measureUnitValue = MeasureUnit::getLightSpeed();
|
||||
measureUnit.adoptInstead(MeasureUnit::createMeterPerSecond(status));
|
||||
measureUnitValue = MeasureUnit::getMeterPerSecond();
|
||||
measureUnit.adoptInstead(MeasureUnit::createMilePerHour(status));
|
||||
measureUnitValue = MeasureUnit::getMilePerHour();
|
||||
measureUnit.adoptInstead(MeasureUnit::createCelsius(status));
|
||||
measureUnitValue = MeasureUnit::getCelsius();
|
||||
measureUnit.adoptInstead(MeasureUnit::createFahrenheit(status));
|
||||
measureUnitValue = MeasureUnit::getFahrenheit();
|
||||
measureUnit.adoptInstead(MeasureUnit::createGenericTemperature(status));
|
||||
measureUnitValue = MeasureUnit::getGenericTemperature();
|
||||
measureUnit.adoptInstead(MeasureUnit::createKelvin(status));
|
||||
measureUnitValue = MeasureUnit::getKelvin();
|
||||
measureUnit.adoptInstead(MeasureUnit::createNewtonMeter(status));
|
||||
measureUnitValue = MeasureUnit::getNewtonMeter();
|
||||
measureUnit.adoptInstead(MeasureUnit::createPoundFoot(status));
|
||||
measureUnitValue = MeasureUnit::getPoundFoot();
|
||||
measureUnit.adoptInstead(MeasureUnit::createAcreFoot(status));
|
||||
measureUnitValue = MeasureUnit::getAcreFoot();
|
||||
measureUnit.adoptInstead(MeasureUnit::createBarrel(status));
|
||||
measureUnitValue = MeasureUnit::getBarrel();
|
||||
measureUnit.adoptInstead(MeasureUnit::createBushel(status));
|
||||
measureUnitValue = MeasureUnit::getBushel();
|
||||
measureUnit.adoptInstead(MeasureUnit::createCentiliter(status));
|
||||
measureUnitValue = MeasureUnit::getCentiliter();
|
||||
measureUnit.adoptInstead(MeasureUnit::createCubicCentimeter(status));
|
||||
measureUnitValue = MeasureUnit::getCubicCentimeter();
|
||||
measureUnit.adoptInstead(MeasureUnit::createCubicFoot(status));
|
||||
measureUnitValue = MeasureUnit::getCubicFoot();
|
||||
measureUnit.adoptInstead(MeasureUnit::createCubicInch(status));
|
||||
measureUnitValue = MeasureUnit::getCubicInch();
|
||||
measureUnit.adoptInstead(MeasureUnit::createCubicKilometer(status));
|
||||
measureUnitValue = MeasureUnit::getCubicKilometer();
|
||||
measureUnit.adoptInstead(MeasureUnit::createCubicMeter(status));
|
||||
measureUnitValue = MeasureUnit::getCubicMeter();
|
||||
measureUnit.adoptInstead(MeasureUnit::createCubicMile(status));
|
||||
measureUnitValue = MeasureUnit::getCubicMile();
|
||||
measureUnit.adoptInstead(MeasureUnit::createCubicYard(status));
|
||||
measureUnitValue = MeasureUnit::getCubicYard();
|
||||
measureUnit.adoptInstead(MeasureUnit::createCup(status));
|
||||
measureUnitValue = MeasureUnit::getCup();
|
||||
measureUnit.adoptInstead(MeasureUnit::createCupMetric(status));
|
||||
measureUnitValue = MeasureUnit::getCupMetric();
|
||||
measureUnit.adoptInstead(MeasureUnit::createDeciliter(status));
|
||||
measureUnitValue = MeasureUnit::getDeciliter();
|
||||
measureUnit.adoptInstead(MeasureUnit::createDessertSpoon(status));
|
||||
measureUnitValue = MeasureUnit::getDessertSpoon();
|
||||
measureUnit.adoptInstead(MeasureUnit::createDessertSpoonImperial(status));
|
||||
measureUnitValue = MeasureUnit::getDessertSpoonImperial();
|
||||
measureUnit.adoptInstead(MeasureUnit::createDram(status));
|
||||
measureUnitValue = MeasureUnit::getDram();
|
||||
measureUnit.adoptInstead(MeasureUnit::createDrop(status));
|
||||
measureUnitValue = MeasureUnit::getDrop();
|
||||
measureUnit.adoptInstead(MeasureUnit::createFluidOunce(status));
|
||||
measureUnitValue = MeasureUnit::getFluidOunce();
|
||||
measureUnit.adoptInstead(MeasureUnit::createFluidOunceImperial(status));
|
||||
measureUnitValue = MeasureUnit::getFluidOunceImperial();
|
||||
measureUnit.adoptInstead(MeasureUnit::createGallon(status));
|
||||
measureUnitValue = MeasureUnit::getGallon();
|
||||
measureUnit.adoptInstead(MeasureUnit::createGallonImperial(status));
|
||||
measureUnitValue = MeasureUnit::getGallonImperial();
|
||||
measureUnit.adoptInstead(MeasureUnit::createHectoliter(status));
|
||||
measureUnitValue = MeasureUnit::getHectoliter();
|
||||
measureUnit.adoptInstead(MeasureUnit::createJigger(status));
|
||||
measureUnitValue = MeasureUnit::getJigger();
|
||||
measureUnit.adoptInstead(MeasureUnit::createLiter(status));
|
||||
measureUnitValue = MeasureUnit::getLiter();
|
||||
measureUnit.adoptInstead(MeasureUnit::createMegaliter(status));
|
||||
measureUnitValue = MeasureUnit::getMegaliter();
|
||||
measureUnit.adoptInstead(MeasureUnit::createMilliliter(status));
|
||||
measureUnitValue = MeasureUnit::getMilliliter();
|
||||
measureUnit.adoptInstead(MeasureUnit::createPinch(status));
|
||||
measureUnitValue = MeasureUnit::getPinch();
|
||||
measureUnit.adoptInstead(MeasureUnit::createPint(status));
|
||||
measureUnitValue = MeasureUnit::getPint();
|
||||
measureUnit.adoptInstead(MeasureUnit::createPintMetric(status));
|
||||
measureUnitValue = MeasureUnit::getPintMetric();
|
||||
measureUnit.adoptInstead(MeasureUnit::createQuart(status));
|
||||
measureUnitValue = MeasureUnit::getQuart();
|
||||
measureUnit.adoptInstead(MeasureUnit::createQuartImperial(status));
|
||||
measureUnitValue = MeasureUnit::getQuartImperial();
|
||||
measureUnit.adoptInstead(MeasureUnit::createTablespoon(status));
|
||||
measureUnitValue = MeasureUnit::getTablespoon();
|
||||
measureUnit.adoptInstead(MeasureUnit::createTeaspoon(status));
|
||||
measureUnitValue = MeasureUnit::getTeaspoon();
|
||||
assertSuccess("", status);
|
||||
}
|
||||
|
||||
void MeasureFormatTest::TestBasic() {
|
||||
UErrorCode status = U_ZERO_ERROR;
|
||||
MeasureUnit *ptr1 = MeasureUnit::createArcMinute(status);
|
||||
|
|
|
|||
|
|
@ -2759,6 +2759,206 @@ public class MeasureUnitCompatibilityTest extends CoreTestFmwk {
|
|||
assertEquals("", 192, units.length);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void TestCompatible77() {
|
||||
MeasureUnit[] units = {
|
||||
MeasureUnit.G_FORCE,
|
||||
MeasureUnit.METER_PER_SECOND_SQUARED,
|
||||
MeasureUnit.ARC_MINUTE,
|
||||
MeasureUnit.ARC_SECOND,
|
||||
MeasureUnit.DEGREE,
|
||||
MeasureUnit.RADIAN,
|
||||
MeasureUnit.REVOLUTION_ANGLE,
|
||||
MeasureUnit.ACRE,
|
||||
MeasureUnit.DUNAM,
|
||||
MeasureUnit.HECTARE,
|
||||
MeasureUnit.SQUARE_CENTIMETER,
|
||||
MeasureUnit.SQUARE_FOOT,
|
||||
MeasureUnit.SQUARE_INCH,
|
||||
MeasureUnit.SQUARE_KILOMETER,
|
||||
MeasureUnit.SQUARE_METER,
|
||||
MeasureUnit.SQUARE_MILE,
|
||||
MeasureUnit.SQUARE_YARD,
|
||||
MeasureUnit.ITEM,
|
||||
MeasureUnit.KARAT,
|
||||
MeasureUnit.MILLIGRAM_OFGLUCOSE_PER_DECILITER,
|
||||
MeasureUnit.MILLIGRAM_PER_DECILITER,
|
||||
MeasureUnit.MILLIMOLE_PER_LITER,
|
||||
MeasureUnit.MOLE,
|
||||
MeasureUnit.PERCENT,
|
||||
MeasureUnit.PERMILLE,
|
||||
MeasureUnit.PART_PER_MILLION,
|
||||
MeasureUnit.PERMYRIAD,
|
||||
MeasureUnit.PORTION_PER_1E9,
|
||||
MeasureUnit.LITER_PER_100KILOMETERS,
|
||||
MeasureUnit.LITER_PER_KILOMETER,
|
||||
MeasureUnit.MILE_PER_GALLON,
|
||||
MeasureUnit.MILE_PER_GALLON_IMPERIAL,
|
||||
MeasureUnit.BIT,
|
||||
MeasureUnit.BYTE,
|
||||
MeasureUnit.GIGABIT,
|
||||
MeasureUnit.GIGABYTE,
|
||||
MeasureUnit.KILOBIT,
|
||||
MeasureUnit.KILOBYTE,
|
||||
MeasureUnit.MEGABIT,
|
||||
MeasureUnit.MEGABYTE,
|
||||
MeasureUnit.PETABYTE,
|
||||
MeasureUnit.TERABIT,
|
||||
MeasureUnit.TERABYTE,
|
||||
MeasureUnit.CENTURY,
|
||||
MeasureUnit.DAY,
|
||||
MeasureUnit.DAY_PERSON,
|
||||
MeasureUnit.DECADE,
|
||||
MeasureUnit.HOUR,
|
||||
MeasureUnit.MICROSECOND,
|
||||
MeasureUnit.MILLISECOND,
|
||||
MeasureUnit.MINUTE,
|
||||
MeasureUnit.MONTH,
|
||||
MeasureUnit.MONTH_PERSON,
|
||||
MeasureUnit.NANOSECOND,
|
||||
MeasureUnit.NIGHT,
|
||||
MeasureUnit.QUARTER,
|
||||
MeasureUnit.SECOND,
|
||||
MeasureUnit.WEEK,
|
||||
MeasureUnit.WEEK_PERSON,
|
||||
MeasureUnit.YEAR,
|
||||
MeasureUnit.YEAR_PERSON,
|
||||
MeasureUnit.AMPERE,
|
||||
MeasureUnit.MILLIAMPERE,
|
||||
MeasureUnit.OHM,
|
||||
MeasureUnit.VOLT,
|
||||
MeasureUnit.BRITISH_THERMAL_UNIT,
|
||||
MeasureUnit.CALORIE,
|
||||
MeasureUnit.ELECTRONVOLT,
|
||||
MeasureUnit.FOODCALORIE,
|
||||
MeasureUnit.JOULE,
|
||||
MeasureUnit.KILOCALORIE,
|
||||
MeasureUnit.KILOJOULE,
|
||||
MeasureUnit.KILOWATT_HOUR,
|
||||
MeasureUnit.THERM_US,
|
||||
MeasureUnit.KILOWATT_HOUR_PER_100_KILOMETER,
|
||||
MeasureUnit.NEWTON,
|
||||
MeasureUnit.POUND_FORCE,
|
||||
MeasureUnit.GIGAHERTZ,
|
||||
MeasureUnit.HERTZ,
|
||||
MeasureUnit.KILOHERTZ,
|
||||
MeasureUnit.MEGAHERTZ,
|
||||
MeasureUnit.DOT,
|
||||
MeasureUnit.DOT_PER_CENTIMETER,
|
||||
MeasureUnit.DOT_PER_INCH,
|
||||
MeasureUnit.EM,
|
||||
MeasureUnit.MEGAPIXEL,
|
||||
MeasureUnit.PIXEL,
|
||||
MeasureUnit.PIXEL_PER_CENTIMETER,
|
||||
MeasureUnit.PIXEL_PER_INCH,
|
||||
MeasureUnit.ASTRONOMICAL_UNIT,
|
||||
MeasureUnit.CENTIMETER,
|
||||
MeasureUnit.DECIMETER,
|
||||
MeasureUnit.EARTH_RADIUS,
|
||||
MeasureUnit.FATHOM,
|
||||
MeasureUnit.FOOT,
|
||||
MeasureUnit.FURLONG,
|
||||
MeasureUnit.INCH,
|
||||
MeasureUnit.KILOMETER,
|
||||
MeasureUnit.LIGHT_YEAR,
|
||||
MeasureUnit.METER,
|
||||
MeasureUnit.MICROMETER,
|
||||
MeasureUnit.MILE,
|
||||
MeasureUnit.MILE_SCANDINAVIAN,
|
||||
MeasureUnit.MILLIMETER,
|
||||
MeasureUnit.NANOMETER,
|
||||
MeasureUnit.NAUTICAL_MILE,
|
||||
MeasureUnit.PARSEC,
|
||||
MeasureUnit.PICOMETER,
|
||||
MeasureUnit.POINT,
|
||||
MeasureUnit.SOLAR_RADIUS,
|
||||
MeasureUnit.YARD,
|
||||
MeasureUnit.CANDELA,
|
||||
MeasureUnit.LUMEN,
|
||||
MeasureUnit.LUX,
|
||||
MeasureUnit.SOLAR_LUMINOSITY,
|
||||
MeasureUnit.CARAT,
|
||||
MeasureUnit.DALTON,
|
||||
MeasureUnit.EARTH_MASS,
|
||||
MeasureUnit.GRAIN,
|
||||
MeasureUnit.GRAM,
|
||||
MeasureUnit.KILOGRAM,
|
||||
MeasureUnit.MICROGRAM,
|
||||
MeasureUnit.MILLIGRAM,
|
||||
MeasureUnit.OUNCE,
|
||||
MeasureUnit.OUNCE_TROY,
|
||||
MeasureUnit.POUND,
|
||||
MeasureUnit.SOLAR_MASS,
|
||||
MeasureUnit.STONE,
|
||||
MeasureUnit.TON,
|
||||
MeasureUnit.TONNE,
|
||||
MeasureUnit.GIGAWATT,
|
||||
MeasureUnit.HORSEPOWER,
|
||||
MeasureUnit.KILOWATT,
|
||||
MeasureUnit.MEGAWATT,
|
||||
MeasureUnit.MILLIWATT,
|
||||
MeasureUnit.WATT,
|
||||
MeasureUnit.ATMOSPHERE,
|
||||
MeasureUnit.BAR,
|
||||
MeasureUnit.GASOLINE_ENERGY_DENSITY,
|
||||
MeasureUnit.HECTOPASCAL,
|
||||
MeasureUnit.INCH_HG,
|
||||
MeasureUnit.KILOPASCAL,
|
||||
MeasureUnit.MEGAPASCAL,
|
||||
MeasureUnit.MILLIBAR,
|
||||
MeasureUnit.MILLIMETER_OF_MERCURY,
|
||||
MeasureUnit.PASCAL,
|
||||
MeasureUnit.POUND_PER_SQUARE_INCH,
|
||||
MeasureUnit.BEAUFORT,
|
||||
MeasureUnit.KILOMETER_PER_HOUR,
|
||||
MeasureUnit.KNOT,
|
||||
MeasureUnit.LIGHT_SPEED,
|
||||
MeasureUnit.METER_PER_SECOND,
|
||||
MeasureUnit.MILE_PER_HOUR,
|
||||
MeasureUnit.CELSIUS,
|
||||
MeasureUnit.FAHRENHEIT,
|
||||
MeasureUnit.GENERIC_TEMPERATURE,
|
||||
MeasureUnit.KELVIN,
|
||||
MeasureUnit.NEWTON_METER,
|
||||
MeasureUnit.POUND_FOOT,
|
||||
MeasureUnit.ACRE_FOOT,
|
||||
MeasureUnit.BARREL,
|
||||
MeasureUnit.BUSHEL,
|
||||
MeasureUnit.CENTILITER,
|
||||
MeasureUnit.CUBIC_CENTIMETER,
|
||||
MeasureUnit.CUBIC_FOOT,
|
||||
MeasureUnit.CUBIC_INCH,
|
||||
MeasureUnit.CUBIC_KILOMETER,
|
||||
MeasureUnit.CUBIC_METER,
|
||||
MeasureUnit.CUBIC_MILE,
|
||||
MeasureUnit.CUBIC_YARD,
|
||||
MeasureUnit.CUP,
|
||||
MeasureUnit.CUP_METRIC,
|
||||
MeasureUnit.DECILITER,
|
||||
MeasureUnit.DESSERT_SPOON,
|
||||
MeasureUnit.DESSERT_SPOON_IMPERIAL,
|
||||
MeasureUnit.DRAM,
|
||||
MeasureUnit.DROP,
|
||||
MeasureUnit.FLUID_OUNCE,
|
||||
MeasureUnit.FLUID_OUNCE_IMPERIAL,
|
||||
MeasureUnit.GALLON,
|
||||
MeasureUnit.GALLON_IMPERIAL,
|
||||
MeasureUnit.HECTOLITER,
|
||||
MeasureUnit.JIGGER,
|
||||
MeasureUnit.LITER,
|
||||
MeasureUnit.MEGALITER,
|
||||
MeasureUnit.MILLILITER,
|
||||
MeasureUnit.PINCH,
|
||||
MeasureUnit.PINT,
|
||||
MeasureUnit.PINT_METRIC,
|
||||
MeasureUnit.QUART,
|
||||
MeasureUnit.QUART_IMPERIAL,
|
||||
MeasureUnit.TABLESPOON,
|
||||
MeasureUnit.TEASPOON,
|
||||
};
|
||||
assertEquals("", 193, units.length);
|
||||
}
|
||||
|
||||
/*
|
||||
* This class contains only compatibility tests generated by MeasureUnitGeneratorTest.
|
||||
* Do not add any other tests here.
|
||||
|
|
|
|||
|
|
@ -264,6 +264,9 @@ public class MeasureUnitGeneratorTest extends CoreTestFmwk {
|
|||
{"TONNE", "72"},
|
||||
{"BEAUFORT", "73"},
|
||||
{"GASOLINE_ENERGY_DENSITY", "74"},
|
||||
{"PORTION_PER_1E9", "77"},
|
||||
{"NIGHT", "77"},
|
||||
{"LIGHT_SPEED", "77"},
|
||||
};
|
||||
|
||||
private static final HashMap<String, String> JAVA_VERSION_MAP = new HashMap<>();
|
||||
|
|
|
|||
|
|
@ -1200,6 +1200,12 @@ public class MeasureUnit implements Serializable {
|
|||
*/
|
||||
public static final MeasureUnit PERMYRIAD = MeasureUnit.internalGetInstance("concentr", "permyriad");
|
||||
|
||||
/**
|
||||
* Constant for unit of concentr: portion-per-1e9
|
||||
* @draft ICU 77
|
||||
*/
|
||||
public static final MeasureUnit PORTION_PER_1E9 = MeasureUnit.internalGetInstance("concentr", "portion-per-1e9");
|
||||
|
||||
/**
|
||||
* Constant for unit of consumption: liter-per-100-kilometer
|
||||
* @stable ICU 56
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue