Skip to content

Commit

Permalink
Merge remote-tracking branch 'solace/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
helios57 committed Aug 26, 2024
2 parents 146f69a + 106f87d commit 4151c95
Showing 1 changed file with 6 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.solace.it.util.semp.config.BrokerConfiguratorBuilder.BrokerConfigurator;
import com.solace.it.util.semp.monitor.BrokerMonitorBuilder;
import com.solace.it.util.semp.monitor.BrokerMonitorBuilder.BrokerMonitor;
import com.solace.spring.cloud.stream.binder.config.JCSMPSessionConfiguration;
import com.solace.test.integration.semp.v2.SempV2Api;
import com.solace.test.integration.semp.v2.action.ApiException;
import com.solace.test.integration.semp.v2.action.model.ActionMsgVpnClientDisconnect;
Expand All @@ -13,9 +14,11 @@
import org.assertj.core.util.Files;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.parallel.Isolated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
Expand All @@ -39,8 +42,9 @@
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;

@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
@AutoConfigureMockMvc
@Isolated
@SpringBootTest
@EnableAutoConfiguration(exclude = JCSMPSessionConfiguration.class)
@ActiveProfiles("multibinderOAuth2")
@DirtiesContext //Ensures all listeners are stopped
class MultiBinderOAuth2IT implements
Expand Down

0 comments on commit 4151c95

Please sign in to comment.