Skip to content

Commit

Permalink
CLDR-16316 test: make it a warning if a currency code recently expired
Browse files Browse the repository at this point in the history 
- 7 months time window
- refactor time code somewhat
- refactor print per review comment
  • Loading branch information
@srl295
srl295 committed Apr 3, 2023
1 parent fef127f commit 3903ebb
Show file tree
Hide file tree
Showing 6 changed files with 47 additions and 30 deletions.
3 changes: 2 additions & 1 deletion tools/cldr-code/src/main/java/org/unicode/cldr/test/CheckForExemplars.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.unicode.cldr.test.CheckCLDR.CheckStatus.Subtype;
import org.unicode.cldr.util.CLDRConfig;
import org.unicode.cldr.util.CLDRFile;
import org.unicode.cldr.util.DateConstants;
import org.unicode.cldr.util.CLDRFile.Status;
import org.unicode.cldr.util.Factory;
import org.unicode.cldr.util.InternalCldrException;
Expand Down Expand Up @@ -625,7 +626,7 @@ private Set<String> getCurrenciesForScript(String script) {
}

// For each territory, get all of its legal tender currencies.
Date now = new Date(System.currentTimeMillis());
Date now = DateConstants.NOW;
scriptToCurrencies = new Relation(new HashMap<String, Set<String>>(), HashSet.class);
for (Object curScript : scriptToTerritories.keySet()) {
Set<String> territories = scriptToTerritories.get(curScript);
Expand Down
9 changes: 4 additions & 5 deletions tools/cldr-code/src/main/java/org/unicode/cldr/test/ExampleGenerator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.unicode.cldr.util.CLDRFile;
import org.unicode.cldr.util.CLDRLocale;
import org.unicode.cldr.util.CldrUtility;
import org.unicode.cldr.util.DateConstants;
import org.unicode.cldr.util.DayPeriodInfo;
import org.unicode.cldr.util.DayPeriodInfo.DayPeriod;
import org.unicode.cldr.util.EmojiConstants;
Expand Down Expand Up @@ -1844,12 +1845,10 @@ private String handleTimeZoneName(XPathParts parts, String value) {
if (parts.contains("daylight")) {
tzOffset += currentZone.getDSTSavings();
}
int MILLIS_PER_MINUTE = 1000 * 60;
int MILLIS_PER_HOUR = MILLIS_PER_MINUTE * 60;
int tm_hrs = tzOffset / MILLIS_PER_HOUR;
int tm_mins = (tzOffset % MILLIS_PER_HOUR) / 60000; // millis per minute
long tm_hrs = tzOffset / DateConstants.MILLIS_PER_HOUR;
long tm_mins = (tzOffset % DateConstants.MILLIS_PER_HOUR) / DateConstants.MILLIS_PER_MINUTE;
result = setBackground(getMZTimeFormat() + " "
+ getGMTFormat(hourFormat, gmtFormat, tm_hrs, tm_mins));
+ getGMTFormat(hourFormat, gmtFormat, (int)tm_hrs, (int)tm_mins));
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion tools/cldr-code/src/main/java/org/unicode/cldr/tool/GenerateDayPeriods.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import org.unicode.cldr.util.CLDRConfig;
import org.unicode.cldr.util.CLDRFile;
import org.unicode.cldr.util.CLDRPaths;
import org.unicode.cldr.util.DateConstants;
import org.unicode.cldr.util.DayPeriodInfo;
import org.unicode.cldr.util.DayPeriodInfo.DayPeriod;
import org.unicode.cldr.util.DayPeriodInfo.Span;
Expand All @@ -20,10 +21,10 @@
import org.unicode.cldr.util.SupplementalDataInfo;
import org.unicode.cldr.util.With;
import org.unicode.cldr.util.XPathParts;
import static org.unicode.cldr.util.DateConstants.MILLIS_PER_DAY;

public class GenerateDayPeriods {
static final SupplementalDataInfo SDI = SupplementalDataInfo.getInstance();
private static final int MILLIS_PER_DAY = 24 * 60 * 60 * 1000;

public static void main(String[] args) throws IOException {
try (PrintWriter out = FileUtilities.openUTF8Writer(CLDRPaths.GEN_DIRECTORY + "/supplemental", "dayPeriods.xml")) {
Expand Down
23 changes: 23 additions & 0 deletions tools/cldr-code/src/main/java/org/unicode/cldr/util/DateConstants.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package org.unicode.cldr.util;

import java.util.Date;

/**
* Some date related constants
*/
public class DateConstants {
/**
* Right now. A single constant so that it is consistent across callers.
*/
public static final Date NOW = new Date();
public static final long MILLIS_PER_SECOND = 60 * 1000;
public static final long MILLIS_PER_MINUTE = MILLIS_PER_SECOND * 60;
public static final long MILLIS_PER_HOUR = MILLIS_PER_MINUTE * 60;
public static final long MILLIS_PER_DAY = MILLIS_PER_HOUR * 24;
public static final long MILLIS_PER_MONTH = MILLIS_PER_DAY * 30;

/**
* A date a little less than 8 months ago.
*/
public static final Date RECENT_HISTORY = new Date(NOW.getTime() - (MILLIS_PER_MONTH * 8));
}
8 changes: 4 additions & 4 deletions tools/cldr-code/src/main/java/org/unicode/cldr/util/DayPeriodInfo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -351,9 +351,9 @@ public String toString(DayPeriod dayPeriod) {
return result.toString();
}

public static String formatTime(int time) {
int minutes = time / (60 * 1000);
int hours = minutes / 60;
public static String formatTime(long time) {
long minutes = time / (60 * 1000);
long hours = minutes / 60;
minutes -= hours * 60;
return String.format("%02d:%02d", hours, minutes);
}
Expand Down Expand Up @@ -486,4 +486,4 @@ private boolean collisionIsErrorSelection(DayPeriod dayPeriod, Span other, Outpu
}
return false;
}
}
}
31 changes: 12 additions & 19 deletions tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestSupplementalInfo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1334,13 +1334,6 @@ public void TestCompleteness() {

private static final Date LIMIT_FOR_NEW_CURRENCY = new Date(
new Date().getYear() - 5, 1, 1);
private static final Date NOW = new Date();
private static final int MILLIS_PER_DAY = 24 * 60 * 60 * 1000;
/**
* A year ago
*/
private static final Date RECENT_HISTORY = new Date(NOW.getTime() - (MILLIS_PER_DAY*366));

private Matcher oldMatcher = Pattern.compile(
"\\bold\\b|\\([0-9]{4}-[0-9]{4}\\)", Pattern.CASE_INSENSITIVE)
.matcher("");
Expand All @@ -1353,7 +1346,7 @@ public void TestCompleteness() {
*
* @param args
*/
public void TestCurrency() {
public void TestSupplementalCurrency() {
IsoCurrencyParser isoCodes = IsoCurrencyParser.getInstance();
Set<String> currencyCodes = STANDARD_CODES
.getGoodAvailableCodes("currency");
Expand Down Expand Up @@ -1402,9 +1395,7 @@ public void TestCurrency() {
if (lastValue == null || lastValue.compareTo(end) > 0) {
currencyLastValid.put(currency, end);
}
if (start.compareTo(NOW) < 0 && end.compareTo(NOW) >= 0) { // Non-tender
// is
// OK...
if (start.compareTo(DateConstants.NOW) < 0 && end.compareTo(DateConstants.NOW) >= 0) { // Non-tender is OK...
modernCurrencyCodes.put(currency,
new Pair<>(territory,
dateInfo));
Expand All @@ -1413,7 +1404,7 @@ public void TestCurrency() {
nonModernCurrencyCodes.put(currency,
new Pair<>(territory,
dateInfo));
if (start.compareTo(NOW) < 0 && end.compareTo(RECENT_HISTORY) >= 0) {
if (start.compareTo(DateConstants.NOW) < 0 && end.compareTo(DateConstants.RECENT_HISTORY) >= 0) {
// It was CLDR tender recently.
recentModernCurrencyCodes.put(currency,
new Pair<>(territory,
Expand Down Expand Up @@ -1444,17 +1435,13 @@ public void TestCurrency() {
if (recentMissing.size() != 0) {
warnln("WARNING: Codes in ISO 4217 and until-recently legal tender in CLDR. " +
"(may need to update https://cldr.unicode.org/development/updating-codes/update-currency-codes ): " +
recentModernCurrencyCodes.entrySet().stream().filter(p -> recentMissing.contains(p.getKey()))
.map(p -> (p.getKey() + " ended=" + p.getValue().getSecond().getEnd()))
.collect(Collectors.joining(", ")));
currencyDateRelationToString(recentModernCurrencyCodes, recentMissing));
missing.removeAll(recentMissing); // not errors
}
if (missing.size() != 0) {
errln("Codes in ISO 4217 but not current tender in CLDR " +
"(may need to update https://cldr.unicode.org/development/updating-codes/update-currency-codes ): " +
nonModernCurrencyCodes.entrySet().stream().filter(p -> missing.contains(p.getKey()))
.map(p -> (p.getKey() + " ended=" + p.getValue().getSecond().getEnd()))
.collect(Collectors.joining(", ")));
currencyDateRelationToString(nonModernCurrencyCodes, missing));
}

for (String currency : modernCurrencyCodes.keySet()) {
Expand Down Expand Up @@ -1539,7 +1526,7 @@ public void TestCurrency() {
Set<CurrencyDateInfo> currencyInfo = SUPPLEMENTAL
.getCurrencyDateInfo(territory);
for (CurrencyDateInfo dateInfo : currencyInfo) {
if (dateInfo.getEnd().compareTo(NOW) < 0) {
if (dateInfo.getEnd().compareTo(DateConstants.NOW) < 0) {
continue;
}
logln("\tCurrencies used instead: "
Expand Down Expand Up @@ -1567,6 +1554,12 @@ public void TestCurrency() {
}
}

private String currencyDateRelationToString(Relation<String, Pair<String, CurrencyDateInfo>> allCodes, Set<String> filter) {
return allCodes.entrySet().stream().filter(p -> filter.contains(p.getKey()))
.map(p -> p.getValue().getSecond().toString())
.collect(Collectors.joining(", "));
}

private void showCountries(final String title, Set<String> isoCountries,
Set<String> cldrCountries, Set<String> missing) {
missing.clear();
Expand Down

0 comments on commit 3903ebb

Please sign in to comment.