modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/group/test/LdapGroupManagerBeanTest.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
New commits: commit 9d5d89cf8c6385028e939ccb76174058cc008d26 Author: Simeon Pinder spinder@redhat.com Date: Tue Sep 24 12:02:13 2013 -0400
Modifying LdapManagerBeanTest to use original settings since the right fix affects other tests as well.
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/group/test/LdapGroupManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/group/test/LdapGroupManagerBeanTest.java index 7452247..6c0fd5e 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/group/test/LdapGroupManagerBeanTest.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/group/test/LdapGroupManagerBeanTest.java @@ -29,7 +29,6 @@ import org.testng.annotations.Test;
import org.rhq.core.domain.common.SystemConfiguration; import org.rhq.core.domain.common.composite.SystemSetting; -import org.rhq.core.domain.common.composite.SystemSettings; import org.rhq.enterprise.server.RHQConstants; import org.rhq.enterprise.server.resource.group.LdapGroupManagerBean; import org.rhq.enterprise.server.resource.group.LdapGroupManagerLocal; @@ -440,10 +439,9 @@ public class LdapGroupManagerBeanTest extends AbstractEJB3Test { * Helper methods ---------------*/ private void setSystemConfigProperty(final String name, final String value) throws Exception { - SystemSettings sysConfig = systemManager.getSystemSettings(LookupUtil.getSubjectManager().getOverlord()); - SystemSetting retrievedKey = SystemSetting.valueOf(name); - sysConfig.put(retrievedKey, value); - systemManager.setSystemSettings(LookupUtil.getSubjectManager().getOverlord(), sysConfig); + Properties sysConfig = systemManager.getSystemConfiguration(LookupUtil.getSubjectManager().getOverlord()); + sysConfig.setProperty(name, value); + systemManager.setSystemConfiguration(LookupUtil.getSubjectManager().getOverlord(), sysConfig, true); }
private void setLdapGroupFilter(String filter) throws Exception {
rhq-commits@lists.fedorahosted.org