1 files changed, 61 insertions, 16 deletions

diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
index fabd4ce923..2879277784 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
@@ -20,31 +20,26 @@
  */
 package org.apache.qpid.server.configuration;
 
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.util.Iterator;
-import java.util.List;
-
+import junit.framework.TestCase;
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.commons.configuration.SystemConfiguration;
 import org.apache.commons.configuration.XMLConfiguration;
-import org.apache.qpid.AMQException;
 import org.apache.qpid.codec.AMQCodecFactory;
 import org.apache.qpid.server.protocol.AMQMinaProtocolSession;
 import org.apache.qpid.server.protocol.AMQProtocolSession;
 import org.apache.qpid.server.protocol.TestIoSession;
-import org.apache.qpid.server.queue.MockProtocolSession;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.registry.ConfigurationFileApplicationRegistry;
-import org.apache.qpid.server.security.access.ACLManager;
 import org.apache.qpid.server.virtualhost.VirtualHost;
 import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
 
-import junit.framework.TestCase;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
 
 public class ServerConfigurationTest extends TestCase
 {
@@ -200,7 +195,7 @@ public class ServerConfigurationTest extends TestCase
         assertEquals(false, serverConfig.getProtectIOEnabled());
 
         // Check value we set
-        _config.setProperty("broker.connector.protectio.enabled", true);
+        _config.setProperty(ServerConfiguration.CONNECTOR_PROTECTIO_ENABLED, true);
         serverConfig = new ServerConfiguration(_config);
         assertEquals(true, serverConfig.getProtectIOEnabled());
     }
@@ -212,7 +207,7 @@ public class ServerConfigurationTest extends TestCase
         assertEquals(262144, serverConfig.getBufferReadLimit());
 
         // Check value we set
-        _config.setProperty("broker.connector.protectio.readBufferLimitSize", 23);
+        _config.setProperty(ServerConfiguration.CONNECTOR_PROTECTIO_READ_BUFFER_LIMIT_SIZE, 23);
         serverConfig = new ServerConfiguration(_config);
         assertEquals(23, serverConfig.getBufferReadLimit());
     }
@@ -224,11 +219,29 @@ public class ServerConfigurationTest extends TestCase
         assertEquals(262144, serverConfig.getBufferWriteLimit());
 
         // Check value we set
-        _config.setProperty("broker.connector.protectio.writeBufferLimitSize", 23);
+        _config.setProperty(ServerConfiguration.CONNECTOR_PROTECTIO_WRITE_BUFFER_LIMIT_SIZE, 23);
         serverConfig = new ServerConfiguration(_config);
         assertEquals(23, serverConfig.getBufferWriteLimit());
     }
 
+
+    public void testGetStatusEnabled() throws ConfigurationException
+    {
+        // Check default
+        ServerConfiguration serverConfig = new ServerConfiguration(_config);
+        assertEquals(true, serverConfig.getStatusUpdatesEnabled());
+
+        // Check disabling we set
+        _config.setProperty(ServerConfiguration.STATUS_UPDATES, "off");
+        serverConfig = new ServerConfiguration(_config);
+        assertEquals(false, serverConfig.getStatusUpdatesEnabled());
+
+        // Check invalid values don't cause error but result in disabled
+        _config.setProperty(ServerConfiguration.STATUS_UPDATES, "Yes Please");
+        serverConfig = new ServerConfiguration(_config);
+        assertEquals(false, serverConfig.getStatusUpdatesEnabled());
+
+    }
     public void testGetSynchedClocks() throws ConfigurationException
     {
         // Check default
@@ -241,6 +254,38 @@ public class ServerConfigurationTest extends TestCase
         assertEquals(true, serverConfig.getSynchedClocks());
     }
 
+    public void testGetLocale() throws ConfigurationException
+    {
+        // Check default
+        ServerConfiguration serverConfig = new ServerConfiguration(_config);
+
+        String defaultParts[] = ServerConfiguration.DEFAULT_ADVANCED_LOCALE.split("_");
+        // The Default is en_US so will split well
+        Locale defaultLocale = new Locale(defaultParts[0],defaultParts[1]);
+
+        assertEquals(defaultLocale, serverConfig.getLocale());
+
+
+        //Test Language only
+        Locale update = new Locale("es");
+        _config.setProperty(ServerConfiguration.ADVANCED_LOCALE, "es");
+        serverConfig = new ServerConfiguration(_config);
+        assertEquals(update, serverConfig.getLocale());
+
+        //Test Language and Country
+        update = new Locale("es","ES");
+        _config.setProperty(ServerConfiguration.ADVANCED_LOCALE, "es_ES");
+        serverConfig = new ServerConfiguration(_config);
+        assertEquals(update, serverConfig.getLocale());
+
+        //Test Language and Country and Variant
+        update = new Locale("es","ES", "Traditional_WIN");
+        _config.setProperty(ServerConfiguration.ADVANCED_LOCALE, "es_ES_Traditional_WIN");
+        serverConfig = new ServerConfiguration(_config);
+        assertEquals(update, serverConfig.getLocale());
+    }
+
+
     public void testGetMsgAuth() throws ConfigurationException
     {
         // Check default