Skip to content
This repository was archived by the owner on Apr 1, 2024. It is now read-only.

Commit 9f63e24

Browse files
authored
[improve][test] Don't configure Mockito spying for MultiBrokerTestZKBaseTest (apache#22250)
1 parent 73f62c5 commit 9f63e24

File tree

3 files changed

+17
-2
lines changed

3 files changed

+17
-2
lines changed

pulsar-broker/src/test/java/org/apache/pulsar/broker/MultiBrokerTestZKBaseTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ protected void onCleanup() {
6565
@Override
6666
protected PulsarTestContext.Builder createPulsarTestContextBuilder(ServiceConfiguration conf) {
6767
return super.createPulsarTestContextBuilder(conf)
68+
.spyNoneByDefault()
6869
.localMetadataStore(createMetadataStore(MetadataStoreConfig.METADATA_STORE))
6970
.configurationMetadataStore(createMetadataStore(MetadataStoreConfig.CONFIGURATION_METADATA_STORE));
7071
}

pulsar-broker/src/test/java/org/apache/pulsar/broker/testcontext/PulsarTestContext.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,17 @@ protected long resolveBrokerShutdownTimeoutMs() {
331331
* @return the builder
332332
*/
333333
public Builder spyByDefault() {
334-
spyConfigBuilder = SpyConfig.builder(SpyConfig.SpyType.SPY);
334+
spyConfigDefault(SpyConfig.SpyType.SPY);
335+
return this;
336+
}
337+
338+
public Builder spyNoneByDefault() {
339+
spyConfigDefault(SpyConfig.SpyType.NONE);
340+
return this;
341+
}
342+
343+
public Builder spyConfigDefault(SpyConfig.SpyType spyType) {
344+
spyConfigBuilder = SpyConfig.builder(spyType);
335345
return this;
336346
}
337347

pulsar-broker/src/test/java/org/apache/pulsar/broker/testcontext/SpyConfig.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,13 +129,17 @@ public static Builder builder() {
129129
*/
130130
public static Builder builder(SpyType defaultSpyType) {
131131
Builder spyConfigBuilder = new Builder();
132+
configureDefaults(spyConfigBuilder, defaultSpyType);
133+
return spyConfigBuilder;
134+
}
135+
136+
public static void configureDefaults(Builder spyConfigBuilder, SpyType defaultSpyType) {
132137
spyConfigBuilder.pulsarService(defaultSpyType);
133138
spyConfigBuilder.pulsarResources(defaultSpyType);
134139
spyConfigBuilder.brokerService(defaultSpyType);
135140
spyConfigBuilder.bookKeeperClient(defaultSpyType);
136141
spyConfigBuilder.compactor(defaultSpyType);
137142
spyConfigBuilder.compactedServiceFactory(defaultSpyType);
138143
spyConfigBuilder.namespaceService(defaultSpyType);
139-
return spyConfigBuilder;
140144
}
141145
}

0 commit comments

Comments
 (0)