DS-1723,DS-1841:

* Start implementing (ModifySpace) connector tests.

Signed-off-by: mchrza <[email protected]>

Author: mchrza

xyz-hub-test/src/main/resources/log4j2.properties

@@ -15,12 +15,12 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 # License-Filename: LICENSE
-rootLogger.level = OFF
+rootLogger.level = INFO
 
-#packages = com.amazonaws.services.lambda.runtime.log4j2
-#appender.LAMBDA.type = Lambda
-#appender.LAMBDA.name = LAMBDA
-#appender.LAMBDA.layout.type = PatternLayout
-#appender.LAMBDA.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %-5p %c:%.-4096m%n
-#
-#rootLogger.appenderRef.stdout.ref = LAMBDA
+packages = com.amazonaws.services.lambda.runtime.log4j2
+appender.LAMBDA.type = Lambda
+appender.LAMBDA.name = LAMBDA
+appender.LAMBDA.layout.type = PatternLayout
+appender.LAMBDA.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %-5p %c:%.-4096m%n
+
+rootLogger.appenderRef.stdout.ref = LAMBDA

xyz-hub-test/src/test/java/com/here/xyz/hub/connectors/EventBasedConnectorTest.java

@@ -0,0 +1,39 @@
+package com.here.xyz.hub.connectors;
+
+import com.here.xyz.connectors.StorageConnector;
+import com.here.xyz.psql.NLConnector;
+import com.here.xyz.psql.PSQLXyzConnector;
+import com.here.xyz.psql.PSQLXyzNLConnector;
+import com.here.xyz.util.db.datasource.DatabaseSettings;
+
+import static com.here.xyz.benchmarks.tools.PerformanceTestHelper.createDBSettings;
+import static com.here.xyz.benchmarks.tools.PerformanceTestHelper.initConnector;
+
+public class EventBasedConnectorTest {
+  private static final DatabaseSettings dbSettings =
+          createDBSettings("localhost", "postgres", "postgres","password", 40);
+
+  protected static float xmin = 7.0f, ymin = 50.0f, xmax = 7.1f, ymax = 50.1f;
+
+  protected enum TARGET_CONNECTOR { PSQL_CONNECTOR, NL_CONNECTOR, PSQL_NL_CONNECTOR};
+
+  protected StorageConnector PSQL_CONNECTOR;
+  protected StorageConnector PSQL_NL_CONNECTOR;
+  protected StorageConnector NL_CONNECTOR;
+  
+  protected StorageConnector loadConnector(TARGET_CONNECTOR targetConnector) throws Exception {
+    if(PSQL_CONNECTOR != null)
+      return PSQL_CONNECTOR;
+    if(NL_CONNECTOR != null)
+      return NL_CONNECTOR;
+    if(PSQL_NL_CONNECTOR != null)
+      return PSQL_NL_CONNECTOR;
+
+    return switch (targetConnector){
+      case PSQL_CONNECTOR -> initConnector("TEST_" + targetConnector, new PSQLXyzConnector(), dbSettings);
+      case PSQL_NL_CONNECTOR -> initConnector("TEST_" + targetConnector, new PSQLXyzNLConnector(), dbSettings);
+      case NL_CONNECTOR -> initConnector("TEST_" + targetConnector, new NLConnector(), dbSettings)
+              .withSeedingMode(false);
+    };
+  }
+}

xyz-hub-test/src/test/java/com/here/xyz/hub/connectors/psqlnlconnector/ConnectorModifySpaceTest.java

@@ -0,0 +1,65 @@
+package com.here.xyz.hub.connectors.psqlnlconnector;
+
+import com.here.xyz.benchmarks.tools.PerformanceTestHelper;
+import com.here.xyz.connectors.StorageConnector;
+import com.here.xyz.events.ModifySpaceEvent;
+import com.here.xyz.events.UpdateStrategy;
+import com.here.xyz.events.WriteFeaturesEvent;
+import com.here.xyz.hub.connectors.EventBasedConnectorTest;
+import com.here.xyz.models.geojson.implementation.FeatureCollection;
+import com.here.xyz.models.hub.Space;
+import com.here.xyz.util.Random;
+import org.junit.Test;
+
+import java.util.Map;
+import java.util.Set;
+
+import static com.here.xyz.events.ModifySpaceEvent.Operation.CREATE;
+
+public class ConnectorModifySpaceTest extends EventBasedConnectorTest {
+
+  @Test
+  public void testCreateSpaceWithSearchableProperties() throws Exception {
+    StorageConnector connector = loadConnector(TARGET_CONNECTOR.PSQL_NL_CONNECTOR);
+
+    String spaceName =  this.getClass().getSimpleName() +"."+Random.randomAlpha(6);
+
+    Map<String, Boolean> searchableProperties = Map.of(
+            "$alias1:[$.properties.refQuad]::scalar", true,
+            "$alias2:[$.properties.globalVersion]::scalar", true,
+            "$alias3:[$.properties.names[*].lang]::array", true,
+            "$foo1.nested:[$.foo1.nested]::scalar", true
+//            "$alias1:[$.properties.street.fc]::scalar", true,
+//            "$alias2:[$.properties.names[*].lang]::array", true,
+//            "$alias3:[$.properties.refQuad like_regex \"^0123\"]::scalar", true,
+
+    );
+
+    /* create space */
+    ModifySpaceEvent modifySpaceEvent = new ModifySpaceEvent()
+            .withSpaceDefinition(new Space()
+                    .withSearchableProperties(searchableProperties)
+                    .withId(spaceName)
+                    .withVersionsToKeep(1000)
+            )
+            .withSpace(spaceName)
+            .withOperation(CREATE);
+    connector.handleEvent(modifySpaceEvent);
+
+    /* write features */
+    FeatureCollection fc = PerformanceTestHelper.generateRandomFeatureCollection(10, xmin, ymin, xmax, ymax, 100, false);
+
+    WriteFeaturesEvent writeFeaturesEvent = new WriteFeaturesEvent()
+            .withModifications(Set.of(
+                    new WriteFeaturesEvent.Modification()
+                            .withFeatureData(fc)
+                            .withUpdateStrategy(UpdateStrategy.DEFAULT_UPDATE_STRATEGY)
+            ))
+            .withSpace(spaceName)
+            .withResponseDataExpected(false);
+    connector.handleEvent(writeFeaturesEvent);
+
+    /* clean test resources */
+    PerformanceTestHelper.deleteSpace(connector, spaceName);
+  }
+}