Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@activemq.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: martyntaylor@apache.org
To: commits@activemq.apache.org
Date: Tue, 27 Sep 2016 13:54:28 -0000
Message-Id: <78353452965d44cab418fa170a48e6aa@git.apache.org>
Subject: [01/15] activemq-artemis git commit: ARTEMIS-751 Simplification of
 the AMQP implementation
archived-at: Tue, 27 Sep 2016 13:54:30 -0000

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 4e349693f -> 0ac9dbd57


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a838bf04/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/proton/ProtonTestForHeader.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/proton/ProtonTestForHeader.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/proton/ProtonTestForHeader.java
deleted file mode 100644
index d23bd5b..0000000
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/proton/ProtonTestForHeader.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.artemis.tests.integration.proton;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.Socket;
-import java.util.HashMap;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.activemq.artemis.api.core.TransportConfiguration;
-import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
-import org.apache.activemq.artemis.core.server.ActiveMQServer;
-import org.apache.activemq.artemis.spi.core.security.ActiveMQJAASSecurityManager;
-import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.artemis.tests.util.Wait;
-import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
-import org.fusesource.hawtbuf.Buffer;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public class ProtonTestForHeader extends ActiveMQTestBase {
-
-   private ActiveMQServer server;
-
-   @Override
-   @Before
-   public void setUp() throws Exception {
-      super.setUp();
-      server = this.createServer(true, true);
-      HashMap<String, Object> params = new HashMap<>();
-      params.put(TransportConstants.PORT_PROP_NAME, "5672");
-      params.put(TransportConstants.PROTOCOLS_PROP_NAME, "AMQP");
-      TransportConfiguration transportConfiguration = new TransportConfiguration(NETTY_ACCEPTOR_FACTORY, params);
-
-      server.getConfiguration().getAcceptorConfigurations().add(transportConfiguration);
-      server.getConfiguration().setSecurityEnabled(true);
-      server.start();
-      ActiveMQJAASSecurityManager securityManager = (ActiveMQJAASSecurityManager) server.getSecurityManager();
-      securityManager.getConfiguration().addUser("auser", "pass");
-   }
-
-   @Override
-   @After
-   public void tearDown() throws Exception {
-      try {
-         server.stop();
-      }
-      finally {
-         super.tearDown();
-      }
-   }
-
-   @Test
-   public void testSimpleBytes() throws Exception {
-      final AmqpHeader header = new AmqpHeader();
-
-      header.setProtocolId(0);
-      header.setMajor(1);
-      header.setMinor(0);
-      header.setRevision(0);
-
-      final ClientConnection connection = new ClientConnection();
-      connection.open("localhost", 5672);
-      connection.send(header);
-
-      AmqpHeader response = connection.readAmqpHeader();
-      assertNotNull(response);
-      IntegrationTestLogger.LOGGER.info("Broker responded with: " + response);
-
-      assertTrue("Broker should have closed client connection", Wait.waitFor(new Wait.Condition() {
-
-         @Override
-         public boolean isSatisfied() throws Exception {
-            try {
-               connection.send(header);
-               return false;
-            }
-            catch (Exception e) {
-               return true;
-            }
-         }
-      }, TimeUnit.SECONDS.toMillis(15), TimeUnit.MILLISECONDS.toMillis(250)));
-   }
-
-   private class ClientConnection {
-
-      protected static final long RECEIVE_TIMEOUT = 10000;
-      protected Socket clientSocket;
-
-      public void open(String host, int port) throws IOException {
-         clientSocket = new Socket(host, port);
-         clientSocket.setTcpNoDelay(true);
-      }
-
-      public void send(AmqpHeader header) throws Exception {
-         IntegrationTestLogger.LOGGER.info("Client sending header: " + header);
-         OutputStream outputStream = clientSocket.getOutputStream();
-         header.getBuffer().writeTo(outputStream);
-         outputStream.flush();
-      }
-
-      public AmqpHeader readAmqpHeader() throws Exception {
-         clientSocket.setSoTimeout((int) RECEIVE_TIMEOUT);
-         InputStream is = clientSocket.getInputStream();
-
-         byte[] header = new byte[8];
-         int read = is.read(header);
-         if (read == header.length) {
-            return new AmqpHeader(new Buffer(header));
-         }
-         else {
-            return null;
-         }
-      }
-   }
-
-   private class AmqpHeader {
-
-      final Buffer PREFIX = new Buffer(new byte[]{'A', 'M', 'Q', 'P'});
-
-      private Buffer buffer;
-
-      AmqpHeader() {
-         this(new Buffer(new byte[]{'A', 'M', 'Q', 'P', 0, 1, 0, 0}));
-      }
-
-      AmqpHeader(Buffer buffer) {
-         this(buffer, true);
-      }
-
-      AmqpHeader(Buffer buffer, boolean validate) {
-         setBuffer(buffer, validate);
-      }
-
-      public int getProtocolId() {
-         return buffer.get(4) & 0xFF;
-      }
-
-      public void setProtocolId(int value) {
-         buffer.data[buffer.offset + 4] = (byte) value;
-      }
-
-      public int getMajor() {
-         return buffer.get(5) & 0xFF;
-      }
-
-      public void setMajor(int value) {
-         buffer.data[buffer.offset + 5] = (byte) value;
-      }
-
-      public int getMinor() {
-         return buffer.get(6) & 0xFF;
-      }
-
-      public void setMinor(int value) {
-         buffer.data[buffer.offset + 6] = (byte) value;
-      }
-
-      public int getRevision() {
-         return buffer.get(7) & 0xFF;
-      }
-
-      public void setRevision(int value) {
-         buffer.data[buffer.offset + 7] = (byte) value;
-      }
-
-      public Buffer getBuffer() {
-         return buffer;
-      }
-
-      public void setBuffer(Buffer value) {
-         setBuffer(value, true);
-      }
-
-      public void setBuffer(Buffer value, boolean validate) {
-         if (validate && !value.startsWith(PREFIX) || value.length() != 8) {
-            throw new IllegalArgumentException("Not an AMQP header buffer");
-         }
-         buffer = value.buffer();
-      }
-
-      public boolean hasValidPrefix() {
-         return buffer.startsWith(PREFIX);
-      }
-
-      @Override
-      public String toString() {
-         StringBuilder builder = new StringBuilder();
-         for (int i = 0; i < buffer.length(); ++i) {
-            char value = (char) buffer.get(i);
-            if (Character.isLetter(value)) {
-               builder.append(value);
-            }
-            else {
-               builder.append(",");
-               builder.append((int) value);
-            }
-         }
-         return builder.toString();
-      }
-   }
-}