java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml | 2 java/code/src/com/redhat/rhn/common/translation/test/TranslationsTest.java | 3 - java/code/src/com/redhat/rhn/domain/kickstart/KickstartInstallType.java | 2 java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java | 4 - java/code/src/com/redhat/rhn/domain/monitoring/notification/Filter.java | 2 java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/BaseFilterEditAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/FilterActionTest.java | 11 ++- java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java | 5 + java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/test/ConfigChannelHandlerTest.java | 29 ++++++---- java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/test/ProfileHandlerTest.java | 6 +- java/code/src/com/redhat/rhn/manager/monitoring/test/MonitoringManagerTest.java | 2 java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java | 8 -- java/code/src/com/redhat/rhn/testing/ServerTestUtils.java | 24 -------- java/code/src/com/redhat/rhn/testing/UserTestUtils.java | 1 java/spacewalk-java.spec | 22 +++++++ rel-eng/packages/spacewalk-java | 2 16 files changed, 65 insertions(+), 60 deletions(-)
New commits: commit 185463b38cd9acfc0a5707456dea86b746590e1f Author: Tomas Lestach tlestach@redhat.com Date: Wed Mar 28 23:48:25 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.29-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 7c4310f..c2fe5f4 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -22,7 +22,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.8.28 +Version: 1.8.29 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -604,6 +604,26 @@ fi %{jardir}/postgresql-jdbc.jar
%changelog +* Wed Mar 28 2012 Tomas Lestach tlestach@redhat.com 1.8.29-1 +- fix ConfigChannelHandlerTest revision comparism (tlestach@redhat.com) +- fix ConfigChannelHandlerTest.testDeployAllSystems (tlestach@redhat.com) +- 805275 - add missing query parameter (tlestach@redhat.com) +- fix ConfigChannelHandlerTest validation issue (tlestach@redhat.com) +- fix MDOM storage (tlestach@redhat.com) +- fix ProfileHandlerTest (tlestach@redhat.com) +- fix KickstartDataTest.testISRhelRevMethods (tlestach@redhat.com) +- fix KickstartScheduleCommandTest (tlestach@redhat.com) +- Revert "fix KickstartDataTest.testCommands" (tlestach@redhat.com) +- fix TranslationsTest (tlestach@redhat.com) +- fix FilterActionTest.testCreateSubmitFailValidation (tlestach@redhat.com) +- fix FilterActionTest.testEditExecute (tlestach@redhat.com) +- rename Filter.isRecurring to Filter.isRecurringBool (tlestach@redhat.com) +- fix ProbeGraphActionTest and MonitoringManagerTest (tlestach@redhat.com) +- fix ProbeGraphActionTest.setUp (tlestach@redhat.com) +- fix SystemManagerTest.testListInstalledPackage (tlestach@redhat.com) +- fix SystemManagerTest.testSsmSystemPackagesToRemove (tlestach@redhat.com) +- 676434 - Text for Brazil timezone is incorrect (sherr@redhat.com) + * Wed Mar 28 2012 Tomas Lestach tlestach@redhat.com 1.8.28-1 - let spacewalk-java-tests require ant-junit (tlestach@redhat.com) - fix AccessTest (tlestach@redhat.com) diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 795a154..c28637b 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.8.28-1 java/ +1.8.29-1 java/
commit 30c3305244e1e69e6c45f1c18af73d9eb63c524d Author: Tomas Lestach tlestach@redhat.com Date: Wed Mar 28 23:12:35 2012 +0200
fix ConfigChannelHandlerTest revision comparism
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/test/ConfigChannelHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/test/ConfigChannelHandlerTest.java index d9589ab..822e5a1 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/test/ConfigChannelHandlerTest.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/test/ConfigChannelHandlerTest.java @@ -262,7 +262,8 @@ public class ConfigChannelHandlerTest extends BaseHandlerTestCase { private void assertRev(ConfigRevision rev, String path, ConfigChannel cc) { List<String> paths = new ArrayList<String>(1); paths.add(path); - assertEquals(rev, handler.lookupFileInfo(adminKey, cc.getLabel(), paths).get(0)); + assertTrue(rev.matches(handler.lookupFileInfo(adminKey, cc.getLabel(), paths) + .get(0)));
}
commit c07295131c5dc81cd28f566004e817f1900fc538 Author: Tomas Lestach tlestach@redhat.com Date: Wed Mar 28 23:05:33 2012 +0200
fix ConfigChannelHandlerTest.testDeployAllSystems
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/test/ConfigChannelHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/test/ConfigChannelHandlerTest.java index ff4f1f9..d9589ab 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/test/ConfigChannelHandlerTest.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/test/ConfigChannelHandlerTest.java @@ -433,27 +433,28 @@ public class ConfigChannelHandlerTest extends BaseHandlerTestCase {
ServerFactory.save(srv1);
- Set <ConfigRevision> revisions = new HashSet<ConfigRevision>(); + Map <Long, Set<ConfigRevision>> revisions = + new HashMap<Long, Set<ConfigRevision>>();
ConfigFile g1f1 = gcc1.createConfigFile( ConfigFileState.normal(), "/etc/foo1"); - revisions.add(ConfigTestUtils.createConfigRevision(g1f1)); + store(revisions, gcc1.getId(), ConfigTestUtils.createConfigRevision(g1f1));
ConfigurationFactory.commit(gcc1);
ConfigFile g1f2 = gcc1.createConfigFile( ConfigFileState.normal(), "/etc/foo2"); - revisions.add(ConfigTestUtils.createConfigRevision(g1f2)); + store(revisions, gcc1.getId(), ConfigTestUtils.createConfigRevision(g1f2)); ConfigurationFactory.commit(gcc2);
ConfigFile g2f2 = gcc2.createConfigFile( ConfigFileState.normal(), "/etc/foo4"); - revisions.add(ConfigTestUtils.createConfigRevision(g2f2)); + store(revisions, gcc2.getId(), ConfigTestUtils.createConfigRevision(g2f2)); ConfigurationFactory.commit(gcc2);
ConfigFile g2f3 = gcc2.createConfigFile( ConfigFileState.normal(), "/etc/foo3"); - revisions.add(ConfigTestUtils.createConfigRevision(g2f3)); + store(revisions, gcc2.getId(), ConfigTestUtils.createConfigRevision(g2f3)); ConfigurationFactory.commit(gcc2);
@@ -489,11 +490,20 @@ public class ConfigChannelHandlerTest extends BaseHandlerTestCase { } } assertNotNull(ca); - assertEquals(revisions.size(), ca.getConfigRevisionActions().size()); + assertEquals(revisions.get(gcc1.getId()).size(), + ca.getConfigRevisionActions().size()); for (ConfigRevisionAction cra : ca.getConfigRevisionActions()) { - assertTrue(revisions.contains(cra.getConfigRevision())); + assertTrue(revisions.get(gcc1.getId()).contains(cra.getConfigRevision())); }
}
+ private void store(Map<Long, Set<ConfigRevision>> revisions, Long ccid, + ConfigRevision crev) { + if (!revisions.containsKey(ccid)) { + revisions.put(ccid, new HashSet<ConfigRevision>()); + } + revisions.get(ccid).add(crev); + } + }
commit acfd4be1ffdd104c4235307c57b1978c51c8b60b Author: Tomas Lestach tlestach@redhat.com Date: Wed Mar 28 22:14:34 2012 +0200
805275 - add missing query parameter
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml index db053c1..34643f9 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml @@ -1285,7 +1285,7 @@ ORDER BY CFN.path </mode>
<mode name="file_names_for_system_channel" class="com.redhat.rhn.frontend.dto.ConfigFileNameDto"> - <query params="sid, user_id"> + <query params="sid, ccid, user_id"> SELECT DISTINCT CFN.id, CFN.path FROM rhnConfigFileName CFN, rhnServerConfigChannel SCC, rhnConfigFile CF, rhnUserServerPerms USP,
commit 84413f11c079c77145e644340615ed91562fc21c Author: Tomas Lestach tlestach@redhat.com Date: Wed Mar 28 21:50:04 2012 +0200
fix ConfigChannelHandlerTest validation issue
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/test/ConfigChannelHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/test/ConfigChannelHandlerTest.java index 5035fac..ff4f1f9 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/test/ConfigChannelHandlerTest.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/test/ConfigChannelHandlerTest.java @@ -204,7 +204,6 @@ public class ConfigChannelHandlerTest extends BaseHandlerTestCase { ConfigChannel cc, String selinuxCtx) throws ValidatorException { Map <String, Object> data = new HashMap<String, Object>(); - data.put("contents", contents); data.put(ConfigRevisionSerializer.GROUP, group); data.put(ConfigRevisionSerializer.OWNER, owner); data.put(ConfigRevisionSerializer.PERMISSIONS, perms); @@ -212,6 +211,7 @@ public class ConfigChannelHandlerTest extends BaseHandlerTestCase { String start = "#@"; String end = "@#"; if (!isDir) { + data.put(ConfigRevisionSerializer.CONTENTS, contents); data.put(ConfigRevisionSerializer.MACRO_START, start); data.put(ConfigRevisionSerializer.MACRO_END, end); }
commit 3d8111689e115179e5806893606e9dfc4854dc42 Author: Tomas Lestach tlestach@redhat.com Date: Wed Mar 28 21:34:50 2012 +0200
fix MDOM storage
do not store it into rhn.conf, but into the rhn_config_macro table
diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java index eb709b8..2d51e97 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java @@ -84,6 +84,9 @@ public class MonitoringConfigAction extends BaseConfigAction { // If the user submitted the form and there exists a value Object param = req.getParameter(ci.getName()); if (param != null) { + if (MDOM.equals(ci.getName())) { + param = IDN.toASCII((String) param); + } if (!param.equals(ci.getDefinition())) { ci.setDefinition((String) param); getManager().storeConfigMacro(ci); @@ -118,7 +121,6 @@ public class MonitoringConfigAction extends BaseConfigAction { ConfigureSatelliteCommand csc = (ConfigureSatelliteCommand) getCommand(user); csc.updateBoolean(ConfigDefaults.WEB_IS_MONITORING_SCOUT, (Boolean) form.get(IS_MONITORING_SCOUT)); - csc.updateString(MDOM, IDN.toASCII(form.getString(MDOM))); if (csc.getKeysToBeUpdated().size() > 0) { valuesChanged = true; ValidatorError[] verrors = csc.storeConfiguration(); @@ -143,7 +145,6 @@ public class MonitoringConfigAction extends BaseConfigAction { form.set(IS_MONITORING_SCOUT, Boolean.valueOf(Config.get().getBoolean( ConfigDefaults.WEB_IS_MONITORING_SCOUT))); - // form.set(MDOM, IDN.toUnicode((String) form.get(MDOM))); }
req.setAttribute("configList", nameDescVals);
commit 0959ab9b746f07b15457ef8e9af5c6818fbf489e Author: Tomas Lestach tlestach@redhat.com Date: Wed Mar 28 18:41:51 2012 +0200
fix ProfileHandlerTest
prevent NPE when saving ksdata without ks defaults
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/test/ProfileHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/test/ProfileHandlerTest.java index 4c0024a..883f2a0 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/test/ProfileHandlerTest.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/test/ProfileHandlerTest.java @@ -154,7 +154,7 @@ public class ProfileHandlerTest extends BaseHandlerTestCase { }
public void testListScript() throws Exception { - KickstartData ks = KickstartDataTest.createTestKickstartData(admin.getOrg()); + KickstartData ks = KickstartDataTest.createKickstartWithChannel(admin.getOrg()); int id = handler.addScript(adminKey, ks.getLabel(), "This is a script", "", "post", true); ks = (KickstartData) HibernateFactory.reload(ks); @@ -170,7 +170,7 @@ public class ProfileHandlerTest extends BaseHandlerTestCase { }
public void testAddScript() throws Exception { - KickstartData ks = KickstartDataTest.createTestKickstartData(admin.getOrg()); + KickstartData ks = KickstartDataTest.createKickstartWithChannel(admin.getOrg()); int id = handler.addScript(adminKey, ks.getLabel(), "This is a script", "", "post", true); ks = (KickstartData) HibernateFactory.reload(ks); @@ -185,7 +185,7 @@ public class ProfileHandlerTest extends BaseHandlerTestCase { }
public void testRemoveScript() throws Exception { - KickstartData ks = KickstartDataTest.createTestKickstartData(admin.getOrg()); + KickstartData ks = KickstartDataTest.createKickstartWithChannel(admin.getOrg());
KickstartScript script = new KickstartScript(); script.setKsdata(ks);
commit 77deb5ee9e432e109f874b7d22b58d5d196cfb2e Author: Tomas Lestach tlestach@redhat.com Date: Wed Mar 28 18:23:20 2012 +0200
fix KickstartDataTest.testISRhelRevMethods
we no longer have fedora_9
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java index 9c7356b..178288a 100644 --- a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java +++ b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java @@ -700,7 +700,7 @@ public class KickstartDataTest extends BaseTestCaseWithUser { assertTrue(k.isRhel5OrGreater());
k.getTree().setInstallType(KickstartFactory. - lookupKickstartInstallTypeByLabel("fedora_9")); + lookupKickstartInstallTypeByLabel("fedora")); assertTrue(k.isRhel5OrGreater()); assertFalse(k.isRhel5()); }
commit 87a6bc75b4fc5bdf7f2b5001f9a19fc01066a745 Author: Tomas Lestach tlestach@redhat.com Date: Wed Mar 28 18:14:02 2012 +0200
fix KickstartScheduleCommandTest
note: important for satellite
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartInstallType.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartInstallType.java index 514de74..5094cf9 100644 --- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartInstallType.java +++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartInstallType.java @@ -94,7 +94,7 @@ public class KickstartInstallType extends BaseDomainHelper { * @return true if the installer type is rhel */ public boolean isRhel() { - return isRhel2() || isRhel3() || isRhel4() || isRhel5(); + return isRhel2() || isRhel3() || isRhel4() || isRhel5() || isRhel6(); }
/**
commit 13f4cf8522538dd84853a0299c2c264c45cb8697 Author: Tomas Lestach tlestach@redhat.com Date: Wed Mar 28 18:00:11 2012 +0200
Revert "fix KickstartDataTest.testCommands"
This reverts commit 067b0fc3c6bf3b05f2b0c8bd3952f8ab58be40ac. due to postgresql hibernate issue on Fedoras
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java index 4d292e6..9c7356b 100644 --- a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java +++ b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java @@ -604,7 +604,7 @@ public class KickstartDataTest extends BaseTestCaseWithUser {
KickstartData k2 = lookupById(user.getOrg(), ksid); assertNotNull(k2); - assertEquals(2, k2.getPartitionData().split("\n").length); + assertEquals(5, k2.getPartitionData().split("\n").length); assertEquals(2, k2.getOptions().size()); // url and command from k creation }
commit 8a7c91c63ff0f9452d36deb1cebd14187be06d47 Author: Tomas Lestach tlestach@redhat.com Date: Wed Mar 28 17:53:26 2012 +0200
fix TranslationsTest
diff --git a/java/code/src/com/redhat/rhn/common/translation/test/TranslationsTest.java b/java/code/src/com/redhat/rhn/common/translation/test/TranslationsTest.java index 52818d7..e98d530 100644 --- a/java/code/src/com/redhat/rhn/common/translation/test/TranslationsTest.java +++ b/java/code/src/com/redhat/rhn/common/translation/test/TranslationsTest.java @@ -62,8 +62,7 @@ public class TranslationsTest extends RhnBaseTestCase { fail("Translation should have failed"); } catch (TranslationException e) { - assertEquals(e.getCause().getClass(), - java.lang.IllegalAccessException.class); + assertNull(e.getCause()); } }
commit 3b7c14ab9313f3821f9ea3625aca5598d69b05e5 Author: Tomas Lestach tlestach@redhat.com Date: Wed Mar 28 17:37:25 2012 +0200
fix FilterActionTest.testCreateSubmitFailValidation
diff --git a/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/FilterActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/FilterActionTest.java index 64d50c1..53e56fe 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/FilterActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/FilterActionTest.java @@ -166,6 +166,9 @@ public class FilterActionTest extends RhnBaseTestCase { assertEquals(1, messages.size()); assertEquals("", ah.getForm().get(FilterCreateAction.DESCRIPTION));
+ // clear action messages + ah.getRequest().getSession().removeAttribute(Globals.ERROR_KEY); + // Test requiredIf ah.getForm().set(FilterCreateAction.RECURRING, Boolean.TRUE); ah.executeAction();
commit 8af60e958a692b69497d1eadf92294ac2fb094df Author: Tomas Lestach tlestach@redhat.com Date: Wed Mar 28 17:20:27 2012 +0200
fix FilterActionTest.testEditExecute
diff --git a/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/FilterActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/FilterActionTest.java index 3431165..64d50c1 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/FilterActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/FilterActionTest.java @@ -214,7 +214,7 @@ public class FilterActionTest extends RhnBaseTestCase {
DynaActionForm form = ah.getForm(); assertEquals(form.get(FilterEditAction.RECURRING), - filter.getRecurring()); + filter.isRecurringBool()); assertEquals(form.get(FilterEditAction.RECURRING_DURATION), filter.getRecurringDuration().toString()); assertEquals(form.get(FilterEditAction.RECURRING_FREQUENCY),
commit 7b21c024a9860e5739d017900be59e1436f4e19a Author: Tomas Lestach tlestach@redhat.com Date: Wed Mar 28 17:19:33 2012 +0200
rename Filter.isRecurring to Filter.isRecurringBool
if there's isRecurring getter, hibernate assumes the recurring property is a boolean and calls a wrong setter
diff --git a/java/code/src/com/redhat/rhn/domain/monitoring/notification/Filter.java b/java/code/src/com/redhat/rhn/domain/monitoring/notification/Filter.java index ab7de8a..bd8e41a 100644 --- a/java/code/src/com/redhat/rhn/domain/monitoring/notification/Filter.java +++ b/java/code/src/com/redhat/rhn/domain/monitoring/notification/Filter.java @@ -192,7 +192,7 @@ public class Filter { /** * @return Returns the recurring boolean */ - public Boolean isRecurring() { + public Boolean isRecurringBool() { return recurring != 0; }
diff --git a/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/BaseFilterEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/BaseFilterEditAction.java index fca64f6..a7d7f71 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/BaseFilterEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/BaseFilterEditAction.java @@ -128,7 +128,7 @@ public abstract class BaseFilterEditAction extends RhnAction { } else { // Fill out the form from the Filter itself - form.set(RECURRING, filter.isRecurring()); + form.set(RECURRING, filter.isRecurringBool()); // Since RECURRING_DURATION is a user inputable field // we have to convert it to a string and also protect against nulls if (filter.getRecurringDuration() != null) { diff --git a/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/FilterActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/FilterActionTest.java index 71d0495..3431165 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/FilterActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/FilterActionTest.java @@ -136,7 +136,7 @@ public class FilterActionTest extends RhnBaseTestCase { action = new FilterCreateAction(); setUpAction(action, "success"); executeSubmit(); - assertFalse(filter.isRecurring().booleanValue()); + assertFalse(filter.isRecurringBool().booleanValue()); Calendar now = Calendar.getInstance(); now.setTime(new Date()); Calendar expires = Calendar.getInstance(); @@ -186,7 +186,7 @@ public class FilterActionTest extends RhnBaseTestCase { ah.getForm().set(FilterCreateAction.DURATION_TYPE, new Long(Calendar.HOUR_OF_DAY)); executeSubmit(); - assertTrue(filter.isRecurring().booleanValue()); + assertTrue(filter.isRecurringBool().booleanValue()); assertEquals(new Long(Calendar.WEEK_OF_YEAR), filter.getRecurringFrequency()); assertEquals(new Long(360), filter.getRecurringDuration()); assertEquals(new Long(Calendar.HOUR_OF_DAY), filter.getRecurringDurationType()); @@ -252,7 +252,7 @@ public class FilterActionTest extends RhnBaseTestCase { MonitoringManager.getInstance().storeFilter(filter, user); ah.getForm().set(FilterCreateAction.RECURRING, Boolean.FALSE); executeSubmit(); - assertFalse(filter.isRecurring().booleanValue()); + assertFalse(filter.isRecurringBool().booleanValue()); assertNull(filter.getRecurringDuration()); assertNull(filter.getRecurringDurationType()); }
commit dee085f377bc5f4343fa62001c9af1539f0e6926 Author: Tomas Lestach tlestach@redhat.com Date: Wed Mar 28 16:24:57 2012 +0200
fix ProbeGraphActionTest and MonitoringManagerTest
diff --git a/java/code/src/com/redhat/rhn/manager/monitoring/test/MonitoringManagerTest.java b/java/code/src/com/redhat/rhn/manager/monitoring/test/MonitoringManagerTest.java index 3931425..b8cd5cf 100644 --- a/java/code/src/com/redhat/rhn/manager/monitoring/test/MonitoringManagerTest.java +++ b/java/code/src/com/redhat/rhn/manager/monitoring/test/MonitoringManagerTest.java @@ -176,7 +176,7 @@ public class MonitoringManagerTest extends RhnBaseTestCase { // Insert a blank number, since some probe data has NULL data. Timestamp laterTime = new Timestamp(System.currentTimeMillis()); insertTimeSeriesData(laterTime, userIn.getOrg().getId(), probeIn - .getId(), "", metric); + .getId(), null, metric); return entryTime; }
commit f01a61d366743a2a877ae1cc2d6bd7f1e1fff5e6 Author: Tomas Lestach tlestach@redhat.com Date: Wed Mar 28 16:24:28 2012 +0200
fix ProbeGraphActionTest.setUp
diff --git a/java/code/src/com/redhat/rhn/testing/UserTestUtils.java b/java/code/src/com/redhat/rhn/testing/UserTestUtils.java index 15c4755..79730c1 100644 --- a/java/code/src/com/redhat/rhn/testing/UserTestUtils.java +++ b/java/code/src/com/redhat/rhn/testing/UserTestUtils.java @@ -125,6 +125,7 @@ public class UserTestUtils extends Assert {
private static User createUserInternal(String userName, boolean randomLogin) { + UserFactory.getSession(); User usr = UserFactory.createUser(); if (randomLogin) { usr.setLogin(userName + TestUtils.randomString());
commit 1bd44dd79d1148f0ef8a00cd23a2cafa67ba5fd8 Author: Tomas Lestach tlestach@redhat.com Date: Wed Mar 28 13:08:15 2012 +0200
fix SystemManagerTest.testListInstalledPackage
diff --git a/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java b/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java index c794932..244a721 100644 --- a/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java +++ b/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java @@ -65,7 +65,6 @@ import com.redhat.rhn.frontend.dto.SystemOverview; import com.redhat.rhn.frontend.listview.PageControl; import com.redhat.rhn.manager.entitlement.EntitlementManager; import com.redhat.rhn.manager.errata.cache.ErrataCacheManager; -import com.redhat.rhn.manager.rhnpackage.PackageManager; import com.redhat.rhn.manager.rhnpackage.test.PackageManagerTest; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager; @@ -1098,7 +1097,7 @@ public class SystemManagerTest extends RhnBaseTestCase {
InstalledPackage p = new InstalledPackage(); p.setArch(PackageFactory.lookupPackageArchByLabel("x86_64")); - p.setName(PackageManager.lookupPackageName("kernel")); + p.setName(PackageFactory.lookupOrCreatePackageByName("kernel")); p.setEvr(PackageEvrFactoryTest.createTestPackageEvr()); p.setServer(s); Set set = new HashSet();
commit fd75654424ceebe8454250c309862ad431f1579d Author: Tomas Lestach tlestach@redhat.com Date: Wed Mar 28 13:07:18 2012 +0200
fix SystemManagerTest.testSsmSystemPackagesToRemove
do not associate packages with a server several times + remove unused method
diff --git a/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java b/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java index 5e0f77e..c794932 100644 --- a/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java +++ b/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java @@ -924,11 +924,6 @@ public class SystemManagerTest extends RhnBaseTestCase { RhnSetDecl.SYSTEMS.getLabel(), SetCleanup.NOOP); assert ssmSet != null;
- ServerTestUtils.addServerPackageMapping(server1.getId(), installedPackage1); - ServerTestUtils.addServerPackageMapping(server1.getId(), installedPackage2); - - ServerTestUtils.addServerPackageMapping(server2.getId(), installedPackage1); - // Add the servers to the SSM set ServerTestUtils.addServersToSsm(admin, server1.getId(), server2.getId());
diff --git a/java/code/src/com/redhat/rhn/testing/ServerTestUtils.java b/java/code/src/com/redhat/rhn/testing/ServerTestUtils.java index 1583b2d..c44a5b0 100644 --- a/java/code/src/com/redhat/rhn/testing/ServerTestUtils.java +++ b/java/code/src/com/redhat/rhn/testing/ServerTestUtils.java @@ -14,8 +14,6 @@ */ package com.redhat.rhn.testing;
-import com.redhat.rhn.common.db.datasource.ModeFactory; -import com.redhat.rhn.common.db.datasource.WriteMode; import com.redhat.rhn.common.hibernate.HibernateFactory; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.errata.Errata; @@ -47,9 +45,7 @@ import com.redhat.rhn.manager.system.SystemManager;
import org.hibernate.Session;
-import java.util.HashMap; import java.util.HashSet; -import java.util.Map; import java.util.Set;
@@ -229,26 +225,6 @@ public class ServerTestUtils { }
/** - * Associates the given package with the given server. - * @param serverId identifies the server - * @param packageIn identifies the package; must already be saved - */ - public static void addServerPackageMapping(Long serverId, Package packageIn) { - WriteMode wm = ModeFactory.getWriteMode("test_queries", - "insert_into_rhnServerPackage_with_arch"); - - Map<String, Long> params = new HashMap<String, Long>(4); - params.put("server_id", serverId); - params.put("pn_id", packageIn.getPackageName().getId()); - params.put("evr_id", packageIn.getPackageEvr().getId()); - params.put("arch_id", packageIn.getPackageArch().getId()); - - int result = wm.executeUpdate(params); - - assert result == 1; - } - - /** * Creates two packages and errata agains the specified server. An installed package * with the default EVR is created and installed to the server. The newer package * is created with the given EVR and is the package associated with the errata.
spacewalk-commits@lists.fedorahosted.org