Update tests for overrides

Author: Lloyd Watkin

configuration.properties.example

@@ -27,6 +27,14 @@ channels.autosubscribe=lounge@example.com;welcome@example.com
 # NOTE: This will only work on local private channels
 channels.autosubscribe.autoapprove=false
 
-# Default channels configuration related to access and permissions
-channels.default.accessmodel=open
-channels.default.role=follower+post
+# Channel configuration related to access model and affiliation
+
+channel.configuration.default.accessmodel=open
+channel.configuration.default.affiliation=member
+
+# Overrides for default configuration
+channel.configuration.posts.affiliation=publisher
+
+channel.configuration.geo.next.accessmodel=authorize
+channel.configuration.geo.current.accessmodel=authorize
+channel.configuration.geo.previous.accessmodel=authorize

src/main/java/org/buddycloud/channelserver/channel/Conf.java

@@ -129,8 +129,9 @@ private static HashMap<String, String> getDefaultConf(JID channelJID, String nod
 		conf.put(PUBLISH_MODEL, PUBLISHERS);
 		conf.put(CREATION_DATE, formatDate(new Date()));
 		conf.put(OWNER, channelJID.toBareJID());
+
 		conf.put(ACCESS_MODEL, AccessModels.createFromString(projectConf.getProperty(
-				Configuration.CONFIGURATION_CHANNELS_DEFAULT_ACCESSMODEL, AccessModels.authorize.toString())).toString());
+				Configuration.CONFIGURATION_CHANNELS_DEFAULT_ACCESSMODEL, AccessModels.open.toString())).toString());
 		conf.put(DEFAULT_AFFILIATION, Affiliations.createFromString(
 				projectConf.getProperty(Configuration.CONFIGURATION_CHANNELS_DEFAULT_AFFILIATION, Affiliations.member.toString()))
 				.toString());

src/test/java/org/buddycloud/channelserver/channel/ConfTest.java

@@ -70,7 +70,7 @@ public void testGetDefaultPostChannelConf() {
 		// ToDo: Find a way to test the Date: assertEquals(Conf.formatDate(new
 		// Date()),result.get(Conf.CREATION_DATE));
 		assertEquals(testChannelJID.toBareJID(), result.get(Conf.OWNER));
-		assertEquals(Affiliations.member.toString(),
+		assertEquals(Affiliations.publisher.toString(),
 				result.get(Conf.DEFAULT_AFFILIATION));
 		assertEquals("1", result.get(Conf.NUM_SUBSCRIBERS));
 		assertEquals("1", result.get(Conf.NOTIFY_CONFIG));
@@ -124,7 +124,7 @@ public void testGetDefaultGeoPreviousChannelConf() {
 				+ " has been before.", result.get(Conf.DESCRIPTION));
 		assertEquals("http://www.w3.org/2005/Atom", result.get(Conf.TYPE));
 		assertEquals("publishers", result.get(Conf.PUBLISH_MODEL));
-		assertEquals(AccessModels.open.toString(),
+		assertEquals(AccessModels.authorize.toString(),
 				result.get(Conf.ACCESS_MODEL));
 		// ToDo: Find a way to test the Date: assertEquals(Conf.formatDate(new
 		// Date()),result.get(Conf.CREATION_DATE));
@@ -153,7 +153,7 @@ public void testGetDefaultGeoCurrentChannelConf() {
 				result.get(Conf.DESCRIPTION));
 		assertEquals("http://www.w3.org/2005/Atom", result.get(Conf.TYPE));
 		assertEquals("publishers", result.get(Conf.PUBLISH_MODEL));
-		assertEquals(AccessModels.open.toString(),
+		assertEquals(AccessModels.authorize.toString(),
 				result.get(Conf.ACCESS_MODEL));
 		// ToDo: Find a way to test the Date: assertEquals(Conf.formatDate(new
 		// Date()),result.get(Conf.CREATION_DATE));
@@ -181,7 +181,7 @@ public void testGetDefaultGeoNextChannelConf() {
 				+ " is going to go.", result.get(Conf.DESCRIPTION));
 		assertEquals("http://www.w3.org/2005/Atom", result.get(Conf.TYPE));
 		assertEquals("publishers", result.get(Conf.PUBLISH_MODEL));
-		assertEquals(AccessModels.open.toString(),
+		assertEquals(AccessModels.authorize.toString(),
 				result.get(Conf.ACCESS_MODEL));
 		// ToDo: Find a way to test the Date: assertEquals(Conf.formatDate(new
 		// Date()),result.get(Conf.CREATION_DATE));

src/test/resources/configuration.properties

@@ -19,7 +19,7 @@ channels.autosubscribe.autoapprove=true
 channel.configuration.default.accessmodel=open
 channel.configuration.default.affiliation=member
 
-channel.configuration.posts.accessmodel=publisher
+channel.configuration.posts.affiliation=publisher
 
 channel.configuration.geo.next.accessmodel=authorize
 channel.configuration.geo.current.accessmodel=authorize