You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2016/12/13 20:54:29 UTC
activemq-artemis git commit: NO-JIRA: fix checkstyle broken after
c38c5a91aa1cd169bfdd75c3d84acd8604cfb3e7
Repository: activemq-artemis
Updated Branches:
refs/heads/master 33af9901c -> d5be1c6dc
NO-JIRA: fix checkstyle broken after c38c5a91aa1cd169bfdd75c3d84acd8604cfb3e7
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/d5be1c6d
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/d5be1c6d
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/d5be1c6d
Branch: refs/heads/master
Commit: d5be1c6dc6fcc77adecca29e2f79d9c72e679767
Parents: 33af990
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue Dec 13 15:53:22 2016 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Dec 13 15:54:15 2016 -0500
----------------------------------------------------------------------
.../tests/integration/jms/SimpleJNDIClientTest.java | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d5be1c6d/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/SimpleJNDIClientTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/SimpleJNDIClientTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/SimpleJNDIClientTest.java
index fa75356..193a0ab 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/SimpleJNDIClientTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/SimpleJNDIClientTest.java
@@ -483,7 +483,6 @@ public class SimpleJNDIClientTest extends ActiveMQTestBase {
@Test
public void testRemoteCFWithTCPUserPassword() throws Exception {
-
//setup user and role on broker
((ActiveMQJAASSecurityManager) liveService.getSecurityManager()).getConfiguration().addUser("myUser", "myPassword");
((ActiveMQJAASSecurityManager) liveService.getSecurityManager()).getConfiguration().addRole("myUser", "consumeCreateRole");
@@ -499,12 +498,10 @@ public class SimpleJNDIClientTest extends ActiveMQTestBase {
props.put("connectionFactory.myConnectionFactory", "tcp://127.0.0.1:61616?user=myUser&password=myPassword");
Context ctx = new InitialContext(props);
-
//create a connection factory
ActiveMQConnectionFactory connectionFactory = (ActiveMQConnectionFactory) ctx.lookup("myConnectionFactory");
- Assert.assertEquals("ensure user is set","myUser", connectionFactory.getUser());
- Assert.assertEquals("ensure password is set", "myPassword",connectionFactory.getPassword());
-
+ Assert.assertEquals("ensure user is set", "myUser", connectionFactory.getUser());
+ Assert.assertEquals("ensure password is set", "myPassword", connectionFactory.getPassword());
//Connect to broker to verify credentials are used with connection
Connection connection = connectionFactory.createConnection();
@@ -519,15 +516,14 @@ public class SimpleJNDIClientTest extends ActiveMQTestBase {
MessageProducer producer = session.createProducer(queue);
producer.send(session.createTextMessage("test Msg"));
Assert.fail("Sending message should throw a JMSSecurityException");
- }catch (JMSSecurityException e) {
- //expected
+ } catch (JMSSecurityException e) {
+ //expected
}
MessageConsumer consumer = session.createConsumer(queue);
-
} finally {
- connection.close();
- }
+ connection.close();
+ }
}
}