Skip to content

Commit a9e2d8e

Browse files
KomachiSionKomachiSion
authored
refactor NamingFuzzyWatchServiceListHolderTest (alibaba#13517)
* refactor NamingFuzzyWatchServiceListHolderTest * add waiting time try to enhance stable of ut.
1 parent 99af351 commit a9e2d8e

1 file changed

Lines changed: 20 additions & 20 deletions

File tree

‎client/src/test/java/com/alibaba/nacos/client/naming/cache/NamingFuzzyWatchServiceListHolderTest.java‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -107,20 +107,20 @@ public void onEvent(FuzzyWatchChangeEvent event) {
107107
connection);
108108
Assertions.assertNotNull(response);
109109
Thread.sleep(100L);
110-
Assertions.assertTrue(watcherFlag.get() == 1);
110+
Assertions.assertEquals(1, watcherFlag.get());
111111

112112
Response duplicatedResponse = namingFuzzyWatchNotifyRequestHandler.requestReply(
113113
namingFuzzyWatchChangeNotifyRequest, connection);
114114
Assertions.assertNotNull(duplicatedResponse);
115115
Thread.sleep(100L);
116-
Assertions.assertTrue(watcherFlag.get() == 1);
116+
Assertions.assertEquals(1, watcherFlag.get());
117117

118118
namingFuzzyWatchChangeNotifyRequest.setChangedType(DELETE_SERVICE);
119119
Response deleteResponse = namingFuzzyWatchNotifyRequestHandler.requestReply(namingFuzzyWatchChangeNotifyRequest,
120120
connection);
121121
Assertions.assertNotNull(deleteResponse);
122122
Thread.sleep(100L);
123-
Assertions.assertTrue(watcherFlag.get() == 2);
123+
Assertions.assertEquals(2, watcherFlag.get());
124124

125125
}
126126

