You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by al...@apache.org on 2021/03/25 07:22:08 UTC
[geode] branch develop updated: GEODE-9062: Fix for
DataSerializableJUnit in StressTest (#6182)
This is an automated email from the ASF dual-hosted git repository.
alberto pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new c800898 GEODE-9062: Fix for DataSerializableJUnit in StressTest (#6182)
c800898 is described below
commit c800898eb5ae31fa583c0e16b5701f4f1eaca466
Author: Alberto Bustamante Reyes <al...@users.noreply.github.com>
AuthorDate: Thu Mar 25 08:21:11 2021 +0100
GEODE-9062: Fix for DataSerializableJUnit in StressTest (#6182)
* GEODE-9062: Fix for DataSerializableJUnit in StressTest
* Empty commit to retrigger CI
---
.../geode/internal/DataSerializableJUnitTest.java | 54 ++++++++++++++++------
1 file changed, 39 insertions(+), 15 deletions(-)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java
index e8e93a8..5cb15fd 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java
@@ -14,8 +14,8 @@
*/
package org.apache.geode.internal;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
@@ -2246,6 +2246,10 @@ public class DataSerializableJUnitTest implements Serializable {
*/
@Test
public void testSupportedClasses() throws Exception {
+ assertThat(Class_testSupportedClasses2.wasInvoked).isFalse();
+ assertThat(Class_testSupportedClasses2.toDataInvoked).isFalse();
+ assertThat(Class_testSupportedClasses2.fromDataInvoked).isFalse();
+
DataSerializer ds1 = DataSerializer.register(Class_testSupportedClasses1.class);
int id = ds1.getId();
@@ -2255,17 +2259,21 @@ public class DataSerializableJUnitTest implements Serializable {
try {
Object o = new NonDataSerializable(new Random());
DataSerializer.writeObject(o, getDataOutput());
- assertTrue(Class_testSupportedClasses2.wasInvoked);
- assertTrue(Class_testSupportedClasses2.toDataInvoked);
- assertFalse(Class_testSupportedClasses2.fromDataInvoked);
+ assertThat(Class_testSupportedClasses2.wasInvoked).isTrue();
+ assertThat(Class_testSupportedClasses2.toDataInvoked).isTrue();
+ assertThat(Class_testSupportedClasses2.fromDataInvoked).isFalse();
Object o2 = DataSerializer.readObject(getDataInput());
- assertTrue(Class_testSupportedClasses2.fromDataInvoked);
- assertEquals(o, o2);
+ assertThat(Class_testSupportedClasses2.fromDataInvoked).isTrue();
+ assertThat(o).isEqualTo(o2);
} finally {
InternalDataSerializer.unregister(id);
InternalDataSerializer.unregister(id2);
}
+
+ Class_testSupportedClasses2.wasInvoked = false;
+ Class_testSupportedClasses2.toDataInvoked = false;
+ Class_testSupportedClasses2.fromDataInvoked = false;
}
/**
@@ -2273,22 +2281,30 @@ public class DataSerializableJUnitTest implements Serializable {
*/
@Test
public void testUDDS2() throws Exception {
+ assertThat(Class_testSupportedClasses3.wasInvoked).isFalse();
+ assertThat(Class_testSupportedClasses3.toDataInvoked).isFalse();
+ assertThat(Class_testSupportedClasses3.fromDataInvoked).isFalse();
+
DataSerializer ds2 = DataSerializer.register(Class_testSupportedClasses3.class);
int id2 = ds2.getId();
try {
Object o = new NonDataSerializable(new Random());
DataSerializer.writeObject(o, getDataOutput());
- assertTrue(Class_testSupportedClasses3.wasInvoked);
- assertTrue(Class_testSupportedClasses3.toDataInvoked);
- assertFalse(Class_testSupportedClasses3.fromDataInvoked);
+ assertThat(Class_testSupportedClasses3.wasInvoked).isTrue();
+ assertThat(Class_testSupportedClasses3.toDataInvoked).isTrue();
+ assertThat(Class_testSupportedClasses3.fromDataInvoked).isFalse();
Object o2 = DataSerializer.readObject(getDataInput());
- assertTrue(Class_testSupportedClasses3.fromDataInvoked);
- assertEquals(o, o2);
+ assertThat(Class_testSupportedClasses3.fromDataInvoked).isTrue();
+ assertThat(o).isEqualTo(o2);
} finally {
InternalDataSerializer.unregister(id2);
}
+
+ Class_testSupportedClasses3.wasInvoked = false;
+ Class_testSupportedClasses3.toDataInvoked = false;
+ Class_testSupportedClasses3.fromDataInvoked = false;
}
/**
@@ -2296,22 +2312,30 @@ public class DataSerializableJUnitTest implements Serializable {
*/
@Test
public void testUDDS4() throws Exception {
+ assertThat(Class_testSupportedClasses4.wasInvoked).isFalse();
+ assertThat(Class_testSupportedClasses4.toDataInvoked).isFalse();
+ assertThat(Class_testSupportedClasses4.fromDataInvoked).isFalse();
+
DataSerializer ds2 = DataSerializer.register(Class_testSupportedClasses4.class);
int id2 = ds2.getId();
try {
Object o = new NonDataSerializable(new Random());
DataSerializer.writeObject(o, getDataOutput());
- assertTrue(Class_testSupportedClasses4.wasInvoked);
- assertTrue(Class_testSupportedClasses4.toDataInvoked);
- assertFalse(Class_testSupportedClasses4.fromDataInvoked);
+ assertThat(Class_testSupportedClasses4.wasInvoked).isTrue();
+ assertThat(Class_testSupportedClasses4.toDataInvoked).isTrue();
+ assertThat(Class_testSupportedClasses4.fromDataInvoked).isFalse();
Object o2 = DataSerializer.readObject(getDataInput());
assertTrue(Class_testSupportedClasses4.fromDataInvoked);
- assertEquals(o, o2);
+ assertThat(o).isEqualTo(o2);
} finally {
InternalDataSerializer.unregister(id2);
}
+
+ Class_testSupportedClasses4.wasInvoked = false;
+ Class_testSupportedClasses4.toDataInvoked = false;
+ Class_testSupportedClasses4.fromDataInvoked = false;
}
private static class Class_testSupportedClasses1 extends DataSerializerImpl {