Skip to content

Commit b1c32fa

Browse files
committed
Enrich K1ColoringTest assertions
1 parent 2a100f5 commit b1c32fa

File tree

1 file changed

+24
-12
lines changed

1 file changed

+24
-12
lines changed

algo/src/test/java/org/neo4j/gds/beta/k1coloring/K1ColoringTest.java

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,11 @@
4040

4141
import java.util.HashSet;
4242
import java.util.List;
43-
import java.util.Set;
4443
import java.util.concurrent.atomic.AtomicLong;
4544
import java.util.stream.LongStream;
4645

4746
import static org.assertj.core.api.Assertions.assertThat;
4847
import static org.junit.jupiter.api.Assertions.assertEquals;
49-
import static org.junit.jupiter.api.Assertions.assertFalse;
50-
import static org.junit.jupiter.api.Assertions.assertNotEquals;
5148
import static org.junit.jupiter.api.Assertions.assertTrue;
5249
import static org.neo4j.gds.TestSupport.fromGdl;
5350
import static org.neo4j.gds.core.concurrency.ParallelUtil.DEFAULT_BATCH_SIZE;
@@ -81,9 +78,17 @@ void testK1Coloring() {
8178

8279
HugeLongArray colors = k1Coloring.colors();
8380

84-
assertNotEquals(colors.get(0), colors.get(1));
85-
assertNotEquals(colors.get(0), colors.get(2));
86-
assertEquals(colors.get(1), colors.get(2));
81+
var colorOfNode0 = colors.get(0);
82+
var colorOfNode1 = colors.get(1);
83+
var colorOfNode2 = colors.get(2);
84+
85+
assertThat(colorOfNode0)
86+
.as("Color of Node0 should be unique")
87+
.isNotEqualTo(colorOfNode1)
88+
.isNotEqualTo(colorOfNode2);
89+
assertThat(colorOfNode1)
90+
.as("Color of Node1 should be unique")
91+
.isNotEqualTo(colorOfNode2);
8792
}
8893

8994
@Test
@@ -113,21 +118,26 @@ void testParallelK1Coloring() {
113118
k1Coloring.compute();
114119
HugeLongArray colors = k1Coloring.colors();
115120

116-
Set<Long> colorsUsed = new HashSet<>(100);
117-
MutableLong conflicts = new MutableLong(0);
121+
var usedColors = new HashSet<>(100);
122+
var conflicts = new MutableLong(0);
118123
graph.forEachNode((nodeId) -> {
119124
graph.forEachRelationship(nodeId, (source, target) -> {
120125
if (source != target && colors.get(source) == colors.get(target)) {
121126
conflicts.increment();
122127
}
123-
colorsUsed.add(colors.get(source));
128+
usedColors.add(colors.get(source));
124129
return true;
125130
});
126131
return true;
127132
});
128133

129-
assertTrue(conflicts.getValue() < 20);
130-
assertTrue(colorsUsed.size() < 20);
134+
assertThat(conflicts.longValue())
135+
.as("Conflicts should be less than 20")
136+
.isLessThan(20L);
137+
138+
assertThat(usedColors.size())
139+
.as("Used colors should be less than 20")
140+
.isLessThan(20);
131141
}
132142

133143

@@ -174,7 +184,9 @@ void everyNodeShouldHaveBeenColored() {
174184

175185
k1Coloring.compute();
176186

177-
assertFalse(k1Coloring.usedColors().get(ColoringStep.INITIAL_FORBIDDEN_COLORS));
187+
assertThat(k1Coloring.usedColors().get(ColoringStep.INITIAL_FORBIDDEN_COLORS))
188+
.as("The result should not contain the initial forbidden colors")
189+
.isFalse();
178190
}
179191

180192
@Test

0 commit comments

Comments
 (0)