@@ -152,11 +152,11 @@ public void onEvent(FuzzyWatchChangeEvent event) {
152152
connection);
153153
Assertions.assertNotNull(responseInitNotify);
154154
Thread.sleep(100L);
155-
Assertions.assertTrue(watcherFlag.get() == 2);
155+
Assertions.assertEquals(2, watcherFlag.get());
156156
try {
157157
Future<ListView<String>> newFuture = namingFuzzyWatchContext.createNewFuture();
158158
newFuture.get(100L, TimeUnit.MILLISECONDS);
159-
Assertions.assertTrue(false);
159+
Assertions.fail();
160160
} catch (TimeoutException timeoutException) {
161161
Assertions.assertTrue(true);
162162
} catch (ExecutionException e) {
@@ -170,7 +170,7 @@ public void onEvent(FuzzyWatchChangeEvent event) {
170170

171171
Assertions.assertNotNull(responseInitNotifyFinish);
172172
Thread.sleep(100L);
173-
Assertions.assertTrue(watcherFlag.get() == 2);
173+
Assertions.assertEquals(2, watcherFlag.get());
174174
try {
175175
Future<ListView<String>> newFuture = namingFuzzyWatchContext.createNewFuture();
176176
ListView<String> stringListView = newFuture.get();
@@ -181,12 +181,12 @@ public void onEvent(FuzzyWatchChangeEvent event) {
181181
Assertions.assertTrue(newFuture.isDone());
182182
try {
183183
newFuture.cancel(true);
184-
Assertions.assertTrue(false);
184+
Assertions.fail();
185185
} catch (UnsupportedOperationException unsupportedOperationException) {
186186
Assertions.assertTrue(true);
187187
}
188188
} catch (Exception timeoutException) {
189-
Assertions.assertTrue(false);
189+
Assertions.fail();
190190
}
191191

192192
namingFuzzyWatchServiceListHolder.registerFuzzyWatcher(generatePattern, new AbstractFuzzyWatchEventWatcher() {
@@ -227,22 +227,22 @@ public void onServiceReachUpLimit() {
227227
NamingFuzzyWatchLoadEvent namingFuzzyWatchLoadEvent = NamingFuzzyWatchLoadEvent.buildEvent(
228228
FUZZY_WATCH_PATTERN_OVER_LIMIT.getCode(), generatePattern, eventScope);
229229
namingFuzzyWatchServiceListHolder.onEvent(namingFuzzyWatchLoadEvent);
230-
Assertions.assertTrue(watcherPatternOverFlag.get() == 1);
231-
Assertions.assertTrue(watcherServiceOverFlag.get() == 0);
230+
Assertions.assertEquals(1, watcherPatternOverFlag.get());
231+
Assertions.assertEquals(0, watcherServiceOverFlag.get());
232232

233233
NamingFuzzyWatchLoadEvent namingFuzzyWatchLoadEventDup = NamingFuzzyWatchLoadEvent.buildEvent(
234234
FUZZY_WATCH_PATTERN_MATCH_COUNT_OVER_LIMIT.getCode(), generatePattern, eventScope);
235235
namingFuzzyWatchServiceListHolder.onEvent(namingFuzzyWatchLoadEventDup);
236-
Assertions.assertTrue(watcherPatternOverFlag.get() == 1);
237-
Assertions.assertTrue(watcherServiceOverFlag.get() == 0);
236+
Assertions.assertEquals(1, watcherPatternOverFlag.get());
237+
Assertions.assertEquals(0, watcherServiceOverFlag.get());
238238
NamingFuzzyWatchContext namingFuzzyWatchContext = namingFuzzyWatchServiceListHolder.getFuzzyWatchContext(
239239
generatePattern);
240240
namingFuzzyWatchContext.clearOverLimitTs();
241241
NamingFuzzyWatchLoadEvent namingFuzzyWatchLoadEvent2 = NamingFuzzyWatchLoadEvent.buildEvent(
242242
FUZZY_WATCH_PATTERN_MATCH_COUNT_OVER_LIMIT.getCode(), generatePattern, eventScope);
243243
namingFuzzyWatchServiceListHolder.onEvent(namingFuzzyWatchLoadEvent2);
244-
Assertions.assertTrue(watcherPatternOverFlag.get() == 1);
245-
Assertions.assertTrue(watcherServiceOverFlag.get() == 1);
244+
Assertions.assertEquals(1, watcherPatternOverFlag.get());
245+
Assertions.assertEquals(1, watcherServiceOverFlag.get());
246246
}
247247

248248
@Test
@@ -288,9 +288,9 @@ public void onServiceReachUpLimit() {
288288
when(namingGrpcClientProxy.fuzzyWatchRequest(any(NamingFuzzyWatchRequest.class))).thenThrow(
289289
new NacosException(FUZZY_WATCH_PATTERN_OVER_LIMIT.getCode(), FUZZY_WATCH_PATTERN_OVER_LIMIT.getMsg()));
290290
namingFuzzyWatchServiceListHolder.executeNamingFuzzyWatch();
291-
Thread.sleep(100L);
292-
Assertions.assertTrue(watcherPatternOverFlag.get() == 1);
293-
Assertions.assertTrue(watcherServiceOverFlag.get() == 0);
291+
Thread.sleep(1000L);
292+
Assertions.assertEquals(1, watcherPatternOverFlag.get());
293+
Assertions.assertEquals(0, watcherServiceOverFlag.get());
294294

295295
namingFuzzyWatchContext.clearOverLimitTs();
296296
//check over fuzzy watch service count
@@ -299,8 +299,8 @@ public void onServiceReachUpLimit() {
299299
FUZZY_WATCH_PATTERN_MATCH_COUNT_OVER_LIMIT.getMsg()));
300300
namingFuzzyWatchServiceListHolder.executeNamingFuzzyWatch();
301301
Thread.sleep(100L);
302-
Assertions.assertTrue(watcherPatternOverFlag.get() == 1);
303-
Assertions.assertTrue(watcherServiceOverFlag.get() == 1);
302+
Assertions.assertEquals(1, watcherPatternOverFlag.get());
303+
Assertions.assertEquals(1, watcherServiceOverFlag.get());
304304

305305
when(namingGrpcClientProxy.fuzzyWatchRequest(any(NamingFuzzyWatchRequest.class))).thenThrow(
306306
new NacosException(500, "unknow"));
@@ -311,7 +311,7 @@ public void onServiceReachUpLimit() {
311311
when(namingGrpcClientProxy.fuzzyWatchRequest(any(NamingFuzzyWatchRequest.class))).thenReturn(
312312
NamingFuzzyWatchResponse.buildSuccessResponse());
313313
namingFuzzyWatchServiceListHolder.executeNamingFuzzyWatch();
314-
Assertions.assertTrue(namingFuzzyWatchServiceListHolder.getFuzzyWatchContext(generatePattern) == null);
314+
Assertions.assertNull(namingFuzzyWatchServiceListHolder.getFuzzyWatchContext(generatePattern));
315315

316316
}
317317

0 commit comments

Comments
 (0)