Skip to content

[improve][test] Don't configure Mockito spying for MultiBrokerTestZKBaseTest #22250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 12, 2024
Merged

[improve][test] Don't configure Mockito spying for MultiBrokerTestZKBaseTest #22250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pulsar-broker/src/test/java/org/apache/pulsar/broker/MultiBrokerTestZKBaseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ protected void onCleanup() {
@Override
protected PulsarTestContext.Builder createPulsarTestContextBuilder(ServiceConfiguration conf) {
return super.createPulsarTestContextBuilder(conf)
.spyNoneByDefault()
.localMetadataStore(createMetadataStore(MetadataStoreConfig.METADATA_STORE))
.configurationMetadataStore(createMetadataStore(MetadataStoreConfig.CONFIGURATION_METADATA_STORE));
}
Expand Down
12 changes: 11 additions & 1 deletion pulsar-broker/src/test/java/org/apache/pulsar/broker/testcontext/PulsarTestContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,17 @@ protected long resolveBrokerShutdownTimeoutMs() {
* @return the builder
*/
public Builder spyByDefault() {
spyConfigBuilder = SpyConfig.builder(SpyConfig.SpyType.SPY);
spyConfigDefault(SpyConfig.SpyType.SPY);
return this;
}

public Builder spyNoneByDefault() {
spyConfigDefault(SpyConfig.SpyType.NONE);
return this;
}

public Builder spyConfigDefault(SpyConfig.SpyType spyType) {
spyConfigBuilder = SpyConfig.builder(spyType);
return this;
}

Expand Down
6 changes: 5 additions & 1 deletion pulsar-broker/src/test/java/org/apache/pulsar/broker/testcontext/SpyConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,13 +129,17 @@ public static Builder builder() {
*/
public static Builder builder(SpyType defaultSpyType) {
Builder spyConfigBuilder = new Builder();
configureDefaults(spyConfigBuilder, defaultSpyType);
return spyConfigBuilder;
}

public static void configureDefaults(Builder spyConfigBuilder, SpyType defaultSpyType) {
spyConfigBuilder.pulsarService(defaultSpyType);
spyConfigBuilder.pulsarResources(defaultSpyType);
spyConfigBuilder.brokerService(defaultSpyType);
spyConfigBuilder.bookKeeperClient(defaultSpyType);
spyConfigBuilder.compactor(defaultSpyType);
spyConfigBuilder.compactedServiceFactory(defaultSpyType);
spyConfigBuilder.namespaceService(defaultSpyType);
return spyConfigBuilder;
}
}