You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2020/01/02 20:08:31 UTC
[tinkerpop] 06/20: TINKERPOP-2076 Fixed mockito usage after rebase
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch TINKERPOP-2076
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit fa7216c0924646c77ad94e866a415fac3128a9d9
Author: stephen <sp...@gmail.com>
AuthorDate: Mon Nov 11 21:06:30 2019 -0500
TINKERPOP-2076 Fixed mockito usage after rebase
---
.../driver/ser/binary/GraphBinaryMessageSerializerV1Test.java | 7 ++++---
.../ser/binary/GraphBinaryReaderWriterRoundTripTest.java | 11 ++++++-----
.../ser/binary/types/sample/SamplePersonSerializerTest.java | 5 +++--
3 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/binary/GraphBinaryMessageSerializerV1Test.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/binary/GraphBinaryMessageSerializerV1Test.java
index d0042ff..45a6a13 100644
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/binary/GraphBinaryMessageSerializerV1Test.java
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/binary/GraphBinaryMessageSerializerV1Test.java
@@ -35,6 +35,7 @@ import java.util.Map;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicInteger;
+import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
@@ -54,7 +55,7 @@ public class GraphBinaryMessageSerializerV1Test {
final int mimeLen = buffer.readByte();
buffer.readBytes(new byte[mimeLen]);
final RequestMessage deserialized = serializer.deserializeRequest(buffer);
- assertThat(request, new ReflectionEquals(deserialized));
+ assertThat(new ReflectionEquals(deserialized).matches(request), is(true));
}
@Test
@@ -68,7 +69,7 @@ public class GraphBinaryMessageSerializerV1Test {
final int mimeLen = buffer.readByte();
buffer.readBytes(new byte[mimeLen]);
final RequestMessage deserialized = serializer.deserializeRequest(buffer);
- assertThat(request, new ReflectionEquals(deserialized));
+ assertThat(new ReflectionEquals(deserialized).matches(request), is(true));
}
@Test
@@ -82,7 +83,7 @@ public class GraphBinaryMessageSerializerV1Test {
final int mimeLen = buffer.readByte();
buffer.readBytes(new byte[mimeLen]);
final RequestMessage deserialized = serializer.deserializeRequest(buffer);
- assertThat(request, new ReflectionEquals(deserialized));
+ assertThat(new ReflectionEquals(deserialized).matches(request), is(true));
}
@Test
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/binary/GraphBinaryReaderWriterRoundTripTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/binary/GraphBinaryReaderWriterRoundTripTest.java
index ea7254d..d6aa701 100644
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/binary/GraphBinaryReaderWriterRoundTripTest.java
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/binary/GraphBinaryReaderWriterRoundTripTest.java
@@ -87,6 +87,7 @@ import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.hasLabel;
+import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
@@ -265,19 +266,19 @@ public class GraphBinaryReaderWriterRoundTripTest {
new Object[] {"BulkSet", bulkSet, null},
new Object[] {"Tree", tree, null},
new Object[] {"EmptyMetrics", new MutableMetrics("idEmpty", "nameEmpty"), (Consumer<Metrics>) m -> {
- assertThat(m, new ReflectionEquals(new MutableMetrics("idEmpty", "nameEmpty")));
+ assertThat(new ReflectionEquals(new MutableMetrics("idEmpty", "nameEmpty")).matches(m), is(true));
}},
new Object[] {"Metrics", metrics, (Consumer<Metrics>) m -> {
- assertThat(m, new ReflectionEquals(metrics, "nested", "counts"));
+ assertThat(new ReflectionEquals(metrics, "nested", "counts").matches(m), is(true));
assertEquals(new ArrayList(metrics.getCounts().values()), new ArrayList(m.getCounts().values()));
- assertThat(m.getNested(), new ReflectionEquals(metrics.getNested()));
+ assertThat(new ReflectionEquals(metrics.getNested()).matches(m.getNested()), is(true));
}},
new Object[] {"EmptyTraversalMetrics", emptyTraversalMetrics, (Consumer<TraversalMetrics>) m -> {
- assertThat(m, new ReflectionEquals(emptyTraversalMetrics));
+ assertThat(new ReflectionEquals(emptyTraversalMetrics).matches(m), is(true));
}},
new Object[] {"TraversalMetrics", traversalMetrics, (Consumer<TraversalMetrics>) m -> {
assertEquals(m.toString(), traversalMetrics.toString());
- assertThat(m, new ReflectionEquals(traversalMetrics, "stepIndexedMetrics", "positionIndexedMetrics"));
+ assertThat(new ReflectionEquals(traversalMetrics, "stepIndexedMetrics", "positionIndexedMetrics").matches(m), is(true));
}},
// collections
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/binary/types/sample/SamplePersonSerializerTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/binary/types/sample/SamplePersonSerializerTest.java
index 3d6bef3..1db2bf7 100644
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/binary/types/sample/SamplePersonSerializerTest.java
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/binary/types/sample/SamplePersonSerializerTest.java
@@ -43,6 +43,7 @@ import java.util.UUID;
import static org.apache.tinkerpop.gremlin.driver.ser.AbstractMessageSerializer.TOKEN_IO_REGISTRIES;
import static org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1.TOKEN_CUSTOM;
+import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertThat;
public class SamplePersonSerializerTest {
@@ -93,7 +94,7 @@ public class SamplePersonSerializerTest {
writer.writeValue(person, buffer, nullable);
final SamplePerson actual = reader.readValue(buffer, SamplePerson.class, nullable);
- assertThat(actual, new ReflectionEquals(person));
+ assertThat(new ReflectionEquals(person).matches(actual), is(true));
buffer.release();
}
}
@@ -108,7 +109,7 @@ public class SamplePersonSerializerTest {
final ResponseMessage deserialized = serializer.deserializeResponse(serialized);
final SamplePerson actual = (SamplePerson) deserialized.getResult().getData();
- assertThat(actual, new ReflectionEquals(person));
+ assertThat(new ReflectionEquals(person).matches(actual), is(true));
}
public static class CustomIoRegistry extends AbstractIoRegistry {