You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hugegraph.apache.org by je...@apache.org on 2022/11/04 12:50:27 UTC
[incubator-hugegraph-toolchain] branch master updated: chore: improve hugegraph-client ut & stabilize hugegraph-client-ci (#355)
This is an automated email from the ASF dual-hosted git repository.
jermy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hugegraph-toolchain.git
The following commit(s) were added to refs/heads/master by this push:
new 6ecc1a26 chore: improve hugegraph-client ut & stabilize hugegraph-client-ci (#355)
6ecc1a26 is described below
commit 6ecc1a26ef2d51aeb69bb22b9add7e18d73fad94
Author: Simon Cheung <mi...@apache.org>
AuthorDate: Fri Nov 4 20:50:22 2022 +0800
chore: improve hugegraph-client ut & stabilize hugegraph-client-ci (#355)
---
.../test/java/com/baidu/hugegraph/api/EdgeLabelApiTest.java | 4 ++--
.../test/java/com/baidu/hugegraph/api/IndexLabelApiTest.java | 6 +++---
.../test/java/com/baidu/hugegraph/api/PropertyKeyApiTest.java | 6 +++---
.../test/java/com/baidu/hugegraph/api/VertexLabelApiTest.java | 4 ++--
.../java/com/baidu/hugegraph/functional/EdgeLabelTest.java | 9 +++++----
.../java/com/baidu/hugegraph/functional/IndexLabelTest.java | 9 +++++----
.../java/com/baidu/hugegraph/functional/PropertyKeyTest.java | 10 +++++-----
.../java/com/baidu/hugegraph/functional/VertexLabelTest.java | 9 +++++----
.../src/test/java/com/baidu/hugegraph/testutil/Utils.java | 5 +++++
9 files changed, 35 insertions(+), 27 deletions(-)
diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/EdgeLabelApiTest.java b/hugegraph-client/src/test/java/com/baidu/hugegraph/api/EdgeLabelApiTest.java
index 8e4b9999..f6d45ba2 100644
--- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/EdgeLabelApiTest.java
+++ b/hugegraph-client/src/test/java/com/baidu/hugegraph/api/EdgeLabelApiTest.java
@@ -530,7 +530,7 @@ public class EdgeLabelApiTest extends BaseApiTest {
father.userdata().get("multiplicity"));
String time = (String) father.userdata().get("~create_time");
Date createTime = DateUtil.parse(time);
- Assert.assertTrue(createTime.before(DateUtil.now()));
+ Utils.assertBeforeNow(createTime);
EdgeLabel write = schema().edgeLabel("write")
.link("person", "book")
@@ -545,6 +545,6 @@ public class EdgeLabelApiTest extends BaseApiTest {
write.userdata().get("multiplicity"));
time = (String) write.userdata().get("~create_time");
createTime = DateUtil.parse(time);
- Assert.assertTrue(createTime.before(DateUtil.now()));
+ Utils.assertBeforeNow(createTime);
}
}
diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/IndexLabelApiTest.java b/hugegraph-client/src/test/java/com/baidu/hugegraph/api/IndexLabelApiTest.java
index f4bc7bf2..0a0e7173 100644
--- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/IndexLabelApiTest.java
+++ b/hugegraph-client/src/test/java/com/baidu/hugegraph/api/IndexLabelApiTest.java
@@ -362,7 +362,7 @@ public class IndexLabelApiTest extends BaseApiTest {
Assert.assertEquals(100, personByAge.userdata().get("max"));
String time = (String) personByAge.userdata().get("~create_time");
Date createTime = DateUtil.parse(time);
- Assert.assertTrue(createTime.before(DateUtil.now()));
+ Utils.assertBeforeNow(createTime);
IndexLabel personByCity = schema().indexLabel("personByCity")
.onV("person")
@@ -377,7 +377,7 @@ public class IndexLabelApiTest extends BaseApiTest {
Assert.assertEquals(18, personByCity.userdata().get("length"));
time = (String) personByCity.userdata().get("~create_time");
createTime = DateUtil.parse(time);
- Assert.assertTrue(createTime.before(DateUtil.now()));
+ Utils.assertBeforeNow(createTime);
IndexLabel bookByName = schema().indexLabel("bookByName")
.onV("book")
@@ -392,7 +392,7 @@ public class IndexLabelApiTest extends BaseApiTest {
bookByName.userdata().get("option"));
time = (String) bookByName.userdata().get("~create_time");
createTime = DateUtil.parse(time);
- Assert.assertTrue(createTime.before(DateUtil.now()));
+ Utils.assertBeforeNow(createTime);
}
@Test
diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/PropertyKeyApiTest.java b/hugegraph-client/src/test/java/com/baidu/hugegraph/api/PropertyKeyApiTest.java
index 17d158fb..f55d70bd 100644
--- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/PropertyKeyApiTest.java
+++ b/hugegraph-client/src/test/java/com/baidu/hugegraph/api/PropertyKeyApiTest.java
@@ -361,7 +361,7 @@ public class PropertyKeyApiTest extends BaseApiTest {
Assert.assertEquals(100, age.userdata().get("max"));
String time = (String) age.userdata().get("~create_time");
Date createTime = DateUtil.parse(time);
- Assert.assertTrue(createTime.before(DateUtil.now()));
+ Utils.assertBeforeNow(createTime);
PropertyKey id = schema().propertyKey("id")
.userdata("length", 15)
@@ -375,7 +375,7 @@ public class PropertyKeyApiTest extends BaseApiTest {
Assert.assertEquals(18, id.userdata().get("length"));
time = (String) id.userdata().get("~create_time");
createTime = DateUtil.parse(time);
- Assert.assertTrue(createTime.before(DateUtil.now()));
+ Utils.assertBeforeNow(createTime);
PropertyKey sex = schema().propertyKey("sex")
.userdata("range",
@@ -389,7 +389,7 @@ public class PropertyKeyApiTest extends BaseApiTest {
sex.userdata().get("range"));
time = (String) sex.userdata().get("~create_time");
createTime = DateUtil.parse(time);
- Assert.assertTrue(createTime.before(DateUtil.now()));
+ Utils.assertBeforeNow(createTime);
}
@Test
diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/VertexLabelApiTest.java b/hugegraph-client/src/test/java/com/baidu/hugegraph/api/VertexLabelApiTest.java
index 5d86361b..b903ca0f 100644
--- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/VertexLabelApiTest.java
+++ b/hugegraph-client/src/test/java/com/baidu/hugegraph/api/VertexLabelApiTest.java
@@ -481,7 +481,7 @@ public class VertexLabelApiTest extends BaseApiTest {
Assert.assertEquals("person", player.userdata().get("super_vl"));
String time = (String) player.userdata().get("~create_time");
Date createTime = DateUtil.parse(time);
- Assert.assertTrue(createTime.before(DateUtil.now()));
+ Utils.assertBeforeNow(createTime);
VertexLabel runner = schema().vertexLabel("runner")
.properties("name")
@@ -494,6 +494,6 @@ public class VertexLabelApiTest extends BaseApiTest {
Assert.assertEquals("player", runner.userdata().get("super_vl"));
time = (String) runner.userdata().get("~create_time");
createTime = DateUtil.parse(time);
- Assert.assertTrue(createTime.before(DateUtil.now()));
+ Utils.assertBeforeNow(createTime);
}
}
diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/EdgeLabelTest.java b/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/EdgeLabelTest.java
index f77fc714..89c00343 100644
--- a/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/EdgeLabelTest.java
+++ b/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/EdgeLabelTest.java
@@ -30,6 +30,7 @@ import com.baidu.hugegraph.driver.SchemaManager;
import com.baidu.hugegraph.structure.Task;
import com.baidu.hugegraph.structure.schema.EdgeLabel;
import com.baidu.hugegraph.testutil.Assert;
+import com.baidu.hugegraph.testutil.Utils;
import com.baidu.hugegraph.util.DateUtil;
import com.google.common.collect.ImmutableList;
@@ -80,7 +81,7 @@ public class EdgeLabelTest extends BaseFuncTest {
father.userdata().get("multiplicity"));
String time = (String) father.userdata().get("~create_time");
Date createTime = DateUtil.parse(time);
- Assert.assertTrue(createTime.before(DateUtil.now()));
+ Utils.assertBeforeNow(createTime);
EdgeLabel write = schema.edgeLabel("write")
.link("person", "book")
@@ -94,7 +95,7 @@ public class EdgeLabelTest extends BaseFuncTest {
write.userdata().get("multiplicity"));
time = (String) write.userdata().get("~create_time");
createTime = DateUtil.parse(time);
- Assert.assertTrue(createTime.before(DateUtil.now()));
+ Utils.assertBeforeNow(createTime);
}
@Test
@@ -114,7 +115,7 @@ public class EdgeLabelTest extends BaseFuncTest {
Assert.assertEquals(1, father.userdata().size());
String time = (String) father.userdata().get("~create_time");
Date createTime = DateUtil.parse(time);
- Assert.assertTrue(createTime.before(DateUtil.now()));
+ Utils.assertBeforeNow(createTime);
father = schema.edgeLabel("father")
.userdata("multiplicity", "one-to-many")
@@ -141,7 +142,7 @@ public class EdgeLabelTest extends BaseFuncTest {
Assert.assertEquals("picture2", write.userdata().get("icon"));
String time = (String) write.userdata().get("~create_time");
Date createTime = DateUtil.parse(time);
- Assert.assertTrue(createTime.before(DateUtil.now()));
+ Utils.assertBeforeNow(createTime);
write = schema.edgeLabel("write")
.userdata("icon", "")
diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/IndexLabelTest.java b/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/IndexLabelTest.java
index a9192ea6..83df0045 100644
--- a/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/IndexLabelTest.java
+++ b/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/IndexLabelTest.java
@@ -29,6 +29,7 @@ import org.junit.Test;
import com.baidu.hugegraph.driver.SchemaManager;
import com.baidu.hugegraph.structure.schema.IndexLabel;
import com.baidu.hugegraph.testutil.Assert;
+import com.baidu.hugegraph.testutil.Utils;
import com.baidu.hugegraph.util.DateUtil;
import com.google.common.collect.ImmutableList;
@@ -60,7 +61,7 @@ public class IndexLabelTest extends BaseFuncTest {
Assert.assertEquals("secondary", personByCity.userdata().get("type"));
String time = (String) personByCity.userdata().get("~create_time");
Date createTime = DateUtil.parse(time);
- Assert.assertTrue(createTime.before(DateUtil.now()));
+ Utils.assertBeforeNow(createTime);
IndexLabel personByAge = schema.indexLabel("personByAge")
.onV("person")
@@ -74,7 +75,7 @@ public class IndexLabelTest extends BaseFuncTest {
Assert.assertEquals("range", personByAge.userdata().get("type"));
time = (String) personByAge.userdata().get("~create_time");
createTime = DateUtil.parse(time);
- Assert.assertTrue(createTime.before(DateUtil.now()));
+ Utils.assertBeforeNow(createTime);
}
@Test
@@ -91,7 +92,7 @@ public class IndexLabelTest extends BaseFuncTest {
Assert.assertEquals(1, personByCity.userdata().size());
String time = (String) personByCity.userdata().get("~create_time");
Date createTime = DateUtil.parse(time);
- Assert.assertTrue(createTime.before(DateUtil.now()));
+ Utils.assertBeforeNow(createTime);
personByCity = schema.indexLabel("personByCity")
.userdata("type", "secondary")
@@ -120,7 +121,7 @@ public class IndexLabelTest extends BaseFuncTest {
Assert.assertEquals("picture", personByCity.userdata().get("icon"));
String time = (String) personByCity.userdata().get("~create_time");
Date createTime = DateUtil.parse(time);
- Assert.assertTrue(createTime.before(DateUtil.now()));
+ Utils.assertBeforeNow(createTime);
personByCity = schema.indexLabel("personByCity")
.userdata("type", "secondary")
diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/PropertyKeyTest.java b/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/PropertyKeyTest.java
index df5203d3..3c5c3569 100644
--- a/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/PropertyKeyTest.java
+++ b/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/PropertyKeyTest.java
@@ -59,7 +59,7 @@ public class PropertyKeyTest extends BaseFuncTest {
Assert.assertEquals(100, age.userdata().get("max"));
String time = (String) age.userdata().get("~create_time");
Date createTime = DateUtil.parse(time);
- Assert.assertTrue(createTime.before(DateUtil.now()));
+ Utils.assertBeforeNow(createTime);
PropertyKey id = schema.propertyKey("id")
.userdata("length", 15)
@@ -70,7 +70,7 @@ public class PropertyKeyTest extends BaseFuncTest {
Assert.assertEquals(18, id.userdata().get("length"));
time = (String) id.userdata().get("~create_time");
createTime = DateUtil.parse(time);
- Assert.assertTrue(createTime.before(DateUtil.now()));
+ Utils.assertBeforeNow(createTime);
PropertyKey sex = schema.propertyKey("sex")
.userdata("range",
@@ -81,7 +81,7 @@ public class PropertyKeyTest extends BaseFuncTest {
sex.userdata().get("range"));
time = (String) sex.userdata().get("~create_time");
createTime = DateUtil.parse(time);
- Assert.assertTrue(createTime.before(DateUtil.now()));
+ Utils.assertBeforeNow(createTime);
}
@Test
@@ -94,7 +94,7 @@ public class PropertyKeyTest extends BaseFuncTest {
Assert.assertEquals(0, age.userdata().get("min"));
String time = (String) age.userdata().get("~create_time");
Date createTime = DateUtil.parse(time);
- Assert.assertTrue(createTime.before(DateUtil.now()));
+ Utils.assertBeforeNow(createTime);
age = schema.propertyKey("age")
.userdata("min", 1)
@@ -119,7 +119,7 @@ public class PropertyKeyTest extends BaseFuncTest {
Assert.assertEquals(100, age.userdata().get("max"));
String time = (String) age.userdata().get("~create_time");
Date createTime = DateUtil.parse(time);
- Assert.assertTrue(createTime.before(DateUtil.now()));
+ Utils.assertBeforeNow(createTime);
age = schema.propertyKey("age")
.userdata("max", "")
diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/VertexLabelTest.java b/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/VertexLabelTest.java
index 151390cd..554f5694 100644
--- a/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/VertexLabelTest.java
+++ b/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/VertexLabelTest.java
@@ -30,6 +30,7 @@ import com.baidu.hugegraph.driver.SchemaManager;
import com.baidu.hugegraph.structure.Task;
import com.baidu.hugegraph.structure.schema.VertexLabel;
import com.baidu.hugegraph.testutil.Assert;
+import com.baidu.hugegraph.testutil.Utils;
import com.baidu.hugegraph.util.DateUtil;
import com.google.common.collect.ImmutableList;
@@ -57,7 +58,7 @@ public class VertexLabelTest extends BaseFuncTest {
Assert.assertEquals("person", player.userdata().get("super_vl"));
String time = (String) player.userdata().get("~create_time");
Date createTime = DateUtil.parse(time);
- Assert.assertTrue(createTime.before(DateUtil.now()));
+ Utils.assertBeforeNow(createTime);
VertexLabel runner = schema.vertexLabel("runner")
.properties("name")
@@ -69,7 +70,7 @@ public class VertexLabelTest extends BaseFuncTest {
Assert.assertEquals("player", runner.userdata().get("super_vl"));
time = (String) runner.userdata().get("~create_time");
createTime = DateUtil.parse(time);
- Assert.assertTrue(createTime.before(DateUtil.now()));
+ Utils.assertBeforeNow(createTime);
}
@Test
@@ -87,7 +88,7 @@ public class VertexLabelTest extends BaseFuncTest {
} catch (InterruptedException e) {
Assert.fail(e.getMessage());
}
- Assert.assertTrue(createTime.before(DateUtil.now()));
+ Utils.assertBeforeNow(createTime);
player = schema.vertexLabel("player")
.userdata("super_vl", "person")
@@ -112,7 +113,7 @@ public class VertexLabelTest extends BaseFuncTest {
Assert.assertEquals("picture1", player.userdata().get("icon"));
String time = (String) player.userdata().get("~create_time");
Date createTime = DateUtil.parse(time);
- Assert.assertTrue(createTime.before(DateUtil.now()));
+ Utils.assertBeforeNow(createTime);
player = schema.vertexLabel("player")
.userdata("icon", "")
diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/testutil/Utils.java b/hugegraph-client/src/test/java/com/baidu/hugegraph/testutil/Utils.java
index e82f7802..a6b73976 100644
--- a/hugegraph-client/src/test/java/com/baidu/hugegraph/testutil/Utils.java
+++ b/hugegraph-client/src/test/java/com/baidu/hugegraph/testutil/Utils.java
@@ -318,4 +318,9 @@ public final class Utils {
public static String formatDate(Date date) {
return DATE_FORMAT.format(date);
}
+
+ public static void assertBeforeNow(Date createTime) {
+ Date now = DateUtil.now();
+ Assert.assertTrue(createTime.before(now) || createTime.equals(now));
+ }
}