| Chunk |
|---|
| Conflicting content |
|---|
}
@Test
<<<<<<< HEAD
@Ignore("Caused by: OtpIOException: failed to connect from 'rabbit-spring-monitor' to peer node 'localhost'")
public void integrationTestsUserCrud() {
=======
// @Ignore
public void integrationTestsUserCrud() throws Exception {
>>>>>>> bd8139948757e7c3fac5363a81e0754264c5ff10
List |
| Solution content |
|---|
}
@Test
// @Ignore
public void integrationTestsUserCrud() throws Exception {
List |
| File |
|---|
| RabbitBrokerAdminIntegrationTests.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Annotation |
| Comment |
| Method signature |
| Chunk |
|---|
| Conflicting content |
|---|
}
}
<<<<<<< HEAD
public void integrationTestListUsers() {
// OtpErlangObject result =
// adminTemplate.getErlangTemplate().executeRpc("rabbit_amqqueue",
// "info_all", "/".getBytes());
// System.out.println(result);
List |
| Solution content |
|---|
}
}
@Test
public void repeatLifecycle() throws Exception {
for (int i = 1; i < 20; i++) {
testStatusAndBrokerLifecycle();
if (i % 5 == 0) {
logger.debug("i = " + i);
}
}
}
// @Test
public void testStatusAndBrokerLifecycle() throws Exception {
RabbitStatus status = brokerAdmin.getStatus();
brokerAdmin.stopBrokerApplication();
status = brokerAdmin.getStatus(); |
| File |
|---|
| RabbitBrokerAdminIntegrationTests.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Annotation |
| Comment |
| Method declaration |
| Method invocation |
| Method signature |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
assertBrokerAppRunning(status);
}
<<<<<<< HEAD
@Test
@Ignore("NEEDS RABBITMQ_HOME to be set.")
public void testStartNode() {
try {
brokerAdmin.stopNode();
} catch (OtpIOException e) {
//assume it is not running.
}
brokerAdmin.startNode();
assertEquals(1,1);
brokerAdmin.stopNode();
}
@Test
@Ignore("Caused by: java.io.IOException: Nameserver not responding on anakata.local when looking up rabbit")
public void testGetQueues() {
=======
@Test
public void testGetQueues() throws Exception {
>>>>>>> bd8139948757e7c3fac5363a81e0754264c5ff10
brokerAdmin.declareQueue(new Queue("test.queue"));
assertEquals("/", connectionFactory.getVirtualHost());
List |
| Solution content |
|---|
assertBrokerAppRunning(status);
}
@Test
public void testGetQueues() throws Exception {
brokerAdmin.declareQueue(new Queue("test.queue"));
assertEquals("/", connectionFactory.getVirtualHost());
List |
| File |
|---|
| RabbitBrokerAdminIntegrationTests.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Annotation |
| Method declaration |
| Method signature |