From 84eaa9e08ae25142c934aa06b2cc077aed1bf1a7 Mon Sep 17 00:00:00 2001 From: Peter Edberg Date: Mon, 5 Mar 2018 05:02:58 +0000 Subject: [PATCH 01/27] ICU-13581 ICU 61 BRS, update API change report to clarify some numberformatter.h draft status X-SVN-Rev: 41065 --- icu4c/APIChangeReport.html | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/icu4c/APIChangeReport.html b/icu4c/APIChangeReport.html index 237d55fb797..ae3edf1b2db 100644 --- a/icu4c/APIChangeReport.html +++ b/icu4c/APIChangeReport.html @@ -50,11 +50,11 @@ -numberformatter.hDerived icu::number::NumberFormatterSettings< Derived >::adoptSymbols(const NumberingSystem*)Draft
ICU 60(missing)
+numberformatter.hDerived icu::number::NumberFormatterSettings< Derived >::adoptSymbols(const NumberingSystem*)Draft
ICU 60(missing)
actually, just
removed “const”
from one param
-numberformatter.hDerived icu::number::NumberFormatterSettings< Derived >::adoptUnit(const icu::MeasureUnit*)Draft
ICU 60(missing)
+numberformatter.hDerived icu::number::NumberFormatterSettings< Derived >::adoptUnit(const icu::MeasureUnit*)Draft
ICU 60(missing)
actually, just
removed “const”
from one param
@@ -74,11 +74,11 @@ -utrans.hvoid utrans_trans(const UTransliterator*, UReplaceable*, UReplaceableCallbacks*, int32_t, int32_t*, UErrorCode*)Stable
ICU 2.0(missing) actually,
just added “const”
to one parameter
+utrans.hvoid utrans_trans(const UTransliterator*, UReplaceable*, UReplaceableCallbacks*, int32_t, int32_t*, UErrorCode*)Stable
ICU 2.0(missing)
actually, just
added “const”
to one param
-utrans.hvoid utrans_transIncremental(const UTransliterator*, UReplaceable*, UReplaceableCallbacks*, UTransPosition*, UErrorCode*)Stable
ICU 2.0(missing) actually,
just added “const”
to one paramete
+utrans.hvoid utrans_transIncremental(const UTransliterator*, UReplaceable*, UReplaceableCallbacks*, UTransPosition*, UErrorCode*)Stable
ICU 2.0(missing)
actually, just
added “const”
to one param
@@ -93,6 +93,9 @@ FileAPIICU 60ICU 61 + + +

(jump back to top) @@ -410,11 +413,11 @@ upluralrules.hUEnumeration* uplrules_getKeywords(const UPluralRules*, UErrorCode*)Draft→Stable
ICU 59 -utrans.hvoid utrans_trans(const UTransliterator*, UReplaceable*, const UReplaceableCallbacks*, int32_t, int32_t*, UErrorCode*)(missing) old version
(stable) lacked “const”
on one parameterStable
+utrans.hvoid utrans_trans(const UTransliterator*, UReplaceable*, const UReplaceableCallbacks*, int32_t, int32_t*, UErrorCode*)(missing)
old version (stable)
lacked “const”
on one paramStable
ICU 2.0 -utrans.hvoid utrans_transIncremental(const UTransliterator*, UReplaceable*, const UReplaceableCallbacks*, UTransPosition*, UErrorCode*)(missing) old version
(stable) lacked “const”
on one parameterStable
+utrans.hvoid utrans_transIncremental(const UTransliterator*, UReplaceable*, const UReplaceableCallbacks*, UTransPosition*, UErrorCode*)(missing)
old version (stable)
lacked “const”
on one paramStable
ICU 2.0 @@ -450,16 +453,16 @@ ICU 61 -numberformatter.hDerived icu::number::NumberFormatterSettings< Derived >::adoptSymbols(NumberingSystem*)(missing)Draft
+numberformatter.hDerived icu::number::NumberFormatterSettings< Derived >::adoptSymbols(NumberingSystem*)(missing)
old version
had “const”
on paramDraft
ICU 60
-(should be ICU 61) +(should be ICU 61)
decided to keep draft ICU 60 -numberformatter.hDerived icu::number::NumberFormatterSettings< Derived >::adoptUnit(icu::MeasureUnit*)(missing)Draft
+numberformatter.hDerived icu::number::NumberFormatterSettings< Derived >::adoptUnit(icu::MeasureUnit*)(missing)
old version
had “const”
on paramDraft
ICU 60
-(should be ICU 61) +(should be ICU 61)
decided to keep draft ICU 60 numberformatter.hDerived icu::number::NumberFormatterSettings< Derived >::grouping(const UGroupingStrategy&)(missing)Draft
@@ -903,7 +906,6 @@ This section shows cases where the signature was "simplified" for the sake of comparison. The simplified form is in bold, followed by all possible variations in "original" form.
-

(jump back to top) From 9eba6f43c1c2fd6e6989294ab81f4d442351911c Mon Sep 17 00:00:00 2001 From: Shane Carr Date: Mon, 5 Mar 2018 09:28:58 +0000 Subject: [PATCH 02/27] ICU-13567 Bringing C/J numberformattestspecification.txt back in sync X-SVN-Rev: 41067 --- .../src/com/ibm/icu/dev/data/numberformattestspecification.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/data/numberformattestspecification.txt b/icu4j/main/tests/core/src/com/ibm/icu/dev/data/numberformattestspecification.txt index afddf315698..1f11f8da7c1 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/data/numberformattestspecification.txt +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/data/numberformattestspecification.txt @@ -13,7 +13,7 @@ // https://docs.google.com/document/d/1T2P0p953_Lh1pRwo-5CuPVrHlIBa_wcXElG-Hhg_WHM/edit?usp=sharing test plus sign -set locale ar +set locale ar-EG set pattern +0;-# begin format output breaks From 7e1e4e0e348d8698884918193b1870541293f99b Mon Sep 17 00:00:00 2001 From: Andy Heninger Date: Mon, 5 Mar 2018 19:43:03 +0000 Subject: [PATCH 03/27] ICU-13598 fix byte order bug in RBBI data wrapper. X-SVN-Rev: 41068 --- .../src/com/ibm/icu/text/RBBIDataWrapper.java | 199 +++++++++++++----- .../src/com/ibm/icu/text/RBBIRuleBuilder.java | 21 +- .../com/ibm/icu/text/RBBITableBuilder.java | 110 +++------- .../ibm/icu/text/RuleBasedBreakIterator.java | 8 +- .../com/ibm/icu/dev/test/rbbi/RBBITest.java | 32 ++- 5 files changed, 199 insertions(+), 171 deletions(-) diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/RBBIDataWrapper.java b/icu4j/main/classes/core/src/com/ibm/icu/text/RBBIDataWrapper.java index 51d96e65870..6b3a9e9e38c 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/text/RBBIDataWrapper.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/text/RBBIDataWrapper.java @@ -9,9 +9,10 @@ package com.ibm.icu.text; +import java.io.DataOutputStream; import java.io.IOException; import java.nio.ByteBuffer; -import java.nio.ByteOrder; +import java.util.Arrays; import com.ibm.icu.impl.ICUBinary; import com.ibm.icu.impl.ICUBinary.Authenticate; @@ -20,13 +21,131 @@ import com.ibm.icu.impl.Trie2; /** *

Internal class used for Rule Based Break Iterators.

*

