Skip to content

Commit bdf1be3

Browse files
authored
Changes multimap state key() tests to not care about order. There is no guarantee on the order keys are returned. Also fixes a couple warnings from other FnApi tests. (#36178)
1 parent 7cee7bb commit bdf1be3

3 files changed

Lines changed: 14 additions & 5 deletions

File tree

sdks/java/harness/src/test/java/org/apache/beam/fn/harness/control/HarnessMonitoringInfosInstructionHandlerTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@
3030
import org.apache.beam.sdk.metrics.Counter;
3131
import org.apache.beam.sdk.metrics.MetricsEnvironment;
3232
import org.junit.Test;
33+
import org.junit.runner.RunWith;
34+
import org.junit.runners.JUnit4;
3335

36+
@RunWith(JUnit4.class)
3437
public class HarnessMonitoringInfosInstructionHandlerTest {
3538

3639
@Test

sdks/java/harness/src/test/java/org/apache/beam/fn/harness/control/ProcessBundleHandlerTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ public void finishBundle(FinishBundleContext context) {
236236
}
237237
}
238238

239+
@SuppressWarnings("ExtendsAutoValue")
239240
private static class TestBundleProcessor extends BundleProcessor {
240241
static int resetCnt = 0;
241242

sdks/java/harness/src/test/java/org/apache/beam/fn/harness/state/MultimapUserStateTest.java

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import static java.util.Collections.singletonList;
2222
import static org.hamcrest.MatcherAssert.assertThat;
2323
import static org.hamcrest.Matchers.emptyIterable;
24+
import static org.hamcrest.collection.ArrayMatching.arrayContainingInAnyOrder;
2425
import static org.hamcrest.core.Is.is;
2526
import static org.junit.Assert.assertArrayEquals;
2627
import static org.junit.Assert.assertEquals;
@@ -167,7 +168,9 @@ public void testKeys() throws Exception {
167168
userState.put(A3, "V1");
168169
userState.put(A1, "V3");
169170
assertArrayEquals(new byte[][] {A1, A2}, Iterables.toArray(initKeys, byte[].class));
170-
assertArrayEquals(new byte[][] {A1, A2, A3}, Iterables.toArray(userState.keys(), byte[].class));
171+
assertThat(
172+
Iterables.toArray(userState.keys(), byte[].class),
173+
is(arrayContainingInAnyOrder(A1, A2, A3)));
171174

172175
userState.clear();
173176
assertArrayEquals(new byte[][] {A1, A2}, Iterables.toArray(initKeys, byte[].class));
@@ -822,8 +825,9 @@ public void testKeysCached() throws Exception {
822825

823826
userState.put(A2, "V1");
824827
userState.put(A3, "V1");
825-
assertArrayEquals(
826-
new byte[][] {A1, A2, A3}, Iterables.toArray(userState.keys(), byte[].class));
828+
assertThat(
829+
Iterables.toArray(userState.keys(), byte[].class),
830+
is(arrayContainingInAnyOrder(A1, A2, A3)));
827831
userState.asyncClose();
828832
}
829833

@@ -841,8 +845,9 @@ public void testKeysCached() throws Exception {
841845
ByteArrayCoder.of(),
842846
StringUtf8Coder.of());
843847

844-
assertArrayEquals(
845-
new byte[][] {A1, A2, A3}, Iterables.toArray(userState.keys(), byte[].class));
848+
assertThat(
849+
Iterables.toArray(userState.keys(), byte[].class),
850+
is(arrayContainingInAnyOrder(A1, A2, A3)));
846851
userState.asyncClose();
847852
}
848853
}

0 commit comments

Comments
 (0)