Merge pull request #224 from surevine/issues/220

Add tests for loading autosubscribe channels. Fixes #220.

Author: abmargb

src/main/java/org/buddycloud/channelserver/Configuration.java

@@ -64,7 +64,6 @@ private Configuration() {
 			}
 		} catch (Exception e) {
 			LOGGER.error("Could not load " + CONFIGURATION_FILE + "!");
-			System.out.println(e.getLocalizedMessage());
 			System.exit(1);
 		}
 	}
@@ -92,6 +91,10 @@ public static Configuration getInstance() {
 	public String getProperty(String key) {
 		return conf.getProperty(key);
 	}
+    
+    public void clear() {
+        conf.clear();
+    }
 
 	public String getProperty(String key, String defaultValue) {
 		return conf.getProperty(key, defaultValue);
@@ -113,12 +116,17 @@ private Collection<String> getStringArrayProperty(String key) {
 	}
 
 	private Collection<JID> getJIDArrayProperty(String key) {
+        System.out.println(conf.getProperty(CONFIGURATION_CHANNELS_AUTOSUBSCRIBE));
 		Collection<String> props = getStringArrayProperty(key);
 
 		Collection<JID> jids = new ArrayList<JID>(props.size());
 
 		for (String prop : props) {
-			jids.add(new JID(prop));
+            try {
+			    jids.add(new JID(prop));
+            } catch (IllegalArgumentException e) {
+                LOGGER.error(e);
+            }
 		}
 
 		return jids;
@@ -171,4 +179,4 @@ public boolean getBooleanProperty(final String key,
 
 		return defaultValue;
 	}
-}
+}

src/test/java/org/buddycloud/channelserver/ConfigurationTest.java

@@ -10,6 +10,8 @@
 import org.junit.Test;
 import org.xmpp.packet.JID;
 
+import org.apache.commons.io.IOUtils;
+
 public class ConfigurationTest {
 
 	private static final String CONFIGURATION_PROPERTIES = "src/test/resources/configuration.properties";
@@ -35,5 +37,31 @@ public void testGetAutoSubscribeChannels() {
 		assertTrue("channel1@server1 not found", channels.contains(new JID("channel1@server1")));
 		assertTrue("channel2@server1 not found", channels.contains(new JID("channel2@server1")));
 	}
+    
+    @Test
+    public void handlesNoEntryForAutosubscribeChannels() throws Exception {
+
+        configuration.clear();
+        configuration.load(IOUtils.toInputStream(
+            Configuration.CONFIGURATION_SERVER_DOMAIN + "=domain.com\n"
+        ));
+        assertEquals(0, configuration.getAutosubscribeChannels().size());
+    }
+                     
+    @Test
+    public void handlesIllegalAutosubscribeChannels() throws Exception {
+        String configurationString = "" +
+            Configuration.CONFIGURATION_CHANNELS_AUTOSUBSCRIBE + "=not-a-jid$$\n";
+        configuration.load(IOUtils.toInputStream(configurationString));
+        assertEquals(0, configuration.getAutosubscribeChannels().size());  
+    }
+    
+    @Test
+    public void handlesNullAutosubscribeChannelsValue() throws Exception {
+        String configurationString = "" +
+            Configuration.CONFIGURATION_CHANNELS_AUTOSUBSCRIBE + "=\n";
+        configuration.load(IOUtils.toInputStream(configurationString));
+        assertEquals(0, configuration.getAutosubscribeChannels().size());  
+    }
 
 }