java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuitesRemoveSetupAction.java | 6 ++++++
java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/FilterListSetupActionTest.java | 1 +
java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteListSetupActionTest.java | 1 +
java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteSystemsEditActionTest.java | 1 +
java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteSystemsSetupActionTest.java | 1 +
java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuitesRemoveSetupActionTest.java | 1 +
java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/PreservationListConfirmDeleteAction.java | 6 ++++++
java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/test/PreservationListConfirmDeleteActionTest.java | 1 +
java/code/src/com/redhat/rhn/frontend/struts/test/BaseSetListActionTest.java | 1 +
9 files changed, 19 insertions(+)
New commits:
commit ce251253320df53d10d1c19c3dd122d0f6b62e40
Author: Devan Goodwin <dgoodwin(a)redhat.com>
Date: Wed May 27 12:24:32 2009 -0300
Fix tests and actions broken by recent change to set clearing logic.
Commit 20da1583321f488edf13d24f62ed1d4b872c2cf1 pushed some set clearing
logic up to a base class which caused a number of test failures, but
also it exposed that some actions actually depend on the set NOT being
cleared.
For now fixing the tests and adjusting the actions in question to
override the clear set boolean getter, as I suspect defaulting to
clearing the set is still the safest thing to do. If this becomes
a larger problem this will have to be reverted, as well as
20da1583321f488edf13d24f62ed1d4b872c2cf1.
diff --git a/java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuitesRemoveSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuitesRemoveSetupAction.java
index b3bffb6..36c612b 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuitesRemoveSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuitesRemoveSetupAction.java
@@ -63,4 +63,10 @@ public class ProbeSuitesRemoveSetupAction extends BaseSetListAction {
public RhnSetDecl getSetDecl() {
return RhnSetDecl.PROBE_SUITES_TO_DELETE;
}
+
+ /** {@inheritDoc} */
+ protected boolean preClearSet() {
+ return false;
+ }
+
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/FilterListSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/FilterListSetupActionTest.java
index 363114f..059a78f 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/FilterListSetupActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/FilterListSetupActionTest.java
@@ -74,6 +74,7 @@ public class FilterListSetupActionTest extends RhnBaseTestCase {
}
sah.setupClampListBounds();
sah.getRequest().setupAddParameter("active", "false");
+ sah.getRequest().setupAddParameter("submitted", "false");
sah.getRequest().setupAddParameter("newset", (String)null);
sah.getRequest().setupAddParameter("returnvisit", (String) null);
sah.executeAction();
diff --git a/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteListSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteListSetupActionTest.java
index fdf5e1b..4349efa 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteListSetupActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteListSetupActionTest.java
@@ -47,6 +47,7 @@ public class ProbeSuiteListSetupActionTest extends RhnBaseTestCase {
for (int i = 0; i < 5; i++) {
ProbeSuiteTest.createTestProbeSuite(user);
}
+ sah.getRequest().setupAddParameter("submitted", "false");
sah.setupClampListBounds();
sah.executeAction();
RhnMockHttpServletRequest request = sah.getRequest();
diff --git a/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteSystemsEditActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteSystemsEditActionTest.java
index ae0390f..cee3ef2 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteSystemsEditActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteSystemsEditActionTest.java
@@ -90,6 +90,7 @@ public class ProbeSuiteSystemsEditActionTest extends RhnBaseTestCase {
sah.getRequest().setupAddParameter("newset", (String)null);
sah.getRequest().setupAddParameter("returnvisit", (String)null);
+ sah.getRequest().setupAddParameter("submitted", "false");
sah.getRequest().setupAddParameter("items_on_page", (String)null);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteSystemsSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteSystemsSetupActionTest.java
index 454fb78..82c61ce 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteSystemsSetupActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteSystemsSetupActionTest.java
@@ -61,6 +61,7 @@ public class ProbeSuiteSystemsSetupActionTest extends RhnBaseTestCase {
sah.setupClampListBounds();
sah.getRequest().setupAddParameter("newset", (String)null);
sah.getRequest().setupAddParameter("returnvisit", (String) null);
+ sah.getRequest().setupAddParameter("submitted", "false");
sah.executeAction();
RhnMockHttpServletRequest request = sah.getRequest();
diff --git a/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuitesRemoveSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuitesRemoveSetupActionTest.java
index 78eed14..767fc45 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuitesRemoveSetupActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuitesRemoveSetupActionTest.java
@@ -57,6 +57,7 @@ public class ProbeSuitesRemoveSetupActionTest extends RhnBaseTestCase {
sah.setupClampListBounds();
sah.getRequest().setupAddParameter("newset", (String)null);
sah.getRequest().setupAddParameter("returnvisit", (String) null);
+ sah.getRequest().setupAddParameter("submitted", "false");
sah.executeAction();
RhnMockHttpServletRequest request = sah.getRequest();
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/PreservationListConfirmDeleteAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/PreservationListConfirmDeleteAction.java
index a36b1c3..e5f3fcc 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/PreservationListConfirmDeleteAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/PreservationListConfirmDeleteAction.java
@@ -66,4 +66,10 @@ public class PreservationListConfirmDeleteAction extends BaseSetListAction {
public RhnSetDecl getSetDecl() {
return RhnSetDecl.FILE_LISTS;
}
+
+ /** {@inheritDoc} */
+ protected boolean preClearSet() {
+ return false;
+ }
+
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/test/PreservationListConfirmDeleteActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/test/PreservationListConfirmDeleteActionTest.java
index 2edd80d..a11461a 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/test/PreservationListConfirmDeleteActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/test/PreservationListConfirmDeleteActionTest.java
@@ -68,6 +68,7 @@ public class PreservationListConfirmDeleteActionTest extends RhnBaseTestCase {
ah.setupClampListBounds();
ah.getRequest().setupAddParameter("newset", (String)null);
ah.getRequest().setupAddParameter("returnvisit", (String) null);
+ ah.getRequest().setupAddParameter("submitted", "false");
ah.executeAction();
RhnMockHttpServletRequest request = ah.getRequest();
diff --git a/java/code/src/com/redhat/rhn/frontend/struts/test/BaseSetListActionTest.java b/java/code/src/com/redhat/rhn/frontend/struts/test/BaseSetListActionTest.java
index f0406d4..ce5662e 100644
--- a/java/code/src/com/redhat/rhn/frontend/struts/test/BaseSetListActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/struts/test/BaseSetListActionTest.java
@@ -44,6 +44,7 @@ public class BaseSetListActionTest extends RhnBaseTestCase {
sah = new ActionHelper();
sah.setUpAction(tla);
sah.setupClampListBounds();
+ sah.getRequest().setupAddParameter("submitted", "false");
}
/**