Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Rename] server/src/test/java/org/elasticsearch/test #377

Merged
merged 2 commits into from
Mar 18, 2021
Merged

[Rename] server/src/test/java/org/elasticsearch/test #377

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1bdb73
Refactor module server/src/test/java/org/elasticsearch/test
harold-wang Mar 18, 2021
b6fea69
Add back full quailified name back
harold-wang Mar 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion server/src/test/java/org/elasticsearch/index/fielddata/AbstractGeoFieldDataTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

import java.io.IOException;

import static org.elasticsearch.test.geo.RandomShapeGenerator.randomPoint;
import static org.opensearch.test.geo.RandomShapeGenerator.randomPoint;
import static org.hamcrest.Matchers.allOf;
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
import static org.hamcrest.Matchers.lessThanOrEqualTo;
Expand Down
2 changes: 1 addition & 1 deletion server/src/test/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilderTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import org.opensearch.common.geo.GeoUtils;
import org.elasticsearch.index.mapper.MappedFieldType;
import org.opensearch.test.AbstractQueryTestCase;
import org.elasticsearch.test.geo.RandomShapeGenerator;
import org.opensearch.test.geo.RandomShapeGenerator;
import org.locationtech.spatial4j.io.GeohashUtils;
import org.locationtech.spatial4j.shape.Rectangle;

Expand Down
2 changes: 1 addition & 1 deletion server/src/test/java/org/elasticsearch/index/query/GeoDistanceQueryBuilderTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import org.opensearch.common.geo.GeoPoint;
import org.opensearch.common.unit.DistanceUnit;
import org.opensearch.test.AbstractQueryTestCase;
import org.elasticsearch.test.geo.RandomShapeGenerator;
import org.opensearch.test.geo.RandomShapeGenerator;
import org.locationtech.spatial4j.shape.Point;

import java.io.IOException;
Expand Down
4 changes: 2 additions & 2 deletions server/src/test/java/org/elasticsearch/index/query/GeoPolygonQueryBuilderTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
import org.opensearch.common.geo.builders.ShapeBuilder;
import org.elasticsearch.index.mapper.MappedFieldType;
import org.opensearch.test.AbstractQueryTestCase;
import org.elasticsearch.test.geo.RandomShapeGenerator;
import org.elasticsearch.test.geo.RandomShapeGenerator.ShapeType;
import org.opensearch.test.geo.RandomShapeGenerator;
import org.opensearch.test.geo.RandomShapeGenerator.ShapeType;
import org.locationtech.jts.geom.Coordinate;
import org.locationtech.spatial4j.shape.jts.JtsGeometry;

Expand Down
2 changes: 1 addition & 1 deletion server/src/test/java/org/elasticsearch/index/query/GeoShapeQueryBuilderGeoPointTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

import org.opensearch.common.geo.ShapeRelation;
import org.opensearch.common.geo.builders.ShapeBuilder;
import org.elasticsearch.test.geo.RandomShapeGenerator;
import org.opensearch.test.geo.RandomShapeGenerator;

public class GeoShapeQueryBuilderGeoPointTests extends GeoShapeQueryBuilderTests {

Expand Down
2 changes: 1 addition & 1 deletion server/src/test/java/org/elasticsearch/index/query/GeoShapeQueryBuilderGeoShapeTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.opensearch.Version;
import org.opensearch.common.geo.ShapeRelation;
import org.opensearch.common.geo.builders.ShapeBuilder;
import org.elasticsearch.test.geo.RandomShapeGenerator;
import org.opensearch.test.geo.RandomShapeGenerator;

public class GeoShapeQueryBuilderGeoShapeTests extends GeoShapeQueryBuilderTests {

Expand Down
4 changes: 2 additions & 2 deletions server/src/test/java/org/elasticsearch/index/query/GeoShapeQueryBuilderTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
import org.elasticsearch.index.mapper.MapperService;
import org.opensearch.test.AbstractQueryTestCase;
import org.opensearch.test.VersionUtils;
import org.elasticsearch.test.geo.RandomShapeGenerator;
import org.elasticsearch.test.geo.RandomShapeGenerator.ShapeType;
import org.opensearch.test.geo.RandomShapeGenerator;
import org.opensearch.test.geo.RandomShapeGenerator.ShapeType;
import org.junit.After;
import org.locationtech.jts.geom.Coordinate;

Expand Down
4 changes: 2 additions & 2 deletions server/src/test/java/org/elasticsearch/index/query/LegacyGeoShapeFieldQueryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
import org.opensearch.common.geo.builders.ShapeBuilder;
import org.opensearch.common.settings.Settings;
import org.opensearch.test.VersionUtils;
import org.elasticsearch.test.geo.RandomShapeGenerator;
import org.elasticsearch.test.geo.RandomShapeGenerator.ShapeType;
import org.opensearch.test.geo.RandomShapeGenerator;
import org.opensearch.test.geo.RandomShapeGenerator.ShapeType;

import java.io.IOException;

Expand Down
2 changes: 1 addition & 1 deletion server/src/test/java/org/elasticsearch/index/search/geo/GeoPointParsingTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import org.opensearch.common.xcontent.XContentParser;
import org.opensearch.common.xcontent.json.JsonXContent;
import org.opensearch.test.OpenSearchTestCase;
import org.elasticsearch.test.geo.RandomGeoGenerator;
import org.opensearch.test.geo.RandomGeoGenerator;

import java.io.IOException;
import java.util.function.DoubleSupplier;
Expand Down
8 changes: 4 additions & 4 deletions server/src/test/java/org/opensearch/common/geo/BaseGeoParsingTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import org.opensearch.geometry.utils.GeographyValidator;
import org.elasticsearch.index.mapper.GeoShapeIndexer;
import org.opensearch.test.OpenSearchTestCase;
import org.elasticsearch.test.hamcrest.ElasticsearchGeoAssertions;
import org.opensearch.test.hamcrest.OpenSearchGeoAssertions;
import org.locationtech.jts.geom.Geometry;
import org.locationtech.jts.geom.GeometryFactory;
import org.locationtech.spatial4j.shape.Shape;
Expand Down Expand Up @@ -55,20 +55,20 @@ abstract class BaseGeoParsingTestCase extends OpenSearchTestCase {
protected void assertValidException(XContentBuilder builder, Class<?> expectedException) throws IOException {
try (XContentParser parser = createParser(builder)) {
parser.nextToken();
ElasticsearchGeoAssertions.assertValidException(parser, expectedException);
OpenSearchGeoAssertions.assertValidException(parser, expectedException);
}
}

protected void assertGeometryEquals(Object expected, XContentBuilder geoJson, boolean useJTS) throws IOException, ParseException {
try (XContentParser parser = createParser(geoJson)) {
parser.nextToken();
if (useJTS) {
ElasticsearchGeoAssertions.assertEquals(expected, ShapeParser.parse(parser).buildS4J());
OpenSearchGeoAssertions.assertEquals(expected, ShapeParser.parse(parser).buildS4J());
} else {
GeometryParser geometryParser = new GeometryParser(true, true, true);
org.opensearch.geometry.Geometry shape = geometryParser.parse(parser);
shape = new GeoShapeIndexer(true, "name").prepareForIndexing(shape);
ElasticsearchGeoAssertions.assertEquals(expected, shape);
OpenSearchGeoAssertions.assertEquals(expected, shape);
}
}
}
Expand Down
Loading