Skip to content

Commit c9f843b

Browse files
nandorKollarnandorKollar
committed
Fix tests
1 parent 1a0aaa5 commit c9f843b

4 files changed

Lines changed: 41 additions & 46 deletions

File tree

‎runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/AbstractIcebergCatalogTest.java‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,10 @@
3838
import com.google.common.collect.Iterables;
3939
import com.google.common.collect.Streams;
4040
import io.quarkus.test.junit.QuarkusMock;
41+
import io.smallrye.common.annotation.Identifier;
4142
import jakarta.annotation.Nonnull;
43+
import jakarta.enterprise.inject.Any;
44+
import jakarta.enterprise.inject.Instance;
4245
import jakarta.inject.Inject;
4346
import java.io.IOException;
4447
import java.io.UncheckedIOException;
@@ -143,7 +146,8 @@
143146
import org.apache.polaris.service.events.PolarisEventDispatcher;
144147
import org.apache.polaris.service.events.PolarisEventMetadataFactory;
145148
import org.apache.polaris.service.events.PolarisEventType;
146-
import org.apache.polaris.service.events.listeners.TestPolarisEventDispatcher;
149+
import org.apache.polaris.service.events.listeners.PolarisEventListener;
150+
import org.apache.polaris.service.events.listeners.TestPolarisEventListener;
147151
import org.apache.polaris.service.exception.FakeAzureHttpResponse;
148152
import org.apache.polaris.service.exception.IcebergExceptionMapper;
149153
import org.apache.polaris.service.storage.PolarisStorageIntegrationProviderImpl;
@@ -203,6 +207,7 @@ public Map<String, String> getConfigOverrides() {
203207
.put("polaris.features.\"LIST_PAGINATION_ENABLED\"", "true")
204208
.put("polaris.behavior-changes.\"ALLOW_NAMESPACE_CUSTOM_LOCATION\"", "true")
205209
.put("polaris.test.rootAugmentor.enabled", "true")
210+
.put("polaris.event-listener.types", "test")
206211
.build();
207212
}
208213
}
@@ -233,7 +238,7 @@ public Map<String, String> getConfigOverrides() {
233238
@Inject PolarisStorageIntegrationProvider storageIntegrationProvider;
234239
@Inject ServiceIdentityProvider serviceIdentityProvider;
235240
@Inject PolarisDiagnostics diagServices;
236-
@Inject PolarisEventDispatcher polarisEventDispatcher;
241+
@Inject @Any Instance<PolarisEventListener> polarisEventListener;
237242
@Inject PolarisEventMetadataFactory eventMetadataFactory;
238243
@Inject PolarisMetaStoreManager metaStoreManager;
239244
@Inject CallContext callContext;
@@ -246,14 +251,15 @@ public Map<String, String> getConfigOverrides() {
246251
@Inject PolarisPrincipal authenticatedRoot;
247252
@Inject PolarisAdminService adminService;
248253
@Inject ResolverFactory resolverFactory;
254+
@Inject PolarisEventDispatcher polarisEventDispatcher;
249255

250256
private IcebergCatalog catalog;
251257
private String realmName;
252258
private PolarisCallContext polarisContext;
253259
private InMemoryFileIO fileIO;
254260
private PolarisEntity catalogEntity;
255261

256-
private TestPolarisEventDispatcher testPolarisEventDispatcher;
262+
private TestPolarisEventListener testPolarisEventListener;
257263

258264
@BeforeAll
259265
public static void setUpMocks() {
@@ -326,9 +332,9 @@ public void before(TestInfo testInfo) {
326332
.thenReturn((PolarisStorageIntegration) storageIntegration);
327333

328334
this.catalog = initCatalog("my-catalog", ImmutableMap.of());
329-
330-
testPolarisEventDispatcher = (TestPolarisEventDispatcher) polarisEventDispatcher;
331-
testPolarisEventDispatcher.clear();
335+
testPolarisEventListener =
336+
(TestPolarisEventListener) polarisEventListener.select(Identifier.Literal.of("test")).get();
337+
testPolarisEventListener.clear();
332338
}
333339

334340
@AfterEach
@@ -2477,13 +2483,13 @@ public void testEventsAreEmitted() {
24772483
table.updateProperties().set(key, valNew).commit();
24782484

24792485
PolarisEvent beforeRefreshEvent =
2480-
testPolarisEventDispatcher.getLatest(PolarisEventType.BEFORE_REFRESH_TABLE);
2486+
testPolarisEventListener.getLatest(PolarisEventType.BEFORE_REFRESH_TABLE);
24812487
Assertions.assertThat(
24822488
beforeRefreshEvent.attributes().getRequired(EventAttributes.TABLE_IDENTIFIER))
24832489
.isEqualTo(TestData.TABLE);
24842490

24852491
PolarisEvent afterRefreshEvent =
2486-
testPolarisEventDispatcher.getLatest(PolarisEventType.AFTER_REFRESH_TABLE);
2492+
testPolarisEventListener.getLatest(PolarisEventType.AFTER_REFRESH_TABLE);
24872493
Assertions.assertThat(
24882494
afterRefreshEvent.attributes().getRequired(EventAttributes.TABLE_IDENTIFIER))
24892495
.isEqualTo(TestData.TABLE);

‎runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/AbstractIcebergCatalogViewTest.java‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020

2121
import com.google.common.collect.ImmutableMap;
2222
import io.quarkus.test.junit.QuarkusMock;
23+
import io.smallrye.common.annotation.Identifier;
24+
import jakarta.enterprise.inject.Any;
25+
import jakarta.enterprise.inject.Instance;
2326
import jakarta.inject.Inject;
2427
import java.io.IOException;
2528
import java.lang.reflect.Field;
@@ -63,7 +66,8 @@
6366
import org.apache.polaris.service.events.PolarisEventDispatcher;
6467
import org.apache.polaris.service.events.PolarisEventMetadataFactory;
6568
import org.apache.polaris.service.events.PolarisEventType;
66-
import org.apache.polaris.service.events.listeners.TestPolarisEventDispatcher;
69+
import org.apache.polaris.service.events.listeners.PolarisEventListener;
70+
import org.apache.polaris.service.events.listeners.TestPolarisEventListener;
6771
import org.apache.polaris.service.storage.PolarisStorageIntegrationProviderImpl;
6872
import org.apache.polaris.service.test.TestData;
6973
import org.assertj.core.api.Assertions;
@@ -90,6 +94,7 @@ public Map<String, String> getConfigOverrides() {
9094
.put("polaris.features.\"ALLOW_WILDCARD_LOCATION\"", "true")
9195
.put("polaris.features.\"SKIP_CREDENTIAL_SUBSCOPING_INDIRECTION\"", "true")
9296
.put("polaris.features.\"LIST_PAGINATION_ENABLED\"", "true")
97+
.put("polaris.event-listener.types", "test")
9398
.build();
9499
}
95100
}
@@ -107,6 +112,7 @@ public Map<String, String> getConfigOverrides() {
107112
@Inject ServiceIdentityProvider serviceIdentityProvider;
108113
@Inject StorageCredentialCache storageCredentialCache;
109114
@Inject PolarisDiagnostics diagServices;
115+
@Inject @Any Instance<PolarisEventListener> polarisEventListener;
110116
@Inject PolarisEventDispatcher polarisEventDispatcher;
111117
@Inject PolarisEventMetadataFactory eventMetadataFactory;
112118
@Inject ResolverFactory resolverFactory;
@@ -123,7 +129,7 @@ public Map<String, String> getConfigOverrides() {
123129
private String realmName;
124130
private PolarisCallContext polarisContext;
125131

126-
private TestPolarisEventDispatcher testPolarisEventDispatcher;
132+
private TestPolarisEventListener testPolarisEventListener;
127133

128134
@BeforeAll
129135
public static void setUpMocks() {
@@ -194,8 +200,9 @@ public void before(TestInfo testInfo) {
194200
new PolarisPassthroughResolutionView(
195201
resolutionManifestFactory, authenticatedRoot, CATALOG_NAME);
196202

197-
testPolarisEventDispatcher = (TestPolarisEventDispatcher) polarisEventDispatcher;
198-
testPolarisEventDispatcher.clear();
203+
testPolarisEventListener =
204+
(TestPolarisEventListener) polarisEventListener.select(Identifier.Literal.of("test")).get();
205+
testPolarisEventListener.clear();
199206
this.catalog =
200207
new IcebergCatalog(
201208
diagServices,
@@ -257,13 +264,13 @@ public void testEventsAreEmitted() {
257264
view.updateProperties().set(key, valNew).commit();
258265

259266
PolarisEvent beforeRefreshEvent =
260-
testPolarisEventDispatcher.getLatest(PolarisEventType.BEFORE_REFRESH_VIEW);
267+
testPolarisEventListener.getLatest(PolarisEventType.BEFORE_REFRESH_VIEW);
261268
Assertions.assertThat(
262269
beforeRefreshEvent.attributes().getRequired(EventAttributes.VIEW_IDENTIFIER))
263270
.isEqualTo(TestData.TABLE);
264271

265272
PolarisEvent afterRefreshEvent =
266-
testPolarisEventDispatcher.getLatest(PolarisEventType.AFTER_REFRESH_VIEW);
273+
testPolarisEventListener.getLatest(PolarisEventType.AFTER_REFRESH_VIEW);
267274
Assertions.assertThat(
268275
afterRefreshEvent.attributes().getRequired(EventAttributes.VIEW_IDENTIFIER))
269276
.isEqualTo(TestData.TABLE);

‎runtime/service/src/test/java/org/apache/polaris/service/events/listeners/QuarkusTestPolarisEventDispatcher.java‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎runtime/service/src/test/java/org/apache/polaris/service/ratelimiter/RateLimiterFilterTest.java‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,19 @@
2626
import io.quarkus.test.junit.QuarkusTest;
2727
import io.quarkus.test.junit.QuarkusTestProfile;
2828
import io.quarkus.test.junit.TestProfile;
29+
import io.smallrye.common.annotation.Identifier;
30+
import jakarta.enterprise.inject.Any;
31+
import jakarta.enterprise.inject.Instance;
2932
import jakarta.inject.Inject;
3033
import jakarta.ws.rs.core.Response.Status;
3134
import java.util.Map;
3235
import java.util.Set;
3336
import java.util.function.Consumer;
3437
import org.apache.polaris.service.events.EventAttributes;
3538
import org.apache.polaris.service.events.PolarisEvent;
36-
import org.apache.polaris.service.events.PolarisEventDispatcher;
3739
import org.apache.polaris.service.events.PolarisEventType;
38-
import org.apache.polaris.service.events.listeners.TestPolarisEventDispatcher;
40+
import org.apache.polaris.service.events.listeners.PolarisEventListener;
41+
import org.apache.polaris.service.events.listeners.TestPolarisEventListener;
3942
import org.apache.polaris.service.ratelimiter.RateLimiterFilterTest.Profile;
4043
import org.apache.polaris.service.test.PolarisIntegrationTestFixture;
4144
import org.apache.polaris.service.test.PolarisIntegrationTestHelper;
@@ -78,13 +81,16 @@ public Map<String, String> getConfigOverrides() {
7881
.put("polaris.realm-context.type", "test")
7982
.put("polaris.authentication.token-broker.type", "symmetric-key")
8083
.put("polaris.authentication.token-broker.symmetric-key.secret", "secret")
84+
.put("polaris.event-listener.types", "test")
8185
.build();
8286
}
8387
}
8488

8589
@Inject PolarisIntegrationTestHelper helper;
8690
@Inject MeterRegistry meterRegistry;
87-
@Inject PolarisEventDispatcher polarisEventDispatcher;
91+
@Inject @Any Instance<PolarisEventListener> polarisEventListener;
92+
93+
private TestPolarisEventListener testPolarisEventListener;
8894

8995
private TestEnvironment testEnv;
9096
private PolarisIntegrationTestFixture fixture;
@@ -107,6 +113,10 @@ public void destroyFixture() {
107113
public void resetMeterRegistry() {
108114
MockRateLimiter.allowProceed = true;
109115
meterRegistry.clear();
116+
117+
testPolarisEventListener =
118+
(TestPolarisEventListener) polarisEventListener.select(Identifier.Literal.of("test")).get();
119+
testPolarisEventListener.clear();
110120
}
111121

112122
@Test
@@ -141,8 +151,7 @@ public void testMetricsAreEmittedWhenRateLimiting() {
141151
}
142152

143153
PolarisEvent event =
144-
((TestPolarisEventDispatcher) polarisEventDispatcher)
145-
.getLatest(PolarisEventType.BEFORE_LIMIT_REQUEST_RATE);
154+
testPolarisEventListener.getLatest(PolarisEventType.BEFORE_LIMIT_REQUEST_RATE);
146155
assertThat(event.attributes().getRequired(EventAttributes.HTTP_METHOD)).isEqualTo("GET");
147156

148157
// Examples of expected metrics:

0 commit comments

Comments
 (0)