You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by xi...@apache.org on 2024/09/23 15:48:04 UTC
(tinkerpop) branch graphbinary-add-datetime updated: remove leftover comments and re-enable some tests.
This is an automated email from the ASF dual-hosted git repository.
xiazcy pushed a commit to branch graphbinary-add-datetime
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/graphbinary-add-datetime by this push:
new 1015cce5c0 remove leftover comments and re-enable some tests.
1015cce5c0 is described below
commit 1015cce5c01cb95674547ae04fc9f59094268289
Author: Yang Xia <55...@users.noreply.github.com>
AuthorDate: Mon Sep 23 08:47:55 2024 -0700
remove leftover comments and re-enable some tests.
---
.../python/tests/driver/test_driver_remote_connection.py | 4 ----
.../gremlin/process/AbstractGremlinProcessTest.java | 1 +
.../gremlin/process/traversal/step/OrderabilityTest.java | 15 ++++++++-------
.../tinkerpop/gremlin/test/features/map/AsDate.feature | 1 -
.../tinkerpop/gremlin/test/features/map/DateAdd.feature | 1 -
5 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/gremlin-python/src/main/python/tests/driver/test_driver_remote_connection.py b/gremlin-python/src/main/python/tests/driver/test_driver_remote_connection.py
index 7262042e0d..49f63f606e 100644
--- a/gremlin-python/src/main/python/tests/driver/test_driver_remote_connection.py
+++ b/gremlin-python/src/main/python/tests/driver/test_driver_remote_connection.py
@@ -35,10 +35,6 @@ test_no_auth_url = gremlin_server_url.format(45940)
class TestDriverRemoteConnection(object):
- # def test_test(self, remote_connection):
- # g = traversal().with_(remote_connection)
- # print(g.inject(datetime.utcfromtimestamp(1690934400000 / 1000.0)).date_add(DT.hour, 2).to_list())
-
def test_extract_request_options(self, remote_connection):
g = traversal().with_(remote_connection)
t = g.with_("evaluationTimeout", 1000).with_("batchSize", 100).V().count()
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
index d8bb0da984..81b6060772 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
@@ -108,6 +108,7 @@ public abstract class AbstractGremlinProcessTest extends AbstractGremlinTest {
public static <T> void checkOrderedResults(final List<T> expectedResults, final Traversal<?, T> traversal) {
final List<T> results = traversal.toList();
assertFalse(traversal.hasNext());
+ System.out.println(results);
if (expectedResults.size() != results.size()) {
logger.error("Expected results: " + expectedResults);
logger.error("Actual results: " + results);
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/OrderabilityTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/OrderabilityTest.java
index 4bbf99e048..a9ff65a080 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/OrderabilityTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/OrderabilityTest.java
@@ -28,7 +28,6 @@ import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Property;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.util.CollectionUtil;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -38,6 +37,9 @@ import static org.apache.tinkerpop.gremlin.structure.Graph.Features.GraphFeature
import static org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexFeatures;
import static org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures;
+import java.time.OffsetDateTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -51,7 +53,7 @@ public abstract class OrderabilityTest extends AbstractGremlinProcessTest {
private interface Constants {
UUID uuid = UUID.randomUUID();
- Date date = new Date();
+ OffsetDateTime date = OffsetDateTime.now(ZoneOffset.UTC);
List list1 = Arrays.asList(1, 2, 3);
List list2 = Arrays.asList(1, 2, 3, 4);
Set set1 = CollectionUtil.asSet(list1);
@@ -178,7 +180,6 @@ public abstract class OrderabilityTest extends AbstractGremlinProcessTest {
* Mixed type values including list, set, map, uuid, date, boolean, numeric, string, null.
*/
@Test
- @Ignore // todo: re-enable after datetime serialization is implemented
@FeatureRequirement(featureClass = GraphFeatures.class, feature = GraphFeatures.FEATURE_ORDERABILITY_SEMANTICS)
public void g_inject_order() {
final Traversal traversal = get_g_inject_order();
@@ -187,12 +188,12 @@ public abstract class OrderabilityTest extends AbstractGremlinProcessTest {
null,
false, true,
1, 2.0,
- Constants.date,
"bar", "foo",
Constants.uuid,
Constants.set1, Constants.set2,
Constants.list1, Constants.list2,
- Constants.map1, Constants.map2
+ Constants.map1, Constants.map2,
+ Constants.date
), traversal);
}
@@ -213,13 +214,13 @@ public abstract class OrderabilityTest extends AbstractGremlinProcessTest {
null,
false, true,
1, 2.0,
- Constants.date,
"bar", "foo",
Constants.uuid,
Constants.set1, Constants.set2,
Constants.list1, Constants.list2,
Constants.map1, Constants.map2,
- unknown
+ unknown,
+ Constants.date
), traversal);
}
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/AsDate.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/AsDate.feature
index 23f46ee70c..a410fd70e7 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/AsDate.feature
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/AsDate.feature
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
-# todo: re-enable after datetime is implemented
@StepClassMap @StepAsDate
Feature: Step - asDate()
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/DateAdd.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/DateAdd.feature
index 939c7419bf..6bd3fc6c9d 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/DateAdd.feature
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/DateAdd.feature
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
-# todo: re-enable after datetime is implemented
@StepClassMap @StepDateAdd
Feature: Step - dateAdd()