From 802296d5d90da499ed7d442f62f0c4d2da9c12bc Mon Sep 17 00:00:00 2001 From: "Hiram R. Chirino" Date: Mon, 4 Sep 2006 06:32:41 +0000 Subject: [PATCH] Fix broken test case: ConfigTest git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@439950 13f79535-47bb-0310-9956-ffa450edef68 --- .../DefaultPersistenceAdapterFactory.java | 2 +- .../util/MemoryIntPropertyEditor.java | 69 +++++++++++++++++++ .../activemq/util/MemoryPropertyEditor.java | 22 ++++++ .../apache/activemq/config/ConfigTest.java | 2 +- .../config/sample-conf/jdbc-example.xml | 2 +- 5 files changed, 94 insertions(+), 3 deletions(-) create mode 100644 activemq-core/src/main/java/org/apache/activemq/util/MemoryIntPropertyEditor.java diff --git a/activemq-core/src/main/java/org/apache/activemq/store/DefaultPersistenceAdapterFactory.java b/activemq-core/src/main/java/org/apache/activemq/store/DefaultPersistenceAdapterFactory.java index 1de45dc96a..9cbacf72e2 100755 --- a/activemq-core/src/main/java/org/apache/activemq/store/DefaultPersistenceAdapterFactory.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/DefaultPersistenceAdapterFactory.java @@ -83,7 +83,7 @@ public class DefaultPersistenceAdapterFactory extends DataSourceSupport implemen } /** - * @org.apache.xbean.Property propertyEditor="org.apache.activemq.util.MemoryPropertyEditor" + * @org.apache.xbean.Property propertyEditor="org.apache.activemq.util.MemoryIntPropertyEditor" */ public void setJournalLogFileSize(int journalLogFileSize) { this.journalLogFileSize = journalLogFileSize; diff --git a/activemq-core/src/main/java/org/apache/activemq/util/MemoryIntPropertyEditor.java b/activemq-core/src/main/java/org/apache/activemq/util/MemoryIntPropertyEditor.java new file mode 100644 index 0000000000..ddcfe62a4d --- /dev/null +++ b/activemq-core/src/main/java/org/apache/activemq/util/MemoryIntPropertyEditor.java @@ -0,0 +1,69 @@ +/** + * + * 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 java.beans.PropertyEditorSupport; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * Converts string values like "20 Mb", "1024kb", and "1g" + * to int values in bytes. + * + */ +public class MemoryIntPropertyEditor extends PropertyEditorSupport { + public void setAsText(String text) throws IllegalArgumentException { + + Pattern p = Pattern.compile("^\\s*(\\d+)\\s*(b)?\\s*$",Pattern.CASE_INSENSITIVE); + Matcher m = p.matcher(text); + if (m.matches()) { + setValue(new Integer(Integer.parseInt(m.group(1)))); + return; + } + + p = Pattern.compile("^\\s*(\\d+)\\s*k(b)?\\s*$",Pattern.CASE_INSENSITIVE); + m = p.matcher(text); + if (m.matches()) { + setValue(new Integer(Integer.parseInt(m.group(1)) * 1024)); + return; + } + + p = Pattern.compile("^\\s*(\\d+)\\s*m(b)?\\s*$", Pattern.CASE_INSENSITIVE); + m = p.matcher(text); + if (m.matches()) { + setValue(new Integer(Integer.parseInt(m.group(1)) * 1024 * 1024 )); + return; + } + + p = Pattern.compile("^\\s*(\\d+)\\s*g(b)?\\s*$", Pattern.CASE_INSENSITIVE); + m = p.matcher(text); + if (m.matches()) { + setValue(new Integer(Integer.parseInt(m.group(1)) * 1024 * 1024 * 1024 )); + return; + } + + throw new IllegalArgumentException( + "Could convert not to a memory size: " + text); + } + + public String getAsText() { + Integer value = (Integer) getValue(); + return (value != null ? value.toString() : ""); + } + +} diff --git a/activemq-core/src/main/java/org/apache/activemq/util/MemoryPropertyEditor.java b/activemq-core/src/main/java/org/apache/activemq/util/MemoryPropertyEditor.java index e24786e6b9..c98780f626 100644 --- a/activemq-core/src/main/java/org/apache/activemq/util/MemoryPropertyEditor.java +++ b/activemq-core/src/main/java/org/apache/activemq/util/MemoryPropertyEditor.java @@ -1,9 +1,31 @@ +/** + * + * 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 java.beans.PropertyEditorSupport; import java.util.regex.Matcher; import java.util.regex.Pattern; +/** + * Converts string values like "20 Mb", "1024kb", and "1g" + * to long values in bytes. + * + */ public class MemoryPropertyEditor extends PropertyEditorSupport { public void setAsText(String text) throws IllegalArgumentException { diff --git a/activemq-core/src/test/java/org/apache/activemq/config/ConfigTest.java b/activemq-core/src/test/java/org/apache/activemq/config/ConfigTest.java index 2b3c0ecb75..5e3afe4720 100755 --- a/activemq-core/src/test/java/org/apache/activemq/config/ConfigTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/config/ConfigTest.java @@ -174,7 +174,7 @@ public class ConfigTest extends TestCase { // Check transport connectors list System.out.print("Checking transport connectors... "); List connectors = broker.getTransportConnectors(); - assertTrue("Should have created at least 4 connectors", (connectors.size() >= 4)); + assertTrue("Should have created at least 3 connectors", (connectors.size() >= 3)); assertTrue ("1st connector should be TcpTransportServer", ((TransportConnector)connectors.get(0)).getServer() instanceof TcpTransportServer); assertTrue ("2nd connector should be TcpTransportServer", ((TransportConnector)connectors.get(1)).getServer() instanceof TcpTransportServer); assertTrue ("3rd connector should be TcpTransportServer", ((TransportConnector)connectors.get(2)).getServer() instanceof TcpTransportServer); diff --git a/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/jdbc-example.xml b/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/jdbc-example.xml index b982c45d16..5977475581 100644 --- a/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/jdbc-example.xml +++ b/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/jdbc-example.xml @@ -28,7 +28,7 @@ - +