| Index: source/test/intltest/itformat.cpp
|
| diff --git a/source/test/intltest/itformat.cpp b/source/test/intltest/itformat.cpp
|
| index e8dc872c17b0b789f2de21cb39d89e5b46f15bd6..f9f815d93e62a0a877be64865e9c47ebc86684af 100644
|
| --- a/source/test/intltest/itformat.cpp
|
| +++ b/source/test/intltest/itformat.cpp
|
| @@ -1,6 +1,6 @@
|
| /********************************************************************
|
| * COPYRIGHT:
|
| - * Copyright (c) 1997-2014, International Business Machines
|
| + * Copyright (c) 1997-2015, International Business Machines
|
| * Corporation and others. All Rights Reserved.
|
| ********************************************************************/
|
|
|
| @@ -65,8 +65,10 @@ extern IntlTest *createGenderInfoTest();
|
| extern IntlTest *createRelativeDateTimeFormatterTest();
|
| #endif
|
| extern IntlTest *createMeasureFormatTest();
|
| -extern IntlTest *createScientificFormatHelperTest();
|
| extern IntlTest *createNumberFormatSpecificationTest();
|
| +extern IntlTest *createScientificNumberFormatterTest();
|
| +extern IntlTest *createNumberFormat2Test();
|
| +
|
|
|
| #define TESTCLASS(id, TestClass) \
|
| case id: \
|
| @@ -184,23 +186,32 @@ void IntlTestFormat::runIndexedTest( int32_t index, UBool exec, const char* &nam
|
| }
|
| break;
|
| case 48:
|
| - name = "ScientificFormatHelperTest";
|
| + name = "NumberFormatSpecificationTest";
|
| if (exec) {
|
| - logln("ScientificFormatHelperTest test---");
|
| + logln("NumberFormatSpecificationTest test---");
|
| logln((UnicodeString)"");
|
| - LocalPointer<IntlTest> test(createScientificFormatHelperTest());
|
| + LocalPointer<IntlTest> test(createNumberFormatSpecificationTest());
|
| callTest(*test, par);
|
| }
|
| break;
|
| - case 49:
|
| - name = "NumberFormatSpecificationTest";
|
| + case 49:
|
| + name = "ScientificNumberFormatterTest";
|
| if (exec) {
|
| - logln("NumberFormatSpecificationTest test---");
|
| + logln("ScientificNumberFormatterTest test---");
|
| logln((UnicodeString)"");
|
| - LocalPointer<IntlTest> test(createNumberFormatSpecificationTest());
|
| + LocalPointer<IntlTest> test(createScientificNumberFormatterTest());
|
| callTest(*test, par);
|
| }
|
| break;
|
| + case 50:
|
| + name = "NumberFormat2Test";
|
| + if (exec) {
|
| + logln("NumberFormat2Test test---");
|
| + logln((UnicodeString)"");
|
| + LocalPointer<IntlTest> test(createNumberFormat2Test());
|
| + callTest(*test, par);
|
| + }
|
| + break;
|
| default: name = ""; break; //needed to end loop
|
| }
|
| if (exec) {
|
|
|