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