|
52 | 52 | import org.mockito.junit.jupiter.MockitoSettings; |
53 | 53 | import org.mockito.quality.Strictness; |
54 | 54 | import org.springframework.context.ApplicationEventPublisher; |
| 55 | +import org.springframework.test.util.ReflectionTestUtils; |
55 | 56 |
|
56 | 57 | import java.util.ArrayList; |
57 | 58 | import java.util.Collections; |
@@ -198,6 +199,49 @@ public void testDoRegisterURI() { |
198 | 199 | assertEquals(ShenyuResultMessage.SUCCESS, abstractShenyuClientRegisterService.doRegisterURI("Selector_Name", Collections.singletonList(uriRegisterDTO), SYS_DEFAULT_NAMESPACE_ID)); |
199 | 200 | } |
200 | 201 |
|
| 202 | + @Test |
| 203 | + public void testDoRegisterURIResetsReadinessWhenTheHandleIsUnchanged() { |
| 204 | + final UnchangedHandleShenyuClientRegisterServiceImpl unchangedHandleService = |
| 205 | + new UnchangedHandleShenyuClientRegisterServiceImpl(); |
| 206 | + ReflectionTestUtils.setField(unchangedHandleService, "selectorService", selectorService); |
| 207 | + ReflectionTestUtils.setField(unchangedHandleService, "discoveryUpstreamService", discoveryUpstreamService); |
| 208 | + ReflectionTestUtils.setField(unchangedHandleService, "eventPublisher", eventPublisher); |
| 209 | + ReflectionTestUtils.setField(unchangedHandleService, "discoveryService", mock(org.apache.shenyu.admin.service.DiscoveryService.class)); |
| 210 | + ReflectionTestUtils.setField(unchangedHandleService, "namespacePluginRelMapper", namespacePluginRelMapper); |
| 211 | + ReflectionTestUtils.setField(unchangedHandleService, "pluginMapper", pluginMapper); |
| 212 | + |
| 213 | + PluginDO pluginDO = new PluginDO(); |
| 214 | + pluginDO.setId("1"); |
| 215 | + pluginDO.setName(PluginEnum.GRPC.getName()); |
| 216 | + when(pluginMapper.selectByName(PluginEnum.GRPC.getName())).thenReturn(pluginDO); |
| 217 | + NamespacePluginVO namespacePluginVO = new NamespacePluginVO(); |
| 218 | + namespacePluginVO.setPluginId("1"); |
| 219 | + namespacePluginVO.setNamespaceId(SYS_DEFAULT_NAMESPACE_ID); |
| 220 | + when(namespacePluginRelMapper.selectByPluginIdAndNamespaceId(pluginDO.getId(), SYS_DEFAULT_NAMESPACE_ID)).thenReturn(namespacePluginVO); |
| 221 | + SelectorDO selectorDO = new SelectorDO(); |
| 222 | + selectorDO.setId("selector-1"); |
| 223 | + selectorDO.setSelectorName("Selector_Name"); |
| 224 | + when(selectorService.findByNameAndPluginNameAndNamespaceId(any(), any(), any())).thenReturn(selectorDO); |
| 225 | + URIRegisterDTO uriRegisterDTO = URIRegisterDTO.builder().build(); |
| 226 | + uriRegisterDTO.setPort(8080); |
| 227 | + uriRegisterDTO.setHost("Host"); |
| 228 | + uriRegisterDTO.setProtocol("dubbo://"); |
| 229 | + |
| 230 | + assertEquals(ShenyuResultMessage.SUCCESS, |
| 231 | + unchangedHandleService.doRegisterURI("Selector_Name", Collections.singletonList(uriRegisterDTO), SYS_DEFAULT_NAMESPACE_ID)); |
| 232 | + |
| 233 | + // the unchanged-handle path must still release the persisted admission markers… |
| 234 | + verify(discoveryUpstreamService).markReadyBySelectorIdAndUrl(eq("selector-1"), anyString()); |
| 235 | + // …and publish the refreshed discovery snapshot |
| 236 | + org.mockito.ArgumentCaptor<org.apache.shenyu.admin.listener.DataChangedEvent> eventCaptor = |
| 237 | + org.mockito.ArgumentCaptor.forClass(org.apache.shenyu.admin.listener.DataChangedEvent.class); |
| 238 | + verify(eventPublisher).publishEvent(eventCaptor.capture()); |
| 239 | + org.apache.shenyu.admin.listener.DataChangedEvent event = eventCaptor.getValue(); |
| 240 | + assertEquals(org.apache.shenyu.common.enums.ConfigGroupEnum.DISCOVER_UPSTREAM, event.getGroupKey()); |
| 241 | + assertEquals(org.apache.shenyu.common.enums.DataEventTypeEnum.UPDATE, |
| 242 | + org.springframework.test.util.ReflectionTestUtils.getField(event, "eventType")); |
| 243 | + } |
| 244 | + |
201 | 245 | @Test |
202 | 246 | public void testCheckNamespacePluginRelWhenPluginMissing() { |
203 | 247 | String pluginName = "missing-plugin"; |
@@ -264,6 +308,45 @@ public void testDoNotReadyAndDoReady() { |
264 | 308 | verify(discoveryUpstreamService).markReadyBySelectorIdAndUrl(eq("selector-1"), anyString()); |
265 | 309 | } |
266 | 310 |
|
| 311 | + /** |
| 312 | + * A registration whose selector handle does not change: buildHandle returns null |
| 313 | + * exactly the way a duplicate Divide registration of an unchanged healthy endpoint |
| 314 | + * does, while the real doDiscoveryLocal (readiness reset + snapshot publish) runs. |
| 315 | + */ |
| 316 | + static class UnchangedHandleShenyuClientRegisterServiceImpl extends AbstractShenyuClientRegisterServiceImpl { |
| 317 | + |
| 318 | + UnchangedHandleShenyuClientRegisterServiceImpl() { |
| 319 | + } |
| 320 | + |
| 321 | + @Override |
| 322 | + public String rpcType() { |
| 323 | + return "grpc"; |
| 324 | + } |
| 325 | + |
| 326 | + @Override |
| 327 | + protected String selectorHandler(final MetaDataRegisterDTO metaDataDTO) { |
| 328 | + return "Selector_Handler"; |
| 329 | + } |
| 330 | + |
| 331 | + @Override |
| 332 | + protected String ruleHandler() { |
| 333 | + return "Rule_Handler"; |
| 334 | + } |
| 335 | + |
| 336 | + @Override |
| 337 | + protected void registerMetadata(final MetaDataRegisterDTO metaDataDTO) { |
| 338 | + } |
| 339 | + |
| 340 | + @Override |
| 341 | + protected String buildHandle(final List<URIRegisterDTO> uriList, final SelectorDO selectorDO) { |
| 342 | + return null; |
| 343 | + } |
| 344 | + |
| 345 | + @Override |
| 346 | + protected void removeDiscoveryUpstream(final String selectorId, final String url) { |
| 347 | + } |
| 348 | + } |
| 349 | + |
267 | 350 | static class MockAbstractShenyuClientRegisterServiceImpl extends AbstractShenyuClientRegisterServiceImpl { |
268 | 351 |
|
269 | 352 | @Override |
|
0 commit comments