honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SQL: Moves the JTS-based tests suppression to Before (#42526) 

Moves the test suppression from `ClassRule` to `Before`, where it is
properly handled in the CI build.

Fixes #42221
This commit is contained in:
Igor Motov 2019-05-24 13:16:48 -04:00
parent 09e8910b0f
commit e28a9e99c4
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x-pack/plugin/sql/qa/src/main/java/org/elasticsearch/xpack/sql/qa/geo/GeoSqlSpecTestCase.java
View File

@ -31,8 +31,6 @@ public abstract class GeoSqlSpecTestCase extends SpecBaseIntegrationTestCase {
@ClassRule
public static LocalH2 H2 = new LocalH2((c) -> {
assumeTrue("JTS inside H2 is using default local for toUpperCase() in string comparison making it fail to parse WKT on certain" +
" locales", "point".toUpperCase(Locale.getDefault()).equals("POINT"));
// Load GIS extensions
H2GISFunctions.load(c);
c.createStatement().execute("RUNSCRIPT FROM 'classpath:/ogc/sqltsch.sql'");
@ -52,6 +50,8 @@ public abstract class GeoSqlSpecTestCase extends SpecBaseIntegrationTestCase {
public void setupTestGeoDataIfNeeded() throws Exception {
assumeTrue("Cannot support locales that don't use Hindu-Arabic numerals and non-ascii - sign due to H2",
"-42".equals(NumberFormat.getInstance(Locale.getDefault()).format(-42)));
assumeTrue("JTS inside H2 is using default local for toUpperCase() in string comparison making it fail to parse WKT on certain" +
" locales", "point".toUpperCase(Locale.getDefault()).equals("POINT"));
if (client().performRequest(new Request("HEAD", "/ogc")).getStatusLine().getStatusCode() == 404) {
GeoDataLoader.loadOGCDatasetIntoEs(client(), "ogc");
}

30
x-pack/plugin/sql/qa/src/main/resources/geo/geo.csv
View File

@ -1,16 +1,16 @@
city,region,region_point,location,shape
Mountain View,Americas,POINT(-105.2551 54.5260),point (-122.083843 37.386483),point (-122.083843 37.386483)
Chicago,Americas,POINT(-105.2551 54.5260),point (-87.637874 41.888783),point (-87.637874 41.888783)
New York,Americas,POINT(-105.2551 54.5260),point (-73.990027 40.745171),point (-73.990027 40.745171)
San Francisco,Americas,POINT(-105.2551 54.5260),point (-122.394228 37.789541),point (-122.394228 37.789541)
Phoenix,Americas,POINT(-105.2551 54.5260),point (-111.973505 33.376242),point (-111.973505 33.376242)
Amsterdam,Europe,POINT(15.2551 54.5260),point (4.850312 52.347557),point (4.850312 52.347557)
Berlin,Europe,POINT(15.2551 54.5260),point (13.390889 52.486701),point (13.390889 52.486701)
Munich,Europe,POINT(15.2551 54.5260),point (11.537505 48.146321),point (11.537505 48.146321)
London,Europe,POINT(15.2551 54.5260),point (-0.121672 51.510871),point (-0.121672 51.510871)
Paris,Europe,POINT(15.2551 54.5260),point (2.351773 48.845538),point (2.351773 48.845538)
Singapore,Asia,POINT(100.6197 34.0479),point (103.855535 1.295868),point (103.855535 1.295868)
Hong Kong,Asia,POINT(100.6197 34.0479),point (114.183925 22.281397),point (114.183925 22.281397)
Seoul,Asia,POINT(100.6197 34.0479),point (127.060851 37.509132),point (127.060851 37.509132)
Tokyo,Asia,POINT(100.6197 34.0479),point (139.76402225 35.669616),point (139.76402225 35.669616)
Sydney,Asia,POINT(100.6197 34.0479),point (151.208629 -33.863385),point (151.208629 -33.863385)
Mountain View,Americas,POINT(-105.2551 54.5260),POINT (-122.083843 37.386483),POINT (-122.083843 37.386483)
Chicago,Americas,POINT(-105.2551 54.5260),POINT (-87.637874 41.888783),POINT (-87.637874 41.888783)
New York,Americas,POINT(-105.2551 54.5260),POINT (-73.990027 40.745171),POINT (-73.990027 40.745171)
San Francisco,Americas,POINT(-105.2551 54.5260),POINT (-122.394228 37.789541),POINT (-122.394228 37.789541)
Phoenix,Americas,POINT(-105.2551 54.5260),POINT (-111.973505 33.376242),POINT (-111.973505 33.376242)
Amsterdam,Europe,POINT(15.2551 54.5260),POINT (4.850312 52.347557),POINT (4.850312 52.347557)
Berlin,Europe,POINT(15.2551 54.5260),POINT (13.390889 52.486701),POINT (13.390889 52.486701)
Munich,Europe,POINT(15.2551 54.5260),POINT (11.537505 48.146321),POINT (11.537505 48.146321)
London,Europe,POINT(15.2551 54.5260),POINT (-0.121672 51.510871),POINT (-0.121672 51.510871)
Paris,Europe,POINT(15.2551 54.5260),POINT (2.351773 48.845538),POINT (2.351773 48.845538)
Singapore,Asia,POINT(100.6197 34.0479),POINT (103.855535 1.295868),POINT (103.855535 1.295868)
Hong Kong,Asia,POINT(100.6197 34.0479),POINT (114.183925 22.281397),POINT (114.183925 22.281397)
Seoul,Asia,POINT(100.6197 34.0479),POINT (127.060851 37.509132),POINT (127.060851 37.509132)
Tokyo,Asia,POINT(100.6197 34.0479),POINT (139.76402225 35.669616),POINT (139.76402225 35.669616)
Sydney,Asia,POINT(100.6197 34.0479),POINT (151.208629 -33.863385),POINT (151.208629 -33.863385)

1 city region region_point location shape
2 Mountain View Americas POINT(-105.2551 54.5260) point (-122.083843 37.386483) POINT (-122.083843 37.386483) point (-122.083843 37.386483) POINT (-122.083843 37.386483)
3 Chicago Americas POINT(-105.2551 54.5260) point (-87.637874 41.888783) POINT (-87.637874 41.888783) point (-87.637874 41.888783) POINT (-87.637874 41.888783)
4 New York Americas POINT(-105.2551 54.5260) point (-73.990027 40.745171) POINT (-73.990027 40.745171) point (-73.990027 40.745171) POINT (-73.990027 40.745171)
5 San Francisco Americas POINT(-105.2551 54.5260) point (-122.394228 37.789541) POINT (-122.394228 37.789541) point (-122.394228 37.789541) POINT (-122.394228 37.789541)
6 Phoenix Americas POINT(-105.2551 54.5260) point (-111.973505 33.376242) POINT (-111.973505 33.376242) point (-111.973505 33.376242) POINT (-111.973505 33.376242)
7 Amsterdam Europe POINT(15.2551 54.5260) point (4.850312 52.347557) POINT (4.850312 52.347557) point (4.850312 52.347557) POINT (4.850312 52.347557)
8 Berlin Europe POINT(15.2551 54.5260) point (13.390889 52.486701) POINT (13.390889 52.486701) point (13.390889 52.486701) POINT (13.390889 52.486701)
9 Munich Europe POINT(15.2551 54.5260) point (11.537505 48.146321) POINT (11.537505 48.146321) point (11.537505 48.146321) POINT (11.537505 48.146321)
10 London Europe POINT(15.2551 54.5260) point (-0.121672 51.510871) POINT (-0.121672 51.510871) point (-0.121672 51.510871) POINT (-0.121672 51.510871)
11 Paris Europe POINT(15.2551 54.5260) point (2.351773 48.845538) POINT (2.351773 48.845538) point (2.351773 48.845538) POINT (2.351773 48.845538)
12 Singapore Asia POINT(100.6197 34.0479) point (103.855535 1.295868) POINT (103.855535 1.295868) point (103.855535 1.295868) POINT (103.855535 1.295868)
13 Hong Kong Asia POINT(100.6197 34.0479) point (114.183925 22.281397) POINT (114.183925 22.281397) point (114.183925 22.281397) POINT (114.183925 22.281397)
14 Seoul Asia POINT(100.6197 34.0479) point (127.060851 37.509132) POINT (127.060851 37.509132) point (127.060851 37.509132) POINT (127.060851 37.509132)
15 Tokyo Asia POINT(100.6197 34.0479) point (139.76402225 35.669616) POINT (139.76402225 35.669616) point (139.76402225 35.669616) POINT (139.76402225 35.669616)
16 Sydney Asia POINT(100.6197 34.0479) point (151.208629 -33.863385) POINT (151.208629 -33.863385) point (151.208629 -33.863385) POINT (151.208629 -33.863385)