From 4dd384fcd76d71960ca0e29b7f98024ef46aa71b Mon Sep 17 00:00:00 2001 From: Sam Whittle Date: Thu, 30 Oct 2025 14:54:37 +0100 Subject: [PATCH 1/2] Fix test expectations which appear to fail with differences in proto generation --- .../control/ProcessBundleHandlerTest.java | 40 +++++++------------ 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/control/ProcessBundleHandlerTest.java b/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/control/ProcessBundleHandlerTest.java index 7ff6da37dcad..62cde0c64461 100644 --- a/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/control/ProcessBundleHandlerTest.java +++ b/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/control/ProcessBundleHandlerTest.java @@ -1998,19 +1998,13 @@ public void testTimerMetrics() throws Exception { for (MetricsApi.MonitoringInfo info : response.getProcessBundle().getMonitoringInfosList()) { if (info.getLabelsOrDefault("NAME", "").equals("timersFired")) { ++timerCounterFound; - assertThat( - info, - allOf( - hasProperty("urn", equalTo("beam:metric:user:sum_int64:v1")), - hasProperty("type", equalTo("beam:metrics:sum_int64:v1")), - hasProperty("payload", equalTo(ByteString.copyFromUtf8("\001"))), - hasProperty( - "labels", - hasEntry( - equalTo("NAMESPACE"), - equalTo( - "org.apache.beam.fn.harness.control.ProcessBundleHandlerTest$SimpleDoFn"))), - hasProperty("labels", hasEntry(equalTo("PTRANSFORM"), equalTo("3L"))))); + assertEquals("beam:metric:user:sum_int64:v1", info.getUrn()); + assertEquals("beam:metrics:sum_int64:v1", info.getType()); + assertEquals( + "org.apache.beam.fn.harness.control.ProcessBundleHandlerTest$SimpleDoFn", + info.getLabelsOrDefault("NAMESPACE", "")); + assertEquals("3L", info.getLabelsOrDefault("PTRANSFORM", "")); + assertEquals(ByteString.copyFromUtf8("\001"), info.getPayload()); } } assertEquals(1, timerCounterFound); @@ -2057,19 +2051,13 @@ public void testStartFinishBundleMetrics() throws Exception { } else { continue; } - assertThat( - info, - allOf( - hasProperty("urn", equalTo("beam:metric:user:sum_int64:v1")), - hasProperty("type", equalTo("beam:metrics:sum_int64:v1")), - hasProperty("payload", equalTo(ByteString.copyFromUtf8("\001"))), - hasProperty( - "labels", - hasEntry( - equalTo("NAMESPACE"), - equalTo( - "org.apache.beam.fn.harness.control.ProcessBundleHandlerTest$SimpleDoFn"))), - hasProperty("labels", hasEntry(equalTo("PTRANSFORM"), equalTo("3L"))))); + assertEquals("beam:metric:user:sum_int64:v1", info.getUrn()); + assertEquals("beam:metrics:sum_int64:v1", info.getType()); + assertEquals( + "org.apache.beam.fn.harness.control.ProcessBundleHandlerTest$SimpleDoFn", + info.getLabelsOrDefault("NAMESPACE", "")); + assertEquals("3L", info.getLabelsOrDefault("PTRANSFORM", "")); + assertEquals(ByteString.copyFromUtf8("\001"), info.getPayload()); } assertEquals(1, startCounterFound); assertEquals(1, finishCounterFound); From 8a500b2d161845cfff4f620fa00ee1f2d7bee0ea Mon Sep 17 00:00:00 2001 From: Sam Whittle Date: Thu, 30 Oct 2025 15:18:43 +0100 Subject: [PATCH 2/2] fix spotless --- .../fn/harness/control/ProcessBundleHandlerTest.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/control/ProcessBundleHandlerTest.java b/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/control/ProcessBundleHandlerTest.java index 62cde0c64461..52b6c87a5c05 100644 --- a/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/control/ProcessBundleHandlerTest.java +++ b/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/control/ProcessBundleHandlerTest.java @@ -21,13 +21,10 @@ import static org.apache.beam.fn.harness.control.ProcessBundleHandler.REGISTERED_RUNNER_FACTORIES; import static org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Preconditions.checkState; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.emptyIterable; import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.hasEntry; -import static org.hamcrest.Matchers.hasProperty; import static org.hamcrest.Matchers.is; import static org.hamcrest.collection.IsEmptyCollection.empty; import static org.junit.Assert.assertEquals; @@ -2001,8 +1998,8 @@ public void testTimerMetrics() throws Exception { assertEquals("beam:metric:user:sum_int64:v1", info.getUrn()); assertEquals("beam:metrics:sum_int64:v1", info.getType()); assertEquals( - "org.apache.beam.fn.harness.control.ProcessBundleHandlerTest$SimpleDoFn", - info.getLabelsOrDefault("NAMESPACE", "")); + "org.apache.beam.fn.harness.control.ProcessBundleHandlerTest$SimpleDoFn", + info.getLabelsOrDefault("NAMESPACE", "")); assertEquals("3L", info.getLabelsOrDefault("PTRANSFORM", "")); assertEquals(ByteString.copyFromUtf8("\001"), info.getPayload()); } @@ -2054,8 +2051,8 @@ public void testStartFinishBundleMetrics() throws Exception { assertEquals("beam:metric:user:sum_int64:v1", info.getUrn()); assertEquals("beam:metrics:sum_int64:v1", info.getType()); assertEquals( - "org.apache.beam.fn.harness.control.ProcessBundleHandlerTest$SimpleDoFn", - info.getLabelsOrDefault("NAMESPACE", "")); + "org.apache.beam.fn.harness.control.ProcessBundleHandlerTest$SimpleDoFn", + info.getLabelsOrDefault("NAMESPACE", "")); assertEquals("3L", info.getLabelsOrDefault("PTRANSFORM", "")); assertEquals(ByteString.copyFromUtf8("\001"), info.getPayload()); }