This class provides access to the compiled break rule data, as -* it is stored in a .brk file. +* it is stored in a .brk file. Refer to the file common/rbbidata.h from +* ICU4C for further details. * Not intended for public use; declared public for testing purposes only. * @internal * @deprecated This API is ICU internal only. */ @Deprecated public final class RBBIDataWrapper { + + /** + * A RBBI State Transition table, the form of the data used at run time in Java. + * These can be created from stored ICU data, or built from rules. + * The structure corresponds closely to struct RBBIStateTable in ICU4C. + * Not intended for public use; declared public for testing purposes only. + * @internal + * @deprecated This API is ICU internal only. + */ + @Deprecated + static public class RBBIStateTable { + /** + * Number of states (rows) in this table. + * @internal + * @deprecated This API is ICU internal only. + */ + @Deprecated + public int fNumStates; + /** + * Length of a table row in bytes. Note mismatch with table data, which is short[]. + * @internal + * @deprecated This API is ICU internal only. + */ + @Deprecated + public int fRowLen; + /** + * Option Flags for this state table. + * @internal + * @deprecated This API is ICU internal only. + */ + @Deprecated + public int fFlags; + /** + * Option Flags for this state table. + * @internal + * @deprecated This API is ICU internal only. + */ + @Deprecated + public int fReserved; + /** + * Linear array of next state values, accessed as short[state, char_class] + * @internal + * @deprecated This API is ICU internal only. + */ + @Deprecated + public short[] fTable; + + static RBBIStateTable get(ByteBuffer bytes, int length) throws IOException { + if (length == 0) { + return null; + } + if (length < 16) { + throw new IOException("Invalid RBBI state table length."); + } + RBBIStateTable This = new RBBIStateTable(); + This.fNumStates = bytes.getInt(); + This.fRowLen = bytes.getInt(); + This.fFlags = bytes.getInt(); + This.fReserved = bytes.getInt(); + int lengthOfShorts = length - 16; // length in bytes. + This.fTable = ICUBinary.getShorts(bytes, lengthOfShorts / 2, lengthOfShorts & 1); + return This; + } + + int put(DataOutputStream bytes) throws IOException { + bytes.writeInt(fNumStates); + bytes.writeInt(fRowLen); + bytes.writeInt(fFlags); + bytes.writeInt(fReserved); + int tableLen = fRowLen * fNumStates / 2; // fRowLen is bytes. + for (int i = 0; i < tableLen; i++) { + bytes.writeShort(fTable[i]); + } + int bytesWritten = 16 + fRowLen * fNumStates; // total bytes written, + // including 16 for the header. + while (bytesWritten % 8 != 0) { + bytes.writeByte(0); + ++bytesWritten; + } + return bytesWritten; + } + + @Override + public boolean equals (Object other) { + if (other == this) { + return true; + } + if (!(other instanceof RBBIStateTable)) { + return false; + } + RBBIStateTable otherST = (RBBIStateTable)other; + if (fNumStates != otherST.fNumStates) return false; + if (fRowLen != otherST.fRowLen) return false; + if (fFlags != otherST.fFlags) return false; + if (fReserved != otherST.fReserved) return false; + return Arrays.equals(fTable, otherST.fTable); + } + } + + /** + * Equals helper for state tables, including null handling. + * Not intended for public use; declared public for testing purposes only. + * @internal + * @deprecated This API is ICU internal only. + */ + @Deprecated + static public boolean equals(RBBIStateTable left, RBBIStateTable right) { + if (left == right) { + return true; + } + if (left == null || right == null) { + return false; + } + return left.equals(right); + } + + // // These fields are the ready-to-use compiled rule data, as // read from the file. @@ -42,31 +161,30 @@ public final class RBBIDataWrapper { * @deprecated This API is ICU internal only. */ @Deprecated - public short fFTable[]; + public RBBIStateTable fFTable; /** * @internal * @deprecated This API is ICU internal only. */ @Deprecated - public short fRTable[]; + public RBBIStateTable fRTable; /** * @internal * @deprecated This API is ICU internal only. */ @Deprecated - public short fSFTable[]; + public RBBIStateTable fSFTable; /** * @internal * @deprecated This API is ICU internal only. */ @Deprecated - public short fSRTable[]; + public RBBIStateTable fSRTable; + Trie2 fTrie; String fRuleSource; int fStatusTable[]; - private boolean isBigEndian; - static final int DATA_FORMAT = 0x42726b20; // "Brk " static final int FORMAT_VERSION = 0x04000000; // 4.0.0.0 @@ -138,15 +256,6 @@ public final class RBBIDataWrapper { @Deprecated public final static int NEXTSTATES = 4; - // Index offsets to header fields of a state table - // struct RBBIStateTable {... in the C version. - // - static final int NUMSTATES = 0; - static final int ROWLEN = 2; - static final int FLAGS = 4; - //ivate static final int RESERVED_2 = 6; - private static final int ROW_DATA = 8; - // Bit selectors for the "FLAGS" field of the state table header // enum RBBIStateTableFlags in the C version. // @@ -212,7 +321,7 @@ public final class RBBIDataWrapper { */ @Deprecated public int getRowIndex(int state){ - return ROW_DATA + state * (fHeader.fCatCount + 4); + return state * (fHeader.fCatCount + 4); } RBBIDataWrapper() { @@ -226,7 +335,6 @@ public final class RBBIDataWrapper { RBBIDataWrapper This = new RBBIDataWrapper(); ICUBinary.readHeader(bytes, DATA_FORMAT, IS_ACCEPTABLE); - This.isBigEndian = bytes.order() == ByteOrder.BIG_ENDIAN; // Read in the RBBI data header... This.fHeader = new RBBIDataHeader(); @@ -274,8 +382,7 @@ public final class RBBIDataWrapper { ICUBinary.skipBytes(bytes, This.fHeader.fFTable - pos); pos = This.fHeader.fFTable; - This.fFTable = ICUBinary.getShorts( - bytes, This.fHeader.fFTableLen / 2, This.fHeader.fFTableLen & 1); + This.fFTable = RBBIStateTable.get(bytes, This.fHeader.fFTableLen); pos += This.fHeader.fFTableLen; // @@ -287,8 +394,7 @@ public final class RBBIDataWrapper { pos = This.fHeader.fRTable; // Create & fill the table itself. - This.fRTable = ICUBinary.getShorts( - bytes, This.fHeader.fRTableLen / 2, This.fHeader.fRTableLen & 1); + This.fRTable = RBBIStateTable.get(bytes, This.fHeader.fRTableLen); pos += This.fHeader.fRTableLen; // @@ -300,8 +406,7 @@ public final class RBBIDataWrapper { pos = This.fHeader.fSFTable; // Create & fill the table itself. - This.fSFTable = ICUBinary.getShorts( - bytes, This.fHeader.fSFTableLen / 2, This.fHeader.fSFTableLen & 1); + This.fSFTable = RBBIStateTable.get(bytes, This.fHeader.fSFTableLen); pos += This.fHeader.fSFTableLen; } @@ -314,8 +419,7 @@ public final class RBBIDataWrapper { pos = This.fHeader.fSRTable; // Create & fill the table itself. - This.fSRTable = ICUBinary.getShorts( - bytes, This.fHeader.fSRTableLen / 2, This.fHeader.fSRTableLen & 1); + This.fSRTable = RBBIStateTable.get(bytes, This.fHeader.fSRTableLen); pos += This.fHeader.fSRTableLen; } @@ -381,25 +485,6 @@ public final class RBBIDataWrapper { return This; } - /** - * Getters for fields from the state table header - * @internal - * @deprecated This API is ICU internal only. - */ - @Deprecated - public int getStateTableNumStates(short table[]) { - if (isBigEndian) { - return (table[NUMSTATES] << 16) | (table[NUMSTATES+1] & 0xffff); - } else { - return (table[NUMSTATES+1] << 16) | (table[NUMSTATES] & 0xffff); - } - } - - int getStateTableFlags(short table[]) { - // This works for up to 15 flags bits. - return table[isBigEndian ? FLAGS + 1 : FLAGS]; - } - ///CLOVER:OFF /* Debug function to display the break iterator data. */ /** @@ -408,7 +493,7 @@ public final class RBBIDataWrapper { */ @Deprecated public void dump(java.io.PrintStream out) { - if (fFTable.length == 0) { + if (fFTable == null) { // There is no table. Fail early for testing purposes. throw new NullPointerException(); } @@ -465,8 +550,8 @@ public final class RBBIDataWrapper { ///CLOVER:OFF /** Dump a state table. (A full set of RBBI rules has 4 state tables.) */ - private void dumpTable(java.io.PrintStream out, short table[]) { - if (table == null || table.length == 0) { + private void dumpTable(java.io.PrintStream out, RBBIStateTable table) { + if (table == null || table.fTable.length == 0) { out.println(" -- null -- "); } else { int n; @@ -480,7 +565,7 @@ public final class RBBIDataWrapper { out.print("-"); } out.println(); - for (state=0; state< getStateTableNumStates(table); state++) { + for (state=0; state < table.fNumStates; state++) { dumpRow(out, table, state); } out.println(); @@ -494,24 +579,24 @@ public final class RBBIDataWrapper { * @param table * @param state */ - private void dumpRow(java.io.PrintStream out, short table[], int state) { + private void dumpRow(java.io.PrintStream out, RBBIStateTable table, int state) { StringBuilder dest = new StringBuilder(fHeader.fCatCount*5 + 20); dest.append(intToString(state, 4)); int row = getRowIndex(state); - if (table[row+ACCEPTING] != 0) { - dest.append(intToString(table[row+ACCEPTING], 5)); + if (table.fTable[row+ACCEPTING] != 0) { + dest.append(intToString(table.fTable[row+ACCEPTING], 5)); }else { dest.append(" "); } - if (table[row+LOOKAHEAD] != 0) { - dest.append(intToString(table[row+LOOKAHEAD], 5)); + if (table.fTable[row+LOOKAHEAD] != 0) { + dest.append(intToString(table.fTable[row+LOOKAHEAD], 5)); }else { dest.append(" "); } - dest.append(intToString(table[row+TAGIDX], 5)); + dest.append(intToString(table.fTable[row+TAGIDX], 5)); for (int col=0; col 0) { - tableData = fSafeRevTables.exportTable(); + table = fSafeRevTables.exportTable(); } else { - tableData = fReverseTables.exportTable(); - } - for (i = 0; i < tableData.length; i++) { - dos.writeShort(tableData[i]); - outputPos += 2; + table = fReverseTables.exportTable(); } + outputPos += table.put(dos); // write out the Trie table Assert.assrt(outputPos == header[12]); diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/RBBITableBuilder.java b/icu4j/main/classes/core/src/com/ibm/icu/text/RBBITableBuilder.java index 8954b672bbb..2a4d0582541 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/text/RBBITableBuilder.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/text/RBBITableBuilder.java @@ -978,118 +978,70 @@ class RBBITableBuilder { } - //----------------------------------------------------------------------------- - // - // getTableSize() Calculate the size in bytes of the runtime form of this - // state transition table. - // - // Note: Refer to common/rbbidata.h from ICU4C for the declarations - // of the structures being matched by this calculation. - // - //----------------------------------------------------------------------------- + /** + * Calculate the size in bytes of the serialized form of this state transition table, + * which is identical to the ICU4C runtime form. + * Refer to common/rbbidata.h from ICU4C for the declarations of the structures + * being matched by this calculation. + */ int getTableSize() { - int size = 0; - int numRows; - int numCols; - int rowSize; - if (fRB.fTreeRoots[fRootIx] == null) { return 0; } - - size = /*sizeof(RBBIStateTable) - 4 */ 16; // The header, with no rows to the table. - - numRows = fDStates.size(); - numCols = fRB.fSetBuilder.getNumCharCategories(); - - // Note The declaration of RBBIStateTableRow is for a table of two columns. - // Therefore we subtract two from numCols when determining - // how much storage to add to a row for the total columns. - // rowSize = sizeof(RBBIStateTableRow) + sizeof(uint16_t)*(numCols-2); - rowSize = 8 + 2*numCols; + int size = 16; // The header of 4 ints, with no rows to the table. + int numRows = fDStates.size(); + int numCols = fRB.fSetBuilder.getNumCharCategories(); + int rowSize = 8 + 2*numCols; size += numRows * rowSize; - while (size % 8 > 0) { // Size must be multiple of 8 bytes in size. - size++; - } - + size = (size + 7) & ~7; // round up to a multiple of 8 bytes return size; } - //----------------------------------------------------------------------------- - // - // exportTable() export the state transition table in the ICU4C format. - // - // Most of the table is 16 bit shorts. This function exports - // the whole thing as an array of shorts. - // - // The size of the array must be rounded up to a multiple of - // 8 bytes. - // - // See struct RBBIStateTable in ICU4C, common/rbbidata.h - // - //----------------------------------------------------------------------------- - - short [] exportTable() { + /** + * Create a RBBIDataWrapper.RBBIStateTable for a newly compiled table. + * RBBIDataWrapper.RBBIStateTable is similar to struct RBBIStateTable in ICU4C, + * in common/rbbidata.h + */ + RBBIDataWrapper.RBBIStateTable exportTable() { int state; int col; + RBBIDataWrapper.RBBIStateTable table = new RBBIDataWrapper.RBBIStateTable(); if (fRB.fTreeRoots[fRootIx] == null) { - return new short[0]; + return table; } Assert.assrt(fRB.fSetBuilder.getNumCharCategories() < 0x7fff && fDStates.size() < 0x7fff); - - int numStates = fDStates.size(); + table.fNumStates = fDStates.size(); // Size of table size in shorts. // the "4" is the size of struct RBBIStateTableRow, the row header part only. int rowLen = 4 + fRB.fSetBuilder.getNumCharCategories(); // Row Length in shorts. - int tableSize = getTableSize() / 2; + int tableSize = (getTableSize() - 16) / 2; // fTable length in shorts. + table.fTable = new short[tableSize]; + table.fRowLen = rowLen * 2; // Row length in bytes. - - short [] table = new short[tableSize]; - - // - // Fill in the header fields. - // Note that NUMSTATES, ROWLEN and FLAGS are ints, not shorts. - // ICU data created from Java is always big endian format, so - // order the halves of the 32 bit fields into the short[] data accordingly. - // TODO: ticket 13598 restructure so that ints are represented as ints directly. - // - // RBBIStateTable.fNumStates - table[RBBIDataWrapper.NUMSTATES] = (short)(numStates >>> 16); - table[RBBIDataWrapper.NUMSTATES+1] = (short)(numStates & 0x0000ffff); - - // RBBIStateTable.fRowLen. In bytes. - int rowLenInBytes = rowLen * 2; - table[RBBIDataWrapper.ROWLEN] = (short)(rowLenInBytes >>> 16); - table[RBBIDataWrapper.ROWLEN+1] = (short)(rowLenInBytes & 0x0000ffff); - - // RBBIStateTable.fFlags - int flags = 0; if (fRB.fLookAheadHardBreak) { - flags |= RBBIDataWrapper.RBBI_LOOKAHEAD_HARD_BREAK; + table.fFlags |= RBBIDataWrapper.RBBI_LOOKAHEAD_HARD_BREAK; } if (fRB.fSetBuilder.sawBOF()) { - flags |= RBBIDataWrapper.RBBI_BOF_REQUIRED; + table.fFlags |= RBBIDataWrapper.RBBI_BOF_REQUIRED; } - table[RBBIDataWrapper.FLAGS] = (short)(flags >>> 16); - table[RBBIDataWrapper.FLAGS+1] = (short)(flags & 0x0000ffff); int numCharCategories = fRB.fSetBuilder.getNumCharCategories(); - for (state=0; state columns = new ArrayList(); for (int column=0; column rows = new ArrayList(); - for (int r=0; r= -1); - s.append(fwtbl[row + RBBIDataWrapper.ACCEPTING]); - s.append(fwtbl[row + RBBIDataWrapper.LOOKAHEAD]); - s.append(fwtbl[row + RBBIDataWrapper.TAGIDX]); + assertTrue("Accepting < -1", fwtbl.fTable[row + RBBIDataWrapper.ACCEPTING] >= -1); + s.append(fwtbl.fTable[row + RBBIDataWrapper.ACCEPTING]); + s.append(fwtbl.fTable[row + RBBIDataWrapper.LOOKAHEAD]); + s.append(fwtbl.fTable[row + RBBIDataWrapper.TAGIDX]); for (int column=0; column Date: Tue, 6 Mar 2018 18:00:29 +0000 Subject: [PATCH 04/27] ICU-13581 Updated currency/numeric code data. X-SVN-Rev: 41069 --- icu4c/source/data/misc/currencyNumericCodes.txt | 6 ++++-- icu4j/main/shared/data/icudata.jar | 4 ++-- icu4j/main/shared/data/icutzdata.jar | 2 +- .../src/com/ibm/icu/dev/tool/currency/NumericCodeData.java | 2 ++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/icu4c/source/data/misc/currencyNumericCodes.txt b/icu4c/source/data/misc/currencyNumericCodes.txt index 6d202337de5..9ce3e6c31df 100644 --- a/icu4c/source/data/misc/currencyNumericCodes.txt +++ b/icu4c/source/data/misc/currencyNumericCodes.txt @@ -1,4 +1,4 @@ -//--------------------------------------------------------- +//--------------------------------------------------------- // Copyright (C) 2016 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html //--------------------------------------------------------- @@ -6,7 +6,7 @@ // Corporation and others. All Rights Reserved. //--------------------------------------------------------- // Build tool: com.ibm.icu.dev.tool.currency.NumericCodeData -// Build date: 2017-09-28T21:49:02Z +// Build date: 2018-03-06T17:38:16Z //--------------------------------------------------------- // >> !!! >> THIS IS A MACHINE-GENERATED FILE << !!! << // >> !!! >>> DO NOT EDIT <<< !!! << @@ -179,6 +179,7 @@ currencyNumericCodes:table(nofallback){ MNT:int{496} MOP:int{446} MRO:int{478} + MRU:int{929} MTL:int{470} MTP:int{470} MUR:int{480} @@ -239,6 +240,7 @@ currencyNumericCodes:table(nofallback){ SRG:int{740} SSP:int{728} STD:int{678} + STN:int{930} SUR:int{810} SVC:int{222} SYP:int{760} diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar index 6ecd1778bff..1ab46f1d820 100755 --- a/icu4j/main/shared/data/icudata.jar +++ b/icu4j/main/shared/data/icudata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5c858f2079eace62ae56dc51e99996e1c5dd99d7f22f3582d7186f51caae0eb2 -size 12505738 +oid sha256:3eb8332f908b83c82671f2b652d0bfdcc1c8da416884d0e358464af42af4f959 +size 12505745 diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar index 094d64384a7..bfd1bfabed7 100755 --- a/icu4j/main/shared/data/icutzdata.jar +++ b/icu4j/main/shared/data/icutzdata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c02de21dd86cf635e3a1d809efc402c412f884354a2c37c9233bf2477b5ff635 +oid sha256:d95bab418a9b465de9415e4e9f878330dbc5f7d6cddc416c492ad871f514fa82 size 92763 diff --git a/tools/currency/src/com/ibm/icu/dev/tool/currency/NumericCodeData.java b/tools/currency/src/com/ibm/icu/dev/tool/currency/NumericCodeData.java index 8ce3cbee19c..23f8fcdd41f 100644 --- a/tools/currency/src/com/ibm/icu/dev/tool/currency/NumericCodeData.java +++ b/tools/currency/src/com/ibm/icu/dev/tool/currency/NumericCodeData.java @@ -281,6 +281,7 @@ public class NumericCodeData { {"MNT", "496"}, {"MOP", "446"}, {"MRO", "478"}, + {"MRU", "929"}, {"MTL", "470"}, {"MTP", "470"}, {"MUR", "480"}, @@ -341,6 +342,7 @@ public class NumericCodeData { {"SRG", "740"}, {"SSP", "728"}, {"STD", "678"}, + {"STN", "930"}, {"SUR", "810"}, {"SVC", "222"}, {"SYP", "760"}, From 63d5dc895a321221587b7bd18d4b803eaaf0e6fd Mon Sep 17 00:00:00 2001 From: Norbert Runge Date: Tue, 6 Mar 2018 18:40:12 +0000 Subject: [PATCH 05/27] ICU-13624 Public header build failures X-SVN-Rev: 41070 --- icu4c/source/common/filteredbrk.cpp | 5 +++++ icu4c/source/common/unicode/filteredbrk.h | 6 +----- icu4c/source/i18n/dtptngen.cpp | 2 ++ icu4c/source/i18n/unicode/dcfmtsym.h | 2 ++ icu4c/source/i18n/unicode/dtptngen.h | 8 ++++++-- 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/icu4c/source/common/filteredbrk.cpp b/icu4c/source/common/filteredbrk.cpp index 30f86173067..20c3aa82430 100644 --- a/icu4c/source/common/filteredbrk.cpp +++ b/icu4c/source/common/filteredbrk.cpp @@ -693,6 +693,11 @@ FilteredBreakIteratorBuilder::createInstance(const Locale& where, UErrorCode& st return (U_SUCCESS(status))? ret.orphan(): NULL; } +FilteredBreakIteratorBuilder * +FilteredBreakIteratorBuilder::createInstance(UErrorCode &status) { + return createEmptyInstance(status); +} + FilteredBreakIteratorBuilder * FilteredBreakIteratorBuilder::createEmptyInstance(UErrorCode& status) { if(U_FAILURE(status)) return NULL; diff --git a/icu4c/source/common/unicode/filteredbrk.h b/icu4c/source/common/unicode/filteredbrk.h index a0319bf0a76..751d1faf404 100644 --- a/icu4c/source/common/unicode/filteredbrk.h +++ b/icu4c/source/common/unicode/filteredbrk.h @@ -64,9 +64,7 @@ class U_COMMON_API FilteredBreakIteratorBuilder : public UObject { * @deprecated ICU 60 use createEmptyInstance instead * @see createEmptyInstance() */ - static inline FilteredBreakIteratorBuilder *createInstance(UErrorCode &status) { - return createEmptyInstance(status); - } + static FilteredBreakIteratorBuilder *createInstance(UErrorCode &status); #endif /* U_HIDE_DEPRECATED_API */ #ifndef U_HIDE_DRAFT_API @@ -105,7 +103,6 @@ class U_COMMON_API FilteredBreakIteratorBuilder : public UObject { */ virtual UBool unsuppressBreakAfter(const UnicodeString& string, UErrorCode& status) = 0; -#ifndef U_HIDE_DEPRECATED_API /** * This function has been deprecated in favor of wrapIteratorWithFilter() * The behavior is identical. @@ -116,7 +113,6 @@ class U_COMMON_API FilteredBreakIteratorBuilder : public UObject { * @see wrapBreakIteratorWithFilter() */ virtual BreakIterator *build(BreakIterator* adoptBreakIterator, UErrorCode& status) = 0; -#endif /* U_HIDE_DEPRECATED_API */ #ifndef U_HIDE_DRAFT_API /** diff --git a/icu4c/source/i18n/dtptngen.cpp b/icu4c/source/i18n/dtptngen.cpp index 6066de60844..aefd70464eb 100644 --- a/icu4c/source/i18n/dtptngen.cpp +++ b/icu4c/source/i18n/dtptngen.cpp @@ -271,6 +271,8 @@ static const char* const CLDR_FIELD_WIDTH[] = { // [UDATPG_WIDTH_COUNT] "", "-short", "-narrow" }; +// TODO(ticket:13619): remove when definition uncommented in dtptngen.h. +static const int32_t UDATPG_WIDTH_COUNT = UDATPG_NARROW + 1; static constexpr UDateTimePGDisplayWidth UDATPG_WIDTH_APPENDITEM = UDATPG_WIDE; static constexpr int32_t UDATPG_FIELD_KEY_MAX = 24; // max length of CLDR field tag (type + width) diff --git a/icu4c/source/i18n/unicode/dcfmtsym.h b/icu4c/source/i18n/unicode/dcfmtsym.h index 86f5c198269..c9ff7a8018b 100644 --- a/icu4c/source/i18n/unicode/dcfmtsym.h +++ b/icu4c/source/i18n/unicode/dcfmtsym.h @@ -513,6 +513,7 @@ DecimalFormatSymbols::getConstSymbol(ENumberFormatSymbol symbol) const { return *strPtr; } +#ifndef U_HIDE_INTERNAL_API inline const UnicodeString& DecimalFormatSymbols::getConstDigitSymbol(int32_t digit) const { if (digit < 0 || digit > 9) { digit = 0; @@ -523,6 +524,7 @@ inline const UnicodeString& DecimalFormatSymbols::getConstDigitSymbol(int32_t di ENumberFormatSymbol key = static_cast(kOneDigitSymbol + digit - 1); return fSymbols[key]; } +#endif // ------------------------------------- diff --git a/icu4c/source/i18n/unicode/dtptngen.h b/icu4c/source/i18n/unicode/dtptngen.h index 20e276a1b5f..feb465e7997 100644 --- a/icu4c/source/i18n/unicode/dtptngen.h +++ b/icu4c/source/i18n/unicode/dtptngen.h @@ -522,7 +522,8 @@ private: */ DateTimePatternGenerator& operator=(const DateTimePatternGenerator& other); - static const int32_t UDATPG_WIDTH_COUNT = UDATPG_NARROW + 1; + // TODO(ticket:13619): re-enable when UDATPG_NARROW no longer in draft mode. + // static const int32_t UDATPG_WIDTH_COUNT = UDATPG_NARROW + 1; Locale pLocale; // pattern locale FormatParser *fp; @@ -530,7 +531,8 @@ private: DistanceInfo *distanceInfo; PatternMap *patternMap; UnicodeString appendItemFormats[UDATPG_FIELD_COUNT]; - UnicodeString fieldDisplayNames[UDATPG_FIELD_COUNT][UDATPG_WIDTH_COUNT]; + // TODO(ticket:13619): [3] -> UDATPG_WIDTH_COUNT + UnicodeString fieldDisplayNames[UDATPG_FIELD_COUNT][3]; UnicodeString dateTimeFormat; UnicodeString decimal; DateTimeMatcher *skipMatcher; @@ -560,9 +562,11 @@ private: void setDateTimeFromCalendar(const Locale& locale, UErrorCode& status); void setDecimalSymbols(const Locale& locale, UErrorCode& status); UDateTimePatternField getAppendFormatNumber(const char* field) const; +#ifndef U_HIDE_DRAFT_API UDateTimePatternField getFieldAndWidthIndices(const char* key, UDateTimePGDisplayWidth* widthP) const; void setFieldDisplayName(UDateTimePatternField field, UDateTimePGDisplayWidth width, const UnicodeString& value); UnicodeString& getMutableFieldDisplayName(UDateTimePatternField field, UDateTimePGDisplayWidth width); +#endif // U_HIDE_DRAFT_API void getAppendName(UDateTimePatternField field, UnicodeString& value); UnicodeString mapSkeletonMetacharacters(const UnicodeString& patternForm, int32_t* flags, UErrorCode& status); int32_t getCanonicalIndex(const UnicodeString& field); From 809eb8615145f72ec086908eec983e800e120493 Mon Sep 17 00:00:00 2001 From: Yoshito Umaoka Date: Tue, 6 Mar 2018 20:10:09 +0000 Subject: [PATCH 06/27] ICU-13581 Added 61 api signature file, purged very old api signature files. Fixed an issue DeprecatedAPIChecker. Fixed API doc problem in RBBIDataWrapper. X-SVN-Rev: 41071 --- .gitattributes | 5 +---- .../core/src/com/ibm/icu/text/RBBIDataWrapper.java | 9 +++++++++ .../tools/build/.settings/org.eclipse.jdt.core.prefs | 6 +++--- icu4j/tools/build/icu4j48.api3.gz | 3 --- icu4j/tools/build/icu4j49.api3.gz | 3 --- icu4j/tools/build/icu4j50.api3.gz | 3 --- icu4j/tools/build/icu4j51.api3.gz | 3 --- icu4j/tools/build/icu4j61.api3.gz | 3 +++ .../ibm/icu/dev/tool/docs/DeprecatedAPIChecker.java | 12 +++++++----- 9 files changed, 23 insertions(+), 24 deletions(-) delete mode 100644 icu4j/tools/build/icu4j48.api3.gz delete mode 100644 icu4j/tools/build/icu4j49.api3.gz delete mode 100644 icu4j/tools/build/icu4j50.api3.gz delete mode 100644 icu4j/tools/build/icu4j51.api3.gz create mode 100644 icu4j/tools/build/icu4j61.api3.gz diff --git a/.gitattributes b/.gitattributes index d6e56e46faa..aaa448fa3de 100644 --- a/.gitattributes +++ b/.gitattributes @@ -498,10 +498,6 @@ icu4j/samples/src/com/ibm/icu/samples/iuc/data/reshello/es.res -text icu4j/samples/src/com/ibm/icu/samples/iuc/data/reshello/mt.res -text icu4j/samples/src/com/ibm/icu/samples/iuc/data/reshello/res_index.res -text icu4j/samples/src/com/ibm/icu/samples/iuc/data/reshello/root.res -text -icu4j/tools/build/icu4j48.api3.gz -text -icu4j/tools/build/icu4j49.api3.gz -text -icu4j/tools/build/icu4j50.api3.gz -text -icu4j/tools/build/icu4j51.api3.gz -text icu4j/tools/build/icu4j52.api3.gz -text icu4j/tools/build/icu4j53.api3.gz -text icu4j/tools/build/icu4j54.api3.gz -text @@ -511,6 +507,7 @@ icu4j/tools/build/icu4j57.api3.gz -text icu4j/tools/build/icu4j58.api3.gz -text icu4j/tools/build/icu4j59.api3.gz -text icu4j/tools/build/icu4j60.api3.gz -text +icu4j/tools/build/icu4j61.api3.gz -text tools/multi/c/Makefile-c.inc -text tools/multi/c/patch/3_0 -text tools/multi/c/patch/3_2 -text diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/RBBIDataWrapper.java b/icu4j/main/classes/core/src/com/ibm/icu/text/RBBIDataWrapper.java index 6b3a9e9e38c..d881946895a 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/text/RBBIDataWrapper.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/text/RBBIDataWrapper.java @@ -76,6 +76,9 @@ public final class RBBIDataWrapper { @Deprecated public short[] fTable; + RBBIStateTable() { + } + static RBBIStateTable get(ByteBuffer bytes, int length) throws IOException { if (length == 0) { return null; @@ -111,6 +114,12 @@ public final class RBBIDataWrapper { return bytesWritten; } + /** + * {@inheritDoc} + * @internal + * @deprecated This API is ICU internal only. + */ + @Deprecated @Override public boolean equals (Object other) { if (other == this) { diff --git a/icu4j/tools/build/.settings/org.eclipse.jdt.core.prefs b/icu4j/tools/build/.settings/org.eclipse.jdt.core.prefs index 4421badc58a..cb972096a48 100644 --- a/icu4j/tools/build/.settings/org.eclipse.jdt.core.prefs +++ b/icu4j/tools/build/.settings/org.eclipse.jdt.core.prefs @@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -98,7 +98,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.source=1.6 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 diff --git a/icu4j/tools/build/icu4j48.api3.gz b/icu4j/tools/build/icu4j48.api3.gz deleted file mode 100644 index c0fb82b4d3c..00000000000 --- a/icu4j/tools/build/icu4j48.api3.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b4c263a9350500e99226792ed7d9ba76e60d0f43201a1bf59750aa04209a9ad0 -size 44237 diff --git a/icu4j/tools/build/icu4j49.api3.gz b/icu4j/tools/build/icu4j49.api3.gz deleted file mode 100644 index 2913f1807af..00000000000 --- a/icu4j/tools/build/icu4j49.api3.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a26350a7dc6ca1c8f26fe50d500214b416c7372b731b0cec8beaf9bfeb3900c4 -size 46534 diff --git a/icu4j/tools/build/icu4j50.api3.gz b/icu4j/tools/build/icu4j50.api3.gz deleted file mode 100644 index 266708b0edc..00000000000 --- a/icu4j/tools/build/icu4j50.api3.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:24256cbbd5596894932fe489e3715a1c165cd10cd6fc291e4edcdb5dd2cf27e3 -size 46977 diff --git a/icu4j/tools/build/icu4j51.api3.gz b/icu4j/tools/build/icu4j51.api3.gz deleted file mode 100644 index 94eb1f7ab7f..00000000000 --- a/icu4j/tools/build/icu4j51.api3.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:262d338ee506cfafa069a9d0e7ad1867df887195d4f7f43cc97844c0beef105e -size 47785 diff --git a/icu4j/tools/build/icu4j61.api3.gz b/icu4j/tools/build/icu4j61.api3.gz new file mode 100644 index 00000000000..1a0e2a568e5 --- /dev/null +++ b/icu4j/tools/build/icu4j61.api3.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e7f22b2a70f93ff866c5fe72b9fe24cf686332d952081017aae03b559f023ae +size 58505 diff --git a/icu4j/tools/build/src/com/ibm/icu/dev/tool/docs/DeprecatedAPIChecker.java b/icu4j/tools/build/src/com/ibm/icu/dev/tool/docs/DeprecatedAPIChecker.java index c7ae792707d..61abf722360 100644 --- a/icu4j/tools/build/src/com/ibm/icu/dev/tool/docs/DeprecatedAPIChecker.java +++ b/icu4j/tools/build/src/com/ibm/icu/dev/tool/docs/DeprecatedAPIChecker.java @@ -364,16 +364,18 @@ public class DeprecatedAPIChecker { // erase generic args if (paramsSegment.indexOf('<') >= 0) { StringBuilder buf = new StringBuilder(); - boolean inGenericsParams = false; + int genericsNestLevel = 0; for (int i = 0; i < paramsSegment.length(); i++) { char c = paramsSegment.charAt(i); - if (inGenericsParams) { - if (c == '>') { - inGenericsParams = false; + if (genericsNestLevel > 0) { + if (c == '<') { + genericsNestLevel++; + } else if (c == '>') { + genericsNestLevel--; } } else { if (c == '<') { - inGenericsParams = true; + genericsNestLevel++; } else { buf.append(c); } From 4b90830e2087a121e706440fad9a58184d6236e4 Mon Sep 17 00:00:00 2001 From: Yoshito Umaoka Date: Tue, 6 Mar 2018 21:08:46 +0000 Subject: [PATCH 07/27] ICU-13581 Added 61.1 serialization compatibility test data, deleted 56.1. X-SVN-Rev: 41072 --- .gitattributes | 148 +++++++++--------- ...m.icu.impl.IllegalIcuArgumentException.dat | 3 - ...om.ibm.icu.impl.InvalidFormatException.dat | 3 - .../com.ibm.icu.impl.JavaTimeZone.dat | 3 - .../com.ibm.icu.impl.OlsonTimeZone.dat | 3 - .../com.ibm.icu.impl.RelativeDateFormat.dat | 3 - .../com.ibm.icu.impl.TimeZoneAdapter.dat | 3 - ....icu.impl.locale.LocaleSyntaxException.dat | 3 - ...om.ibm.icu.text.ArabicShapingException.dat | 3 - .../com.ibm.icu.text.ChineseDateFormat.dat | 3 - ....ibm.icu.text.ChineseDateFormatSymbols.dat | 3 - .../com.ibm.icu.text.CurrencyPluralInfo.dat | 3 - .../ICU_56.1/com.ibm.icu.text.DateFormat.dat | 3 - .../com.ibm.icu.text.DateFormatSymbols.dat | 3 - .../com.ibm.icu.text.DateIntervalFormat.dat | 3 - .../com.ibm.icu.text.DateIntervalInfo.dat | 3 - .../com.ibm.icu.text.DecimalFormat.dat | 3 - .../com.ibm.icu.text.DecimalFormatSymbols.dat | 3 - .../com.ibm.icu.text.MeasureFormat.dat | 3 - .../com.ibm.icu.text.NumberFormat.dat | 3 - .../com.ibm.icu.text.PluralFormat.dat | 3 - ...com.ibm.icu.text.RuleBasedNumberFormat.dat | 3 - .../com.ibm.icu.text.SimpleDateFormat.dat | 3 - ....ibm.icu.text.StringPrepParseException.dat | 3 - .../com.ibm.icu.text.TimeUnitFormat.dat | 3 - .../com.ibm.icu.util.BuddhistCalendar.dat | 3 - .../ICU_56.1/com.ibm.icu.util.Calendar.dat | 3 - .../com.ibm.icu.util.ChineseCalendar.dat | 3 - .../com.ibm.icu.util.CopticCalendar.dat | 3 - .../com.ibm.icu.util.DangiCalendar.dat | 3 - .../com.ibm.icu.util.EthiopicCalendar.dat | 3 - .../com.ibm.icu.util.GregorianCalendar.dat | 3 - .../com.ibm.icu.util.HebrewCalendar.dat | 3 - ...icu.util.ICUCloneNotSupportedException.dat | 3 - .../com.ibm.icu.util.ICUException.dat | 3 - ...m.ibm.icu.util.ICUUncheckedIOException.dat | 3 - ....ibm.icu.util.IllformedLocaleException.dat | 3 - .../com.ibm.icu.util.IndianCalendar.dat | 3 - .../com.ibm.icu.util.IslamicCalendar.dat | 3 - .../com.ibm.icu.util.JapaneseCalendar.dat | 3 - .../com.ibm.icu.util.PersianCalendar.dat | 3 - .../com.ibm.icu.util.RuleBasedTimeZone.dat | 3 - .../com.ibm.icu.util.TaiwanCalendar.dat | 3 - .../ICU_56.1/com.ibm.icu.util.TimeZone.dat | 3 - ...cu.util.UResourceTypeMismatchException.dat | 3 - .../com.ibm.icu.impl.DateNumberFormat.dat | 0 ...m.icu.impl.IllegalIcuArgumentException.dat | 3 + ...om.ibm.icu.impl.InvalidFormatException.dat | 3 + .../com.ibm.icu.impl.JavaTimeZone.dat | 3 + .../com.ibm.icu.impl.OlsonTimeZone.dat | 3 + .../com.ibm.icu.impl.RelativeDateFormat.dat | 3 + .../com.ibm.icu.impl.TZDBTimeZoneNames.dat | 0 .../com.ibm.icu.impl.TimeZoneAdapter.dat | 3 + .../com.ibm.icu.impl.TimeZoneGenericNames.dat | 0 .../com.ibm.icu.impl.TimeZoneNamesImpl.dat | 0 ....icu.impl.duration.BasicDurationFormat.dat | 0 ....icu.impl.locale.LocaleSyntaxException.dat | 3 + ....icu.impl.number.CustomSymbolCurrency.dat} | 0 ...cu.impl.number.DecimalFormatProperties.dat | 3 + .../com.ibm.icu.impl.number.Properties.dat | 3 + .../com.ibm.icu.math.BigDecimal.dat | 0 .../com.ibm.icu.math.MathContext.dat | 0 ...om.ibm.icu.text.ArabicShapingException.dat | 3 + ...m.ibm.icu.text.ChineseDateFormat$Field.dat | 0 .../com.ibm.icu.text.ChineseDateFormat.dat | 3 + ....ibm.icu.text.ChineseDateFormatSymbols.dat | 3 + .../com.ibm.icu.text.CompactDecimalFormat.dat | 0 .../com.ibm.icu.text.CurrencyPluralInfo.dat | 3 + .../com.ibm.icu.text.DateFormat$Field.dat | 0 .../ICU_61.1/com.ibm.icu.text.DateFormat.dat | 3 + .../com.ibm.icu.text.DateFormatSymbols.dat | 3 + .../com.ibm.icu.text.DateIntervalFormat.dat | 3 + ....icu.text.DateIntervalInfo$PatternInfo.dat | 0 .../com.ibm.icu.text.DateIntervalInfo.dat | 3 + .../com.ibm.icu.text.DecimalFormat.dat | 3 + .../com.ibm.icu.text.DecimalFormatSymbols.dat | 3 + .../com.ibm.icu.text.MeasureFormat.dat | 3 + .../com.ibm.icu.text.MessageFormat$Field.dat | 0 .../com.ibm.icu.text.MessageFormat.dat | 0 .../com.ibm.icu.text.NumberFormat$Field.dat | 0 .../com.ibm.icu.text.NumberFormat.dat | 3 + .../com.ibm.icu.text.PluralFormat.dat | 3 + .../com.ibm.icu.text.PluralRules.dat | 0 ...com.ibm.icu.text.RuleBasedNumberFormat.dat | 3 + .../com.ibm.icu.text.SelectFormat.dat | 0 .../com.ibm.icu.text.SimpleDateFormat.dat | 3 + ....ibm.icu.text.StringPrepParseException.dat | 3 + .../com.ibm.icu.text.TimeUnitFormat.dat | 3 + .../com.ibm.icu.text.TimeZoneFormat.dat | 0 .../com.ibm.icu.util.AnnualTimeZoneRule.dat | 0 .../com.ibm.icu.util.BuddhistCalendar.dat | 3 + .../ICU_61.1/com.ibm.icu.util.Calendar.dat | 3 + .../com.ibm.icu.util.ChineseCalendar.dat | 3 + .../com.ibm.icu.util.CopticCalendar.dat | 3 + .../ICU_61.1/com.ibm.icu.util.Currency.dat | 3 + .../com.ibm.icu.util.DangiCalendar.dat | 3 + .../com.ibm.icu.util.DateInterval.dat | 0 .../com.ibm.icu.util.DateTimeRule.dat | 0 .../com.ibm.icu.util.EthiopicCalendar.dat | 3 + .../com.ibm.icu.util.GregorianCalendar.dat | 3 + .../com.ibm.icu.util.HebrewCalendar.dat | 3 + ...icu.util.ICUCloneNotSupportedException.dat | 3 + .../com.ibm.icu.util.ICUException.dat | 3 + ...m.ibm.icu.util.ICUUncheckedIOException.dat | 3 + ....ibm.icu.util.IllformedLocaleException.dat | 3 + .../com.ibm.icu.util.IndianCalendar.dat | 3 + .../com.ibm.icu.util.InitialTimeZoneRule.dat | 0 .../com.ibm.icu.util.IslamicCalendar.dat | 3 + .../com.ibm.icu.util.JapaneseCalendar.dat | 3 + .../com.ibm.icu.util.MeasureUnit.dat | 0 .../com.ibm.icu.util.NoUnit.dat} | 0 .../com.ibm.icu.util.PersianCalendar.dat | 3 + .../com.ibm.icu.util.RuleBasedTimeZone.dat | 3 + .../com.ibm.icu.util.SimpleTimeZone.dat | 0 .../com.ibm.icu.util.TaiwanCalendar.dat | 3 + ...com.ibm.icu.util.TimeArrayTimeZoneRule.dat | 0 .../ICU_61.1/com.ibm.icu.util.TimeUnit.dat | 3 + .../ICU_61.1/com.ibm.icu.util.TimeZone.dat | 3 + .../com.ibm.icu.util.ULocale.dat | 0 ...cu.util.UResourceTypeMismatchException.dat | 3 + .../com.ibm.icu.util.VTimeZone.dat | 0 121 files changed, 220 insertions(+), 204 deletions(-) delete mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.IllegalIcuArgumentException.dat delete mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.InvalidFormatException.dat delete mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.JavaTimeZone.dat delete mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.OlsonTimeZone.dat delete mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.RelativeDateFormat.dat delete mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.TimeZoneAdapter.dat delete mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.locale.LocaleSyntaxException.dat delete mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.ArabicShapingException.dat delete mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.ChineseDateFormat.dat delete mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.ChineseDateFormatSymbols.dat delete mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.CurrencyPluralInfo.dat delete mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.DateFormat.dat delete mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.DateFormatSymbols.dat delete mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.DateIntervalFormat.dat delete mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.DateIntervalInfo.dat delete mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.DecimalFormat.dat delete mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.DecimalFormatSymbols.dat delete mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.MeasureFormat.dat delete mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.NumberFormat.dat delete mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.PluralFormat.dat delete mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.RuleBasedNumberFormat.dat delete mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.SimpleDateFormat.dat delete mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.StringPrepParseException.dat delete mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.TimeUnitFormat.dat delete mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.BuddhistCalendar.dat delete mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.Calendar.dat delete mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.ChineseCalendar.dat delete mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.CopticCalendar.dat delete mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.DangiCalendar.dat delete mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.EthiopicCalendar.dat delete mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.GregorianCalendar.dat delete mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.HebrewCalendar.dat delete mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.ICUCloneNotSupportedException.dat delete mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.ICUException.dat delete mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.ICUUncheckedIOException.dat delete mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.IllformedLocaleException.dat delete mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.IndianCalendar.dat delete mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.IslamicCalendar.dat delete mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.JapaneseCalendar.dat delete mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.PersianCalendar.dat delete mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.RuleBasedTimeZone.dat delete mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.TaiwanCalendar.dat delete mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.TimeZone.dat delete mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.UResourceTypeMismatchException.dat rename icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/{ICU_56.1 => ICU_61.1}/com.ibm.icu.impl.DateNumberFormat.dat (100%) create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.IllegalIcuArgumentException.dat create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.InvalidFormatException.dat create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.JavaTimeZone.dat create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.OlsonTimeZone.dat create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.RelativeDateFormat.dat rename icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/{ICU_56.1 => ICU_61.1}/com.ibm.icu.impl.TZDBTimeZoneNames.dat (100%) create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.TimeZoneAdapter.dat rename icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/{ICU_56.1 => ICU_61.1}/com.ibm.icu.impl.TimeZoneGenericNames.dat (100%) rename icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/{ICU_56.1 => ICU_61.1}/com.ibm.icu.impl.TimeZoneNamesImpl.dat (100%) rename icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/{ICU_56.1 => ICU_61.1}/com.ibm.icu.impl.duration.BasicDurationFormat.dat (100%) create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.locale.LocaleSyntaxException.dat rename icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/{ICU_56.1/com.ibm.icu.util.Currency.dat => ICU_61.1/com.ibm.icu.impl.number.CustomSymbolCurrency.dat} (100%) create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.number.DecimalFormatProperties.dat create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.number.Properties.dat rename icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/{ICU_56.1 => ICU_61.1}/com.ibm.icu.math.BigDecimal.dat (100%) rename icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/{ICU_56.1 => ICU_61.1}/com.ibm.icu.math.MathContext.dat (100%) create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.ArabicShapingException.dat rename icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/{ICU_56.1 => ICU_61.1}/com.ibm.icu.text.ChineseDateFormat$Field.dat (100%) create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.ChineseDateFormat.dat create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.ChineseDateFormatSymbols.dat rename icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/{ICU_56.1 => ICU_61.1}/com.ibm.icu.text.CompactDecimalFormat.dat (100%) create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.CurrencyPluralInfo.dat rename icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/{ICU_56.1 => ICU_61.1}/com.ibm.icu.text.DateFormat$Field.dat (100%) create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.DateFormat.dat create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.DateFormatSymbols.dat create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.DateIntervalFormat.dat rename icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/{ICU_56.1 => ICU_61.1}/com.ibm.icu.text.DateIntervalInfo$PatternInfo.dat (100%) create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.DateIntervalInfo.dat create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.DecimalFormat.dat create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.DecimalFormatSymbols.dat create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.MeasureFormat.dat rename icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/{ICU_56.1 => ICU_61.1}/com.ibm.icu.text.MessageFormat$Field.dat (100%) rename icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/{ICU_56.1 => ICU_61.1}/com.ibm.icu.text.MessageFormat.dat (100%) rename icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/{ICU_56.1 => ICU_61.1}/com.ibm.icu.text.NumberFormat$Field.dat (100%) create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.NumberFormat.dat create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.PluralFormat.dat rename icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/{ICU_56.1 => ICU_61.1}/com.ibm.icu.text.PluralRules.dat (100%) create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.RuleBasedNumberFormat.dat rename icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/{ICU_56.1 => ICU_61.1}/com.ibm.icu.text.SelectFormat.dat (100%) create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.SimpleDateFormat.dat create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.StringPrepParseException.dat create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.TimeUnitFormat.dat rename icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/{ICU_56.1 => ICU_61.1}/com.ibm.icu.text.TimeZoneFormat.dat (100%) rename icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/{ICU_56.1 => ICU_61.1}/com.ibm.icu.util.AnnualTimeZoneRule.dat (100%) create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.BuddhistCalendar.dat create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.Calendar.dat create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.ChineseCalendar.dat create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.CopticCalendar.dat create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.Currency.dat create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.DangiCalendar.dat rename icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/{ICU_56.1 => ICU_61.1}/com.ibm.icu.util.DateInterval.dat (100%) rename icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/{ICU_56.1 => ICU_61.1}/com.ibm.icu.util.DateTimeRule.dat (100%) create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.EthiopicCalendar.dat create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.GregorianCalendar.dat create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.HebrewCalendar.dat create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.ICUCloneNotSupportedException.dat create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.ICUException.dat create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.ICUUncheckedIOException.dat create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.IllformedLocaleException.dat create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.IndianCalendar.dat rename icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/{ICU_56.1 => ICU_61.1}/com.ibm.icu.util.InitialTimeZoneRule.dat (100%) create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.IslamicCalendar.dat create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.JapaneseCalendar.dat rename icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/{ICU_56.1 => ICU_61.1}/com.ibm.icu.util.MeasureUnit.dat (100%) rename icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/{ICU_56.1/com.ibm.icu.util.TimeUnit.dat => ICU_61.1/com.ibm.icu.util.NoUnit.dat} (100%) create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.PersianCalendar.dat create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.RuleBasedTimeZone.dat rename icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/{ICU_56.1 => ICU_61.1}/com.ibm.icu.util.SimpleTimeZone.dat (100%) create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.TaiwanCalendar.dat rename icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/{ICU_56.1 => ICU_61.1}/com.ibm.icu.util.TimeArrayTimeZoneRule.dat (100%) create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.TimeUnit.dat create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.TimeZone.dat rename icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/{ICU_56.1 => ICU_61.1}/com.ibm.icu.util.ULocale.dat (100%) create mode 100644 icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.UResourceTypeMismatchException.dat rename icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/{ICU_56.1 => ICU_61.1}/com.ibm.icu.util.VTimeZone.dat (100%) diff --git a/.gitattributes b/.gitattributes index aaa448fa3de..9ab0a976d3c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -115,78 +115,6 @@ icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_3.6/com.ibm icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_3.6/com.ibm.icu.util.TimeZone.dat -text icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_3.6/com.ibm.icu.util.ULocale.dat -text icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_3.6/com.ibm.icu.util.UResourceTypeMismatchException.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.DateNumberFormat.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.IllegalIcuArgumentException.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.InvalidFormatException.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.JavaTimeZone.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.OlsonTimeZone.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.RelativeDateFormat.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.TZDBTimeZoneNames.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.TimeZoneAdapter.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.TimeZoneGenericNames.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.TimeZoneNamesImpl.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.duration.BasicDurationFormat.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.locale.LocaleSyntaxException.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.math.BigDecimal.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.math.MathContext.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.ArabicShapingException.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.ChineseDateFormat$Field.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.ChineseDateFormat.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.ChineseDateFormatSymbols.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.CompactDecimalFormat.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.CurrencyPluralInfo.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.DateFormat$Field.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.DateFormat.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.DateFormatSymbols.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.DateIntervalFormat.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.DateIntervalInfo$PatternInfo.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.DateIntervalInfo.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.DecimalFormat.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.DecimalFormatSymbols.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.MeasureFormat.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.MessageFormat$Field.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.MessageFormat.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.NumberFormat$Field.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.NumberFormat.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.PluralFormat.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.PluralRules.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.RuleBasedNumberFormat.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.SelectFormat.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.SimpleDateFormat.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.StringPrepParseException.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.TimeUnitFormat.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.TimeZoneFormat.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.AnnualTimeZoneRule.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.BuddhistCalendar.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.Calendar.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.ChineseCalendar.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.CopticCalendar.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.Currency.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.DangiCalendar.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.DateInterval.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.DateTimeRule.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.EthiopicCalendar.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.GregorianCalendar.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.HebrewCalendar.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.ICUCloneNotSupportedException.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.ICUException.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.ICUUncheckedIOException.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.IllformedLocaleException.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.IndianCalendar.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.InitialTimeZoneRule.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.IslamicCalendar.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.JapaneseCalendar.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.MeasureUnit.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.PersianCalendar.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.RuleBasedTimeZone.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.SimpleTimeZone.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.TaiwanCalendar.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.TimeArrayTimeZoneRule.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.TimeUnit.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.TimeZone.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.ULocale.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.UResourceTypeMismatchException.dat -text -icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.VTimeZone.dat -text icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_57.1/com.ibm.icu.impl.DateNumberFormat.dat -text icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_57.1/com.ibm.icu.impl.IllegalIcuArgumentException.dat -text icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_57.1/com.ibm.icu.impl.InvalidFormatException.dat -text @@ -480,6 +408,82 @@ icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_60.1/com.ib icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_60.1/com.ibm.icu.util.ULocale.dat -text icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_60.1/com.ibm.icu.util.UResourceTypeMismatchException.dat -text icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_60.1/com.ibm.icu.util.VTimeZone.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.DateNumberFormat.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.IllegalIcuArgumentException.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.InvalidFormatException.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.JavaTimeZone.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.OlsonTimeZone.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.RelativeDateFormat.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.TZDBTimeZoneNames.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.TimeZoneAdapter.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.TimeZoneGenericNames.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.TimeZoneNamesImpl.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.duration.BasicDurationFormat.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.locale.LocaleSyntaxException.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.number.CustomSymbolCurrency.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.number.DecimalFormatProperties.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.number.Properties.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.math.BigDecimal.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.math.MathContext.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.ArabicShapingException.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.ChineseDateFormat$Field.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.ChineseDateFormat.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.ChineseDateFormatSymbols.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.CompactDecimalFormat.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.CurrencyPluralInfo.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.DateFormat$Field.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.DateFormat.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.DateFormatSymbols.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.DateIntervalFormat.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.DateIntervalInfo$PatternInfo.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.DateIntervalInfo.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.DecimalFormat.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.DecimalFormatSymbols.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.MeasureFormat.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.MessageFormat$Field.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.MessageFormat.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.NumberFormat$Field.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.NumberFormat.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.PluralFormat.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.PluralRules.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.RuleBasedNumberFormat.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.SelectFormat.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.SimpleDateFormat.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.StringPrepParseException.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.TimeUnitFormat.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.TimeZoneFormat.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.AnnualTimeZoneRule.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.BuddhistCalendar.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.Calendar.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.ChineseCalendar.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.CopticCalendar.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.Currency.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.DangiCalendar.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.DateInterval.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.DateTimeRule.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.EthiopicCalendar.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.GregorianCalendar.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.HebrewCalendar.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.ICUCloneNotSupportedException.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.ICUException.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.ICUUncheckedIOException.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.IllformedLocaleException.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.IndianCalendar.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.InitialTimeZoneRule.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.IslamicCalendar.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.JapaneseCalendar.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.MeasureUnit.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.NoUnit.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.PersianCalendar.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.RuleBasedTimeZone.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.SimpleTimeZone.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.TaiwanCalendar.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.TimeArrayTimeZoneRule.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.TimeUnit.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.TimeZone.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.ULocale.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.UResourceTypeMismatchException.dat -text +icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.VTimeZone.dat -text icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/Trie2Test.setRanges1.16.tri2 -text icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/Trie2Test.setRanges1.32.tri2 -text icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/Trie2Test.setRanges2.16.tri2 -text diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.IllegalIcuArgumentException.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.IllegalIcuArgumentException.dat deleted file mode 100644 index 028a8d69058..00000000000 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.IllegalIcuArgumentException.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:52254032982876a6e09c5a944fd616cb38b9ef0bf77fc96d676b16f085b232e7 -size 1326 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.InvalidFormatException.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.InvalidFormatException.dat deleted file mode 100644 index cfc43036f4e..00000000000 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.InvalidFormatException.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4b1629d477faf37e068645dbd7bdd3f296b84bb9e9af7857b191d0758645d646 -size 7789 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.JavaTimeZone.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.JavaTimeZone.dat deleted file mode 100644 index d603ef173ad..00000000000 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.JavaTimeZone.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3b71a1aa6334661bafe78b40cdd292172639a4983f620a6aeafd8157451010fd -size 2543 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.OlsonTimeZone.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.OlsonTimeZone.dat deleted file mode 100644 index 10222ab8e1f..00000000000 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.OlsonTimeZone.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a99aba3a360ed13aee933cbaee252b7486da617e8e0cf3f98015c49d447a0d64 -size 20881 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.RelativeDateFormat.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.RelativeDateFormat.dat deleted file mode 100644 index b0248a66337..00000000000 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.RelativeDateFormat.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bc02ee6f798fb5a63e6f9c1bc37787b3e88b2dc9d548b8e0544bd1b61cd260bb -size 11139 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.TimeZoneAdapter.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.TimeZoneAdapter.dat deleted file mode 100644 index 13a5a3dc386..00000000000 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.TimeZoneAdapter.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:42f57461449643a68e5390f9d1e0d9afef4932f660dcd7adbf6fc367b7e20780 -size 21314 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.locale.LocaleSyntaxException.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.locale.LocaleSyntaxException.dat deleted file mode 100644 index c170b1dab6e..00000000000 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.locale.LocaleSyntaxException.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:467a7d6c89e76f9eb4a513d62192984eeafc3fee81d0f401c377a9318cd94cdc -size 1616 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.ArabicShapingException.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.ArabicShapingException.dat deleted file mode 100644 index 7c0e3147d9d..00000000000 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.ArabicShapingException.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f659a4b818664f61566f7e64e73a26c7c4ec826b06dff489ba3d087c7ff7f359 -size 7789 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.ChineseDateFormat.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.ChineseDateFormat.dat deleted file mode 100644 index 2651cb6a4bc..00000000000 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.ChineseDateFormat.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e8b0bb3b15f7e40c8dfc49601039333c5d6a6cc592999538a8d87d58d1950c78 -size 187867 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.ChineseDateFormatSymbols.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.ChineseDateFormatSymbols.dat deleted file mode 100644 index 9b65ac463fe..00000000000 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.ChineseDateFormatSymbols.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1e2b661b1469752d405eba96246b8837ee9440fd977ee9d277d8beacc800b17d -size 40465 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.CurrencyPluralInfo.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.CurrencyPluralInfo.dat deleted file mode 100644 index ece7b4e823b..00000000000 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.CurrencyPluralInfo.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1217ef9cd1162e28bfd1867e216a003ea7b8c5327b69dd591163fd4d8620e314 -size 1186 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.DateFormat.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.DateFormat.dat deleted file mode 100644 index 7469f45c69c..00000000000 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.DateFormat.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3fb58afc6c2a264f7844fe58128111e2644fb343fce887b123a5046ba83611b1 -size 42240 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.DateFormatSymbols.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.DateFormatSymbols.dat deleted file mode 100644 index 2cf39781baf..00000000000 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.DateFormatSymbols.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d867f33f71bb49653e1a0c9a83f80783a3696bfe2027f43a9327252421793684 -size 26889 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.DateIntervalFormat.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.DateIntervalFormat.dat deleted file mode 100644 index a9124faaba9..00000000000 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.DateIntervalFormat.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:95ed3c962d6efb1ab00257a63845592703eee2ea39e0cdf3d1d69a8f34e493fd -size 10730 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.DateIntervalInfo.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.DateIntervalInfo.dat deleted file mode 100644 index 26a38ab1a5b..00000000000 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.DateIntervalInfo.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:875bb8966aff03b29eac45bf77914c14365ffb416d7c61da37098372c6bc9160 -size 568 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.DecimalFormat.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.DecimalFormat.dat deleted file mode 100644 index e3614b7dfbc..00000000000 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.DecimalFormat.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2785ebb976af3f8c8f9434ec296b7d84ddba73ce2dd73cc42a192d8418cea38d -size 10640 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.DecimalFormatSymbols.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.DecimalFormatSymbols.dat deleted file mode 100644 index 42b7fe6e9d0..00000000000 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.DecimalFormatSymbols.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:24cdde3696db1f6a2feb44eec7bd94e00a043aa8253b8af7b7c906b04e35d6bd -size 5298 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.MeasureFormat.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.MeasureFormat.dat deleted file mode 100644 index ded146ff9d7..00000000000 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.MeasureFormat.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e2ae0ec0fe6d0470bf06d65f6ec1cfdb3186b021d249db45ec51654e4116a623 -size 3692 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.NumberFormat.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.NumberFormat.dat deleted file mode 100644 index 8e9d0a6fcd5..00000000000 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.NumberFormat.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:581715d958bcbba2f229dd6679c2c891390ee0dfc44580e8c9c416f87ccb4f79 -size 4238 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.PluralFormat.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.PluralFormat.dat deleted file mode 100644 index 10608886592..00000000000 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.PluralFormat.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6cd9ecc9387f78d1f155378e588f7518c3e6d022d1043f74f358eaee8183c617 -size 3582 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.RuleBasedNumberFormat.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.RuleBasedNumberFormat.dat deleted file mode 100644 index f8aaf52c683..00000000000 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.RuleBasedNumberFormat.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3e41842affa91bd0d5aef2bd95f546d22fdff59f32181bfc6cd50ac788a0ffdd -size 44566 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.SimpleDateFormat.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.SimpleDateFormat.dat deleted file mode 100644 index 617d948ee57..00000000000 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.SimpleDateFormat.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:683de991c6c19e48a3eb14ef2e8790721218bfd9a083c64d7454c8bfefb31e94 -size 84226 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.StringPrepParseException.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.StringPrepParseException.dat deleted file mode 100644 index d1f1dc4348a..00000000000 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.StringPrepParseException.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:66507ed5132b223e9a685071d0b58ee601ffb14a48af6ffbfb7ffdac26506f3f -size 12324 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.TimeUnitFormat.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.TimeUnitFormat.dat deleted file mode 100644 index bbd0ce8c110..00000000000 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.TimeUnitFormat.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9a5d31a69b543f7e9fff358b0e15a1ebff3f1a35bfffe48f0168026d93ea3f16 -size 3226 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.BuddhistCalendar.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.BuddhistCalendar.dat deleted file mode 100644 index 9287fb2b2e6..00000000000 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.BuddhistCalendar.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6ab8358a3b8086624b52607073ab6b0f000eff3e9fff79c2aff9fdd1c5a84703 -size 2672 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.Calendar.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.Calendar.dat deleted file mode 100644 index 33093c0aedd..00000000000 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.Calendar.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4129426033dc89387b59fc26793cd494e00bba2bd2d51be9672de8552c18749d -size 4090 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.ChineseCalendar.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.ChineseCalendar.dat deleted file mode 100644 index 2050a1ad254..00000000000 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.ChineseCalendar.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9ee50c904b7299aa5231cf3305ede35663979ae8951d71b6c02709d91132177e -size 3152 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.CopticCalendar.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.CopticCalendar.dat deleted file mode 100644 index 66b2f0be3e0..00000000000 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.CopticCalendar.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:81cde1a3c81c6903b40bbf774b6d2ea350ed218aad0aa9cfec32359b677585d5 -size 3328 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.DangiCalendar.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.DangiCalendar.dat deleted file mode 100644 index e65833a5cd0..00000000000 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.DangiCalendar.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4749c561e70fae7aa9e25c56fac53fb2c154285452e9f16466b15459984952c2 -size 3538 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.EthiopicCalendar.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.EthiopicCalendar.dat deleted file mode 100644 index e1eaffeb5aa..00000000000 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.EthiopicCalendar.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0af7860147c0471f76693fc447c511eb39ce8c1e1fb31fca6b00966899534e39 -size 2621 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.GregorianCalendar.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.GregorianCalendar.dat deleted file mode 100644 index d14e7a60794..00000000000 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.GregorianCalendar.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0dff05da6620db99b4cf3d1de51deae4883727886052a73abd7130c0dfb687cb -size 4099 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.HebrewCalendar.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.HebrewCalendar.dat deleted file mode 100644 index 52ccb7109bd..00000000000 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.HebrewCalendar.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c3928c3b09855591e40160b12ba24cce9bcd042fa6af47b88670094235974df3 -size 3647 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.ICUCloneNotSupportedException.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.ICUCloneNotSupportedException.dat deleted file mode 100644 index d713a5c9e7e..00000000000 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.ICUCloneNotSupportedException.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0746a48c4146985c594ded58f22f589e4230082d97d3ae3c6b4219897b28c315 -size 2976 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.ICUException.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.ICUException.dat deleted file mode 100644 index 0d38370ef58..00000000000 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.ICUException.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1dd56dfbec495e034ed2fe3fe14ce2c74ac2d13eb641b59daf0b49e75acb2597 -size 2881 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.ICUUncheckedIOException.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.ICUUncheckedIOException.dat deleted file mode 100644 index de09aed20e1..00000000000 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.ICUUncheckedIOException.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:180601978bacbc685d519ab0583a14b29291b1eb387ceb65eb09d4a9d6ca6071 -size 2914 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.IllformedLocaleException.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.IllformedLocaleException.dat deleted file mode 100644 index 204625619d9..00000000000 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.IllformedLocaleException.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f7a25bb8d755c096fca551f0869a11daeccecf9c503043acd9111ea27043a515 -size 1616 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.IndianCalendar.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.IndianCalendar.dat deleted file mode 100644 index 3209bf1fe56..00000000000 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.IndianCalendar.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9b18b919178557e2666a3b9ca7f94c4b376a11d567e2fce60a93e556b14f5582 -size 2493 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.IslamicCalendar.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.IslamicCalendar.dat deleted file mode 100644 index b9598e6218e..00000000000 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.IslamicCalendar.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b634c9a6176dff02fad7e91af0dc654ef9d50b00015b42b09ff292df8c7e62a0 -size 3876 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.JapaneseCalendar.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.JapaneseCalendar.dat deleted file mode 100644 index 98ed54d3b73..00000000000 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.JapaneseCalendar.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:21136d3476732e12b01da36638f4b411112bdd1e88affd333e1652edd90c87ca -size 2750 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.PersianCalendar.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.PersianCalendar.dat deleted file mode 100644 index a75b61a5720..00000000000 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.PersianCalendar.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:923e0bdf9e4483dd41dd0b22bf2a0429fcfc28f80bf9ee8f21669d04f7a15da4 -size 3339 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.RuleBasedTimeZone.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.RuleBasedTimeZone.dat deleted file mode 100644 index 9537c287633..00000000000 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.RuleBasedTimeZone.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f811ee6e4cd76878e700c3eafb0627b3b0cb0524668dc844b0c9b055e649e682 -size 1401 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.TaiwanCalendar.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.TaiwanCalendar.dat deleted file mode 100644 index a8d3c3b8d8a..00000000000 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.TaiwanCalendar.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5edd8630751be9110abbf34a1dd60858d8c1c0ab3f6fbd6fb5b21ecd613451bb -size 2821 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.TimeZone.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.TimeZone.dat deleted file mode 100644 index 474bab4c9be..00000000000 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.TimeZone.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a6f6ba35d524dd1f2ad021a4283812432f27a6654abc376364f90dbba036c0f3 -size 1588 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.UResourceTypeMismatchException.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.UResourceTypeMismatchException.dat deleted file mode 100644 index d457f7d8603..00000000000 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.UResourceTypeMismatchException.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7489b33a9ba56159a9c485b1854090105088395179c5e7bcb13e76ba85e7bf82 -size 7854 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.DateNumberFormat.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.DateNumberFormat.dat similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.DateNumberFormat.dat rename to icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.DateNumberFormat.dat diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.IllegalIcuArgumentException.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.IllegalIcuArgumentException.dat new file mode 100644 index 00000000000..00b43694ea6 --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.IllegalIcuArgumentException.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f80cd388edcf9e4fd9b337d182910a93c3d9feea19391d2189832f373a567f3 +size 1114 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.InvalidFormatException.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.InvalidFormatException.dat new file mode 100644 index 00000000000..d3b18a8f3b6 --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.InvalidFormatException.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9de66628521edc985e7f2b3f2c150e305dd71a9bebcdc23f3442ab376cb632ad +size 3177 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.JavaTimeZone.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.JavaTimeZone.dat new file mode 100644 index 00000000000..eb68ebd766c --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.JavaTimeZone.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7adf8cee33cbca0f7e704ef98fb466774ec43494e3fe13b0cc6bca15f6d8bf4d +size 2551 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.OlsonTimeZone.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.OlsonTimeZone.dat new file mode 100644 index 00000000000..9f1890f600b --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.OlsonTimeZone.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2bfa6e2f916fc828fd939286e13c5d2736a73b6cb98906592c37b343ee32546c +size 20899 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.RelativeDateFormat.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.RelativeDateFormat.dat new file mode 100644 index 00000000000..357d814b59b --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.RelativeDateFormat.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:016fa24b518b8bb5bf9224b238a336f4567df9aace3dc8f9310f65ead752b1f6 +size 11741 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.TZDBTimeZoneNames.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.TZDBTimeZoneNames.dat similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.TZDBTimeZoneNames.dat rename to icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.TZDBTimeZoneNames.dat diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.TimeZoneAdapter.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.TimeZoneAdapter.dat new file mode 100644 index 00000000000..9f90c24763e --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.TimeZoneAdapter.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ae5e9ab8e2df89635c4e3f36084c6a8ea7339587e8ca0b4b27dbfd3067a264e2 +size 21332 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.TimeZoneGenericNames.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.TimeZoneGenericNames.dat similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.TimeZoneGenericNames.dat rename to icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.TimeZoneGenericNames.dat diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.TimeZoneNamesImpl.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.TimeZoneNamesImpl.dat similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.TimeZoneNamesImpl.dat rename to icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.TimeZoneNamesImpl.dat diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.duration.BasicDurationFormat.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.duration.BasicDurationFormat.dat similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.impl.duration.BasicDurationFormat.dat rename to icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.duration.BasicDurationFormat.dat diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.locale.LocaleSyntaxException.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.locale.LocaleSyntaxException.dat new file mode 100644 index 00000000000..09409f67d37 --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.locale.LocaleSyntaxException.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:70dae8d2ef1821146420cff67e5c3866e4147eec4fdb59d59788bf85f725ede9 +size 1134 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.Currency.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.number.CustomSymbolCurrency.dat similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.Currency.dat rename to icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.number.CustomSymbolCurrency.dat diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.number.DecimalFormatProperties.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.number.DecimalFormatProperties.dat new file mode 100644 index 00000000000..9b399f7cd99 --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.number.DecimalFormatProperties.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:66e2c812a75a2eaed73980a64ec1bfdaf5532a3631a1c9f8b774f7fa28c7c938 +size 586 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.number.Properties.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.number.Properties.dat new file mode 100644 index 00000000000..f2fd7c9cccf --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.impl.number.Properties.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4adaec8f2996b030f6d2051fdaad1f5e611a93b47d869557b51ca10548e33a9e +size 106 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.math.BigDecimal.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.math.BigDecimal.dat similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.math.BigDecimal.dat rename to icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.math.BigDecimal.dat diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.math.MathContext.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.math.MathContext.dat similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.math.MathContext.dat rename to icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.math.MathContext.dat diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.ArabicShapingException.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.ArabicShapingException.dat new file mode 100644 index 00000000000..783a4d2becf --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.ArabicShapingException.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d533a36cc0d76933c046e95d6f6621b7136539fa2cdcb668d89de6c224ffe95a +size 3177 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.ChineseDateFormat$Field.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.ChineseDateFormat$Field.dat similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.ChineseDateFormat$Field.dat rename to icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.ChineseDateFormat$Field.dat diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.ChineseDateFormat.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.ChineseDateFormat.dat new file mode 100644 index 00000000000..2a114da5268 --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.ChineseDateFormat.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:17afd45aab575351b10f0d7b445deaa7f6bac97d380d6d0e01df2dfd61500be4 +size 91840 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.ChineseDateFormatSymbols.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.ChineseDateFormatSymbols.dat new file mode 100644 index 00000000000..fde98c9104a --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.ChineseDateFormatSymbols.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:93a9f6baba18a863415072255297d77928bb5ca35c69f7e9d1391205e54e62af +size 39168 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.CompactDecimalFormat.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.CompactDecimalFormat.dat similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.CompactDecimalFormat.dat rename to icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.CompactDecimalFormat.dat diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.CurrencyPluralInfo.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.CurrencyPluralInfo.dat new file mode 100644 index 00000000000..37552ea726f --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.CurrencyPluralInfo.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:23f9742a6f4b6f08894ae8f7c86e7e68e0790ea17cd55545c4cc178385df1dab +size 1170 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.DateFormat$Field.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.DateFormat$Field.dat similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.DateFormat$Field.dat rename to icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.DateFormat$Field.dat diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.DateFormat.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.DateFormat.dat new file mode 100644 index 00000000000..b2b29f93aae --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.DateFormat.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7b8f8aedb933657f73dd73a49b2f4cc6bdbe5af60425fa138a7a2b8c8e2ab9ad +size 46875 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.DateFormatSymbols.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.DateFormatSymbols.dat new file mode 100644 index 00000000000..2b2745154ca --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.DateFormatSymbols.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e98bafef6f92abdf5906efac20106b74e7002ef2f985af90a910c027d3285a1a +size 31524 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.DateIntervalFormat.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.DateIntervalFormat.dat new file mode 100644 index 00000000000..a3a7522d471 --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.DateIntervalFormat.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aacd027f4e48e4105a08016840640678fe5b0bbaefda513e13e37d3917baae50 +size 10974 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.DateIntervalInfo$PatternInfo.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.DateIntervalInfo$PatternInfo.dat similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.DateIntervalInfo$PatternInfo.dat rename to icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.DateIntervalInfo$PatternInfo.dat diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.DateIntervalInfo.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.DateIntervalInfo.dat new file mode 100644 index 00000000000..e275e4ae088 --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.DateIntervalInfo.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3f2086d2494717aef3779c3064483802b9fda4e59b71115d7027df80d18b74c5 +size 568 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.DecimalFormat.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.DecimalFormat.dat new file mode 100644 index 00000000000..dab07448d4f --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.DecimalFormat.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb9a9e35dd78c1295ba4914fb0cebf578f59c8360300530d50813ba15d262279 +size 11288 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.DecimalFormatSymbols.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.DecimalFormatSymbols.dat new file mode 100644 index 00000000000..1b7cf487a9e --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.DecimalFormatSymbols.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e6a985e4a10117f442bba5a37392225ee36ec4cb02ad750561c15c9a3b5a2734 +size 7259 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.MeasureFormat.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.MeasureFormat.dat new file mode 100644 index 00000000000..6d91c785da4 --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.MeasureFormat.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4fde081cf28ffd69df197f9b110155d1daab4bcf686cd6ea1604814ca4a1c956 +size 3246 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.MessageFormat$Field.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.MessageFormat$Field.dat similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.MessageFormat$Field.dat rename to icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.MessageFormat$Field.dat diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.MessageFormat.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.MessageFormat.dat similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.MessageFormat.dat rename to icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.MessageFormat.dat diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.NumberFormat$Field.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.NumberFormat$Field.dat similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.NumberFormat$Field.dat rename to icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.NumberFormat$Field.dat diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.NumberFormat.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.NumberFormat.dat new file mode 100644 index 00000000000..4a3321f7166 --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.NumberFormat.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c4158486c993fd2af97cebe59366262978be8cff8c67dc026667477235a8238c +size 3699 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.PluralFormat.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.PluralFormat.dat new file mode 100644 index 00000000000..7789b342975 --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.PluralFormat.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:77ebde478ea76a9b4dd9ed9f422ba58338057632731218a3a4a3a8b4fd7fadad +size 3003 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.PluralRules.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.PluralRules.dat similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.PluralRules.dat rename to icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.PluralRules.dat diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.RuleBasedNumberFormat.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.RuleBasedNumberFormat.dat new file mode 100644 index 00000000000..8c11d936137 --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.RuleBasedNumberFormat.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1e79a5ad14f9c2572fff22c1c09cb22cff0830c3d26605b7b1bc54ea458b395c +size 44502 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.SelectFormat.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.SelectFormat.dat similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.SelectFormat.dat rename to icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.SelectFormat.dat diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.SimpleDateFormat.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.SimpleDateFormat.dat new file mode 100644 index 00000000000..1f46885a546 --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.SimpleDateFormat.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5f4e4cf79944d20920b1c9278f3b6692586f52dd6ffefe36f514e0d137457b12 +size 90751 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.StringPrepParseException.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.StringPrepParseException.dat new file mode 100644 index 00000000000..6afc6557a20 --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.StringPrepParseException.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8a128c4935e8cf099bc5bb4889ef064df6f70c0ab1f1a99698a0a945114e02d1 +size 7712 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.TimeUnitFormat.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.TimeUnitFormat.dat new file mode 100644 index 00000000000..0411f5c0358 --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.TimeUnitFormat.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f19bf27dc82ee74212a6e3f19d17b78c059c9ecc7d2616511e26aae2223a8f92 +size 2649 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.TimeZoneFormat.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.TimeZoneFormat.dat similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.text.TimeZoneFormat.dat rename to icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.text.TimeZoneFormat.dat diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.AnnualTimeZoneRule.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.AnnualTimeZoneRule.dat similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.AnnualTimeZoneRule.dat rename to icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.AnnualTimeZoneRule.dat diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.BuddhistCalendar.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.BuddhistCalendar.dat new file mode 100644 index 00000000000..f43d6777392 --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.BuddhistCalendar.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4cda3d7cfafe054fadb7168027ab1340e39752705606c6e950c7614440ecaf55 +size 2672 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.Calendar.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.Calendar.dat new file mode 100644 index 00000000000..2aaa6d196ad --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.Calendar.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1d375b82c172b54df34bc9a34e11021aaa632cdeabf65d688cffe582fdbf8860 +size 4090 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.ChineseCalendar.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.ChineseCalendar.dat new file mode 100644 index 00000000000..66e63d8111d --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.ChineseCalendar.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b33b7db9e2b236b08fec3c6b143013b58bd86b76412fc581d93922672d022266 +size 3152 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.CopticCalendar.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.CopticCalendar.dat new file mode 100644 index 00000000000..05290f51604 --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.CopticCalendar.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c85007184bbe4c3900bc2ace639f81cb1c9eccf3231aadae95224598acd337b8 +size 3328 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.Currency.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.Currency.dat new file mode 100644 index 00000000000..2d55cbab333 --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.Currency.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e69c5ec7b30b43892842f01c23b163ae2f5b28251d541c7930a6b25cd097d898 +size 345 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.DangiCalendar.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.DangiCalendar.dat new file mode 100644 index 00000000000..ebd6d3aeb47 --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.DangiCalendar.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:964903236d5c4d294608f50fd2620593d6fd44a7c754a0477145954542bde077 +size 3538 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.DateInterval.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.DateInterval.dat similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.DateInterval.dat rename to icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.DateInterval.dat diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.DateTimeRule.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.DateTimeRule.dat similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.DateTimeRule.dat rename to icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.DateTimeRule.dat diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.EthiopicCalendar.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.EthiopicCalendar.dat new file mode 100644 index 00000000000..004a394cdb4 --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.EthiopicCalendar.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c85e43ae183896910a16e9cf30fe43d1979f41edb411c28fc123bd94810dd60 +size 2621 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.GregorianCalendar.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.GregorianCalendar.dat new file mode 100644 index 00000000000..5d4c76a5679 --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.GregorianCalendar.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a393395853dc448d3fdeedbc84f514b0da492028e9ef5774a785ba706426633b +size 4099 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.HebrewCalendar.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.HebrewCalendar.dat new file mode 100644 index 00000000000..5d6c431bc61 --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.HebrewCalendar.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e0d992fd31bbf1799d5e79c8cfe2d9ed12c7166e1c75647216bd71a006fb7ca0 +size 3647 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.ICUCloneNotSupportedException.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.ICUCloneNotSupportedException.dat new file mode 100644 index 00000000000..6086f7dc77e --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.ICUCloneNotSupportedException.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d730737a740900b3daea5296c2168d0f6d0d2704edceb24c040dec7279cdab6 +size 1674 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.ICUException.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.ICUException.dat new file mode 100644 index 00000000000..7570a79767a --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.ICUException.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:24e34d57f74769611c2ed746c9c809f53793c0133c79c9e4e69f2a531f038e45 +size 1579 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.ICUUncheckedIOException.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.ICUUncheckedIOException.dat new file mode 100644 index 00000000000..01ab9d72a54 --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.ICUUncheckedIOException.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1a0912fd8fdc5e51b3b6c2597f3c1453f63fe980d2b46fd533e6455ca591a107 +size 1612 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.IllformedLocaleException.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.IllformedLocaleException.dat new file mode 100644 index 00000000000..a00b77a6da2 --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.IllformedLocaleException.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c5c0f622bb099bd386112a41476f7222a13cf7f326183d6c8bf418de78b06b1f +size 1184 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.IndianCalendar.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.IndianCalendar.dat new file mode 100644 index 00000000000..c4f84341696 --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.IndianCalendar.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3726856c09be8995c87e289eea63f5320230c5f78f2923a18a846ad2cd856edc +size 2511 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.InitialTimeZoneRule.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.InitialTimeZoneRule.dat similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.InitialTimeZoneRule.dat rename to icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.InitialTimeZoneRule.dat diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.IslamicCalendar.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.IslamicCalendar.dat new file mode 100644 index 00000000000..445077e491b --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.IslamicCalendar.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:607ee068db504f0c0034daabbdf51d534129bc65bb10d2d98461acd3da640857 +size 3876 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.JapaneseCalendar.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.JapaneseCalendar.dat new file mode 100644 index 00000000000..13b267f8d36 --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.JapaneseCalendar.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:25531d0503ef12acd5b4d60268fa7cae84f06231d0315867eb637df7be2522be +size 2750 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.MeasureUnit.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.MeasureUnit.dat similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.MeasureUnit.dat rename to icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.MeasureUnit.dat diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.TimeUnit.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.NoUnit.dat similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.TimeUnit.dat rename to icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.NoUnit.dat diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.PersianCalendar.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.PersianCalendar.dat new file mode 100644 index 00000000000..e76406370e2 --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.PersianCalendar.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dad53ea259fd7ec2ecc00c0f868b11275742f041c450c00014982c484e0ac024 +size 3664 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.RuleBasedTimeZone.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.RuleBasedTimeZone.dat new file mode 100644 index 00000000000..77341a9112b --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.RuleBasedTimeZone.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5ded0a8be478791768bc8b2d656518b69e0f6844533203497cd95bf4bd681123 +size 1401 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.SimpleTimeZone.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.SimpleTimeZone.dat similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.SimpleTimeZone.dat rename to icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.SimpleTimeZone.dat diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.TaiwanCalendar.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.TaiwanCalendar.dat new file mode 100644 index 00000000000..6a7cc008b0a --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.TaiwanCalendar.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:227687eeff821f0c4cfe3eb44447ea9b8563bd565941881dedfb6991d32aebfc +size 2821 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.TimeArrayTimeZoneRule.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.TimeArrayTimeZoneRule.dat similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.TimeArrayTimeZoneRule.dat rename to icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.TimeArrayTimeZoneRule.dat diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.TimeUnit.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.TimeUnit.dat new file mode 100644 index 00000000000..0d413839448 --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.TimeUnit.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:20e3c8b651ca2b9706c4f15d3c2a06821bebbe9e797a87acad6e236089e520af +size 173 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.TimeZone.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.TimeZone.dat new file mode 100644 index 00000000000..555c8233218 --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.TimeZone.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:204bb6dc07d2b4dd79d14ef08deaada3dbf44a1ef31c1f3338059df89bfc0fcf +size 1606 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.ULocale.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.ULocale.dat similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.ULocale.dat rename to icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.ULocale.dat diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.UResourceTypeMismatchException.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.UResourceTypeMismatchException.dat new file mode 100644 index 00000000000..9b80d9b66eb --- /dev/null +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.UResourceTypeMismatchException.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71914581933b62c6041a6dfec711dee75e801bde7d5f6b0344478f1031dafb67 +size 3242 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.VTimeZone.dat b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.VTimeZone.dat similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_56.1/com.ibm.icu.util.VTimeZone.dat rename to icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/data/ICU_61.1/com.ibm.icu.util.VTimeZone.dat From b5e8865ff2049b4da31a295c5b97e2740e98d26f Mon Sep 17 00:00:00 2001 From: Norbert Runge Date: Tue, 6 Mar 2018 23:13:49 +0000 Subject: [PATCH 08/27] ICU-13581 Make tests work, not crash, when run without ICU data X-SVN-Rev: 41073 --- icu4c/source/test/intltest/alphaindextst.cpp | 6 +++++- .../test/intltest/numbertest_patternmodifier.cpp | 9 +++++++-- icu4c/source/test/intltest/numfmtst.cpp | 16 ++++++++++++---- 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/icu4c/source/test/intltest/alphaindextst.cpp b/icu4c/source/test/intltest/alphaindextst.cpp index 667e0435a86..8a4edb27711 100644 --- a/icu4c/source/test/intltest/alphaindextst.cpp +++ b/icu4c/source/test/intltest/alphaindextst.cpp @@ -736,7 +736,11 @@ void AlphabeticIndexTest::testHasBuckets() { void AlphabeticIndexTest::checkHasBuckets(const Locale &locale, UScriptCode script) { IcuTestErrorCode errorCode(*this, "checkHasBuckets"); AlphabeticIndex aindex(locale, errorCode); - LocalPointer index(aindex.buildImmutableIndex(errorCode)); + LocalPointer index(aindex.buildImmutableIndex(errorCode), errorCode); + if (U_FAILURE(errorCode)) { + dataerrln("%s %d Error in index creation", __FILE__, __LINE__); + return; + } UnicodeString loc = locale.getName(); assertTrue(loc + u" at least 3 buckets", index->getBucketCount() >= 3); const AlphabeticIndex::Bucket *bucket = index->getBucket(1); diff --git a/icu4c/source/test/intltest/numbertest_patternmodifier.cpp b/icu4c/source/test/intltest/numbertest_patternmodifier.cpp index 07f840576bf..79c99e9c224 100644 --- a/icu4c/source/test/intltest/numbertest_patternmodifier.cpp +++ b/icu4c/source/test/intltest/numbertest_patternmodifier.cpp @@ -106,8 +106,13 @@ void PatternModifierTest::testPatternWithNoPlaceholder() { nsb.append(u"x123y", UNUM_FIELD_COUNT, status); assertSuccess("Spot 5", status); MicroProps micros; - LocalPointer imod(mod.createImmutable(status)); - assertSuccess("Spot 6", status); + LocalPointer imod(mod.createImmutable(status), status); + if (U_FAILURE(status)) { + dataerrln("%s %d Error in ImmutablePatternModifier creation", + __FILE__, __LINE__); + assertSuccess("Spot 6", status); + return; + } DecimalQuantity quantity; imod->applyToMicros(micros, quantity); micros.modMiddle->apply(nsb, 1, 4, status); diff --git a/icu4c/source/test/intltest/numfmtst.cpp b/icu4c/source/test/intltest/numfmtst.cpp index a72567903f5..c8fce9e28b6 100644 --- a/icu4c/source/test/intltest/numfmtst.cpp +++ b/icu4c/source/test/intltest/numfmtst.cpp @@ -8934,8 +8934,12 @@ void NumberFormatTest::Test11035_FormatCurrencyAmount() { // Test two ways to set a currency via API Locale loc1 = Locale("pt_PT"); - LocalPointer fmt1(NumberFormat::createCurrencyInstance(loc1, status)); - assertSuccess("Creating fmt1", status); + LocalPointer fmt1(NumberFormat::createCurrencyInstance("loc1", status), + status); + if (U_FAILURE(status)) { + dataerrln("%s %d NumberFormat instance fmt1 is null", __FILE__, __LINE__); + return; + } fmt1->setCurrency(u"PTE", status); assertSuccess("Setting currency on fmt1", status); UnicodeString actualSetCurrency; @@ -8947,7 +8951,7 @@ void NumberFormatTest::Test11035_FormatCurrencyAmount() { UnicodeString actualLocaleString; fmt2->format(amount, actualLocaleString); - // TODO: The following test fill fail until DecimalFormat wraps NumberFormatter. + // TODO: The following test will fail until DecimalFormat wraps NumberFormatter. if (!logKnownIssue("13574")) { assertEquals("Custom Currency Pattern, Set Currency", expected, actualSetCurrency); } @@ -8955,7 +8959,11 @@ void NumberFormatTest::Test11035_FormatCurrencyAmount() { void NumberFormatTest::Test11318_DoubleConversion() { IcuTestErrorCode status(*this, "Test11318_DoubleConversion"); - LocalPointer nf(NumberFormat::createInstance("en", status)); + LocalPointer nf(NumberFormat::createInstance("en", status), status); + if (U_FAILURE(status)) { + dataerrln("%s %d Error in NumberFormat instance creation", __FILE__, __LINE__); + return; + } nf->setMaximumFractionDigits(40); nf->setMaximumIntegerDigits(40); UnicodeString appendTo; From 61e984c3cbf8827fece66d326ac16dafcb3eb6cc Mon Sep 17 00:00:00 2001 From: Peter Edberg Date: Tue, 6 Mar 2018 23:41:20 +0000 Subject: [PATCH 09/27] ICU-13581 ICU4C 61rc BRS, update U_HIDE_ conditionals X-SVN-Rev: 41075 --- .../source/common/unicode/bytestriebuilder.h | 1 - icu4c/source/common/unicode/ucurr.h | 5 +++- icu4c/source/common/unicode/utf8.h | 2 ++ icu4c/source/common/unicode/utypes.h | 4 ++- icu4c/source/i18n/unicode/dcfmtsym.h | 3 --- icu4c/source/i18n/unicode/decimfmt.h | 2 ++ icu4c/source/i18n/unicode/numberformatter.h | 27 ++++++++++++++++--- icu4c/source/layoutex/layout/plruns.h | 3 +++ 8 files changed, 38 insertions(+), 9 deletions(-) diff --git a/icu4c/source/common/unicode/bytestriebuilder.h b/icu4c/source/common/unicode/bytestriebuilder.h index a8412d3d6e8..97814fcc6af 100644 --- a/icu4c/source/common/unicode/bytestriebuilder.h +++ b/icu4c/source/common/unicode/bytestriebuilder.h @@ -154,7 +154,6 @@ private: const char *s; }; - // don't use #ifndef U_HIDE_INTERNAL_API with private class members or virtual methods. virtual Node *createLinearMatchNode(int32_t i, int32_t byteIndex, int32_t length, Node *nextNode) const; diff --git a/icu4c/source/common/unicode/ucurr.h b/icu4c/source/common/unicode/ucurr.h index e3831bba150..192bc298cf7 100644 --- a/icu4c/source/common/unicode/ucurr.h +++ b/icu4c/source/common/unicode/ucurr.h @@ -102,8 +102,10 @@ typedef enum UCurrNameStyle { * currency, such as "US Dollar" for USD. * @stable ICU 2.6 */ - UCURR_LONG_NAME, + UCURR_LONG_NAME +#ifndef U_HIDE_DRAFT_API + , /** * Selector for getName() indicating the narrow currency symbol. * The narrow currency symbol is similar to the regular currency @@ -113,6 +115,7 @@ typedef enum UCurrNameStyle { * @draft ICU 61 */ UCURR_NARROW_SYMBOL_NAME +#endif // U_HIDE_DRAFT_API } UCurrNameStyle; #if !UCONFIG_NO_SERVICE diff --git a/icu4c/source/common/unicode/utf8.h b/icu4c/source/common/unicode/utf8.h index 8fdedbd1100..4bb063c5e36 100644 --- a/icu4c/source/common/unicode/utf8.h +++ b/icu4c/source/common/unicode/utf8.h @@ -609,6 +609,7 @@ utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i); } \ } +#ifndef U_HIDE_DRAFT_API /** * If the string ends with a UTF-8 byte sequence that is valid so far * but incomplete, then reduce the length of the string to end before @@ -657,6 +658,7 @@ utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i); } \ } \ } +#endif // U_HIDE_DRAFT_API /* definitions with backward iteration -------------------------------------- */ diff --git a/icu4c/source/common/unicode/utypes.h b/icu4c/source/common/unicode/utypes.h index edda5660d1d..dd89f39acb0 100644 --- a/icu4c/source/common/unicode/utypes.h +++ b/icu4c/source/common/unicode/utypes.h @@ -539,13 +539,15 @@ typedef enum UErrorCode { U_DEFAULT_KEYWORD_MISSING, /**< Missing DEFAULT rule in plural rules */ U_DECIMAL_NUMBER_SYNTAX_ERROR, /**< Decimal number syntax error */ U_FORMAT_INEXACT_ERROR, /**< Cannot format a number exactly and rounding mode is ROUND_UNNECESSARY @stable ICU 4.8 */ +#ifndef U_HIDE_DRAFT_API U_NUMBER_ARG_OUTOFBOUNDS_ERROR, /**< The argument to a NumberFormatter helper method was out of bounds; the bounds are usually 0 to 999. @draft ICU 61 */ +#endif // U_HIDE_DRAFT_API #ifndef U_HIDE_DEPRECATED_API /** * One more than the highest normal formatting API error code. * @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420. */ - U_FMT_PARSE_ERROR_LIMIT, + U_FMT_PARSE_ERROR_LIMIT = 0x10113, #endif // U_HIDE_DEPRECATED_API /* diff --git a/icu4c/source/i18n/unicode/dcfmtsym.h b/icu4c/source/i18n/unicode/dcfmtsym.h index c9ff7a8018b..59b79a70b99 100644 --- a/icu4c/source/i18n/unicode/dcfmtsym.h +++ b/icu4c/source/i18n/unicode/dcfmtsym.h @@ -406,8 +406,6 @@ public: * returning a const reference to one of the symbol strings. * The returned reference becomes invalid when the symbol is changed * or when the DecimalFormatSymbols are destroyed. - * ### TODO markus 2002oct11: Consider proposing getConstSymbol() to be really public. - * Note: moved #ifndef U_HIDE_INTERNAL_API after this, since this is needed for inline in DecimalFormat * * @param symbol Constant to indicate a number format symbol. * @return the format symbol by the param 'symbol' @@ -501,7 +499,6 @@ DecimalFormatSymbols::getSymbol(ENumberFormatSymbol symbol) const { return *strPtr; } -// See comments above for this function. Not hidden with #ifndef U_HIDE_INTERNAL_API inline const UnicodeString & DecimalFormatSymbols::getConstSymbol(ENumberFormatSymbol symbol) const { const UnicodeString *strPtr; diff --git a/icu4c/source/i18n/unicode/decimfmt.h b/icu4c/source/i18n/unicode/decimfmt.h index dcd4b7a3291..dbc27d3a65e 100644 --- a/icu4c/source/i18n/unicode/decimfmt.h +++ b/icu4c/source/i18n/unicode/decimfmt.h @@ -1970,12 +1970,14 @@ public: UCurrencyUsage getCurrencyUsage() const; +#ifndef U_HIDE_DEPRECATED_API /** * The resource tags we use to retrieve decimal format data from * locale resource bundles. * @deprecated ICU 3.4. This string has no public purpose. Please don't use it. */ static const char fgNumberPatterns[]; +#endif // U_HIDE_DEPRECATED_API #ifndef U_HIDE_INTERNAL_API /** diff --git a/icu4c/source/i18n/unicode/numberformatter.h b/icu4c/source/i18n/unicode/numberformatter.h index 1152f154ed4..3fbb33cceea 100644 --- a/icu4c/source/i18n/unicode/numberformatter.h +++ b/icu4c/source/i18n/unicode/numberformatter.h @@ -151,14 +151,17 @@ typedef enum UNumberUnitWidth { * * @draft ICU 60 */ - UNUM_UNIT_WIDTH_HIDDEN, + UNUM_UNIT_WIDTH_HIDDEN +#ifndef U_HIDE_INTERNAL_API + , /** * One more than the highest UNumberUnitWidth value. * * @internal ICU 60: The numeric value may change over time; see ICU ticket #12420. */ UNUM_UNIT_WIDTH_COUNT +#endif // U_HIDE_INTERNAL_API } UNumberUnitWidth; /** @@ -336,14 +339,17 @@ typedef enum UNumberSignDisplay { * * @draft ICU 61 */ - UNUM_SIGN_ACCOUNTING_EXCEPT_ZERO, + UNUM_SIGN_ACCOUNTING_EXCEPT_ZERO +#ifndef U_HIDE_INTERNAL_API + , /** * One more than the highest UNumberSignDisplay value. * * @internal ICU 60: The numeric value may change over time; see ICU ticket #12420. */ UNUM_SIGN_COUNT +#endif // U_HIDE_INTERNAL_API } UNumberSignDisplay; /** @@ -369,14 +375,17 @@ typedef enum UNumberDecimalSeparatorDisplay { * * @draft ICU 60 */ - UNUM_DECIMAL_SEPARATOR_ALWAYS, + UNUM_DECIMAL_SEPARATOR_ALWAYS +#ifndef U_HIDE_INTERNAL_API + , /** * One more than the highest UNumberDecimalSeparatorDisplay value. * * @internal ICU 60: The numeric value may change over time; see ICU ticket #12420. */ UNUM_DECIMAL_SEPARATOR_COUNT +#endif // U_HIDE_INTERNAL_API } UNumberDecimalMarkDisplay; U_NAMESPACE_BEGIN namespace number { // icu::number @@ -395,6 +404,7 @@ class IntegerWidth; namespace impl { +#ifndef U_HIDE_INTERNAL_API /** * Datatype for minimum/maximum fraction digits. Must be able to hold kMaxIntFracSig. * @@ -409,6 +419,7 @@ typedef int16_t digits_t; * @internal */ static constexpr int32_t DEFAULT_THRESHOLD = 3; +#endif // U_HIDE_INTERNAL_API // Forward declarations: class Padder; @@ -1222,6 +1233,7 @@ class U_I18N_API IntegerWidth : public UMemory { namespace impl { +// Do not enclose entire SymbolsWrapper with #ifndef U_HIDE_INTERNAL_API, needed for a protected field /** @internal */ class U_I18N_API SymbolsWrapper : public UMemory { public: @@ -1237,6 +1249,7 @@ class U_I18N_API SymbolsWrapper : public UMemory { /** @internal */ SymbolsWrapper &operator=(const SymbolsWrapper &other); +#ifndef U_HIDE_INTERNAL_API /** * The provided object is copied, but we do not adopt it. * @internal @@ -1284,6 +1297,7 @@ class U_I18N_API SymbolsWrapper : public UMemory { } return FALSE; } +#endif // U_HIDE_INTERNAL_API private: enum SymbolsPointerType { @@ -1300,9 +1314,11 @@ class U_I18N_API SymbolsWrapper : public UMemory { void doCleanup(); }; +// Do not enclose entire Grouper with #ifndef U_HIDE_INTERNAL_API, needed for a protected field /** @internal */ class U_I18N_API Grouper : public UMemory { public: +#ifndef U_HIDE_INTERNAL_API /** @internal */ static Grouper forStrategy(UGroupingStrategy grouping); @@ -1311,6 +1327,7 @@ class U_I18N_API Grouper : public UMemory { /** @internal */ Grouper(int16_t grouping1, int16_t grouping2, int16_t minGrouping) : fGrouping1(grouping1), fGrouping2(grouping2), fMinGrouping(minGrouping) {} +#endif // U_HIDE_INTERNAL_API private: /** @@ -1352,14 +1369,17 @@ class U_I18N_API Grouper : public UMemory { friend class NumberFormatterImpl; }; +// Do not enclose entire Padder with #ifndef U_HIDE_INTERNAL_API, needed for a protected field /** @internal */ class U_I18N_API Padder : public UMemory { public: +#ifndef U_HIDE_INTERNAL_API /** @internal */ static Padder none(); /** @internal */ static Padder codePoints(UChar32 cp, int32_t targetWidth, UNumberFormatPadPosition position); +#endif // U_HIDE_INTERNAL_API private: UChar32 fWidth; // -3 = error; -2 = bogus; -1 = no padding @@ -1409,6 +1429,7 @@ class U_I18N_API Padder : public UMemory { friend class impl::NumberFormatterImpl; }; +// Do not enclose entire MacroProps with #ifndef U_HIDE_INTERNAL_API, needed for a protected field /** @internal */ struct U_I18N_API MacroProps : public UMemory { /** @internal */ diff --git a/icu4c/source/layoutex/layout/plruns.h b/icu4c/source/layoutex/layout/plruns.h index 2a7a397d3ec..6cbece8040e 100644 --- a/icu4c/source/layoutex/layout/plruns.h +++ b/icu4c/source/layoutex/layout/plruns.h @@ -20,14 +20,17 @@ /** * Opaque datatype representing an array of font runs + * @internal */ typedef void pl_fontRuns; /** * Opaque datatype representing an array of value runs + * @internal */ typedef void pl_valueRuns; /** * Opaque datatype representing an array of locale runs + * @internal */ typedef void pl_localeRuns; From e1907060808a56ed34d11af99b9f35146b9986ed Mon Sep 17 00:00:00 2001 From: Shane Carr Date: Wed, 7 Mar 2018 18:24:34 +0000 Subject: [PATCH 10/27] ICU-13574 Reverting change of DecimalFormatSymbols::getConstSymbol to @draft from @internal. X-SVN-Rev: 41076 --- icu4c/source/i18n/unicode/dcfmtsym.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/icu4c/source/i18n/unicode/dcfmtsym.h b/icu4c/source/i18n/unicode/dcfmtsym.h index 59b79a70b99..e58befa31bd 100644 --- a/icu4c/source/i18n/unicode/dcfmtsym.h +++ b/icu4c/source/i18n/unicode/dcfmtsym.h @@ -406,10 +406,12 @@ public: * returning a const reference to one of the symbol strings. * The returned reference becomes invalid when the symbol is changed * or when the DecimalFormatSymbols are destroyed. + * ### TODO markus 2002oct11: Consider proposing getConstSymbol() to be really public. + * Note: moved #ifndef U_HIDE_INTERNAL_API after this, since this is needed for inline in DecimalFormat * * @param symbol Constant to indicate a number format symbol. * @return the format symbol by the param 'symbol' - * @draft ICU 61 + * @internal */ inline const UnicodeString& getConstSymbol(ENumberFormatSymbol symbol) const; @@ -499,6 +501,7 @@ DecimalFormatSymbols::getSymbol(ENumberFormatSymbol symbol) const { return *strPtr; } +// See comments above for this function. Not hidden with #ifdef U_HIDE_INTERNAL_API inline const UnicodeString & DecimalFormatSymbols::getConstSymbol(ENumberFormatSymbol symbol) const { const UnicodeString *strPtr; From 88475c3f8dfa84102adbc7303ec1459adb081510 Mon Sep 17 00:00:00 2001 From: Yoshito Umaoka Date: Wed, 7 Mar 2018 19:30:29 +0000 Subject: [PATCH 11/27] ICU-13581 Syncnronize ICU_DATA_VERSION with ICU_VERSION X-SVN-Rev: 41078 --- icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java b/icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java index 69d1a305a79..5e7e68a7bda 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java @@ -568,7 +568,7 @@ public final class VersionInfo implements Comparable UNICODE_10_0 = getInstance(10, 0, 0, 0); ICU_VERSION = getInstance(61, 1, 0, 0); - ICU_DATA_VERSION = getInstance(61, 0, 1, 0); + ICU_DATA_VERSION = ICU_VERSION; UNICODE_VERSION = UNICODE_10_0; UCOL_RUNTIME_VERSION = getInstance(9); From e9c948ff1f9f55a2abd701ad47d84a30a1428d3b Mon Sep 17 00:00:00 2001 From: Peter Edberg Date: Wed, 7 Mar 2018 19:48:51 +0000 Subject: [PATCH 12/27] ICU-13581 Update ICU4C 61 API change report for DecimalFormatSymbols::getConstSymbol status reversion in r41076 X-SVN-Rev: 41079 --- icu4c/APIChangeReport.html | 112 +++++++++++++++++-------------------- 1 file changed, 52 insertions(+), 60 deletions(-) diff --git a/icu4c/APIChangeReport.html b/icu4c/APIChangeReport.html index ae3edf1b2db..d17133d90b3 100644 --- a/icu4c/APIChangeReport.html +++ b/icu4c/APIChangeReport.html @@ -175,85 +175,81 @@ char16ptr.hicu::ConstChar16Ptr::~ConstChar16Ptr()Draft→Stable
ICU 59 -dcfmtsym.hconst UnicodeString& icu::DecimalFormatSymbols::getConstSymbol(ENumberFormatSymbol)InternalDraft
-ICU 61 - - edits.hIterator icu::Edits::getCoarseChangesIterator()Draft→Stable
ICU 59 - + edits.hIterator icu::Edits::getCoarseIterator()Draft→Stable
ICU 59 - + edits.hIterator icu::Edits::getFineChangesIterator()Draft→Stable
ICU 59 - + edits.hIterator icu::Edits::getFineIterator()Draft→Stable
ICU 59 - + edits.hUBool icu::Edits::copyErrorTo(UErrorCode&)Draft→Stable
ICU 59 - + edits.hUBool icu::Edits::hasChanges()Draft→Stable
ICU 59 - + edits.hicu::Edits::Edits()Draft→Stable
ICU 59 - + edits.hicu::Edits::~Edits()Draft→Stable
ICU 59 - + edits.hint32_t icu::Edits::lengthDelta()Draft→Stable
ICU 59 - + edits.hvoid icu::Edits::addReplace(int32_t, int32_t)Draft→Stable
ICU 59 - + edits.hvoid icu::Edits::addUnchanged(int32_t)Draft→Stable
ICU 59 - + edits.hvoid icu::Edits::reset()Draft→Stable
ICU 59 - + measunit.hstatic MeasureUnit* icu::MeasureUnit::createPoint(UErrorCode&)Draft→Stable
ICU 59 - + ubrk.hUBreakIterator* ubrk_openBinaryRules(const uint8_t*, int32_t, const UChar*, int32_t, UErrorCode*)Draft→Stable
ICU 59 - + ubrk.hint32_t ubrk_getBinaryRules(UBreakIterator*, uint8_t*, int32_t, UErrorCode*)Draft→Stable
ICU 59 - + unistr.hUNISTR_FROM_STRING_EXPLICIT icu::UnicodeString::UnicodeString(const uint16_t*)Draft→Stable
ICU 59 - + unistr.hUNISTR_FROM_STRING_EXPLICIT icu::UnicodeString::UnicodeString(const wchar_t*)Draft→Stable
ICU 59 - + unistr.hicu::UnicodeString::UnicodeString(const std::nullptr_t)Draft→Stable
ICU 59 - + unistr.hicu::UnicodeString::UnicodeString(const std::nullptr_t, int32_t)Draft→Stable
ICU 59 - + unistr.hicu::UnicodeString::UnicodeString(const uint16_t*, int32_t)Draft→Stable
ICU 59 - + unistr.hicu::UnicodeString::UnicodeString(const wchar_t*, int32_t)Draft→Stable
ICU 59 - + unistr.hicu::UnicodeString::UnicodeString(std::nullptr_t, int32_t, int32_t)Draft→Stable
ICU 59 - + unistr.hicu::UnicodeString::UnicodeString(uint16_t*, int32_t, int32_t)Draft→Stable
ICU 59 - + unistr.hicu::UnicodeString::UnicodeString(wchar_t*, int32_t, int32_t)Draft→Stable
ICU 59 - + unum.hint32_t unum_formatDoubleForFields(const UNumberFormat*, double, UChar*, int32_t, UFieldPositionIterator*, UErrorCode*)Draft→Stable
ICU 59 - + upluralrules.hUEnumeration* uplrules_getKeywords(const UPluralRules*, UErrorCode*)Draft→Stable
ICU 59 @@ -440,118 +436,114 @@ dcfmtsym.hconst UnicodeString& icu::DecimalFormatSymbols::getConstDigitSymbol(int32_t)(missing)Internal
- + dtptngen.hUnicodeString icu::DateTimePatternGenerator::getFieldDisplayName(UDateTimePatternField, UDateTimePGDisplayWidth)(missing)Draft
ICU 61 - + measunit.hstatic MeasureUnit icu::MeasureUnit::resolveUnitPerUnit(const MeasureUnit&, const MeasureUnit&, bool*)(missing)Internal
- + numberformatter.hDerived icu::number::NumberFormatterSettings< Derived >::adoptPerUnit(icu::MeasureUnit*)(missing)Draft
ICU 61 - + numberformatter.hDerived icu::number::NumberFormatterSettings< Derived >::adoptSymbols(NumberingSystem*)(missing)
old version
had “const”
on paramDraft
ICU 60
(should be ICU 61)
decided to keep draft ICU 60 - + numberformatter.hDerived icu::number::NumberFormatterSettings< Derived >::adoptUnit(icu::MeasureUnit*)(missing)
old version
had “const”
on paramDraft
ICU 60
(should be ICU 61)
decided to keep draft ICU 60 - + numberformatter.hDerived icu::number::NumberFormatterSettings< Derived >::grouping(const UGroupingStrategy&)(missing)Draft
ICU 61 - + numberformatter.hDerived icu::number::NumberFormatterSettings< Derived >::perUnit(const icu::MeasureUnit&)(missing)Draft
ICU 61 - + numberformatter.henum UGroupingStrategy::UNUM_GROUPING_AUTO(missing)Draft
ICU 61 - + numberformatter.henum UGroupingStrategy::UNUM_GROUPING_MIN2(missing)Draft
ICU 61 - + numberformatter.henum UGroupingStrategy::UNUM_GROUPING_OFF(missing)Draft
ICU 61 - + numberformatter.henum UGroupingStrategy::UNUM_GROUPING_ON_ALIGNED(missing)Draft
ICU 61 - + numberformatter.henum UGroupingStrategy::UNUM_GROUPING_THOUSANDS(missing)Draft
ICU 61 - + numberformatter.henum UNumberSignDisplay::UNUM_SIGN_ACCOUNTING_EXCEPT_ZERO(missing)Draft
ICU 61 - + numberformatter.henum UNumberSignDisplay::UNUM_SIGN_EXCEPT_ZERO(missing)Draft
ICU 61 - + numberformatter.hicu::number::impl::Grouper::Grouper(int16_t, int16_t, int16_t)(missing)Internal
- + numberformatter.hstatic Grouper icu::number::impl::Grouper::forStrategy(UGroupingStrategy)(missing)Internal
- + rbbi.hvoid icu::RuleBasedBreakIterator::dumpTables()(missing)Internal
- + ucurr.henum UCurrNameStyle::UCURR_NARROW_SYMBOL_NAME(missing)Draft
ICU 61 - + udatpg.henum UDateTimePGDisplayWidth::UDATPG_ABBREVIATED(missing)Draft
ICU 61 - + udatpg.henum UDateTimePGDisplayWidth::UDATPG_NARROW(missing)Draft
ICU 61 - + udatpg.henum UDateTimePGDisplayWidth::UDATPG_WIDE(missing)Draft
ICU 61 - + udatpg.hint32_t udatpg_getFieldDisplayName(const UDateTimePatternGenerator*, UDateTimePatternField, UDateTimePGDisplayWidth, UChar*, int32_t, UErrorCode*)(missing)Draft
ICU 61 - + utf8.h#define U8_INTERNAL_NEXT_OR_SUB(missing)Internal
- + utf8.h#define U8_TRUNCATE_IF_INCOMPLETE(missing)Draft
ICU 61 - + utrans.hvoid utrans_trans(const UTransliterator*, UReplaceable*, const UReplaceableCallbacks*, int32_t, int32_t*, UErrorCode*)(missing) old version
(stable) lacked “const”
on one parameterStable
ICU 2.0 - + utrans.hvoid utrans_transIncremental(const UTransliterator*, UReplaceable*, const UReplaceableCallbacks*, UTransPosition*, UErrorCode*)(missing) old version
(stable) lacked “const”
on one parameterStable
ICU 2.0 - -utypes.henum UErrorCode::U_NUMBER_ARG_OUTOFBOUNDS_ERROR(missing)Draft
-ICU 61 -

(jump back to top) @@ -911,7 +903,7 @@ (jump back to top)

-Contents generated by StableAPI tool on Thu Mar 01 06:18:25 UTC 2018
Copyright (C) 2018, International Business Machines Corporation, All Rights Reserved. +Contents generated by StableAPI tool on Wed Mar 07 19:18:25 UTC 2018
Copyright (C) 2018, International Business Machines Corporation, All Rights Reserved.

From 04a7f2e10ba1813fd25145d61699594e161db233 Mon Sep 17 00:00:00 2001 From: Yoshito Umaoka Date: Wed, 7 Mar 2018 22:05:02 +0000 Subject: [PATCH 13/27] ICU-13581 Updated ICU4J readme for 61RC. X-SVN-Rev: 41080 --- icu4j/readme.html | 60 +++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/icu4j/readme.html b/icu4j/readme.html index abf02230db5..d6b6d6f7aff 100644 --- a/icu4j/readme.html +++ b/icu4j/readme.html @@ -14,16 +14,16 @@ h3.doc { text-decoration: underline }

International Components for Unicode for Java (ICU4J)

-

Read Me for ICU4J 61.1

-(Last Update: 2018-Feb-20) +

Read Me for ICU4J 61 Release Candidate

+(Last Update: 2018-Mar-7)

- +for ICU 62 development. It is not recommended for production use. --> Note: This is a release candidate of ICU4J 61. The contents of this document may not reflect the recent changes done for ICU 61 development. This release candidate is intended for those @@ -145,9 +145,9 @@ about new features in this release.

The list of API changes since the previous ICU4J release is available here.

- + - +

License Information

@@ -161,8 +161,8 @@ file included in this package.

Platform Dependencies

-ICU4J 60 depends on J2SE 6 functionality. Therefore, ICU4J only runs on -JRE version 6 or later. ICU4J 60 is tested on JRE 6, 7, 8 and 9. +ICU4J 61 depends on J2SE 6 functionality. Therefore, ICU4J only runs on +JRE version 6 or later. ICU4J 61 is tested on JRE 6, 7, 8 and 9.

How to Download ICU4J

There are a few different ways to download the ICU4J releases. @@ -180,19 +180,19 @@ builds, and they are packaged in jar files for convenient download. <dependency> <groupId>com.ibm.icu</groupId> <artifactId>icu4j</artifactId> - <version>60.1</version> + <version>61.1</version> </dependency> <dependency> <groupId>com.ibm.icu</groupId> <artifactId>icu4j-charset</artifactId> - <version>60.1</version> + <version>61.1</version> </dependency> <dependency> <groupId>com.ibm.icu</groupId> <artifactId>icu4j-localespi</artifactId> - <version>60.1</version> + <version>61.1</version> </dependency> @@ -567,8 +567,8 @@ compile: @copy: [copy] Copying 24 files to C:\icu4j\main\classes\core\out\bin - [copy] Copied 4 empty directories to 3 empty directories under D:\devicu\ma -int-60\icu4j\main\classes\core\out\bin + [copy] Copied 4 empty directories to 3 empty directories under C:\icu4j\mai +n\classes\core\out\bin set-icuconfig-datapath: @@ -731,54 +731,54 @@ from release to release, so clients should not depend on the exact organization of the data in ICU4J.

    -
  • The primary locale data is under the directory icudt60b, +
  • The primary locale data is under the directory icudt61b, as a set of ".res" files whose names are the locale identifiers. Locale naming is documented the com.ibm.icu.util.ULocale class, and the use of these names in searching for resources is documented in com.ibm.icu.util.UResourceBundle.
    • -
  • The break iterator data is under the directory icudt60b/brkitr, +
  • The break iterator data is under the directory icudt61b/brkitr, as a set of ".res", ".brk" and ".dict" files.
    • -
  • The collation data is under the directory icudt60b/coll, +
  • The collation data is under the directory icudt61b/coll, as a set of ".res" files.
    • -
  • The currency display name data is under the directory icudt60b/curr, +
  • The currency display name data is under the directory icudt61b/curr, as a set of ".res" files.
    • -
  • The language display name data is under the directory icudt60b/lang, +
  • The language display name data is under the directory icudt61b/lang, as a set of ".res" files.
  • The rule-based number format data is under the directory - icudt60b/rbnf, as a set of ".res" files. + icudt61b/rbnf, as a set of ".res" files. -
  • The region display name data is under the directory icudt60b/region, +
  • The region display name data is under the directory icudt61b/region, as a set of ".res" files.
  • The rule-based transliterator data is under the directory - icudt60b/translit, as a set of ".res" files.
    • + icudt61b/translit, as a set of ".res" files. -
  • The measurement unit data is under the directory icudt60b/unit, +
  • The measurement unit data is under the directory icudt61b/unit, as a set of ".res" files.
  • The time zone display name data is under the directory - icudt60b/zone, as a set of ".res" files.
    • + icudt61b/zone, as a set of ".res" files.
  • The character property data and default unicode collation algorithm - (UCA) data is found under the directory icudt60b, as a set of + (UCA) data is found under the directory icudt61b, as a set of ".icu" files.
    • -
  • The normalization data is found under the directory icudt60b, +
  • The normalization data is found under the directory icudt61b, as a set of ".nrm" files.
  • The character set converter data is under the directory - icudt60b, as a set of ".cnv" files. These files are + icudt61b, as a set of ".cnv" files. These files are currently included only in icu-charset.jar.
  • The time zone rule data is under the directory - icudt60b, as zoneinfo64.res.
    • + icudt61b, as zoneinfo64.res. -
  • The holiday data is under the directory icudt60b, +
  • The holiday data is under the directory icudt61b, as a set of ".class" files, named "HolidayBundle_" followed by the locale ID.
    • @@ -876,8 +876,8 @@ ICU4J data is built by ICU4C tools. Please see "icu4j-readme.txt" in icu4c/sourc
    Generating Data from CLDR
    Note: This procedure assumes that all 3 sources are present
      -
    1. Checkout or download CLDR version 'release-32'
      2. -
    2. Checkout ICU with tag 'release-60-1'
      3. +
    3. Checkout or download CLDR version 'release-33'
      4. +
    4. Checkout ICU with tag 'release-61-1'
    5. cd to icu4c/source/data directory
    6. Follow the instructions in icu4c/source/data/cldr-icu-readme.txt
    7. Rebuild ICU4C with the newly generated data.
      8. From 4a5c8afa5b0a09a60818b42cdf075095566090ac Mon Sep 17 00:00:00 2001 From: Shane Carr Date: Wed, 7 Mar 2018 22:28:36 +0000 Subject: [PATCH 14/27] ICU-13461 Removing obsolete comment in StringSegment.java X-SVN-Rev: 41081 --- .../main/classes/core/src/com/ibm/icu/impl/StringSegment.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/StringSegment.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/StringSegment.java index 138abe82392..3b4f9ce8d35 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/impl/StringSegment.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/StringSegment.java @@ -87,8 +87,7 @@ public class StringSegment implements CharSequence { } /** - * Returns the first code point in the string segment, or -1 if the string starts with an invalid - * code point. + * Returns the first code point in the string segment. * *

      * Important: Most of the time, you should use {@link #startsWith}, which handles From 8da6ef17765ec98742186ad8a6b8379cfb74dd81 Mon Sep 17 00:00:00 2001 From: Shane Carr Date: Thu, 8 Mar 2018 00:20:31 +0000 Subject: [PATCH 15/27] ICU-13574 Revising codePointZero loading based on feedback. X-SVN-Rev: 41082 --- icu4c/source/i18n/dcfmtsym.cpp | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/icu4c/source/i18n/dcfmtsym.cpp b/icu4c/source/i18n/dcfmtsym.cpp index 02c0e077f43..a2cc58c4151 100644 --- a/icu4c/source/i18n/dcfmtsym.cpp +++ b/icu4c/source/i18n/dcfmtsym.cpp @@ -437,15 +437,19 @@ DecimalFormatSymbols::initialize(const Locale& loc, UErrorCode& status, sink.resolveMissingMonetarySeparators(fSymbols); // Resolve codePointZero - const UnicodeString& stringZero = getConstDigitSymbol(0); - UChar32 tempCodePointZero = stringZero.char32At(0); - if (u_isdigit(tempCodePointZero) && stringZero.countChar32() == 1) { - for (int32_t i=0; i<=9; i++) { - const UnicodeString& stringDigit = getConstDigitSymbol(i); - if (stringDigit.char32At(0) != tempCodePointZero + i || stringDigit.countChar32() != 1) { - tempCodePointZero = -1; - break; - } + UChar32 tempCodePointZero; + for (int32_t i=0; i<=9; i++) { + const UnicodeString& stringDigit = getConstDigitSymbol(i); + if (stringDigit.countChar32() != 1) { + tempCodePointZero = -1; + break; + } + UChar32 cp = stringDigit.char32At(0); + if (i == 0) { + tempCodePointZero = cp; + } else if (cp != tempCodePointZero + i) { + tempCodePointZero = -1; + break; } } fCodePointZero = tempCodePointZero; From 193aa17f087198cc36fb43a557f074920a9a01b7 Mon Sep 17 00:00:00 2001 From: Andy Heninger Date: Thu, 8 Mar 2018 18:32:15 +0000 Subject: [PATCH 16/27] ICU-13631 Regex Address Sanitizer fix. X-SVN-Rev: 41086 --- icu4c/source/i18n/rematch.cpp | 11 ++++++----- icu4c/source/test/intltest/regextst.cpp | 26 +++++++++++++++++++++++++ icu4c/source/test/intltest/regextst.h | 1 + 3 files changed, 33 insertions(+), 5 deletions(-) diff --git a/icu4c/source/i18n/rematch.cpp b/icu4c/source/i18n/rematch.cpp index d01117f057b..efa3909e5e9 100644 --- a/icu4c/source/i18n/rematch.cpp +++ b/icu4c/source/i18n/rematch.cpp @@ -438,7 +438,7 @@ RegexMatcher &RegexMatcher::appendReplacement(UText *dest, status = U_REGEX_INVALID_CAPTURE_GROUP_NAME; } } - + } else if (u_isdigit(nextChar)) { // $n Scan for a capture group number int32_t numCaptureGroups = fPattern->fGroupMap->size(); @@ -459,7 +459,7 @@ RegexMatcher &RegexMatcher::appendReplacement(UText *dest, break; } (void)UTEXT_NEXT32(replacement); - groupNum=groupNum*10 + nextDigitVal; + groupNum=groupNum*10 + nextDigitVal; ++numDigits; } } else { @@ -2187,7 +2187,7 @@ int32_t RegexMatcher::split(UText *input, break; } i++; - dest[i] = utext_extract_replace(fInputText, dest[i], + dest[i] = utext_extract_replace(fInputText, dest[i], start64(groupNum, status), end64(groupNum, status), &status); } @@ -5469,7 +5469,7 @@ GC_Done: if (lbStartIdx < 0) { // First time through loop. lbStartIdx = fp->fInputIdx - minML; - if (lbStartIdx > 0) { + if (lbStartIdx > 0 && lbStartIdx < fInputLength) { U16_SET_CP_START(inputBuf, 0, lbStartIdx); } } else { @@ -5546,7 +5546,7 @@ GC_Done: if (lbStartIdx < 0) { // First time through loop. lbStartIdx = fp->fInputIdx - minML; - if (lbStartIdx > 0) { + if (lbStartIdx > 0 && lbStartIdx < fInputLength) { U16_SET_CP_START(inputBuf, 0, lbStartIdx); } } else { @@ -5818,3 +5818,4 @@ UOBJECT_DEFINE_RTTI_IMPLEMENTATION(RegexMatcher) U_NAMESPACE_END #endif // !UCONFIG_NO_REGULAR_EXPRESSIONS + diff --git a/icu4c/source/test/intltest/regextst.cpp b/icu4c/source/test/intltest/regextst.cpp index 398bc68e279..b1d75537cfd 100644 --- a/icu4c/source/test/intltest/regextst.cpp +++ b/icu4c/source/test/intltest/regextst.cpp @@ -39,6 +39,7 @@ #include "unicode/ustring.h" #include "unicode/utext.h" #include "unicode/utf16.h" +#include "cstr.h" #include "regextst.h" #include "regexcmp.h" #include "uvector.h" @@ -101,6 +102,7 @@ void RegexTest::runIndexedTest( int32_t index, UBool exec, const char* &name, ch TESTCASE_AUTO(NamedCapture); TESTCASE_AUTO(NamedCaptureLimits); TESTCASE_AUTO(TestBug12884); + TESTCASE_AUTO(TestBug13631); TESTCASE_AUTO_END; } @@ -5806,4 +5808,28 @@ void RegexTest::TestBug12884() { REGEX_ASSERT(status == U_REGEX_TIME_OUT); } +// Bug 13631. A find() of a pattern with a zero length look-behind assertions +// can cause a read past the end of the input text. +// The failure is seen when running this test with Clang's Addresss Sanitizer. + +void RegexTest::TestBug13631() { + const UChar *pats[] = { u"(? Date: Fri, 9 Mar 2018 13:22:01 +0000 Subject: [PATCH 17/27] ICU-13581 ICU 61 BRS, update API change report for release-61-rc tag. X-SVN-Rev: 41087 --- icu4c/APIChangeReport.html | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/icu4c/APIChangeReport.html b/icu4c/APIChangeReport.html index d17133d90b3..5c73f8f7527 100644 --- a/icu4c/APIChangeReport.html +++ b/icu4c/APIChangeReport.html @@ -5,12 +5,12 @@ --> -ICU4C API Comparison: ICU 60 (update #1: 60.2) with ICU 61 +ICU4C API Comparison: ICU 60 with ICU 61 -

      ICU4C API Comparison: ICU 60 (update #1: 60.2) with ICU 61

      +

      ICU4C API Comparison: ICU 60 with ICU 61

      • @@ -50,11 +50,11 @@ -numberformatter.hDerived icu::number::NumberFormatterSettings< Derived >::adoptSymbols(const NumberingSystem*)Draft
        ICU 60(missing)
        actually, just
        removed “const”
        from one param
        +numberformatter.hDerived icu::number::NumberFormatterSettings< Derived >::adoptSymbols(const NumberingSystem*)Draft
        ICU 60(missing)
        -numberformatter.hDerived icu::number::NumberFormatterSettings< Derived >::adoptUnit(const icu::MeasureUnit*)Draft
        ICU 60(missing)
        actually, just
        removed “const”
        from one param
        +numberformatter.hDerived icu::number::NumberFormatterSettings< Derived >::adoptUnit(const icu::MeasureUnit*)Draft
        ICU 60(missing)
        @@ -74,11 +74,11 @@ -utrans.hvoid utrans_trans(const UTransliterator*, UReplaceable*, UReplaceableCallbacks*, int32_t, int32_t*, UErrorCode*)Stable
        ICU 2.0(missing)
        actually, just
        added “const”
        to one param
        +utrans.hvoid utrans_trans(const UTransliterator*, UReplaceable*, UReplaceableCallbacks*, int32_t, int32_t*, UErrorCode*)Stable
        ICU 2.0(missing)
        -utrans.hvoid utrans_transIncremental(const UTransliterator*, UReplaceable*, UReplaceableCallbacks*, UTransPosition*, UErrorCode*)Stable
        ICU 2.0(missing)
        actually, just
        added “const”
        to one param
        +utrans.hvoid utrans_transIncremental(const UTransliterator*, UReplaceable*, UReplaceableCallbacks*, UTransPosition*, UErrorCode*)Stable
        ICU 2.0(missing)
        @@ -93,9 +93,6 @@ FileAPIICU 60ICU 61 - - -

        (jump back to top) @@ -409,11 +406,11 @@ upluralrules.hUEnumeration* uplrules_getKeywords(const UPluralRules*, UErrorCode*)Draft→Stable
        ICU 59 -utrans.hvoid utrans_trans(const UTransliterator*, UReplaceable*, const UReplaceableCallbacks*, int32_t, int32_t*, UErrorCode*)(missing)
        old version (stable)
        lacked “const”
        on one paramStable
        +utrans.hvoid utrans_trans(const UTransliterator*, UReplaceable*, const UReplaceableCallbacks*, int32_t, int32_t*, UErrorCode*)(missing)Stable
        ICU 2.0 -utrans.hvoid utrans_transIncremental(const UTransliterator*, UReplaceable*, const UReplaceableCallbacks*, UTransPosition*, UErrorCode*)(missing)
        old version (stable)
        lacked “const”
        on one paramStable
        +utrans.hvoid utrans_transIncremental(const UTransliterator*, UReplaceable*, const UReplaceableCallbacks*, UTransPosition*, UErrorCode*)(missing)Stable
        ICU 2.0 @@ -449,16 +446,16 @@ ICU 61 -numberformatter.hDerived icu::number::NumberFormatterSettings< Derived >::adoptSymbols(NumberingSystem*)(missing)
        old version
        had “const”
        on paramDraft
        +numberformatter.hDerived icu::number::NumberFormatterSettings< Derived >::adoptSymbols(NumberingSystem*)(missing)Draft
        ICU 60
        -(should be ICU 61)
        decided to keep draft ICU 60         +(should be ICU 61) -numberformatter.hDerived icu::number::NumberFormatterSettings< Derived >::adoptUnit(icu::MeasureUnit*)(missing)
        old version
        had “const”
        on paramDraft
        +numberformatter.hDerived icu::number::NumberFormatterSettings< Derived >::adoptUnit(icu::MeasureUnit*)(missing)Draft
        ICU 60
        -(should be ICU 61)
        decided to keep draft ICU 60         +(should be ICU 61) numberformatter.hDerived icu::number::NumberFormatterSettings< Derived >::grouping(const UGroupingStrategy&)(missing)Draft
        @@ -537,11 +534,11 @@ ICU 61 -utrans.hvoid utrans_trans(const UTransliterator*, UReplaceable*, const UReplaceableCallbacks*, int32_t, int32_t*, UErrorCode*)(missing) old version
        (stable) lacked “const”
        on one parameterStable
        +utrans.hvoid utrans_trans(const UTransliterator*, UReplaceable*, const UReplaceableCallbacks*, int32_t, int32_t*, UErrorCode*)(missing)Stable
        ICU 2.0 -utrans.hvoid utrans_transIncremental(const UTransliterator*, UReplaceable*, const UReplaceableCallbacks*, UTransPosition*, UErrorCode*)(missing) old version
        (stable) lacked “const”
        on one parameterStable
        +utrans.hvoid utrans_transIncremental(const UTransliterator*, UReplaceable*, const UReplaceableCallbacks*, UTransPosition*, UErrorCode*)(missing)Stable
        ICU 2.0 @@ -898,12 +895,13 @@ This section shows cases where the signature was "simplified" for the sake of comparison. The simplified form is in bold, followed by all possible variations in "original" form.
        +

          (jump back to top)

          -Contents generated by StableAPI tool on Wed Mar 07 19:18:25 UTC 2018
          Copyright (C) 2018, International Business Machines Corporation, All Rights Reserved.           +Contents generated by StableAPI tool on Fri Mar 09 14:18:54 CET 2018
          Copyright (C) 2018, International Business Machines Corporation, All Rights Reserved.

          From 0d32dd8f05e3d7b4f10cdb386b12d4cec84725af Mon Sep 17 00:00:00 2001 From: Andy Heninger Date: Fri, 9 Mar 2018 18:39:14 +0000 Subject: [PATCH 18/27] ICU-13632 regex out-of-bounds memory reference fix. X-SVN-Rev: 41088 --- icu4c/source/i18n/uregex.cpp | 6 ++++-- icu4c/source/test/intltest/regextst.cpp | 19 +++++++++++++++++++ icu4c/source/test/intltest/regextst.h | 3 ++- 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/icu4c/source/i18n/uregex.cpp b/icu4c/source/i18n/uregex.cpp index 0c26bdf656d..12f36894d71 100644 --- a/icu4c/source/i18n/uregex.cpp +++ b/icu4c/source/i18n/uregex.cpp @@ -1465,8 +1465,10 @@ int32_t RegexCImpl::appendReplacement(RegularExpression *regexp, int32_t groupNum = 0; U_ASSERT(c == DOLLARSIGN); - UChar32 c32; - U16_GET(replacementText, 0, replIdx, replacementLength, c32); + UChar32 c32 = -1; + if (replIdx < replacementLength) { + U16_GET(replacementText, 0, replIdx, replacementLength, c32); + } if (u_isdigit(c32)) { int32_t numDigits = 0; int32_t numCaptureGroups = m->fPattern->fGroupMap->size(); diff --git a/icu4c/source/test/intltest/regextst.cpp b/icu4c/source/test/intltest/regextst.cpp index b1d75537cfd..4b0a2f43fca 100644 --- a/icu4c/source/test/intltest/regextst.cpp +++ b/icu4c/source/test/intltest/regextst.cpp @@ -103,6 +103,7 @@ void RegexTest::runIndexedTest( int32_t index, UBool exec, const char* &name, ch TESTCASE_AUTO(NamedCaptureLimits); TESTCASE_AUTO(TestBug12884); TESTCASE_AUTO(TestBug13631); + TESTCASE_AUTO(TestBug13632); TESTCASE_AUTO_END; } @@ -5831,5 +5832,23 @@ void RegexTest::TestBug13631() { } } +// Bug 13632 Out of bounds memory reference if a replacement string ends with a '$', +// where a following group specification would be expected. +// Failure shows when running the test under Clang's Address Sanitizer. + +void RegexTest::TestBug13632() { + UErrorCode status = U_ZERO_ERROR; + URegularExpression *re = uregex_openC(" ", 0, nullptr, &status); + const char16_t *sourceString = u"Hello, world."; + uregex_setText(re, sourceString, u_strlen(sourceString), &status); + + const int32_t destCap = 20; + char16_t dest[destCap] = {}; + const char16_t replacement[] = {u'x', u'$'}; // Not nul terminated string. + uregex_replaceAll(re, replacement, 2, dest, destCap, &status); + + assertEquals("", U_REGEX_INVALID_CAPTURE_GROUP_NAME, status); + uregex_close(re); +} #endif /* !UCONFIG_NO_REGULAR_EXPRESSIONS */ diff --git a/icu4c/source/test/intltest/regextst.h b/icu4c/source/test/intltest/regextst.h index 7e98cd6226f..cfa62d70384 100644 --- a/icu4c/source/test/intltest/regextst.h +++ b/icu4c/source/test/intltest/regextst.h @@ -58,7 +58,8 @@ public: virtual void TestBug11480(); virtual void TestBug12884(); virtual void TestBug13631(); - + virtual void TestBug13632(); + // The following functions are internal to the regexp tests. virtual void assertUText(const char *expected, UText *actual, const char *file, int line); virtual void assertUTextInvariant(const char *invariant, UText *actual, const char *file, int line); From 5b55224ac541bf7d8a6ee419ac322ce676b2393c Mon Sep 17 00:00:00 2001 From: Markus Scherer Date: Fri, 9 Mar 2018 19:02:32 +0000 Subject: [PATCH 19/27] ICU-13581 roll back API change report r41087 -- misunderstanding X-SVN-Rev: 41089 --- icu4c/APIChangeReport.html | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/icu4c/APIChangeReport.html b/icu4c/APIChangeReport.html index 5c73f8f7527..d17133d90b3 100644 --- a/icu4c/APIChangeReport.html +++ b/icu4c/APIChangeReport.html @@ -5,12 +5,12 @@ --> -ICU4C API Comparison: ICU 60 with ICU 61 +ICU4C API Comparison: ICU 60 (update #1: 60.2) with ICU 61 -

          ICU4C API Comparison: ICU 60 with ICU 61

          +

          ICU4C API Comparison: ICU 60 (update #1: 60.2) with ICU 61

          • @@ -50,11 +50,11 @@ -numberformatter.hDerived icu::number::NumberFormatterSettings< Derived >::adoptSymbols(const NumberingSystem*)Draft
            ICU 60(missing)
            +numberformatter.hDerived icu::number::NumberFormatterSettings< Derived >::adoptSymbols(const NumberingSystem*)Draft
            ICU 60(missing)
            actually, just
            removed “const”
            from one param
            -numberformatter.hDerived icu::number::NumberFormatterSettings< Derived >::adoptUnit(const icu::MeasureUnit*)Draft
            ICU 60(missing)
            +numberformatter.hDerived icu::number::NumberFormatterSettings< Derived >::adoptUnit(const icu::MeasureUnit*)Draft
            ICU 60(missing)
            actually, just
            removed “const”
            from one param
            @@ -74,11 +74,11 @@ -utrans.hvoid utrans_trans(const UTransliterator*, UReplaceable*, UReplaceableCallbacks*, int32_t, int32_t*, UErrorCode*)Stable
            ICU 2.0(missing)
            +utrans.hvoid utrans_trans(const UTransliterator*, UReplaceable*, UReplaceableCallbacks*, int32_t, int32_t*, UErrorCode*)Stable
            ICU 2.0(missing)
            actually, just
            added “const”
            to one param
            -utrans.hvoid utrans_transIncremental(const UTransliterator*, UReplaceable*, UReplaceableCallbacks*, UTransPosition*, UErrorCode*)Stable
            ICU 2.0(missing)
            +utrans.hvoid utrans_transIncremental(const UTransliterator*, UReplaceable*, UReplaceableCallbacks*, UTransPosition*, UErrorCode*)Stable
            ICU 2.0(missing)
            actually, just
            added “const”
            to one param
            @@ -93,6 +93,9 @@ FileAPIICU 60ICU 61 + + +

            (jump back to top) @@ -406,11 +409,11 @@ upluralrules.hUEnumeration* uplrules_getKeywords(const UPluralRules*, UErrorCode*)Draft→Stable
            ICU 59 -utrans.hvoid utrans_trans(const UTransliterator*, UReplaceable*, const UReplaceableCallbacks*, int32_t, int32_t*, UErrorCode*)(missing)Stable
            +utrans.hvoid utrans_trans(const UTransliterator*, UReplaceable*, const UReplaceableCallbacks*, int32_t, int32_t*, UErrorCode*)(missing)
            old version (stable)
            lacked “const”
            on one paramStable
            ICU 2.0 -utrans.hvoid utrans_transIncremental(const UTransliterator*, UReplaceable*, const UReplaceableCallbacks*, UTransPosition*, UErrorCode*)(missing)Stable
            +utrans.hvoid utrans_transIncremental(const UTransliterator*, UReplaceable*, const UReplaceableCallbacks*, UTransPosition*, UErrorCode*)(missing)
            old version (stable)
            lacked “const”
            on one paramStable
            ICU 2.0 @@ -446,16 +449,16 @@ ICU 61 -numberformatter.hDerived icu::number::NumberFormatterSettings< Derived >::adoptSymbols(NumberingSystem*)(missing)Draft
            +numberformatter.hDerived icu::number::NumberFormatterSettings< Derived >::adoptSymbols(NumberingSystem*)(missing)
            old version
            had “const”
            on paramDraft
            ICU 60
            -(should be ICU 61)             +(should be ICU 61)
            decided to keep draft ICU 60 -numberformatter.hDerived icu::number::NumberFormatterSettings< Derived >::adoptUnit(icu::MeasureUnit*)(missing)Draft
            +numberformatter.hDerived icu::number::NumberFormatterSettings< Derived >::adoptUnit(icu::MeasureUnit*)(missing)
            old version
            had “const”
            on paramDraft
            ICU 60
            -(should be ICU 61)             +(should be ICU 61)
            decided to keep draft ICU 60 numberformatter.hDerived icu::number::NumberFormatterSettings< Derived >::grouping(const UGroupingStrategy&)(missing)Draft
            @@ -534,11 +537,11 @@ ICU 61 -utrans.hvoid utrans_trans(const UTransliterator*, UReplaceable*, const UReplaceableCallbacks*, int32_t, int32_t*, UErrorCode*)(missing)Stable
            +utrans.hvoid utrans_trans(const UTransliterator*, UReplaceable*, const UReplaceableCallbacks*, int32_t, int32_t*, UErrorCode*)(missing) old version
            (stable) lacked “const”
            on one parameterStable
            ICU 2.0 -utrans.hvoid utrans_transIncremental(const UTransliterator*, UReplaceable*, const UReplaceableCallbacks*, UTransPosition*, UErrorCode*)(missing)Stable
            +utrans.hvoid utrans_transIncremental(const UTransliterator*, UReplaceable*, const UReplaceableCallbacks*, UTransPosition*, UErrorCode*)(missing) old version
            (stable) lacked “const”
            on one parameterStable
            ICU 2.0 @@ -895,13 +898,12 @@ This section shows cases where the signature was "simplified" for the sake of comparison. The simplified form is in bold, followed by all possible variations in "original" form.
            -

              (jump back to top)

              -Contents generated by StableAPI tool on Fri Mar 09 14:18:54 CET 2018
              Copyright (C) 2018, International Business Machines Corporation, All Rights Reserved.               +Contents generated by StableAPI tool on Wed Mar 07 19:18:25 UTC 2018
              Copyright (C) 2018, International Business Machines Corporation, All Rights Reserved.

              From 2a2741ff121f0c72ca4f78caf99f7b85ac05b2f9 Mon Sep 17 00:00:00 2001 From: Jeff Genovy <29107334+jefgen@users.noreply.github.com> Date: Tue, 13 Mar 2018 01:10:11 +0000 Subject: [PATCH 20/27] ICU-13636 The VS2017 optimizer has issues with this function. Disable optimizations for now as a work-around. X-SVN-Rev: 41095 --- icu4c/source/test/cintltst/utf8tst.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/icu4c/source/test/cintltst/utf8tst.c b/icu4c/source/test/cintltst/utf8tst.c index b7062e3b82f..9f4109c2078 100644 --- a/icu4c/source/test/cintltst/utf8tst.c +++ b/icu4c/source/test/cintltst/utf8tst.c @@ -757,6 +757,14 @@ static void TestFwdBack() { } } +/** +* Ticket #13636 - Visual Studio 2017 has problems optimizing this function. +* As a workaround, we will turn off optimization just for this function on VS2017 and above. +*/ +#if defined(_MSC_VER) && (_MSC_VER > 1900) +#pragma optimize( "", off ) +#endif + static void TestFwdBackUnsafe() { /* * Use a (mostly) well-formed UTF-8 string and test at code point boundaries. @@ -842,6 +850,13 @@ static void TestFwdBackUnsafe() { } } +/** +* Ticket #13636 - Turn optimization back on. +*/ +#if defined(_MSC_VER) && (_MSC_VER > 1900) +#pragma optimize( "", on ) +#endif + static void TestSetChar() { static const uint8_t input[] = {0x61, 0xe4, 0xba, 0x8c, 0x7f, 0xfe, 0x62, 0xc5, 0x7f, 0x61, 0x80, 0x80, 0xe0, 0x00 }; From 24431ce7a986d11fed192e536068200d7d7a81af Mon Sep 17 00:00:00 2001 From: Shane Carr Date: Tue, 13 Mar 2018 02:14:29 +0000 Subject: [PATCH 21/27] ICU-13402 Tweaking NumberFormatter pointers and adding additional pointers on the factory methods in ICU4C and ICU4J. X-SVN-Rev: 41096 --- icu4c/source/i18n/unicode/decimfmt.h | 17 ++++- icu4c/source/i18n/unicode/measfmt.h | 14 +++- icu4c/source/i18n/unicode/numfmt.h | 29 +++++++- .../ibm/icu/text/CompactDecimalFormat.java | 9 ++- .../src/com/ibm/icu/text/DecimalFormat.java | 3 +- .../src/com/ibm/icu/text/MeasureFormat.java | 3 +- .../src/com/ibm/icu/text/NumberFormat.java | 66 ++++++++++++++++++- 7 files changed, 130 insertions(+), 11 deletions(-) diff --git a/icu4c/source/i18n/unicode/decimfmt.h b/icu4c/source/i18n/unicode/decimfmt.h index dbc27d3a65e..b062208d9b1 100644 --- a/icu4c/source/i18n/unicode/decimfmt.h +++ b/icu4c/source/i18n/unicode/decimfmt.h @@ -77,7 +77,7 @@ template class U_I18N_API EnumSetIMPORTANT: New users are strongly encouraged to see if * numberformatter.h fits their use case. Although not deprecated, this header - * is on life support and is provided for backwards compatibility only. + * is provided for backwards compatibility only. *
              * * DecimalFormat is a concrete subclass of NumberFormat that formats decimal @@ -694,6 +694,9 @@ public: * on NumberFormat such as createInstance. These factories will * return the most appropriate sub-class of NumberFormat for a given * locale. + *

              + * NOTE: New users are strongly encouraged to use + * {@link NumberFormatter} instead of DecimalFormat. * @param status Output param set to success/failure code. If the * pattern is invalid this will be set to a failure code. * @stable ICU 2.0 @@ -709,6 +712,9 @@ public: * on NumberFormat such as createInstance. These factories will * return the most appropriate sub-class of NumberFormat for a given * locale. + *

              + * NOTE: New users are strongly encouraged to use + * {@link NumberFormatter} instead of DecimalFormat. * @param pattern A non-localized pattern string. * @param status Output param set to success/failure code. If the * pattern is invalid this will be set to a failure code. @@ -727,6 +733,9 @@ public: * createInstance or createCurrencyInstance. If you need only minor adjustments * to a standard format, you can modify the format returned by * a NumberFormat factory method. + *

              + * NOTE: New users are strongly encouraged to use + * {@link NumberFormatter} instead of DecimalFormat. * * @param pattern a non-localized pattern string * @param symbolsToAdopt the set of symbols to be used. The caller should not @@ -832,6 +841,9 @@ public: * createInstance or createCurrencyInstance. If you need only minor adjustments * to a standard format, you can modify the format returned by * a NumberFormat factory method. + *

              + * NOTE: New users are strongly encouraged to use + * {@link NumberFormatter} instead of DecimalFormat. * * @param pattern a non-localized pattern string * @param symbolsToAdopt the set of symbols to be used. The caller should not @@ -855,6 +867,9 @@ public: * createInstance or createCurrencyInstance. If you need only minor adjustments * to a standard format, you can modify the format returned by * a NumberFormat factory method. + *

              + * NOTE: New users are strongly encouraged to use + * {@link NumberFormatter} instead of DecimalFormat. * * @param pattern a non-localized pattern string * @param symbols the set of symbols to be used diff --git a/icu4c/source/i18n/unicode/measfmt.h b/icu4c/source/i18n/unicode/measfmt.h index c80d2446f1b..00f2d47a004 100644 --- a/icu4c/source/i18n/unicode/measfmt.h +++ b/icu4c/source/i18n/unicode/measfmt.h @@ -89,7 +89,7 @@ class DateFormat; /** *

              IMPORTANT: New users are strongly encouraged to see if * numberformatter.h fits their use case. Although not deprecated, this header - * is on life support and is provided for backwards compatibility only. + * is provided for backwards compatibility only. * * @see Format * @author Alan Liu @@ -102,6 +102,9 @@ class U_I18N_API MeasureFormat : public Format { /** * Constructor. + *

              + * NOTE: New users are strongly encouraged to use + * {@link NumberFormatter} instead of NumberFormat. * @stable ICU 53 */ MeasureFormat( @@ -109,6 +112,9 @@ class U_I18N_API MeasureFormat : public Format { /** * Constructor. + *

              + * NOTE: New users are strongly encouraged to use + * {@link NumberFormatter} instead of NumberFormat. * @stable ICU 53 */ MeasureFormat( @@ -228,6 +234,9 @@ class U_I18N_API MeasureFormat : public Format { /** * Return a formatter for CurrencyAmount objects in the given * locale. + *

              + * NOTE: New users are strongly encouraged to use + * {@link NumberFormatter} instead of NumberFormat. * @param locale desired locale * @param ec input-output error code * @return a formatter object, or NULL upon error @@ -239,6 +248,9 @@ class U_I18N_API MeasureFormat : public Format { /** * Return a formatter for CurrencyAmount objects in the default * locale. + *

              + * NOTE: New users are strongly encouraged to use + * {@link NumberFormatter} instead of NumberFormat. * @param ec input-output error code * @return a formatter object, or NULL upon error * @stable ICU 3.0 diff --git a/icu4c/source/i18n/unicode/numfmt.h b/icu4c/source/i18n/unicode/numfmt.h index 4a8e049f931..39379851b0f 100644 --- a/icu4c/source/i18n/unicode/numfmt.h +++ b/icu4c/source/i18n/unicode/numfmt.h @@ -55,7 +55,7 @@ class StringEnumeration; /** *

              IMPORTANT: New users are strongly encouraged to see if * numberformatter.h fits their use case. Although not deprecated, this header - * is on life support and is provided for backwards compatibility only. + * is provided for backwards compatibility only. *

              * * Abstract base class for all number formats. Provides interface for @@ -708,6 +708,9 @@ public: /** * Create a default style NumberFormat for the current default locale. * The default formatting style is locale dependent. + *

              + * NOTE: New users are strongly encouraged to use + * {@link NumberFormatter} instead of NumberFormat. * @stable ICU 2.0 */ static NumberFormat* U_EXPORT2 createInstance(UErrorCode&); @@ -716,6 +719,9 @@ public: * Create a default style NumberFormat for the specified locale. * The default formatting style is locale dependent. * @param inLocale the given locale. + *

              + * NOTE: New users are strongly encouraged to use + * {@link NumberFormatter} instead of NumberFormat. * @stable ICU 2.0 */ static NumberFormat* U_EXPORT2 createInstance(const Locale& inLocale, @@ -723,6 +729,9 @@ public: /** * Create a specific style NumberFormat for the specified locale. + *

              + * NOTE: New users are strongly encouraged to use + * {@link NumberFormatter} instead of NumberFormat. * @param desiredLocale the given locale. * @param style the given style. * @param errorCode Output param filled with success/failure status. @@ -759,12 +768,18 @@ public: /** * Returns a currency format for the current default locale. + *

              + * NOTE: New users are strongly encouraged to use + * {@link NumberFormatter} instead of NumberFormat. * @stable ICU 2.0 */ static NumberFormat* U_EXPORT2 createCurrencyInstance(UErrorCode&); /** * Returns a currency format for the specified locale. + *

              + * NOTE: New users are strongly encouraged to use + * {@link NumberFormatter} instead of NumberFormat. * @param inLocale the given locale. * @stable ICU 2.0 */ @@ -773,12 +788,18 @@ public: /** * Returns a percentage format for the current default locale. + *

              + * NOTE: New users are strongly encouraged to use + * {@link NumberFormatter} instead of NumberFormat. * @stable ICU 2.0 */ static NumberFormat* U_EXPORT2 createPercentInstance(UErrorCode&); /** * Returns a percentage format for the specified locale. + *

              + * NOTE: New users are strongly encouraged to use + * {@link NumberFormatter} instead of NumberFormat. * @param inLocale the given locale. * @stable ICU 2.0 */ @@ -787,12 +808,18 @@ public: /** * Returns a scientific format for the current default locale. + *

              + * NOTE: New users are strongly encouraged to use + * {@link NumberFormatter} instead of NumberFormat. * @stable ICU 2.0 */ static NumberFormat* U_EXPORT2 createScientificInstance(UErrorCode&); /** * Returns a scientific format for the specified locale. + *

              + * NOTE: New users are strongly encouraged to use + * {@link NumberFormatter} instead of NumberFormat. * @param inLocale the given locale. * @stable ICU 2.0 */ diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/CompactDecimalFormat.java b/icu4j/main/classes/core/src/com/ibm/icu/text/CompactDecimalFormat.java index 18e1ee1b35c..e185a54ecb7 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/text/CompactDecimalFormat.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/text/CompactDecimalFormat.java @@ -23,8 +23,7 @@ import com.ibm.icu.util.ULocale; *

              * IMPORTANT: New users are strongly encouraged to see if * {@link NumberFormatter} fits their use case. Although not deprecated, this - * class, CompactDecimalFormat, is on life support and is provided for - * backwards compatibility only. + * class, CompactDecimalFormat, is provided for backwards compatibility only. *

              * * The CompactDecimalFormat produces abbreviated numbers, suitable for display in environments will @@ -80,6 +79,9 @@ public class CompactDecimalFormat extends DecimalFormat { } /** + * NOTE: New users are strongly encouraged to use + * {@link NumberFormatter} instead of NumberFormat. + *
              * Creates a CompactDecimalFormat appropriate for a locale. The result may be affected by the * number system in the locale, such as ar-u-nu-latn. * @@ -92,6 +94,9 @@ public class CompactDecimalFormat extends DecimalFormat { } /** + * NOTE: New users are strongly encouraged to use + * {@link NumberFormatter} instead of NumberFormat. + *
              * Creates a CompactDecimalFormat appropriate for a locale. The result may be affected by the * number system in the locale, such as ar-u-nu-latn. * diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/DecimalFormat.java b/icu4j/main/classes/core/src/com/ibm/icu/text/DecimalFormat.java index cf56e20aab0..c7bb125782b 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/text/DecimalFormat.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/text/DecimalFormat.java @@ -39,8 +39,7 @@ import com.ibm.icu.util.ULocale.Category; *

              * IMPORTANT: New users are strongly encouraged to see if * {@link NumberFormatter} fits their use case. Although not deprecated, this - * class, DecimalFormat, is on life support and is only provided for - * java.text.DecimalFormat compatibility. + * class, DecimalFormat, is only provided for java.text.DecimalFormat compatibility. *

              * * DecimalFormat is the primary diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/MeasureFormat.java b/icu4j/main/classes/core/src/com/ibm/icu/text/MeasureFormat.java index 9ae8eb69f78..cf0d2dcdda2 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/text/MeasureFormat.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/text/MeasureFormat.java @@ -58,8 +58,7 @@ import com.ibm.icu.util.UResourceBundle; *

              * IMPORTANT: New users are strongly encouraged to see if * {@link NumberFormatter} fits their use case. Although not deprecated, this - * class, MeasureFormat, is on life support and is provided for - * backwards compatibility only. + * class, MeasureFormat, is provided for backwards compatibility only. *

              * *

              diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/NumberFormat.java b/icu4j/main/classes/core/src/com/ibm/icu/text/NumberFormat.java index 38885def708..63d2a109c40 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/text/NumberFormat.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/text/NumberFormat.java @@ -39,8 +39,7 @@ import com.ibm.icu.util.UResourceBundle; *

              * IMPORTANT: New users are strongly encouraged to see if * {@link NumberFormatter} fits their use case. Although not deprecated, this - * class, NumberFormat, is on life support and is only provided for - * java.text.NumberFormat compatibility. + * class, NumberFormat, is only provided for java.text.NumberFormat compatibility. *

              * * NumberFormat is the abstract base class for all number @@ -585,6 +584,9 @@ public abstract class NumberFormat extends UFormat { //============== Locale Stuff ===================== /** + * NOTE: New users are strongly encouraged to use + * {@link NumberFormatter} instead of NumberFormat. + *
              * Returns the default number format for the current default FORMAT locale. * The default format is one of the styles provided by the other * factory methods: getNumberInstance, getIntegerInstance, @@ -599,6 +601,9 @@ public abstract class NumberFormat extends UFormat { } /** + * NOTE: New users are strongly encouraged to use + * {@link NumberFormatter} instead of NumberFormat. + *
              * Returns the default number format for the specified locale. * The default format is one of the styles provided by the other * factory methods: getNumberInstance, getCurrencyInstance or getPercentInstance. @@ -610,6 +615,9 @@ public abstract class NumberFormat extends UFormat { } /** + * NOTE: New users are strongly encouraged to use + * {@link NumberFormatter} instead of NumberFormat. + *
              * {@icu} Returns the default number format for the specified locale. * The default format is one of the styles provided by the other * factory methods: getNumberInstance, getCurrencyInstance or getPercentInstance. @@ -621,6 +629,9 @@ public abstract class NumberFormat extends UFormat { } /** + * NOTE: New users are strongly encouraged to use + * {@link NumberFormatter} instead of NumberFormat. + *
              * {@icu} Returns a specific style number format for default FORMAT locale. * @param style number format style * @see Category#FORMAT @@ -631,6 +642,9 @@ public abstract class NumberFormat extends UFormat { } /** + * NOTE: New users are strongly encouraged to use + * {@link NumberFormatter} instead of NumberFormat. + *
              * {@icu} Returns a specific style number format for a specific locale. * @param inLocale the specific locale. * @param style number format style @@ -642,6 +656,9 @@ public abstract class NumberFormat extends UFormat { /** + * NOTE: New users are strongly encouraged to use + * {@link NumberFormatter} instead of NumberFormat. + *
              * Returns a general-purpose number format for the current default FORMAT locale. * @see Category#FORMAT * @stable ICU 2.0 @@ -651,6 +668,9 @@ public abstract class NumberFormat extends UFormat { } /** + * NOTE: New users are strongly encouraged to use + * {@link NumberFormatter} instead of NumberFormat. + *
              * Returns a general-purpose number format for the specified locale. * @stable ICU 2.0 */ @@ -659,6 +679,9 @@ public abstract class NumberFormat extends UFormat { } /** + * NOTE: New users are strongly encouraged to use + * {@link NumberFormatter} instead of NumberFormat. + *
              * {@icu} Returns a general-purpose number format for the specified locale. * @stable ICU 3.2 */ @@ -667,6 +690,9 @@ public abstract class NumberFormat extends UFormat { } /** + * NOTE: New users are strongly encouraged to use + * {@link NumberFormatter} instead of NumberFormat. + *
              * Returns an integer number format for the current default FORMAT locale. The * returned number format is configured to round floating point numbers * to the nearest integer using IEEE half-even rounding (see {@link @@ -684,6 +710,9 @@ public abstract class NumberFormat extends UFormat { } /** + * NOTE: New users are strongly encouraged to use + * {@link NumberFormatter} instead of NumberFormat. + *
              * Returns an integer number format for the specified locale. The * returned number format is configured to round floating point numbers * to the nearest integer using IEEE half-even rounding (see {@link @@ -701,6 +730,9 @@ public abstract class NumberFormat extends UFormat { } /** + * NOTE: New users are strongly encouraged to use + * {@link NumberFormatter} instead of NumberFormat. + *
              * {@icu} Returns an integer number format for the specified locale. The * returned number format is configured to round floating point numbers * to the nearest integer using IEEE half-even rounding (see {@link @@ -717,6 +749,9 @@ public abstract class NumberFormat extends UFormat { } /** + * NOTE: New users are strongly encouraged to use + * {@link NumberFormatter} instead of NumberFormat. + *
              * Returns a currency format for the current default FORMAT locale. * @return a number format for currency * @see Category#FORMAT @@ -727,6 +762,9 @@ public abstract class NumberFormat extends UFormat { } /** + * NOTE: New users are strongly encouraged to use + * {@link NumberFormatter} instead of NumberFormat. + *
              * Returns a currency format for the specified locale. * @return a number format for currency * @stable ICU 2.0 @@ -736,6 +774,9 @@ public abstract class NumberFormat extends UFormat { } /** + * NOTE: New users are strongly encouraged to use + * {@link NumberFormatter} instead of NumberFormat. + *
              * {@icu} Returns a currency format for the specified locale. * @return a number format for currency * @stable ICU 3.2 @@ -745,6 +786,9 @@ public abstract class NumberFormat extends UFormat { } /** + * NOTE: New users are strongly encouraged to use + * {@link NumberFormatter} instead of NumberFormat. + *
              * Returns a percentage format for the current default FORMAT locale. * @return a number format for percents * @see Category#FORMAT @@ -755,6 +799,9 @@ public abstract class NumberFormat extends UFormat { } /** + * NOTE: New users are strongly encouraged to use + * {@link NumberFormatter} instead of NumberFormat. + *
              * Returns a percentage format for the specified locale. * @return a number format for percents * @stable ICU 2.0 @@ -764,6 +811,9 @@ public abstract class NumberFormat extends UFormat { } /** + * NOTE: New users are strongly encouraged to use + * {@link NumberFormatter} instead of NumberFormat. + *
              * {@icu} Returns a percentage format for the specified locale. * @return a number format for percents * @stable ICU 3.2 @@ -773,6 +823,9 @@ public abstract class NumberFormat extends UFormat { } /** + * NOTE: New users are strongly encouraged to use + * {@link NumberFormatter} instead of NumberFormat. + *
              * {@icu} Returns a scientific format for the current default FORMAT locale. * @return a scientific number format * @see Category#FORMAT @@ -783,6 +836,9 @@ public abstract class NumberFormat extends UFormat { } /** + * NOTE: New users are strongly encouraged to use + * {@link NumberFormatter} instead of NumberFormat. + *
              * {@icu} Returns a scientific format for the specified locale. * @return a scientific number format * @stable ICU 2.0 @@ -792,6 +848,9 @@ public abstract class NumberFormat extends UFormat { } /** + * NOTE: New users are strongly encouraged to use + * {@link NumberFormatter} instead of NumberFormat. + *
              * {@icu} Returns a scientific format for the specified locale. * @return a scientific number format * @stable ICU 3.2 @@ -1345,6 +1404,9 @@ public abstract class NumberFormat extends UFormat { /** + * NOTE: New users are strongly encouraged to use + * {@link NumberFormatter} instead of NumberFormat. + *
              * Returns a specific style number format for a specific locale. * @param desiredLocale the specific locale. * @param choice number format style From 03e807ba6d693ab9131d213be67cb576b6b629e2 Mon Sep 17 00:00:00 2001 From: Shane Carr Date: Tue, 13 Mar 2018 02:19:25 +0000 Subject: [PATCH 22/27] ICU-13402 Adding NumberFormatter pointers to compactdecimalformat.h X-SVN-Rev: 41097 --- icu4c/source/i18n/unicode/compactdecimalformat.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/icu4c/source/i18n/unicode/compactdecimalformat.h b/icu4c/source/i18n/unicode/compactdecimalformat.h index 3fbe5da9cee..d682d2d0e74 100644 --- a/icu4c/source/i18n/unicode/compactdecimalformat.h +++ b/icu4c/source/i18n/unicode/compactdecimalformat.h @@ -16,7 +16,7 @@ #include "unicode/utypes.h" /** * \file - * \brief C++ API: Formats decimal numbers in compact form. + * \brief C++ API: Compatibility APIs for compact decimal number formatting. */ #if !UCONFIG_NO_FORMATTING @@ -30,6 +30,11 @@ U_NAMESPACE_BEGIN class PluralRules; /** + *

              IMPORTANT: New users are strongly encouraged to see if + * numberformatter.h fits their use case. Although not deprecated, this header + * is provided for backwards compatibility only. + *

              + * * The CompactDecimalFormat produces abbreviated numbers, suitable for display in * environments will limited real estate. For example, 'Hits: 1.2B' instead of * 'Hits: 1,200,000,000'. The format will be appropriate for the given language, @@ -56,6 +61,9 @@ public: /** * Returns a compact decimal instance for specified locale. + *

              + * NOTE: New users are strongly encouraged to use + * {@link NumberFormatter} instead of NumberFormat. * @param inLocale the given locale. * @param style whether to use short or long style. * @param status error code returned here. From e16361e686bd26a309b7fa1481addcf546d2a972 Mon Sep 17 00:00:00 2001 From: Shane Carr Date: Tue, 13 Mar 2018 23:37:02 +0000 Subject: [PATCH 23/27] ICU-13640 Updating license files. X-SVN-Rev: 41101 --- icu4c/LICENSE | 4 ++-- icu4j/main/shared/licenses/LICENSE | 33 ++++++++++++++++++++++++++++-- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/icu4c/LICENSE b/icu4c/LICENSE index 923219da903..25b6eb9d341 100644 --- a/icu4c/LICENSE +++ b/icu4c/LICENSE @@ -1,7 +1,7 @@ COPYRIGHT AND PERMISSION NOTICE (ICU 58 and later) -Copyright © 1991-2017 Unicode, Inc. All rights reserved. -Distributed under the Terms of Use in http://www.unicode.org/copyright.html +Copyright © 1991-2018 Unicode, Inc. All rights reserved. +Distributed under the Terms of Use in http://www.unicode.org/copyright.html. Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation diff --git a/icu4j/main/shared/licenses/LICENSE b/icu4j/main/shared/licenses/LICENSE index c84076cd072..25b6eb9d341 100644 --- a/icu4j/main/shared/licenses/LICENSE +++ b/icu4j/main/shared/licenses/LICENSE @@ -1,7 +1,7 @@ COPYRIGHT AND PERMISSION NOTICE (ICU 58 and later) -Copyright © 1991-2017 Unicode, Inc. All rights reserved. -Distributed under the Terms of Use in http://www.unicode.org/copyright.html +Copyright © 1991-2018 Unicode, Inc. All rights reserved. +Distributed under the Terms of Use in http://www.unicode.org/copyright.html. Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation @@ -383,3 +383,32 @@ Database section 7. # by ICANN or the IETF Trust on the database or the code. Any person # making a contribution to the database or code waives all rights to # future claims in that contribution or in the TZ Database. + +6. Google double-conversion + +Copyright 2006-2011, the V8 project authors. All rights reserved. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of Google Inc. nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. From 965d758dd70f69fc88f022e36ba71263324a32f2 Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Wed, 14 Mar 2018 20:45:39 +0000 Subject: [PATCH 24/27] ICU-13083 update escaper per feedback, remerge r41105 X-SVN-Rev: 41106 --- icu4c/source/tools/escapesrc/escapesrc.cpp | 27 +++++++++------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/icu4c/source/tools/escapesrc/escapesrc.cpp b/icu4c/source/tools/escapesrc/escapesrc.cpp index 53f6a40db48..c90dafa4e01 100644 --- a/icu4c/source/tools/escapesrc/escapesrc.cpp +++ b/icu4c/source/tools/escapesrc/escapesrc.cpp @@ -9,25 +9,24 @@ #include #include -// Include this even though we aren't linking against it. +// We only use U8_* macros, which are entirely inline. #include "unicode/utf8.h" -// Include this here, to avoid needing to compile and link part of common lib -// (bootstrapping problem) -#include "utf_impl.cpp" +// This contains a codepage and ISO 14882:1998 illegality table. +// Use "make gen-table" to rebuild it. +#include "cptbl.h" /** * What is this? - * or even: - * what IS this?? - * + * * "This" is a preprocessor that makes an attempt to convert fully valid C++11 source code - * in utf-8 into.. something else. Something consumable by certain compilers (Solaris, xlC) - * which aren't quite there. + * in utf-8 into something consumable by certain compilers (Solaris, xlC) + * which aren't quite standards compliant. * * - u"" or u'' gets converted to u"\uNNNN" or u'\uNNNN' * - u8"" gets converted to "\xAA\xBB\xCC\xDD" etc. - * - if the system is EBCDIC-based, well, that's taken into account. + * (some compilers do not support the u8 prefix correctly.) + * - if the system is EBCDIC-based, that is used to correct the input characters. * * Usage: * escapesrc infile.cpp outfile.cpp @@ -38,8 +37,8 @@ * %.o: _%.cpp * $(COMPILE.cc) ... $@ $< * - * Naturally, 'escapesrc' has to be excluded from said build rule. - + * In the Makefiles, SKIP_ESCAPING=YES is used to prevent escapesrc.cpp + * from being itself escaped. */ @@ -49,10 +48,6 @@ static const char kLF = 0x0A, kCR = 0x0D; -// This contains a codepage and ISO 14882:1998 illegality table. -// Use "make gen-table" to rebuild it. -# include "cptbl.h" - // For convenience # define cp1047_to_8859(c) cp1047_8859_1[c] From 3951517380f86997ca583336418e48c832584b29 Mon Sep 17 00:00:00 2001 From: Shane Carr Date: Fri, 16 Mar 2018 21:53:08 +0000 Subject: [PATCH 25/27] ICU-13648 Moving double_conversion into ICU namespace to fix name mangling. X-SVN-Rev: 41116 --- icu4c/source/i18n/digitlst.cpp | 2 +- icu4c/source/i18n/double-conversion-bignum-dtoa.cpp | 11 +++++++++++ icu4c/source/i18n/double-conversion-bignum-dtoa.h | 11 +++++++++++ icu4c/source/i18n/double-conversion-bignum.cpp | 11 +++++++++++ icu4c/source/i18n/double-conversion-bignum.h | 11 +++++++++++ icu4c/source/i18n/double-conversion-cached-powers.cpp | 11 +++++++++++ icu4c/source/i18n/double-conversion-cached-powers.h | 11 +++++++++++ icu4c/source/i18n/double-conversion-diy-fp.cpp | 10 ++++++++++ icu4c/source/i18n/double-conversion-diy-fp.h | 11 +++++++++++ icu4c/source/i18n/double-conversion-fast-dtoa.cpp | 11 +++++++++++ icu4c/source/i18n/double-conversion-fast-dtoa.h | 11 +++++++++++ icu4c/source/i18n/double-conversion-ieee.h | 11 +++++++++++ icu4c/source/i18n/double-conversion-utils.h | 11 +++++++++++ icu4c/source/i18n/double-conversion.cpp | 11 +++++++++++ icu4c/source/i18n/double-conversion.h | 11 +++++++++++ icu4c/source/i18n/number_decimalquantity.cpp | 2 +- 16 files changed, 155 insertions(+), 2 deletions(-) diff --git a/icu4c/source/i18n/digitlst.cpp b/icu4c/source/i18n/digitlst.cpp index 5ceccd38b61..978bb60004f 100644 --- a/icu4c/source/i18n/digitlst.cpp +++ b/icu4c/source/i18n/digitlst.cpp @@ -51,7 +51,7 @@ #include #include -using double_conversion::DoubleToStringConverter; +using icu::double_conversion::DoubleToStringConverter; #if !defined(U_USE_STRTOD_L) # if U_PLATFORM_USES_ONLY_WIN32_API diff --git a/icu4c/source/i18n/double-conversion-bignum-dtoa.cpp b/icu4c/source/i18n/double-conversion-bignum-dtoa.cpp index 677f0de1ff5..07d0b0eb0f8 100644 --- a/icu4c/source/i18n/double-conversion-bignum-dtoa.cpp +++ b/icu4c/source/i18n/double-conversion-bignum-dtoa.cpp @@ -30,6 +30,10 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// ICU PATCH: ifdef around UCONFIG_NO_FORMATTING +#include "unicode/utypes.h" +#if !UCONFIG_NO_FORMATTING + #include // ICU PATCH: Customize header file paths for ICU. @@ -39,6 +43,9 @@ #include "double-conversion-bignum.h" #include "double-conversion-ieee.h" +// ICU PATCH: Wrap in ICU namespace +U_NAMESPACE_BEGIN + namespace double_conversion { static int NormalizedExponent(uint64_t significand, int exponent) { @@ -646,3 +653,7 @@ static void FixupMultiply10(int estimated_power, bool is_even, } } // namespace double_conversion + +// ICU PATCH: Close ICU namespace +U_NAMESPACE_END +#endif // ICU PATCH: close #if !UCONFIG_NO_FORMATTING diff --git a/icu4c/source/i18n/double-conversion-bignum-dtoa.h b/icu4c/source/i18n/double-conversion-bignum-dtoa.h index 76b81ca9a16..edc21b0f2e4 100644 --- a/icu4c/source/i18n/double-conversion-bignum-dtoa.h +++ b/icu4c/source/i18n/double-conversion-bignum-dtoa.h @@ -30,6 +30,10 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// ICU PATCH: ifdef around UCONFIG_NO_FORMATTING +#include "unicode/utypes.h" +#if !UCONFIG_NO_FORMATTING + #ifndef DOUBLE_CONVERSION_BIGNUM_DTOA_H_ #define DOUBLE_CONVERSION_BIGNUM_DTOA_H_ @@ -37,6 +41,9 @@ #include "double-conversion-utils.h" +// ICU PATCH: Wrap in ICU namespace +U_NAMESPACE_BEGIN + namespace double_conversion { enum BignumDtoaMode { @@ -88,4 +95,8 @@ void BignumDtoa(double v, BignumDtoaMode mode, int requested_digits, } // namespace double_conversion +// ICU PATCH: Close ICU namespace +U_NAMESPACE_END + #endif // DOUBLE_CONVERSION_BIGNUM_DTOA_H_ +#endif // ICU PATCH: close #if !UCONFIG_NO_FORMATTING diff --git a/icu4c/source/i18n/double-conversion-bignum.cpp b/icu4c/source/i18n/double-conversion-bignum.cpp index 2af24771b0b..d5682af35f8 100644 --- a/icu4c/source/i18n/double-conversion-bignum.cpp +++ b/icu4c/source/i18n/double-conversion-bignum.cpp @@ -30,11 +30,18 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// ICU PATCH: ifdef around UCONFIG_NO_FORMATTING +#include "unicode/utypes.h" +#if !UCONFIG_NO_FORMATTING + // ICU PATCH: Customize header file paths for ICU. #include "double-conversion-bignum.h" #include "double-conversion-utils.h" +// ICU PATCH: Wrap in ICU namespace +U_NAMESPACE_BEGIN + namespace double_conversion { Bignum::Bignum() @@ -771,3 +778,7 @@ void Bignum::SubtractTimes(const Bignum& other, int factor) { } // namespace double_conversion + +// ICU PATCH: Close ICU namespace +U_NAMESPACE_END +#endif // ICU PATCH: close #if !UCONFIG_NO_FORMATTING diff --git a/icu4c/source/i18n/double-conversion-bignum.h b/icu4c/source/i18n/double-conversion-bignum.h index 5b38e678b31..d1af3bf5e77 100644 --- a/icu4c/source/i18n/double-conversion-bignum.h +++ b/icu4c/source/i18n/double-conversion-bignum.h @@ -30,6 +30,10 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// ICU PATCH: ifdef around UCONFIG_NO_FORMATTING +#include "unicode/utypes.h" +#if !UCONFIG_NO_FORMATTING + #ifndef DOUBLE_CONVERSION_BIGNUM_H_ #define DOUBLE_CONVERSION_BIGNUM_H_ @@ -37,6 +41,9 @@ #include "double-conversion-utils.h" +// ICU PATCH: Wrap in ICU namespace +U_NAMESPACE_BEGIN + namespace double_conversion { class Bignum { @@ -148,4 +155,8 @@ class Bignum { } // namespace double_conversion +// ICU PATCH: Close ICU namespace +U_NAMESPACE_END + #endif // DOUBLE_CONVERSION_BIGNUM_H_ +#endif // ICU PATCH: close #if !UCONFIG_NO_FORMATTING diff --git a/icu4c/source/i18n/double-conversion-cached-powers.cpp b/icu4c/source/i18n/double-conversion-cached-powers.cpp index 8b01626c52a..e49700444c6 100644 --- a/icu4c/source/i18n/double-conversion-cached-powers.cpp +++ b/icu4c/source/i18n/double-conversion-cached-powers.cpp @@ -30,6 +30,10 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// ICU PATCH: ifdef around UCONFIG_NO_FORMATTING +#include "unicode/utypes.h" +#if !UCONFIG_NO_FORMATTING + #include #include #include @@ -40,6 +44,9 @@ #include "double-conversion-cached-powers.h" +// ICU PATCH: Wrap in ICU namespace +U_NAMESPACE_BEGIN + namespace double_conversion { struct CachedPower { @@ -180,3 +187,7 @@ void PowersOfTenCache::GetCachedPowerForDecimalExponent(int requested_exponent, } } // namespace double_conversion + +// ICU PATCH: Close ICU namespace +U_NAMESPACE_END +#endif // ICU PATCH: close #if !UCONFIG_NO_FORMATTING diff --git a/icu4c/source/i18n/double-conversion-cached-powers.h b/icu4c/source/i18n/double-conversion-cached-powers.h index 25fd1f1f150..438746b1432 100644 --- a/icu4c/source/i18n/double-conversion-cached-powers.h +++ b/icu4c/source/i18n/double-conversion-cached-powers.h @@ -30,6 +30,10 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// ICU PATCH: ifdef around UCONFIG_NO_FORMATTING +#include "unicode/utypes.h" +#if !UCONFIG_NO_FORMATTING + #ifndef DOUBLE_CONVERSION_CACHED_POWERS_H_ #define DOUBLE_CONVERSION_CACHED_POWERS_H_ @@ -37,6 +41,9 @@ #include "double-conversion-diy-fp.h" +// ICU PATCH: Wrap in ICU namespace +U_NAMESPACE_BEGIN + namespace double_conversion { class PowersOfTenCache { @@ -68,4 +75,8 @@ class PowersOfTenCache { } // namespace double_conversion +// ICU PATCH: Close ICU namespace +U_NAMESPACE_END + #endif // DOUBLE_CONVERSION_CACHED_POWERS_H_ +#endif // ICU PATCH: close #if !UCONFIG_NO_FORMATTING diff --git a/icu4c/source/i18n/double-conversion-diy-fp.cpp b/icu4c/source/i18n/double-conversion-diy-fp.cpp index eac50e33213..f38430c6c3c 100644 --- a/icu4c/source/i18n/double-conversion-diy-fp.cpp +++ b/icu4c/source/i18n/double-conversion-diy-fp.cpp @@ -30,12 +30,18 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// ICU PATCH: ifdef around UCONFIG_NO_FORMATTING +#include "unicode/utypes.h" +#if !UCONFIG_NO_FORMATTING // ICU PATCH: Customize header file paths for ICU. #include "double-conversion-diy-fp.h" #include "double-conversion-utils.h" +// ICU PATCH: Wrap in ICU namespace +U_NAMESPACE_BEGIN + namespace double_conversion { void DiyFp::Multiply(const DiyFp& other) { @@ -62,3 +68,7 @@ void DiyFp::Multiply(const DiyFp& other) { } } // namespace double_conversion + +// ICU PATCH: Close ICU namespace +U_NAMESPACE_END +#endif // ICU PATCH: close #if !UCONFIG_NO_FORMATTING diff --git a/icu4c/source/i18n/double-conversion-diy-fp.h b/icu4c/source/i18n/double-conversion-diy-fp.h index 132886c8883..21896851d22 100644 --- a/icu4c/source/i18n/double-conversion-diy-fp.h +++ b/icu4c/source/i18n/double-conversion-diy-fp.h @@ -30,6 +30,10 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// ICU PATCH: ifdef around UCONFIG_NO_FORMATTING +#include "unicode/utypes.h" +#if !UCONFIG_NO_FORMATTING + #ifndef DOUBLE_CONVERSION_DIY_FP_H_ #define DOUBLE_CONVERSION_DIY_FP_H_ @@ -37,6 +41,9 @@ #include "double-conversion-utils.h" +// ICU PATCH: Wrap in ICU namespace +U_NAMESPACE_BEGIN + namespace double_conversion { // This "Do It Yourself Floating Point" class implements a floating-point number @@ -122,4 +129,8 @@ class DiyFp { } // namespace double_conversion +// ICU PATCH: Close ICU namespace +U_NAMESPACE_END + #endif // DOUBLE_CONVERSION_DIY_FP_H_ +#endif // ICU PATCH: close #if !UCONFIG_NO_FORMATTING diff --git a/icu4c/source/i18n/double-conversion-fast-dtoa.cpp b/icu4c/source/i18n/double-conversion-fast-dtoa.cpp index 6b0914407ae..8d1499a79b4 100644 --- a/icu4c/source/i18n/double-conversion-fast-dtoa.cpp +++ b/icu4c/source/i18n/double-conversion-fast-dtoa.cpp @@ -30,6 +30,10 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// ICU PATCH: ifdef around UCONFIG_NO_FORMATTING +#include "unicode/utypes.h" +#if !UCONFIG_NO_FORMATTING + // ICU PATCH: Customize header file paths for ICU. #include "double-conversion-fast-dtoa.h" @@ -38,6 +42,9 @@ #include "double-conversion-diy-fp.h" #include "double-conversion-ieee.h" +// ICU PATCH: Wrap in ICU namespace +U_NAMESPACE_BEGIN + namespace double_conversion { // The minimal and maximal target exponent define the range of w's binary @@ -670,3 +677,7 @@ bool FastDtoa(double v, } } // namespace double_conversion + +// ICU PATCH: Close ICU namespace +U_NAMESPACE_END +#endif // ICU PATCH: close #if !UCONFIG_NO_FORMATTING diff --git a/icu4c/source/i18n/double-conversion-fast-dtoa.h b/icu4c/source/i18n/double-conversion-fast-dtoa.h index b7e70a458e3..58a6470052c 100644 --- a/icu4c/source/i18n/double-conversion-fast-dtoa.h +++ b/icu4c/source/i18n/double-conversion-fast-dtoa.h @@ -30,6 +30,10 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// ICU PATCH: ifdef around UCONFIG_NO_FORMATTING +#include "unicode/utypes.h" +#if !UCONFIG_NO_FORMATTING + #ifndef DOUBLE_CONVERSION_FAST_DTOA_H_ #define DOUBLE_CONVERSION_FAST_DTOA_H_ @@ -37,6 +41,9 @@ #include "double-conversion-utils.h" +// ICU PATCH: Wrap in ICU namespace +U_NAMESPACE_BEGIN + namespace double_conversion { enum FastDtoaMode { @@ -92,4 +99,8 @@ bool FastDtoa(double d, } // namespace double_conversion +// ICU PATCH: Close ICU namespace +U_NAMESPACE_END + #endif // DOUBLE_CONVERSION_FAST_DTOA_H_ +#endif // ICU PATCH: close #if !UCONFIG_NO_FORMATTING diff --git a/icu4c/source/i18n/double-conversion-ieee.h b/icu4c/source/i18n/double-conversion-ieee.h index 387298a6e7f..952bcea27f6 100644 --- a/icu4c/source/i18n/double-conversion-ieee.h +++ b/icu4c/source/i18n/double-conversion-ieee.h @@ -30,6 +30,10 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// ICU PATCH: ifdef around UCONFIG_NO_FORMATTING +#include "unicode/utypes.h" +#if !UCONFIG_NO_FORMATTING + #ifndef DOUBLE_CONVERSION_DOUBLE_H_ #define DOUBLE_CONVERSION_DOUBLE_H_ @@ -37,6 +41,9 @@ #include "double-conversion-diy-fp.h" +// ICU PATCH: Wrap in ICU namespace +U_NAMESPACE_BEGIN + namespace double_conversion { // We assume that doubles and uint64_t have the same endianness. @@ -406,4 +413,8 @@ class Single { } // namespace double_conversion +// ICU PATCH: Close ICU namespace +U_NAMESPACE_END + #endif // DOUBLE_CONVERSION_DOUBLE_H_ +#endif // ICU PATCH: close #if !UCONFIG_NO_FORMATTING diff --git a/icu4c/source/i18n/double-conversion-utils.h b/icu4c/source/i18n/double-conversion-utils.h index 17a56832264..02795b4bc56 100644 --- a/icu4c/source/i18n/double-conversion-utils.h +++ b/icu4c/source/i18n/double-conversion-utils.h @@ -30,6 +30,10 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// ICU PATCH: ifdef around UCONFIG_NO_FORMATTING +#include "unicode/utypes.h" +#if !UCONFIG_NO_FORMATTING + #ifndef DOUBLE_CONVERSION_UTILS_H_ #define DOUBLE_CONVERSION_UTILS_H_ @@ -159,6 +163,9 @@ typedef uint16_t uc16; DISALLOW_COPY_AND_ASSIGN(TypeName) #endif +// ICU PATCH: Wrap in ICU namespace +U_NAMESPACE_BEGIN + namespace double_conversion { static const int kCharSize = sizeof(char); @@ -344,4 +351,8 @@ inline Dest BitCast(Source* source) { } // namespace double_conversion +// ICU PATCH: Close ICU namespace +U_NAMESPACE_END + #endif // DOUBLE_CONVERSION_UTILS_H_ +#endif // ICU PATCH: close #if !UCONFIG_NO_FORMATTING diff --git a/icu4c/source/i18n/double-conversion.cpp b/icu4c/source/i18n/double-conversion.cpp index 43e0262c856..8629284aa0e 100644 --- a/icu4c/source/i18n/double-conversion.cpp +++ b/icu4c/source/i18n/double-conversion.cpp @@ -30,6 +30,10 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// ICU PATCH: ifdef around UCONFIG_NO_FORMATTING +#include "unicode/utypes.h" +#if !UCONFIG_NO_FORMATTING + #include #include @@ -43,6 +47,9 @@ #include "double-conversion-ieee.h" #include "double-conversion-utils.h" +// ICU PATCH: Wrap in ICU namespace +U_NAMESPACE_BEGIN + namespace double_conversion { #if 0 // not needed for ICU @@ -992,3 +999,7 @@ float StringToDoubleConverter::StringToFloat( #endif // not needed for ICU } // namespace double_conversion + +// ICU PATCH: Close ICU namespace +U_NAMESPACE_END +#endif // ICU PATCH: close #if !UCONFIG_NO_FORMATTING diff --git a/icu4c/source/i18n/double-conversion.h b/icu4c/source/i18n/double-conversion.h index 388c5be450d..0939412734a 100644 --- a/icu4c/source/i18n/double-conversion.h +++ b/icu4c/source/i18n/double-conversion.h @@ -30,6 +30,10 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// ICU PATCH: ifdef around UCONFIG_NO_FORMATTING +#include "unicode/utypes.h" +#if !UCONFIG_NO_FORMATTING + #ifndef DOUBLE_CONVERSION_DOUBLE_CONVERSION_H_ #define DOUBLE_CONVERSION_DOUBLE_CONVERSION_H_ @@ -37,6 +41,9 @@ #include "double-conversion-utils.h" +// ICU PATCH: Wrap in ICU namespace +U_NAMESPACE_BEGIN + namespace double_conversion { class DoubleToStringConverter { @@ -552,4 +559,8 @@ class StringToDoubleConverter { } // namespace double_conversion +// ICU PATCH: Close ICU namespace +U_NAMESPACE_END + #endif // DOUBLE_CONVERSION_DOUBLE_CONVERSION_H_ +#endif // ICU PATCH: close #if !UCONFIG_NO_FORMATTING diff --git a/icu4c/source/i18n/number_decimalquantity.cpp b/icu4c/source/i18n/number_decimalquantity.cpp index e4203ad2ad3..b68df26ba26 100644 --- a/icu4c/source/i18n/number_decimalquantity.cpp +++ b/icu4c/source/i18n/number_decimalquantity.cpp @@ -21,7 +21,7 @@ using namespace icu; using namespace icu::number; using namespace icu::number::impl; -using double_conversion::DoubleToStringConverter; +using icu::double_conversion::DoubleToStringConverter; namespace { From 5140fad4f6d50aef176b281c2676e40e7c6df845 Mon Sep 17 00:00:00 2001 From: Andy Heninger Date: Fri, 23 Mar 2018 20:43:21 +0000 Subject: [PATCH 26/27] ICU-13659 Remove problematic UnifiedCache assertion checks. X-SVN-Rev: 41145 --- icu4c/source/common/unifiedcache.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/icu4c/source/common/unifiedcache.cpp b/icu4c/source/common/unifiedcache.cpp index 7ed6bbb819b..f0f660ed06b 100644 --- a/icu4c/source/common/unifiedcache.cpp +++ b/icu4c/source/common/unifiedcache.cpp @@ -263,13 +263,10 @@ UBool UnifiedCache::_flush(UBool all) const { int32_t UnifiedCache::_computeCountOfItemsToEvict() const { int32_t totalItems = uhash_count(fHashtable); int32_t evictableItems = totalItems - fNumValuesInUse; - U_ASSERT(totalItems >= fNumValuesInUse); - U_ASSERT(totalItems >= evictableItems); int32_t unusedLimitByPercentage = fNumValuesInUse * fMaxPercentageOfInUse / 100; int32_t unusedLimit = std::max(unusedLimitByPercentage, fMaxUnused); int32_t countOfItemsToEvict = std::max(0, evictableItems - unusedLimit); - U_ASSERT(countOfItemsToEvict >= 0 && countOfItemsToEvict <= evictableItems); return countOfItemsToEvict; } From dc3a13b4595c810b1546c1eed5439db026f693d6 Mon Sep 17 00:00:00 2001 From: Andy Heninger Date: Fri, 23 Mar 2018 22:51:39 +0000 Subject: [PATCH 27/27] ICU-13660 add atomic_inc & dec tests. X-SVN-Rev: 41148 --- icu4c/source/test/intltest/tsmthred.cpp | 117 ++++++++++-------------- icu4c/source/test/intltest/tsmthred.h | 2 +- 2 files changed, 47 insertions(+), 72 deletions(-) diff --git a/icu4c/source/test/intltest/tsmthred.cpp b/icu4c/source/test/intltest/tsmthred.cpp index 1a717e3dc03..d0d7a1e475d 100644 --- a/icu4c/source/test/intltest/tsmthred.cpp +++ b/icu4c/source/test/intltest/tsmthred.cpp @@ -45,6 +45,7 @@ MultithreadTest::~MultithreadTest() #include #include #include // tolower, toupper +#include #include "unicode/putil.h" @@ -62,82 +63,24 @@ void MultithreadTest::runIndexedTest( int32_t index, UBool exec, const char* &name, char* /*par*/ ) { if (exec) logln("TestSuite MultithreadTest: "); - switch (index) { - case 0: - name = "TestThreads"; - if (exec) - TestThreads(); - break; - case 1: - name = "TestMutex"; - if (exec) - TestMutex(); - break; - - case 2: - name = "TestThreadedIntl"; + TESTCASE_AUTO_BEGIN; + TESTCASE_AUTO(TestThreads); + TESTCASE_AUTO(TestMutex); #if !UCONFIG_NO_FORMATTING - if (exec) { - TestThreadedIntl(); - } + TESTCASE_AUTO(TestThreadedIntl); #endif - break; - - case 3: - name = "TestCollators"; #if !UCONFIG_NO_COLLATION - if (exec) { - TestCollators(); - } + TESTCASE_AUTO(TestCollators); #endif /* #if !UCONFIG_NO_COLLATION */ - break; - - case 4: - name = "TestString"; - if (exec) { - TestString(); - } - break; - - case 5: - name = "TestArabicShapingThreads"; - if (exec) { - TestArabicShapingThreads(); - } - break; - - case 6: - name = "TestAnyTranslit"; - if (exec) { - TestAnyTranslit(); - } - break; - - case 7: - name = "TestConditionVariables"; - if (exec) { - TestConditionVariables(); - } - break; - case 8: - name = "TestUnifiedCache"; - if (exec) { - TestUnifiedCache(); - } - break; -#if !UCONFIG_NO_TRANSLITERATION - case 9: - name = "TestBreakTranslit"; - if (exec) { - TestBreakTranslit(); - } - break; -#endif - default: - name = ""; - break; //needed to end loop - } + TESTCASE_AUTO(TestString); + TESTCASE_AUTO(TestArabicShapingThreads); + TESTCASE_AUTO(TestAnyTranslit); + TESTCASE_AUTO(TestConditionVariables); + TESTCASE_AUTO(TestUnifiedCache); + TESTCASE_AUTO(TestBreakTranslit); + TESTCASE_AUTO(TestIncDec); + TESTCASE_AUTO_END } @@ -1572,4 +1515,36 @@ void MultithreadTest::TestBreakTranslit() { gTranslitExpected = NULL; } + +class TestIncDecThread : public SimpleThread { +public: + TestIncDecThread() { }; + virtual void run(); +}; + +static u_atomic_int32_t gIncDecCounter; + +void TestIncDecThread::run() { + umtx_atomic_inc(&gIncDecCounter); + for (int32_t i=0; i<5000000; ++i) { + umtx_atomic_inc(&gIncDecCounter); + umtx_atomic_dec(&gIncDecCounter); + } +} + +void MultithreadTest::TestIncDec() +{ + static constexpr int NUM_THREADS = 4; + gIncDecCounter = 0; + TestIncDecThread threads[NUM_THREADS]; + for (auto &thread:threads) { + thread.start(); + } + for (auto &thread:threads) { + thread.join(); + } + assertEquals("TestIncDec", NUM_THREADS, gIncDecCounter); +} + + #endif /* !UCONFIG_NO_TRANSLITERATION */ diff --git a/icu4c/source/test/intltest/tsmthred.h b/icu4c/source/test/intltest/tsmthred.h index 6ed24d7635c..b2517e22203 100644 --- a/icu4c/source/test/intltest/tsmthred.h +++ b/icu4c/source/test/intltest/tsmthred.h @@ -52,7 +52,7 @@ public: void TestConditionVariables(); void TestUnifiedCache(); void TestBreakTranslit(); - + void TestIncDec(); }; #endif