activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r1482017 - in /activemq/trunk/activemq-client/src: main/java/org/apache/activemq/util/StringToListOfActiveMQDestinationConverter.java test/java/org/apache/activemq/util/StringToListOfActiveMQDestinationConverterTest.java
Date Mon, 13 May 2013 18:24:34 GMT
Author: tabish
Date: Mon May 13 18:24:33 2013
New Revision: 1482017

URL: http://svn.apache.org/r1482017
Log:
Fix and test for: https://issues.apache.org/jira/browse/AMQ-4484

Added:
    activemq/trunk/activemq-client/src/test/java/org/apache/activemq/util/StringToListOfActiveMQDestinationConverterTest.java
  (with props)
Modified:
    activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/StringToListOfActiveMQDestinationConverter.java

Modified: activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/StringToListOfActiveMQDestinationConverter.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/StringToListOfActiveMQDestinationConverter.java?rev=1482017&r1=1482016&r2=1482017&view=diff
==============================================================================
--- activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/StringToListOfActiveMQDestinationConverter.java
(original)
+++ activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/StringToListOfActiveMQDestinationConverter.java
Mon May 13 18:24:33 2013
@@ -39,13 +39,19 @@ public class StringToListOfActiveMQDesti
 
         String text = value.toString();
         if (text.startsWith("[") && text.endsWith("]")) {
-            text = text.substring(1, text.length() - 1);
+            text = text.substring(1, text.length() - 1).trim();
+
+            if (text.isEmpty()) {
+                return null;
+            }
+
             String[] array = text.split(",");
 
             List<ActiveMQDestination> list = new ArrayList<ActiveMQDestination>();
             for (String item : array) {
                 list.add(ActiveMQDestination.createDestination(item.trim(), ActiveMQDestination.QUEUE_TYPE));
             }
+
             return list;
         } else {
             return null;

Added: activemq/trunk/activemq-client/src/test/java/org/apache/activemq/util/StringToListOfActiveMQDestinationConverterTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/test/java/org/apache/activemq/util/StringToListOfActiveMQDestinationConverterTest.java?rev=1482017&view=auto
==============================================================================
--- activemq/trunk/activemq-client/src/test/java/org/apache/activemq/util/StringToListOfActiveMQDestinationConverterTest.java
(added)
+++ activemq/trunk/activemq-client/src/test/java/org/apache/activemq/util/StringToListOfActiveMQDestinationConverterTest.java
Mon May 13 18:24:33 2013
@@ -0,0 +1,66 @@
+/**
+ * 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.util;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+import java.util.List;
+
+import org.apache.activemq.command.ActiveMQDestination;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class StringToListOfActiveMQDestinationConverterTest {
+
+    @Before
+    public void setUp() throws Exception {
+    }
+
+    @After
+    public void tearDown() throws Exception {
+    }
+
+    @Test
+    public void testConvertToActiveMQDestination() {
+
+        List<ActiveMQDestination> result = StringToListOfActiveMQDestinationConverter.convertToActiveMQDestination("");
+        assertNull(result);
+
+        result = StringToListOfActiveMQDestinationConverter.convertToActiveMQDestination("[]");
+        assertNull(result);
+        result = StringToListOfActiveMQDestinationConverter.convertToActiveMQDestination("[
 ]");
+        assertNull(result);
+
+        result = StringToListOfActiveMQDestinationConverter.convertToActiveMQDestination("[one,two,three]");
+        assertNotNull(result);
+        assertEquals(3, result.size());
+
+        result = StringToListOfActiveMQDestinationConverter.convertToActiveMQDestination("[one,
two, three  ]");
+        assertNotNull(result);
+        assertEquals(3, result.size());
+    }
+
+    @Test
+    public void testConvertFromActiveMQDestination() {
+        String result = StringToListOfActiveMQDestinationConverter.convertFromActiveMQDestination(null);
+        assertNull(result);
+    }
+
+}

Propchange: activemq/trunk/activemq-client/src/test/java/org/apache/activemq/util/StringToListOfActiveMQDestinationConverterTest.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message