Skip to content

Commit

Permalink
improve int set/map test
Browse files Browse the repository at this point in the history 
Change-Id: Ie252a89f9e4e003803737c6311a29cb4ff5a536c
  • Loading branch information
@javeme
javeme committed Dec 28, 2021
1 parent 1d031c5 commit f3ece21
Show file tree
Hide file tree
Showing 2 changed files with 116 additions and 20 deletions.
110 changes: 95 additions & 15 deletions hugegraph-test/src/main/java/com/baidu/hugegraph/unit/util/collection/IntMapTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@

package com.baidu.hugegraph.unit.util.collection;

import java.util.HashMap;
import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Random;
import java.util.function.BiFunction;
Expand Down Expand Up @@ -52,20 +54,98 @@ public void teardown() throws Exception {
@Test
public void testIntFixedMap() {
IntMap map = fixed(eachCount);
testIntMap(map);
}

runWithThreads(1, () -> {
for (int i = 0; i < batchCount; i++) {
for (int k = 0; k < eachCount; k++) {
map.containsKey(k);
map.put(k, k);
}
map.get(i);
@Test
public void testIntFixedMapBySegments() {
IntMap map = fixedBySegments(eachCount, 4);
testIntMap(map);

IntMap map2 = fixedBySegments(eachCount, 400);
testIntMap(map2);

IntMap map3 = fixedBySegments(eachCount, 4000);
testIntMap(map3);
}

private void testIntMap(IntMap map) {
Assert.assertEquals(0, map.size());
Map<Integer, Integer> jucMap = new HashMap<>();

Assert.assertEquals(0, map.size());
Assert.assertTrue(map.concurrent());

int modUpdate = 1 + new Random().nextInt(100);
Random random = new Random();
for (int k = 0; k < eachCount; k++) {
if(k % modUpdate == 0) {
int v = random.nextInt(eachCount);
map.put(k, v);
jucMap.put(k, v);
}
});
}

Assert.assertEquals(jucMap.size(), map.size());
for (int k = 0; k < eachCount; k++) {
if (jucMap.containsKey(k)) {
Assert.assertTrue("expect " + k, map.containsKey(k));
Assert.assertEquals((int) jucMap.get(k), map.get(k));
} else {
Assert.assertFalse("unexpect " + k, map.containsKey(k));
}
}

for (int k = 0; k < eachCount; k++) {
int v = random.nextInt(eachCount);
map.put(k, v);
jucMap.put(k, v);
}

Assert.assertEquals(eachCount, map.size());
for (int k = 0; k < eachCount; k++) {
Assert.assertTrue("expect " + k, map.containsKey(k));
Assert.assertEquals((int) jucMap.get(k), map.get(k));
}

int modRemove = 1 + new Random().nextInt(100);
for (int k = 0; k < eachCount; k++) {
if(k % modRemove == 0) {
map.remove(k);
jucMap.remove(k);
}
}

Assert.assertEquals(jucMap.size(), map.size());
for (int k = 0; k < eachCount; k++) {
if (jucMap.containsKey(k)) {
Assert.assertTrue("expect " + k, map.containsKey(k));
Assert.assertEquals((int) jucMap.get(k), map.get(k));
} else {
Assert.assertFalse("unexpect " + k, map.containsKey(k));
}
}

int outOfBoundKey = eachCount;

Assert.assertFalse(map.containsKey(outOfBoundKey));

Assert.assertThrows(IllegalArgumentException.class, () -> {
map.put(outOfBoundKey, 0);
}, e -> {
Assert.assertContains("out of bound", e.getMessage());
});

Assert.assertThrows(IllegalArgumentException.class, () -> {
map.remove(outOfBoundKey);
}, e -> {
Assert.assertContains("out of bound", e.getMessage());
});

map.clear();
Assert.assertEquals(0, map.size());
for (int k = 0; k < eachCount; k++) {
Assert.assertFalse("unexpect " + k, map.containsKey(k));
}
}

Expand All @@ -90,7 +170,7 @@ public void testIntFixedMapConcurrent() {
}

@Test
public void testIntFixedMapSegmentConcurrent() {
public void testIntFixedMapBySegmentsConcurrent() {
IntMap map = fixedBySegments(eachCount, 4);

runWithThreads(THREADS_NUM, () -> {
Expand All @@ -110,7 +190,7 @@ public void testIntFixedMapSegmentConcurrent() {
}

@Test
public void testIntFixedMapSegmentPut() {
public void testIntFixedMapBySegmentsPut() {
BiFunction<Integer, Integer, Integer> testMap = (capacity, segs) -> {
IntMap map = fixedBySegments(capacity, segs);

Expand Down Expand Up @@ -203,7 +283,7 @@ public void testIntFixedMapSegmentPut() {
}

@Test
public void testIntFixedMapSegmentPutRandom() {
public void testIntFixedMapBySegmentsPutRandom() {
int count = 100;
BiFunction<Integer, Integer, Integer> testMap = (capacity, segs) -> {
IntMap map = fixedBySegments(capacity, segs);
Expand Down Expand Up @@ -235,7 +315,7 @@ public void testIntFixedMapSegmentPutRandom() {
}

@Test
public void testIntFixedMapSegmentKeys() {
public void testIntFixedMapBySegmentsKeys() {
IntMap map = fixedBySegments(Integer.MAX_VALUE, 40);
map.put(Integer.MAX_VALUE - 1, 1);

Expand All @@ -256,7 +336,7 @@ public void testIntFixedMapSegmentKeys() {
}

@Test
public void testIntFixedMapSegmentKeysWithMultiSegs() {
public void testIntFixedMapBySegmentsKeysWithMultiSegs() {
int segments = 400;
int segmentSize = Integer.MAX_VALUE / segments;
int step = 50;
Expand Down Expand Up @@ -285,7 +365,7 @@ public void testIntFixedMapSegmentKeysWithMultiSegs() {
}

@Test
public void testIntFixedMapSegmentValues() {
public void testIntFixedMapBySegmentsValues() {
IntMap map = fixedBySegments(Integer.MAX_VALUE, 40);
map.put(Integer.MAX_VALUE - 1, 1);

Expand All @@ -306,7 +386,7 @@ public void testIntFixedMapSegmentValues() {
}

@Test
public void testIntFixedMapSegmentValuesWithMultiSegs() {
public void testIntFixedMapBySegmentsValuesWithMultiSegs() {
int segments = 400;
int segmentSize = Integer.MAX_VALUE / segments;
int step = 50;
Expand Down
26 changes: 21 additions & 5 deletions hugegraph-test/src/main/java/com/baidu/hugegraph/unit/util/collection/IntSetTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@

package com.baidu.hugegraph.unit.util.collection;

import java.util.HashSet;
import java.util.Random;
import java.util.Set;

import org.junit.After;
import org.junit.Before;
Expand Down Expand Up @@ -79,21 +81,28 @@ public void testIntFixedSetBySegmentsConcurrent() {
}

private void testIntSet(IntSet set) {
int mod = new Random().nextInt(100);
Set<Integer> jucSet = new HashSet<>();

Assert.assertEquals(0, set.size());
Assert.assertTrue(set.concurrent());

int mod = 1 + new Random().nextInt(100);
for (int i = 0; i < batchCount; i++) {
for (int k = 0; k < eachCount; k++) {
set.contains(k);
if(k % mod == 0) {
set.add(k);
jucSet.add(k);
}
}
}

int size = eachCount / mod + 1;
if (eachCount % mod == 0) {
size += 1;
}
int size = jucSet.size();
Assert.assertEquals(size, set.size());
for (Integer k : jucSet) {
boolean exist = set.contains(k);
Assert.assertTrue("expect " + k, exist);
}

for (int k = 0; k < eachCount; k++) {
boolean exist = set.contains(k);
Expand Down Expand Up @@ -139,6 +148,13 @@ private void testIntSet(IntSet set) {
}, e -> {
Assert.assertContains("out of bound", e.getMessage());
});

set.clear();
Assert.assertEquals(0, set.size());
for (int k = 0; k < eachCount; k++) {
boolean exist = set.contains(k);
Assert.assertFalse("unexpect " + k, exist);
}
}

private void testIntSetConcurrent(IntSet set) {
Expand Down

0 comments on commit f3ece21

Please sign in to comment.