File tree Expand file tree Collapse file tree 1 file changed +4
-3
lines changed
server/src/test/java/org/elasticsearch/common/joda Expand file tree Collapse file tree 1 file changed +4
-3
lines changed Original file line number Diff line number Diff line change @@ -41,14 +41,15 @@ protected boolean enableWarningsCheck() {
41
41
42
42
@ BeforeClass
43
43
public static void checkJvmProperties () {
44
+ String localeProviders = System .getProperty ("java.locale.providers" , "" );
44
45
boolean runtimeJdk8 = JavaVersion .current ().getVersion ().get (0 ) == 8 ;
45
- assert (runtimeJdk8 && (System .getProperty ("java.locale.providers" , "" ).equals ("SPI,JRE" )))
46
- || (false == runtimeJdk8 && (System .getProperty ("java.locale.providers" , "" ).contains ("SPI" )))
46
+ assert (runtimeJdk8 && localeProviders .equals ("SPI,JRE" )) || (false == runtimeJdk8 && localeProviders .contains ("SPI" ))
47
47
: "`-Djava.locale.providers` needs to be set" ;
48
48
assumeFalse (
49
- "won't work in jdk8 " + " because SPI mechanism is not looking at classpath - needs ISOCalendarDataProvider in jre's ext/libs" ,
49
+ "won't work in jdk8 because SPI mechanism is not looking at classpath - needs ISOCalendarDataProvider in jre's ext/libs" ,
50
50
runtimeJdk8
51
51
);
52
+ assumeFalse ("CLDR messes up several datatime checks, ignore these" , localeProviders .contains ("CLDR" ));
52
53
}
53
54
54
55
public void testIncorrectFormat () {
You can’t perform that action at this time.
0 commit comments