tiennm99/zfoo
1
0
Fork 0
mirror of https://github.com/tiennm99/zfoo.git synced 2026-08-07 04:24:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

test[map]: fix test

Browse Source
This commit is contained in:
godotg
2023-03-26 12:37:23 +08:00
parent d681ffc356
commit c4d495eab5
2 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/src/main/java/com/zfoo/net/packet/common/PairIntLong.java
+14 -1
View File
@@ -17,7 +17,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.zfoo.protocol.IPacket;
import java.util.Comparator;
import java.util.Objects;
/**
* @author godotg
@@ -45,6 +45,19 @@ public class PairIntLong implements IPacket {
return PROTOCOL_ID;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
PairIntLong that = (PairIntLong) o;
return key == that.key && value == that.value;
}
@Override
public int hashCode() {
return Objects.hash(key, value);
}
public int getKey() {
return key;
}
net/src/test/java/com/zfoo/net/util/TreeMapTest.java
+11 -11
View File
@@ -63,7 +63,7 @@ public class TreeMapTest {
Assert.assertFalse(map.returnedNull());
Assert.assertEquals(map.getLastKey(), n - 1);
Assert.assertFalse(map.returnedNull());
Assert.assertEquals(map.getLastEntry(), PairIntLong.valueOf(n - 1, (long) (3 * (n - 1))));
Assert.assertEquals(map.getLastEntry(), PairIntLong.valueOf(n - 1, (3 * (n - 1))));
Assert.assertFalse(map.returnedNull());
for (int i = -2; i <= n + 1; i++) {
int lowerKey = map.lowerKey(i);
@@ -96,7 +96,7 @@ public class TreeMapTest {
}
PairIntLong lowerEntry = map.lowerEntry(i);
if (i > 0) {
Assert.assertEquals(lowerEntry, PairIntLong.valueOf(lowerKey, (long) (3 * lowerKey)));
Assert.assertEquals(lowerEntry, PairIntLong.valueOf(lowerKey, (3 * lowerKey)));
Assert.assertFalse(map.returnedNull());
} else {
Assert.assertNull(lowerEntry);
@@ -104,7 +104,7 @@ public class TreeMapTest {
}
PairIntLong higherEntry = map.higherEntry(i);
if (i < n - 1) {
Assert.assertEquals(higherEntry, PairIntLong.valueOf(higherKey, (long) (3 * higherKey)));
Assert.assertEquals(higherEntry, PairIntLong.valueOf(higherKey, (3 * higherKey)));
Assert.assertFalse(map.returnedNull());
} else {
Assert.assertNull(higherEntry);
@@ -112,7 +112,7 @@ public class TreeMapTest {
}
PairIntLong floorEntry = map.floorEntry(i);
if (i >= 0) {
Assert.assertEquals(floorEntry, PairIntLong.valueOf(floorKey, (long) (3 * floorKey)));
Assert.assertEquals(floorEntry, PairIntLong.valueOf(floorKey, (3 * floorKey)));
Assert.assertFalse(map.returnedNull());
} else {
Assert.assertNull(floorEntry);
@@ -120,7 +120,7 @@ public class TreeMapTest {
}
PairIntLong ceilingEntry = map.ceilingEntry(i);
if (i < n) {
Assert.assertEquals(ceilingEntry, PairIntLong.valueOf(ceilingKey, (long) (3 * ceilingKey)));
Assert.assertEquals(ceilingEntry, PairIntLong.valueOf(ceilingKey, (3 * ceilingKey)));
Assert.assertFalse(map.returnedNull());
} else {
Assert.assertNull(ceilingEntry);
@@ -262,7 +262,7 @@ public class TreeMapTest {
Assert.assertTrue(map.returnedNull());
Assert.assertNull(ezResultEntry);
} else {
Assert.assertEquals(ezResultEntry, PairIntLong.valueOf(javaEntry.getKey(), (long) javaEntry.getValue()));
Assert.assertEquals(ezResultEntry, PairIntLong.valueOf(javaEntry.getKey(), javaEntry.getValue()));
}
}
{
@@ -278,7 +278,7 @@ public class TreeMapTest {
Assert.assertTrue(map.returnedNull());
Assert.assertNull(ezResultEntry);
} else {
Assert.assertEquals(ezResultEntry, PairIntLong.valueOf(javaEntry.getKey(), (long) javaEntry.getValue()));
Assert.assertEquals(ezResultEntry, PairIntLong.valueOf(javaEntry.getKey(), javaEntry.getValue()));
}
}
{
@@ -294,7 +294,7 @@ public class TreeMapTest {
Assert.assertTrue(map.returnedNull());
Assert.assertNull(ezResultEntry);
} else {
Assert.assertEquals(ezResultEntry, PairIntLong.valueOf(javaEntry.getKey(), (long) javaEntry.getValue()));
Assert.assertEquals(ezResultEntry, PairIntLong.valueOf(javaEntry.getKey(), javaEntry.getValue()));
}
}
{
@@ -310,7 +310,7 @@ public class TreeMapTest {
Assert.assertTrue(map.returnedNull());
Assert.assertNull(ezResultEntry);
} else {
Assert.assertEquals(ezResultEntry, PairIntLong.valueOf(javaEntry.getKey(), (long) javaEntry.getValue()));
Assert.assertEquals(ezResultEntry, PairIntLong.valueOf(javaEntry.getKey(), javaEntry.getValue()));
}
}
}
@@ -333,7 +333,7 @@ public class TreeMapTest {
} else {
long actualOldValue = map.put(key, newValue);
Assert.assertFalse(map.returnedNull());
Assert.assertEquals(actualOldValue, (long) oldValue);
Assert.assertEquals(actualOldValue, oldValue.longValue());
}
} else if (prob < 0.6) {
int key = rnd.nextInt(50);
@@ -344,7 +344,7 @@ public class TreeMapTest {
} else {
long actualOldValue = map.remove(key);
Assert.assertFalse(map.returnedNull());
Assert.assertEquals(actualOldValue, (long) oldValue);
Assert.assertEquals(actualOldValue, oldValue.longValue());
}
} else {
int key = rnd.nextInt(20);