1919
2020import org .apache .shenyu .admin .discovery .DiscoveryProcessor ;
2121import org .apache .shenyu .admin .discovery .DiscoveryProcessorHolder ;
22+ import org .apache .shenyu .admin .listener .DataChangedEvent ;
2223import org .apache .shenyu .admin .exception .ValidFailException ;
2324import org .apache .shenyu .admin .mapper .DiscoveryHandlerMapper ;
2425import org .apache .shenyu .admin .mapper .DiscoveryMapper ;
3940import org .apache .shenyu .admin .service .impl .ProxySelectorServiceImpl ;
4041import org .apache .shenyu .admin .utils .ShenyuResultMessage ;
4142import org .apache .shenyu .common .dto .ProxySelectorData ;
43+ import org .apache .shenyu .common .enums .ConfigGroupEnum ;
4244import org .junit .jupiter .api .BeforeEach ;
4345import org .junit .jupiter .api .Test ;
4446import org .junit .jupiter .api .extension .ExtendWith ;
4951import org .mockito .junit .jupiter .MockitoExtension ;
5052import org .mockito .junit .jupiter .MockitoSettings ;
5153import org .mockito .quality .Strictness ;
54+ import org .springframework .context .ApplicationEventPublisher ;
55+ import org .springframework .transaction .support .TransactionSynchronization ;
56+ import org .springframework .transaction .support .TransactionSynchronizationManager ;
5257
5358import java .sql .Timestamp ;
5459import java .util .ArrayList ;
@@ -102,11 +107,14 @@ class ProxySelectorServiceTest {
102107 @ Mock
103108 private DiscoveryProcessorHolder discoveryProcessorHolder ;
104109
110+ @ Mock
111+ private ApplicationEventPublisher eventPublisher ;
112+
105113 @ BeforeEach
106114 void testSetUp () {
107115
108116 proxySelectorService = new ProxySelectorServiceImpl (proxySelectorMapper , discoveryMapper , discoveryUpstreamMapper ,
109- discoveryHandlerMapper , discoveryRelMapper , selectorMapper , discoveryProcessorHolder );
117+ discoveryHandlerMapper , discoveryRelMapper , selectorMapper , discoveryProcessorHolder , eventPublisher );
110118 }
111119
112120 @ Test
@@ -246,14 +254,17 @@ void testCreateOrUpdate() {
246254 assertEquals (proxySelectorService .createOrUpdate (proxySelectorDTO ), ShenyuResultMessage .CREATE_SUCCESS );
247255 }
248256
249- @ Test
250- void testUpdateWithNullDiscoveryUpstreams () {
257+ @ ParameterizedTest
258+ @ ValueSource (booleans = {false , true })
259+ void testUpdatePublishesListenerConfigurationAfterCommit (final boolean commit ) {
251260
252261 ProxySelectorAddDTO proxySelectorDTO = new ProxySelectorAddDTO ();
253262 proxySelectorDTO .setId ("proxy-1" );
254263 proxySelectorDTO .setName ("test" );
255- proxySelectorDTO .setPluginName ("test " );
264+ proxySelectorDTO .setPluginName ("tcp " );
256265 proxySelectorDTO .setForwardPort (8080 );
266+ proxySelectorDTO .setNamespaceId ("namespace-1" );
267+ proxySelectorDTO .setProps ("{\" loadBalance\" :\" roundRobin\" }" );
257268 proxySelectorDTO .setDiscovery (new ProxySelectorAddDTO .Discovery ());
258269
259270 DiscoveryRelDO discoveryRelDO = new DiscoveryRelDO ();
@@ -273,8 +284,30 @@ void testUpdateWithNullDiscoveryUpstreams() {
273284 given (discoveryProcessorHolder .chooseProcessor ("local" )).willReturn (discoveryProcessor );
274285 given (discoveryUpstreamMapper .selectByDiscoveryHandlerId ("handler-1" )).willReturn (Collections .emptyList ());
275286
276- assertEquals (proxySelectorService .update (proxySelectorDTO ), ShenyuResultMessage .UPDATE_SUCCESS );
277- verify (discoveryUpstreamMapper , never ()).deleteByDiscoveryHandlerId (any ());
287+ TransactionSynchronizationManager .initSynchronization ();
288+ try {
289+ assertEquals (proxySelectorService .update (proxySelectorDTO ), ShenyuResultMessage .UPDATE_SUCCESS );
290+ verify (discoveryUpstreamMapper , never ()).deleteByDiscoveryHandlerId (any ());
291+ verifyNoInteractions (eventPublisher );
292+ int status = commit ? TransactionSynchronization .STATUS_COMMITTED : TransactionSynchronization .STATUS_ROLLED_BACK ;
293+ TransactionSynchronizationManager .getSynchronizations ().forEach (synchronization -> synchronization .afterCompletion (status ));
294+ if (!commit ) {
295+ verifyNoInteractions (eventPublisher );
296+ return ;
297+ }
298+ ArgumentCaptor <DataChangedEvent > captor = ArgumentCaptor .forClass (DataChangedEvent .class );
299+ verify (eventPublisher ).publishEvent (captor .capture ());
300+ DataChangedEvent event = captor .getValue ();
301+ assertEquals (ConfigGroupEnum .PROXY_SELECTOR , event .getGroupKey ());
302+ List <?> payload = (List <?>) event .getSource ();
303+ assertEquals (1 , payload .size ());
304+ ProxySelectorData data = (ProxySelectorData ) payload .get (0 );
305+ assertEquals ("test" , data .getName ());
306+ assertEquals (8080 , data .getForwardPort ());
307+ assertEquals ("roundRobin" , data .getProps ().getProperty ("loadBalance" ));
308+ } finally {
309+ TransactionSynchronizationManager .clearSynchronization ();
310+ }
278311 }
279312
280313 @ ParameterizedTest
0 commit comments