Skip to content

Commit 89ea594

Browse files
committed
Added unit tests to check async batch request feature flag
1 parent 5c6b27f commit 89ea594

4 files changed

Lines changed: 38 additions & 4 deletions

File tree

conf/default-config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,5 @@
4141
"operator_type": "public",
4242
"enable_remote_config": true,
4343
"uid_instance_id_prefix": "local-operator",
44-
"enable_async_batch_request": true
44+
"enable_async_batch_request": false
4545
}

src/main/java/com/uid2/operator/Const.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ public class Config extends com.uid2.shared.Const.Config {
4242

4343
public static final String EnableAsyncBatchRequestProp = "enable_async_batch_request";
4444

45-
public static final String DefaultWorkerPoolThreadCount = "default_worker_pool_thread_count";
45+
public static final String DefaultWorkerPoolThreadCountProp = "default_worker_pool_thread_count";
4646
}
4747
}

src/main/java/com/uid2/operator/Main.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
import java.time.Duration;
6262
import java.time.Instant;
6363
import java.util.*;
64-
import java.util.function.Consumer;
6564
import java.util.function.Supplier;
6665

6766
import static com.uid2.operator.Const.Config.EnableRemoteConfigProp;
@@ -498,7 +497,7 @@ private static Vertx createVertx() {
498497
: 3600 * 1000;
499498

500499
final int defaultWorkerPoolSize = Math.max(2, (Runtime.getRuntime().availableProcessors() - 2) / 2 + 1);
501-
final int workerPoolSize = getEnvInt(Const.Config.DefaultWorkerPoolThreadCount, defaultWorkerPoolSize);
500+
final int workerPoolSize = getEnvInt(Const.Config.DefaultWorkerPoolThreadCountProp, defaultWorkerPoolSize);
502501
LOGGER.info("Creating Vertx with default worker pool size: {}", workerPoolSize);
503502

504503
VertxOptions vertxOptions = new VertxOptions()

src/test/java/com/uid2/operator/UIDOperatorVerticleTest.java

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ public class UIDOperatorVerticleTest {
142142
private ExtendedUIDOperatorVerticle uidOperatorVerticle;
143143
private RuntimeConfig runtimeConfig;
144144
private EncryptedTokenEncoder encoder;
145+
private ListAppender<ILoggingEvent> asyncBatchRequestLogWatcher;
145146

146147
@BeforeEach
147148
void deployVerticle(Vertx vertx, VertxTestContext testContext, TestInfo testInfo) {
@@ -161,6 +162,20 @@ void deployVerticle(Vertx vertx, VertxTestContext testContext, TestInfo testInfo
161162
if (testInfo.getDisplayName().equals("cstgNoPhoneSupport(Vertx, VertxTestContext)")) {
162163
config.put("enable_phone_support", false);
163164
}
165+
if (testInfo.getTestMethod().isPresent() &&
166+
testInfo.getTestMethod().get().getName().equals("asyncBatchRequestEnabledLogsCorrectMessage")) {
167+
config.put(Const.Config.EnableAsyncBatchRequestProp, true);
168+
asyncBatchRequestLogWatcher = new ListAppender<>();
169+
asyncBatchRequestLogWatcher.start();
170+
((Logger) LoggerFactory.getLogger(UIDOperatorVerticle.class)).addAppender(asyncBatchRequestLogWatcher);
171+
}
172+
if (testInfo.getTestMethod().isPresent() &&
173+
testInfo.getTestMethod().get().getName().equals("asyncBatchRequestDisabledLogsCorrectMessage")) {
174+
config.put(Const.Config.EnableAsyncBatchRequestProp, false);
175+
asyncBatchRequestLogWatcher = new ListAppender<>();
176+
asyncBatchRequestLogWatcher.start();
177+
((Logger) LoggerFactory.getLogger(UIDOperatorVerticle.class)).addAppender(asyncBatchRequestLogWatcher);
178+
}
164179
when(configStore.getConfig()).thenAnswer(x -> runtimeConfig);
165180

166181
this.uidInstanceIdProvider = new UidInstanceIdProvider("test-instance", "id");
@@ -5602,4 +5617,24 @@ void identityBucketsAlwaysReturnMilliseconds(Vertx vertx, VertxTestContext testC
56025617
testContext.completeNow();
56035618
});
56045619
}
5620+
5621+
@Test
5622+
void asyncBatchRequestEnabledLogsCorrectMessage(Vertx vertx, VertxTestContext testContext) {
5623+
// Verify that when enable_async_batch_request is true, the correct log message is emitted
5624+
assertThat(asyncBatchRequestLogWatcher.list.stream()
5625+
.map(ILoggingEvent::getFormattedMessage)
5626+
.collect(Collectors.toList()))
5627+
.contains("Async batch requests enabled");
5628+
testContext.completeNow();
5629+
}
5630+
5631+
@Test
5632+
void asyncBatchRequestDisabledLogsCorrectMessage(Vertx vertx, VertxTestContext testContext) {
5633+
// Verify that when enable_async_batch_request is false, the correct log message is emitted
5634+
assertThat(asyncBatchRequestLogWatcher.list.stream()
5635+
.map(ILoggingEvent::getFormattedMessage)
5636+
.collect(Collectors.toList()))
5637+
.contains("Async batch requests disabled");
5638+
testContext.completeNow();
5639+
}
56055640
}

0 commit comments

Comments
 (0)