@@ -77,32 +77,35 @@ private void assertFormattingAlwaysEmitsUsLocale(Locale locale) {
77
77
}
78
78
79
79
public void testParsingDatesFormattedWithSystemLocale () throws Exception {
80
- // TODO(eamonnmcmanus): fix this test, which fails on JDK 8 and 17
81
- if (JavaVersion .getMajorJavaVersion () != 11 ) {
82
- return ;
83
- }
84
80
TimeZone defaultTimeZone = TimeZone .getDefault ();
85
81
TimeZone .setDefault (TimeZone .getTimeZone ("UTC" ));
86
82
Locale defaultLocale = Locale .getDefault ();
87
83
Locale .setDefault (Locale .FRANCE );
88
84
try {
89
- String afterYearSep1 = JavaVersion . isJava9OrLater () ? JavaVersion . getMajorJavaVersion () < 16 ? " à " : ", " : " " ;
90
- String afterYearSep2 = JavaVersion . isJava9OrLater () ? " à " : " " ;
91
- assertParsed ( String . format ( "1 janv. 1970%s00:00:00" , afterYearSep1 ),
85
+ Date date = new Date ( 0 ) ;
86
+ assertParsed (
87
+ DateFormat . getDateTimeInstance ( DateFormat . MEDIUM , DateFormat . MEDIUM ). format ( date ),
92
88
DateType .DATE .createDefaultsAdapterFactory ());
93
- assertParsed ("01/01/70" , DateType .DATE .createAdapterFactory (DateFormat .SHORT ));
94
- assertParsed ("1 janv. 1970" , DateType .DATE .createAdapterFactory (DateFormat .MEDIUM ));
95
- assertParsed ("1 janvier 1970" , DateType .DATE .createAdapterFactory (DateFormat .LONG ));
96
- assertParsed ("01/01/70 00:00" ,
89
+ assertParsed (
90
+ DateFormat .getDateInstance (DateFormat .SHORT ).format (date ),
91
+ DateType .DATE .createAdapterFactory (DateFormat .SHORT ));
92
+ assertParsed (
93
+ DateFormat .getDateInstance (DateFormat .MEDIUM ).format (date ),
94
+ DateType .DATE .createAdapterFactory (DateFormat .MEDIUM ));
95
+ assertParsed (
96
+ DateFormat .getDateInstance (DateFormat .LONG ).format (date ),
97
+ DateType .DATE .createAdapterFactory (DateFormat .LONG ));
98
+ assertParsed (
99
+ DateFormat .getDateTimeInstance (DateFormat .SHORT , DateFormat .SHORT ).format (date ),
97
100
DateType .DATE .createAdapterFactory (DateFormat .SHORT , DateFormat .SHORT ));
98
- assertParsed (String .format ("1 janv. 1970%s00:00:00" , afterYearSep1 ),
101
+ assertParsed (
102
+ DateFormat .getDateTimeInstance (DateFormat .MEDIUM , DateFormat .MEDIUM ).format (date ),
99
103
DateType .DATE .createAdapterFactory (DateFormat .MEDIUM , DateFormat .MEDIUM ));
100
- assertParsed (String .format ("1 janvier 1970%s00:00:00 UTC" , afterYearSep2 ),
104
+ assertParsed (
105
+ DateFormat .getDateTimeInstance (DateFormat .LONG , DateFormat .LONG ).format (date ),
101
106
DateType .DATE .createAdapterFactory (DateFormat .LONG , DateFormat .LONG ));
102
- assertParsed (JavaVersion .isJava9OrLater () ? (JavaVersion .getMajorJavaVersion () < 11 ?
103
- "jeudi 1 janvier 1970 à 00:00:00 Coordinated Universal Time" :
104
- "jeudi 1 janvier 1970 à 00:00:00 Temps universel coordonné" ) :
105
- "jeudi 1 janvier 1970 00 h 00 UTC" ,
107
+ assertParsed (
108
+ DateFormat .getDateTimeInstance (DateFormat .FULL , DateFormat .FULL ).format (date ),
106
109
DateType .DATE .createAdapterFactory (DateFormat .FULL , DateFormat .FULL ));
107
110
} finally {
108
111
TimeZone .setDefault (defaultTimeZone );
0 commit comments