java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbesListSetupActionTest.java
| 7 ++++---
java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataActionTest.java
| 4 +++-
2 files changed, 7 insertions(+), 4 deletions(-)
New commits:
commit ed01429526233dfaa4314d917e79c0484a11f934
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Fri Mar 27 16:42:39 2009 -0400
couple of unit test fixes
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbesListSetupActionTest.java
b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbesListSetupActionTest.java
index 23b344f..b41ac58 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbesListSetupActionTest.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbesListSetupActionTest.java
@@ -23,6 +23,7 @@ import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.server.test.ServerFactoryTest;
import com.redhat.rhn.frontend.action.systems.monitoring.ProbesListSetupAction;
import com.redhat.rhn.frontend.dto.monitoring.ServerProbeDto;
+import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper;
import com.redhat.rhn.manager.monitoring.MonitoringManager;
import com.redhat.rhn.testing.ActionHelper;
import com.redhat.rhn.testing.RhnBaseTestCase;
@@ -55,8 +56,8 @@ public class ProbesListSetupActionTest extends RhnBaseTestCase {
ah.setupClampListBounds();
ActionForward af = ah.executeAction();
assertEquals("default", af.getName());
- assertNotNull(ah.getRequest().getAttribute("pageList"));
- DataResult dr = (DataResult) ah.getRequest().getAttribute("pageList");
+ DataResult dr = (DataResult) ah.getRequest().getAttribute(ListHelper.DATA_SET);
+ assertNotNull(dr);
assertTrue(dr.size() > 0);
assertTrue(dr.getStart() == 1);
assertTrue(dr.getEnd() > 0);
@@ -85,7 +86,7 @@ public class ProbesListSetupActionTest extends RhnBaseTestCase {
ah.setupClampListBounds();
ActionForward af = ah.executeAction();
assertEquals("default", af.getName());
- DataResult dr = (DataResult) ah.getRequest().getAttribute("pageList");
+ DataResult dr = (DataResult) ah.getRequest().getAttribute(ListHelper.DATA_SET);
assertTrue(dr.size() == 0);
}
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataActionTest.java
b/java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataActionTest.java
index d167ebc..3db6ecb 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataActionTest.java
@@ -14,6 +14,7 @@
*/
package com.redhat.rhn.frontend.action.systems.test;
+import com.redhat.rhn.common.localization.LocalizationService;
import com.redhat.rhn.domain.channel.Channel;
import com.redhat.rhn.domain.channel.ChannelFactory;
import com.redhat.rhn.domain.channel.test.ChannelFactoryTest;
@@ -56,7 +57,8 @@ public class ErrataActionTest extends RhnMockStrutsTestCase {
String pathInfo = "/systems/details/ErrataList";
setRequestPathInfo(pathInfo);
addSubmitted();
- addRequestParameter(RequestContext.DISPATCH, Boolean.toString(true));
+ addRequestParameter(RequestContext.DISPATCH,
+
LocalizationService.getInstance().getMessage("errata.jsp.apply"));
// Create System
Server server = ServerFactoryTest.createTestServer(user, true);
Show replies by thread