Skip to content

Commit 1a07bb8

Browse files
trasktrask
authored
Use assertj consistently everywhere (open-telemetry#2253)
1 parent 492af6c commit 1a07bb8

File tree

5 files changed

+140
-134
lines changed

5 files changed

+140
-134
lines changed

‎consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent/ConsistentProbabilityBasedSamplerTest.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
package io.opentelemetry.contrib.sampler.consistent;
77

88
import static org.assertj.core.api.Assertions.assertThat;
9-
import static org.junit.jupiter.api.Assertions.assertTrue;
109

1110
import io.opentelemetry.api.common.Attributes;
1211
import io.opentelemetry.api.trace.SpanKind;
@@ -63,8 +62,8 @@ private void test(SplittableRandom rng, double samplingProbability) {
6362
.getUpdatedTraceState(TraceState.getDefault())
6463
.get(OtelTraceState.TRACE_STATE_KEY);
6564
OtelTraceState traceState = OtelTraceState.parse(traceStateString);
66-
assertTrue(traceState.hasValidR());
67-
assertTrue(traceState.hasValidP());
65+
assertThat(traceState.hasValidR()).isTrue();
66+
assertThat(traceState.hasValidP()).isTrue();
6867
observedPvalues.merge(traceState.getP(), 1L, Long::sum);
6968
}
7069
}

