You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2017/11/03 17:27:54 UTC
qpid-broker-j git commit: NO-JIRA: [Broker-J Tests] Correcting typo
in tests AMPQ => AMQP
Repository: qpid-broker-j
Updated Branches:
refs/heads/master 5da2df52a -> 440268243
NO-JIRA: [Broker-J Tests] Correcting typo in tests AMPQ => AMQP
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/44026824
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/44026824
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/44026824
Branch: refs/heads/master
Commit: 440268243e851fd7be2dfada654029ffa8c1fb7a
Parents: 5da2df5
Author: Keith Wall <kw...@apache.org>
Authored: Fri Nov 3 17:27:21 2017 +0000
Committer: Keith Wall <kw...@apache.org>
Committed: Fri Nov 3 17:27:46 2017 +0000
----------------------------------------------------------------------
.../store/berkeleydb/BDBAMQP10V0UpgradeTest.java | 2 +-
.../management/amqp/AmqpManagementTest.java | 18 +++++++++---------
.../apache/qpid/systest/rest/PortRestTest.java | 12 ++++++------
.../qpid/transport/ProtocolNegotiationTest.java | 2 +-
4 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/44026824/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBAMQP10V0UpgradeTest.java
----------------------------------------------------------------------
diff --git a/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBAMQP10V0UpgradeTest.java b/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBAMQP10V0UpgradeTest.java
index 34c550c..d064cec 100644
--- a/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBAMQP10V0UpgradeTest.java
+++ b/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBAMQP10V0UpgradeTest.java
@@ -92,7 +92,7 @@ public class BDBAMQP10V0UpgradeTest extends QpidBrokerTestCase
}
}
- public void testRecoverAmpqV0Message() throws Exception
+ public void testRecoverAmqpV0Message() throws Exception
{
Connection connection = getConnection();
connection.start();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/44026824/systests/src/test/java/org/apache/qpid/systest/management/amqp/AmqpManagementTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/systest/management/amqp/AmqpManagementTest.java b/systests/src/test/java/org/apache/qpid/systest/management/amqp/AmqpManagementTest.java
index 58bc844..50bc3c1 100644
--- a/systests/src/test/java/org/apache/qpid/systest/management/amqp/AmqpManagementTest.java
+++ b/systests/src/test/java/org/apache/qpid/systest/management/amqp/AmqpManagementTest.java
@@ -74,15 +74,15 @@ public class AmqpManagementTest extends QpidBrokerTestCase
{
TestBrokerConfiguration config = getDefaultBrokerConfiguration();
- Map<String, Object> ampqSslPort = new HashMap<>();
- ampqSslPort.put(Port.TRANSPORTS, Collections.singletonList(Transport.SSL));
- ampqSslPort.put(Port.PORT, DEFAULT_SSL_PORT);
- ampqSslPort.put(Port.NAME, TestBrokerConfiguration.ENTRY_NAME_SSL_PORT);
- ampqSslPort.put(Port.KEY_STORE, TestBrokerConfiguration.ENTRY_NAME_SSL_KEYSTORE);
- ampqSslPort.put(Port.AUTHENTICATION_PROVIDER, TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER);
- ampqSslPort.put(Port.PROTOCOLS, System.getProperty(TEST_AMQP_PORT_PROTOCOLS_PROPERTY));
-
- config.addObjectConfiguration(Port.class, ampqSslPort);
+ Map<String, Object> amqpSslPort = new HashMap<>();
+ amqpSslPort.put(Port.TRANSPORTS, Collections.singletonList(Transport.SSL));
+ amqpSslPort.put(Port.PORT, DEFAULT_SSL_PORT);
+ amqpSslPort.put(Port.NAME, TestBrokerConfiguration.ENTRY_NAME_SSL_PORT);
+ amqpSslPort.put(Port.KEY_STORE, TestBrokerConfiguration.ENTRY_NAME_SSL_KEYSTORE);
+ amqpSslPort.put(Port.AUTHENTICATION_PROVIDER, TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER);
+ amqpSslPort.put(Port.PROTOCOLS, System.getProperty(TEST_AMQP_PORT_PROTOCOLS_PROPERTY));
+
+ config.addObjectConfiguration(Port.class, amqpSslPort);
Map<String, Object> aliasAttributes = new HashMap<>();
aliasAttributes.put(VirtualHostAlias.NAME, "defaultAlias");
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/44026824/systests/src/test/java/org/apache/qpid/systest/rest/PortRestTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/systest/rest/PortRestTest.java b/systests/src/test/java/org/apache/qpid/systest/rest/PortRestTest.java
index 6b99bd4..9c3ee44 100644
--- a/systests/src/test/java/org/apache/qpid/systest/rest/PortRestTest.java
+++ b/systests/src/test/java/org/apache/qpid/systest/rest/PortRestTest.java
@@ -264,23 +264,23 @@ public class PortRestTest extends QpidRestTestCase
startDefaultBroker(true);
getRestTestHelper().setUsernameAndPassword(SystemConfig.MANAGEMENT_MODE_USER_NAME, MANAGEMENT_MODE_PASSWORD);
- String ampqPortName = TestBrokerConfiguration.ENTRY_NAME_AMQP_PORT;
+ String amqpPortName = TestBrokerConfiguration.ENTRY_NAME_AMQP_PORT;
Map<String, Object> portData =
- getRestTestHelper().getJsonAsMap("port/" + getRestTestHelper().encodeAsUTF(ampqPortName));
+ getRestTestHelper().getJsonAsMap("port/" + getRestTestHelper().encodeAsUTF(amqpPortName));
Asserts.assertPortAttributes(portData, State.QUIESCED);
}
public void testDeletePort() throws Exception
{
- String ampqPortName = TestBrokerConfiguration.ENTRY_NAME_AMQP_PORT;
+ String amqpPortName = TestBrokerConfiguration.ENTRY_NAME_AMQP_PORT;
Map<String, Object> portData =
- getRestTestHelper().getJsonAsMap("port/" + getRestTestHelper().encodeAsUTF(ampqPortName));
+ getRestTestHelper().getJsonAsMap("port/" + getRestTestHelper().encodeAsUTF(amqpPortName));
assertFalse("Port data are not found", portData.isEmpty());
- int deleteResponseCode = getRestTestHelper().submitRequest("port/" + ampqPortName, "DELETE");
+ int deleteResponseCode = getRestTestHelper().submitRequest("port/" + amqpPortName, "DELETE");
assertEquals("Port deletion should be allowed", 200, deleteResponseCode);
- getRestTestHelper().submitRequest("port/" + getRestTestHelper().encodeAsUTF(ampqPortName), "GET", HttpServletResponse.SC_NOT_FOUND);
+ getRestTestHelper().submitRequest("port/" + getRestTestHelper().encodeAsUTF(amqpPortName), "GET", HttpServletResponse.SC_NOT_FOUND);
}
public void testNewPortCreationFailsWhenPortIsAlreadyBound() throws Exception
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/44026824/systests/src/test/java/org/apache/qpid/transport/ProtocolNegotiationTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/transport/ProtocolNegotiationTest.java b/systests/src/test/java/org/apache/qpid/transport/ProtocolNegotiationTest.java
index 840f5b2..f25bdd6 100644
--- a/systests/src/test/java/org/apache/qpid/transport/ProtocolNegotiationTest.java
+++ b/systests/src/test/java/org/apache/qpid/transport/ProtocolNegotiationTest.java
@@ -270,7 +270,7 @@ public class ProtocolNegotiationTest extends QpidBrokerTestCase
int len = inputStream.read(receivedHeader);
assertEquals("Unexpected number of bytes available from socket", receivedHeader.length, len);
- sender.send(QpidByteBuffer.wrap("NOTANAMPQFRAME".getBytes()));
+ sender.send(QpidByteBuffer.wrap("NOTANAMQPFRAME".getBytes()));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org