Restore default locale in TestFunctions and add method to stip trailing period from months

h2/src/test/org/h2/test/db/TestFunctions.java

@@ -1497,7 +1497,8 @@ public class TestFunctions extends TestBase implements AggregateFunction {
 
         assertResult("1979-11-12 08:12:34.56", stat, "SELECT X FROM T");
         assertResult("-100-01-15 14:04:02.12", stat, "SELECT X FROM U");
-        String expected = String.format(Locale.US, "%tb", timestamp1979).toUpperCase();
+        String expected = String.format("%tb", timestamp1979).toUpperCase();
+        expected = stripTrailingPeriod(expected);
         assertResult("12-" + expected + "-79 08.12.34.560000 AM", stat,
                 "SELECT TO_CHAR(X) FROM T");
         assertResult("- / , . ; : text - /", stat,
@@ -1617,7 +1618,8 @@ public class TestFunctions extends TestBase implements AggregateFunction {
         assertResult("11", stat, "SELECT TO_CHAR(X, 'Mm') FROM T");
         assertResult("11", stat, "SELECT TO_CHAR(X, 'mM') FROM T");
         assertResult("11", stat, "SELECT TO_CHAR(X, 'mm') FROM T");
-        expected = String.format(Locale.US, "%1$tb", timestamp1979);
+        expected = String.format("%1$tb", timestamp1979);
+        expected = stripTrailingPeriod(expected);
         expected = expected.substring(0, 1).toUpperCase() + expected.substring(1);
         assertResult(expected.toUpperCase(), stat,
                 "SELECT TO_CHAR(X, 'MON') FROM T");
@@ -1672,6 +1674,14 @@ public class TestFunctions extends TestBase implements AggregateFunction {
         conn.close();
     }
 
+    String stripTrailingPeriod(String expected) {
+        // CLDR provider appends period on some locales
+        int l = expected.length() - 1;
+        if (expected.charAt(l) == '.')
+            expected = expected.substring(0, l);
+        return expected;
+    }
+
     private void testIfNull() throws SQLException {
         deleteDb("functions");
         Connection conn = getConnection("functions");