[#643] AMQP Tests: adjust according to Kai comments on June 14th

Signed-off-by: Alfusainey Jallow <alf.jallow@gmail.com>
eclipse-hono · Jun 14, 2018 · dbe49c3 · dbe49c3
1 parent 7b058ee
commit dbe49c3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 424 deletions.
diff --git a/...AmqpProtocolAdapterWithoutClientTest.java → ...qp/VertxBasedAmqpProtocolAdapterTest.java b/...AmqpProtocolAdapterWithoutClientTest.java → ...qp/VertxBasedAmqpProtocolAdapterTest.java
@@ -39,12 +39,10 @@
 import io.vertx.proton.ProtonServer;
 
 /**
- * Verifies the behaviour of {@link VertxBasedAmqpProtocolAdapter}. In this test setup, the AMQP adapter is not deployed
- * as a running Verticle and does not use an AMQP client to simulate a client device.
- * Rather, the setup manually instantiates the adapter and gives it a user defined ProtonServer.
+ * Verifies the behaviour of {@link VertxBasedAmqpProtocolAdapter}.
  */
 @RunWith(VertxUnitRunner.class)
-public class VertxBasedAmqpProtocolAdapterWithoutClientTest {
+public class VertxBasedAmqpProtocolAdapterTest {
 
     @Rule
     public Timeout globalTimeout = new Timeout(2, TimeUnit.SECONDS);
@@ -157,7 +155,7 @@ public void testAnonymousRelayNotSupported() {
     public void uploadTelemetryMessageWithSettledDeliverySemantics() {
         // GIVEN an AMQP adapter with a configured server
         final VertxBasedAmqpProtocolAdapter adapter = givenAnAmqpAdapter();
-        final MessageSender sender = givenAmessageSenderForAnyTenant();
+        final MessageSender telemetrySender = givenATelemetrySenderForAnyTenant();
 
         // which is enabled for a tenant
         givenAConfiguredTenant("some-tenant", true);
@@ -170,7 +168,7 @@ public void uploadTelemetryMessageWithSettledDeliverySemantics() {
         adapter.uploadMessage(new AmqpContext(delivery, getFakeMessage(), resource));
 
         // THEN the adapter sends the message and does not wait for response from the peer.
-        verify(sender).send(any(Message.class));
+        verify(telemetrySender).send(any(Message.class));
     }
 
     /**
@@ -180,10 +178,10 @@ public void uploadTelemetryMessageWithSettledDeliverySemantics() {
      * AT_LEAST_ONCE delivery semantics.
      */
     @Test
-    public void uploadTelemetryMessageWithNotSettledDeliverySemantics() {
+    public void uploadTelemetryMessageWithUnsettledDeliverySemantics() {
         // GIVEN an adapter configured to use a user-define server.
         final VertxBasedAmqpProtocolAdapter adapter = givenAnAmqpAdapter();
-        final MessageSender sender = givenAmessageSenderForAnyTenant();
+        final MessageSender telemetrySender = givenATelemetrySenderForAnyTenant();
 
         // which is enabled for a tenant
         givenAConfiguredTenant("enabled-tenant", true);
@@ -195,7 +193,7 @@ public void uploadTelemetryMessageWithNotSettledDeliverySemantics() {
         adapter.uploadMessage(new AmqpContext(delivery, getFakeMessage(), resource));
 
         // THEN the sender sends the message and waits for the outcome from the downstream peer
-        verify(sender).sendAndWaitForOutcome(any(Message.class));
+        verify(telemetrySender).sendAndWaitForOutcome(any(Message.class));
     }
 
     private void givenAConfiguredTenant(final String tenantId, final boolean enabled) {
@@ -215,7 +213,7 @@ private Message getFakeMessage() {
         return message;
     }
 
-    private MessageSender givenAmessageSenderForAnyTenant() {
+    private MessageSender givenATelemetrySenderForAnyTenant() {
         final MessageSender sender = mock(MessageSender.class);
         when(messagingServiceClient.getOrCreateTelemetrySender(anyString())).thenReturn(Future.succeededFuture(sender));
         return sender;