From d3cb7bbc8fa4b08d408451965ad45925a7851c5d Mon Sep 17 00:00:00 2001
From: Igor Motov <igor@motovs.org>
Date: Wed, 17 Jul 2019 08:59:06 -0400
Subject: [PATCH] Geo: fix GeoWKTShapeParserTests (#44448)

Changes in #44187 introduced some optimization in the way shapes are
generated. These changes were not captured in GeoWKTShapeParserTests.

Relates #44187
---
 .../elasticsearch/common/geo/GeoWKTShapeParserTests.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/server/src/test/java/org/elasticsearch/common/geo/GeoWKTShapeParserTests.java b/server/src/test/java/org/elasticsearch/common/geo/GeoWKTShapeParserTests.java
index 8610fa551c3..172349e8d9a 100644
--- a/server/src/test/java/org/elasticsearch/common/geo/GeoWKTShapeParserTests.java
+++ b/server/src/test/java/org/elasticsearch/common/geo/GeoWKTShapeParserTests.java
@@ -41,6 +41,7 @@ import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.geo.geometry.Geometry;
+import org.elasticsearch.geo.geometry.GeometryCollection;
 import org.elasticsearch.geo.geometry.Line;
 import org.elasticsearch.geo.geometry.MultiLine;
 import org.elasticsearch.geo.geometry.MultiPoint;
@@ -131,6 +132,9 @@ public class GeoWKTShapeParserTests extends BaseGeoParsingTestCase {
         if (numPoints == 0) {
             expectedGeom = MultiPoint.EMPTY;
             actual = new MultiPointBuilder();
+        } else if (numPoints == 1) {
+            expectedGeom = points.get(0);
+            actual = new MultiPointBuilder(coordinates);
         } else {
             expectedGeom = new MultiPoint(points);
             actual = new MultiPointBuilder(coordinates);
@@ -195,7 +199,7 @@ public class GeoWKTShapeParserTests extends BaseGeoParsingTestCase {
         }
         Geometry expectedGeom;
         if (lines.isEmpty()) {
-            expectedGeom = MultiLine.EMPTY;
+            expectedGeom = GeometryCollection.EMPTY;
         } else if (lines.size() == 1) {
             expectedGeom = new Line(lines.get(0).getLats(), lines.get(0).getLons());
         } else {