‎consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent/ConsistentReservoirSamplingSpanProcessorTest.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import static org.assertj.core.api.AssertionsForClassTypes.assertThatCode;
1212
import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
1313
import static org.awaitility.Awaitility.await;
14-
import static org.junit.jupiter.api.Assertions.assertTrue;
1514
import static org.mockito.ArgumentMatchers.any;
1615
import static org.mockito.ArgumentMatchers.anyList;
1716
import static org.mockito.ArgumentMatchers.argThat;
@@ -566,8 +565,8 @@ private void testConsistentSampling(
566565
String traceStateString =
567566
spanData.getSpanContext().getTraceState().get(OtelTraceState.TRACE_STATE_KEY);
568567
OtelTraceState traceState = OtelTraceState.parse(traceStateString);
569-
assertTrue(traceState.hasValidR());
570-
assertTrue(traceState.hasValidP());
568+
assertThat(traceState.hasValidR()).isTrue();
569+
assertThat(traceState.hasValidP()).isTrue();
571570
observedPvalues.merge(traceState.getP(), 1L, Long::sum);
572571
totalAdjustedCount += 1L << traceState.getP();
573572
spanNameCounts.merge(spanData.getName(), 1L, Long::sum);

‎consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent/ConsistentSamplerTest.java‎

Lines changed: 34 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
import static io.opentelemetry.contrib.sampler.consistent.OtelTraceState.getInvalidP;
99
import static io.opentelemetry.contrib.sampler.consistent.OtelTraceState.getInvalidR;
1010
import static org.assertj.core.api.Assertions.assertThat;
11-
import static org.junit.jupiter.api.Assertions.assertEquals;
12-
import static org.junit.jupiter.api.Assertions.assertFalse;
13-
import static org.junit.jupiter.api.Assertions.assertThrows;
11+
import static org.assertj.core.api.Assertions.assertThatThrownBy;
1412

1513
import io.opentelemetry.api.common.Attributes;
1614
import io.opentelemetry.api.trace.Span;
@@ -32,45 +30,50 @@ class ConsistentSamplerTest {
3230

3331
@Test
3432
void testGetSamplingRate() {
35-
assertThrows(
36-
IllegalArgumentException.class, () -> ConsistentSampler.getSamplingProbability(-1));
33+
assertThatThrownBy(() -> ConsistentSampler.getSamplingProbability(-1))
34+
.isInstanceOf(IllegalArgumentException.class);
3735
for (int i = 0; i < OtelTraceState.getMaxP() - 1; i += 1) {
38-
assertEquals(Math.pow(0.5, i), ConsistentSampler.getSamplingProbability(i));
36+
assertThat(ConsistentSampler.getSamplingProbability(i)).isEqualTo(Math.pow(0.5, i));
3937
}
40-
assertEquals(0., ConsistentSampler.getSamplingProbability(OtelTraceState.getMaxP()));
41-
assertThrows(
42-
IllegalArgumentException.class,
43-
() -> ConsistentSampler.getSamplingProbability(OtelTraceState.getMaxP() + 1));
38+
assertThat(ConsistentSampler.getSamplingProbability(OtelTraceState.getMaxP())).isEqualTo(0.);
39+
assertThatThrownBy(() -> ConsistentSampler.getSamplingProbability(OtelTraceState.getMaxP() + 1))
40+
.isInstanceOf(IllegalArgumentException.class);
4441
}
4542

4643
@Test
4744
void testGetLowerBoundP() {
48-
assertEquals(0, ConsistentSampler.getLowerBoundP(1.0));
49-
assertEquals(0, ConsistentSampler.getLowerBoundP(Math.nextDown(1.0)));
45+
assertThat(ConsistentSampler.getLowerBoundP(1.0)).isEqualTo(0);
46+
assertThat(ConsistentSampler.getLowerBoundP(Math.nextDown(1.0))).isEqualTo(0);
5047
for (int i = 1; i < OtelTraceState.getMaxP() - 1; i += 1) {
5148
double samplingProbability = Math.pow(0.5, i);
52-
assertEquals(i, ConsistentSampler.getLowerBoundP(samplingProbability));
53-
assertEquals(i - 1, ConsistentSampler.getLowerBoundP(Math.nextUp(samplingProbability)));
54-
assertEquals(i, ConsistentSampler.getLowerBoundP(Math.nextDown(samplingProbability)));
49+
assertThat(ConsistentSampler.getLowerBoundP(samplingProbability)).isEqualTo(i);
50+
assertThat(ConsistentSampler.getLowerBoundP(Math.nextUp(samplingProbability)))
51+
.isEqualTo(i - 1);
52+
assertThat(ConsistentSampler.getLowerBoundP(Math.nextDown(samplingProbability))).isEqualTo(i);
5553
}
56-
assertEquals(OtelTraceState.getMaxP() - 1, ConsistentSampler.getLowerBoundP(Double.MIN_NORMAL));
57-
assertEquals(OtelTraceState.getMaxP() - 1, ConsistentSampler.getLowerBoundP(Double.MIN_VALUE));
58-
assertEquals(OtelTraceState.getMaxP(), ConsistentSampler.getLowerBoundP(0.0));
54+
assertThat(ConsistentSampler.getLowerBoundP(Double.MIN_NORMAL))
55+
.isEqualTo(OtelTraceState.getMaxP() - 1);
56+
assertThat(ConsistentSampler.getLowerBoundP(Double.MIN_VALUE))
57+
.isEqualTo(OtelTraceState.getMaxP() - 1);
58+
assertThat(ConsistentSampler.getLowerBoundP(0.0)).isEqualTo(OtelTraceState.getMaxP());
5959
}
6060

6161
@Test
6262
void testGetUpperBoundP() {
63-
assertEquals(0, ConsistentSampler.getUpperBoundP(1.0));
64-
assertEquals(1, ConsistentSampler.getUpperBoundP(Math.nextDown(1.0)));
63+
assertThat(ConsistentSampler.getUpperBoundP(1.0)).isEqualTo(0);
64+
assertThat(ConsistentSampler.getUpperBoundP(Math.nextDown(1.0))).isEqualTo(1);
6565
for (int i = 1; i < OtelTraceState.getMaxP() - 1; i += 1) {
6666
double samplingProbability = Math.pow(0.5, i);
67-
assertEquals(i, ConsistentSampler.getUpperBoundP(samplingProbability));
68-
assertEquals(i, ConsistentSampler.getUpperBoundP(Math.nextUp(samplingProbability)));
69-
assertEquals(i + 1, ConsistentSampler.getUpperBoundP(Math.nextDown(samplingProbability)));
67+
assertThat(ConsistentSampler.getUpperBoundP(samplingProbability)).isEqualTo(i);
68+
assertThat(ConsistentSampler.getUpperBoundP(Math.nextUp(samplingProbability))).isEqualTo(i);
69+
assertThat(ConsistentSampler.getUpperBoundP(Math.nextDown(samplingProbability)))
70+
.isEqualTo(i + 1);
7071
}
71-
assertEquals(OtelTraceState.getMaxP(), ConsistentSampler.getUpperBoundP(Double.MIN_NORMAL));
72-
assertEquals(OtelTraceState.getMaxP(), ConsistentSampler.getUpperBoundP(Double.MIN_VALUE));
73-
assertEquals(OtelTraceState.getMaxP(), ConsistentSampler.getUpperBoundP(0.0));
72+
assertThat(ConsistentSampler.getUpperBoundP(Double.MIN_NORMAL))
73+
.isEqualTo(OtelTraceState.getMaxP());
74+
assertThat(ConsistentSampler.getUpperBoundP(Double.MIN_VALUE))
75+
.isEqualTo(OtelTraceState.getMaxP());
76+
assertThat(ConsistentSampler.getUpperBoundP(0.0)).isEqualTo(OtelTraceState.getMaxP());
7477
}
7578

7679
@Test
@@ -168,18 +171,18 @@ private static void assertConsistentSampling(
168171
SamplingResult samplingResult =
169172
sampler.shouldSample(parentContext, traceId, name, spanKind, attributes, parentLinks);
170173

171-
assertEquals(expectSampled, getSampledFlag(samplingResult));
174+
assertThat(getSampledFlag(samplingResult)).isEqualTo(expectSampled);
172175
OptionalInt p = getP(samplingResult, parentContext);
173176
if (OtelTraceState.isValidP(expectedP)) {
174-
assertEquals(expectedP, p.getAsInt());
177+
assertThat(p.getAsInt()).isEqualTo(expectedP);
175178
} else {
176-
assertFalse(p.isPresent());
179+
assertThat(p.isPresent()).isFalse();
177180
}
178181
OptionalInt r = getR(samplingResult, parentContext);
179182
if (OtelTraceState.isValidR(expectedR)) {
180-
assertEquals(expectedR, r.getAsInt());
183+
assertThat(r.getAsInt()).isEqualTo(expectedR);
181184
} else {
182-
assertFalse(r.isPresent());
185+
assertThat(r.isPresent()).isFalse();
183186
}
184187
}
185188

‎consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent/OtelTraceStateTest.java‎

Lines changed: 48 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@
55

66
package io.opentelemetry.contrib.sampler.consistent;
77

8-
import static org.junit.jupiter.api.Assertions.assertEquals;
8+
import static org.assertj.core.api.Assertions.assertThat;
99

1010
import java.util.stream.Collectors;
1111
import java.util.stream.Stream;
12-
import org.junit.jupiter.api.Assertions;
1312
import org.junit.jupiter.api.Test;
1413

1514
class OtelTraceStateTest {
@@ -21,59 +20,57 @@ private static String getXString(int len) {
2120
@Test
2221
void test() {
2322

24-
Assertions.assertEquals("", OtelTraceState.parse("").serialize());
25-
assertEquals("", OtelTraceState.parse("").serialize());
23+
assertThat(OtelTraceState.parse("").serialize()).isEqualTo("");
24+
assertThat(OtelTraceState.parse("").serialize()).isEqualTo("");
2625

27-
assertEquals("", OtelTraceState.parse("a").serialize());
28-
assertEquals("", OtelTraceState.parse("#").serialize());
29-
assertEquals("", OtelTraceState.parse(" ").serialize());
26+
assertThat(OtelTraceState.parse("a").serialize()).isEqualTo("");
27+
assertThat(OtelTraceState.parse("#").serialize()).isEqualTo("");
28+
assertThat(OtelTraceState.parse(" ").serialize()).isEqualTo("");
3029

31-
assertEquals("p:5", OtelTraceState.parse("p:5").serialize());
32-
assertEquals("p:63", OtelTraceState.parse("p:63").serialize());
33-
assertEquals("", OtelTraceState.parse("p:64").serialize());
34-
assertEquals("", OtelTraceState.parse("p:5;").serialize());
35-
assertEquals("", OtelTraceState.parse("p:99").serialize());
36-
assertEquals("", OtelTraceState.parse("p:").serialize());
37-
assertEquals("", OtelTraceState.parse("p:232").serialize());
38-
assertEquals("", OtelTraceState.parse("x;p:5").serialize());
39-
assertEquals("", OtelTraceState.parse("p:5;x").serialize());
40-
assertEquals("p:5;x:3", OtelTraceState.parse("x:3;p:5").serialize());
41-
assertEquals("p:5;x:3", OtelTraceState.parse("p:5;x:3").serialize());
42-
assertEquals("", OtelTraceState.parse("p:5;x:3;").serialize());
43-
assertEquals(
44-
"p:5;a:" + getXString(246) + ";x:3",
45-
OtelTraceState.parse("a:" + getXString(246) + ";p:5;x:3").serialize());
46-
assertEquals("", OtelTraceState.parse("a:" + getXString(247) + ";p:5;x:3").serialize());
30+
assertThat(OtelTraceState.parse("p:5").serialize()).isEqualTo("p:5");
31+
assertThat(OtelTraceState.parse("p:63").serialize()).isEqualTo("p:63");
32+
assertThat(OtelTraceState.parse("p:64").serialize()).isEqualTo("");
33+
assertThat(OtelTraceState.parse("p:5;").serialize()).isEqualTo("");
34+
assertThat(OtelTraceState.parse("p:99").serialize()).isEqualTo("");
35+
assertThat(OtelTraceState.parse("p:").serialize()).isEqualTo("");
36+
assertThat(OtelTraceState.parse("p:232").serialize()).isEqualTo("");
37+
assertThat(OtelTraceState.parse("x;p:5").serialize()).isEqualTo("");
38+
assertThat(OtelTraceState.parse("p:5;x").serialize()).isEqualTo("");
39+
assertThat(OtelTraceState.parse("x:3;p:5").serialize()).isEqualTo("p:5;x:3");
40+
assertThat(OtelTraceState.parse("p:5;x:3").serialize()).isEqualTo("p:5;x:3");
41+
assertThat(OtelTraceState.parse("p:5;x:3;").serialize()).isEqualTo("");
42+
assertThat(OtelTraceState.parse("a:" + getXString(246) + ";p:5;x:3").serialize())
43+
.isEqualTo("p:5;a:" + getXString(246) + ";x:3");
44+
assertThat(OtelTraceState.parse("a:" + getXString(247) + ";p:5;x:3").serialize()).isEqualTo("");
4745

48-
assertEquals("r:5", OtelTraceState.parse("r:5").serialize());
49-
assertEquals("r:62", OtelTraceState.parse("r:62").serialize());
50-
assertEquals("", OtelTraceState.parse("r:63").serialize());
51-
assertEquals("", OtelTraceState.parse("r:5;").serialize());
52-
assertEquals("", OtelTraceState.parse("r:99").serialize());
53-
assertEquals("", OtelTraceState.parse("r:").serialize());
54-
assertEquals("", OtelTraceState.parse("r:232").serialize());
55-
assertEquals("", OtelTraceState.parse("x;r:5").serialize());
56-
assertEquals("", OtelTraceState.parse("r:5;x").serialize());
57-
assertEquals("r:5;x:3", OtelTraceState.parse("x:3;r:5").serialize());
58-
assertEquals("r:5;x:3", OtelTraceState.parse("r:5;x:3").serialize());
59-
assertEquals("", OtelTraceState.parse("r:5;x:3;").serialize());
60-
assertEquals(
61-
"r:5;a:" + getXString(246) + ";x:3",
62-
OtelTraceState.parse("a:" + getXString(246) + ";r:5;x:3").serialize());
63-
assertEquals("", OtelTraceState.parse("a:" + getXString(247) + ";r:5;x:3").serialize());
46+
assertThat(OtelTraceState.parse("r:5").serialize()).isEqualTo("r:5");
47+
assertThat(OtelTraceState.parse("r:62").serialize()).isEqualTo("r:62");
48+
assertThat(OtelTraceState.parse("r:63").serialize()).isEqualTo("");
49+
assertThat(OtelTraceState.parse("r:5;").serialize()).isEqualTo("");
50+
assertThat(OtelTraceState.parse("r:99").serialize()).isEqualTo("");
51+
assertThat(OtelTraceState.parse("r:").serialize()).isEqualTo("");
52+
assertThat(OtelTraceState.parse("r:232").serialize()).isEqualTo("");
53+
assertThat(OtelTraceState.parse("x;r:5").serialize()).isEqualTo("");
54+
assertThat(OtelTraceState.parse("r:5;x").serialize()).isEqualTo("");
55+
assertThat(OtelTraceState.parse("x:3;r:5").serialize()).isEqualTo("r:5;x:3");
56+
assertThat(OtelTraceState.parse("r:5;x:3").serialize()).isEqualTo("r:5;x:3");
57+
assertThat(OtelTraceState.parse("r:5;x:3;").serialize()).isEqualTo("");
58+
assertThat(OtelTraceState.parse("a:" + getXString(246) + ";r:5;x:3").serialize())
59+
.isEqualTo("r:5;a:" + getXString(246) + ";x:3");
60+
assertThat(OtelTraceState.parse("a:" + getXString(247) + ";r:5;x:3").serialize()).isEqualTo("");
6461

65-
assertEquals("p:7;r:5", OtelTraceState.parse("r:5;p:7").serialize());
66-
assertEquals("p:4;r:5", OtelTraceState.parse("r:5;p:4").serialize());
67-
assertEquals("p:7;r:5", OtelTraceState.parse("r:5;p:7").serialize());
68-
assertEquals("p:4;r:5", OtelTraceState.parse("r:5;p:4").serialize());
62+
assertThat(OtelTraceState.parse("r:5;p:7").serialize()).isEqualTo("p:7;r:5");
63+
assertThat(OtelTraceState.parse("r:5;p:4").serialize()).isEqualTo("p:4;r:5");
64+
assertThat(OtelTraceState.parse("r:5;p:7").serialize()).isEqualTo("p:7;r:5");
65+
assertThat(OtelTraceState.parse("r:5;p:4").serialize()).isEqualTo("p:4;r:5");
6966

70-
assertEquals("r:6", OtelTraceState.parse("r:5;r:6").serialize());
71-
assertEquals("p:6;r:10", OtelTraceState.parse("p:5;p:6;r:10").serialize());
72-
assertEquals("", OtelTraceState.parse("p5;p:6;r:10").serialize());
73-
assertEquals("p:6;r:10;p5:3", OtelTraceState.parse("p5:3;p:6;r:10").serialize());
74-
assertEquals("", OtelTraceState.parse(":p:6;r:10").serialize());
75-
assertEquals("", OtelTraceState.parse(";p:6;r:10").serialize());
76-
assertEquals("", OtelTraceState.parse("_;p:6;r:10").serialize());
77-
assertEquals("", OtelTraceState.parse("5;p:6;r:10").serialize());
67+
assertThat(OtelTraceState.parse("r:5;r:6").serialize()).isEqualTo("r:6");
68+
assertThat(OtelTraceState.parse("p:5;p:6;r:10").serialize()).isEqualTo("p:6;r:10");
69+
assertThat(OtelTraceState.parse("p5;p:6;r:10").serialize()).isEqualTo("");
70+
assertThat(OtelTraceState.parse("p5:3;p:6;r:10").serialize()).isEqualTo("p:6;r:10;p5:3");
71+
assertThat(OtelTraceState.parse(":p:6;r:10").serialize()).isEqualTo("");
72+
assertThat(OtelTraceState.parse(";p:6;r:10").serialize()).isEqualTo("");
73+
assertThat(OtelTraceState.parse("_;p:6;r:10").serialize()).isEqualTo("");
74+
assertThat(OtelTraceState.parse("5;p:6;r:10").serialize()).isEqualTo("");
7875
}
7976
}

0 commit comments

Comments
 (0)