Hi,
In some frontend tests it is assumed that at least one Monitoring Scout
exists, and those tests will fail if there is none.
The proposed attached patch creates a test Monitoring Scout before any
operation that requires one, thus eliminating this precondition.
Regards,
--
Silvio Moioli
SUSE LINUX Products GmbH
Maxfeldstraße 5, 90409 Nürnberg Germany
>From f3c39d5f5adb90216f97988c29133e549df291d4 Mon Sep 17 00:00:00 2001
From: Silvio Moioli <smoi...@suse.de>
Date: Fri, 6 Sep 2013 15:10:02 +0200
Subject: [PATCH 02/22] Frontend monitoring tests: ensure a Monitoring Scout
exists
---
.../com/redhat/rhn/domain/monitoring/suite/test/ProbeSuiteTest.java | 2 ++
.../frontend/action/monitoring/notification/test/FilterActionTest.java | 1 +
.../action/monitoring/test/ProbeSuiteProbeCreateActionTest.java | 2 ++
.../action/monitoring/test/ProbeSuiteSystemsEditActionTest.java | 2 ++
.../frontend/action/systems/monitoring/test/ProbeCreateActionTest.java | 2 ++
.../frontend/action/systems/monitoring/test/ProbeCreateTestCase.java | 3 +++
.../frontend/action/systems/monitoring/test/ProbeDeleteActionTest.java | 2 ++
.../action/systems/monitoring/test/ProbeDetailsActionTest.java | 2 ++
.../frontend/action/systems/monitoring/test/ProbeEditActionTest.java | 2 ++
.../frontend/action/systems/monitoring/test/ProbeGraphActionTest.java | 1 +
10 files changed, 19 insertions(+)
diff --git a/java/code/src/com/redhat/rhn/domain/monitoring/suite/test/ProbeSuiteTest.java b/java/code/src/com/redhat/rhn/domain/monitoring/suite/test/ProbeSuiteTest.java
index eaa16b0..f9018ad 100644
--- a/java/code/src/com/redhat/rhn/domain/monitoring/suite/test/ProbeSuiteTest.java
+++ b/java/code/src/com/redhat/rhn/domain/monitoring/suite/test/ProbeSuiteTest.java
@@ -30,6 +30,7 @@ import com.redhat.rhn.domain.server.test.ServerFactoryTest;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.testing.BaseTestCaseWithUser;
import com.redhat.rhn.testing.TestUtils;
+import com.redhat.rhn.testing.UserTestUtils;
import org.hibernate.HibernateException;
@@ -191,6 +192,7 @@ public class ProbeSuiteTest extends BaseTestCaseWithUser {
}
// Just grab the 1st one for this test.
+ UserTestUtils.addMonitoringScoutOrg(user);
SatCluster sc = (SatCluster)
user.getOrg().getMonitoringScouts().iterator().next();
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 39ab377..902dab3 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
@@ -87,6 +87,7 @@ public class FilterActionTest extends RhnBaseTestCase {
filter = FilterTest.createTestFilter(user,
"filter" + TestUtils.randomString());
// Create a test probe
+ UserTestUtils.addMonitoringScoutOrg(user);
ServerProbe p = (ServerProbe) MonitoringFactoryTest.createTestProbe(user);
Server s = ServerFactoryTest.createTestServer(user, true);
SatCluster sc = (SatCluster) user.getOrg().getMonitoringScouts().iterator().next();
diff --git a/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteProbeCreateActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteProbeCreateActionTest.java
index 1cc37ee..648fe51 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteProbeCreateActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteProbeCreateActionTest.java
@@ -27,6 +27,7 @@ import com.redhat.rhn.frontend.action.systems.monitoring.test.ProbeCreateTestCas
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
import com.redhat.rhn.testing.ForwardWrapper;
+import com.redhat.rhn.testing.UserTestUtils;
/**
* ProbeCreateActionTest
@@ -51,6 +52,7 @@ public class ProbeSuiteProbeCreateActionTest extends ProbeCreateTestCase {
public void testSubmitExecute() throws Exception {
+ UserTestUtils.addMonitoringScoutOrg(user);
ServerProbe orig = (ServerProbe) MonitoringFactoryTest.createTestProbe(user);
modifyActionHelper("success");
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 68acee4..69dfd2e 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
@@ -40,6 +40,7 @@ import com.redhat.rhn.manager.rhnset.RhnSetDecl;
import com.redhat.rhn.manager.user.UserManager;
import com.redhat.rhn.testing.ActionHelper;
import com.redhat.rhn.testing.RhnBaseTestCase;
+import com.redhat.rhn.testing.UserTestUtils;
import org.apache.struts.Globals;
import org.apache.struts.action.Action;
@@ -80,6 +81,7 @@ public class ProbeSuiteSystemsEditActionTest extends RhnBaseTestCase {
// Create a 2nd server that isn't in the suite
Server serverNotInSuite = ServerFactoryTest.createTestServer(user, true,
ServerConstants.getServerGroupTypeMonitoringEntitled());
+ UserTestUtils.addMonitoringScoutOrg(user);
SatCluster c = (SatCluster)
user.getOrg().getMonitoringScouts().iterator().next();
sah.getRequest().
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeCreateActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeCreateActionTest.java
index f8ec855..7f25628 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeCreateActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeCreateActionTest.java
@@ -27,6 +27,7 @@ import com.redhat.rhn.frontend.action.systems.monitoring.ProbeCreateAction;
import com.redhat.rhn.frontend.action.systems.monitoring.ProbeDetailsAction;
import com.redhat.rhn.frontend.struts.RhnAction;
import com.redhat.rhn.testing.ForwardWrapper;
+import com.redhat.rhn.testing.UserTestUtils;
/**
* ProbeCreateActionTest
@@ -46,6 +47,7 @@ public class ProbeCreateActionTest extends ProbeCreateTestCase {
public void testSubmitExecute() throws Exception {
+ UserTestUtils.addMonitoringScoutOrg(user);
Probe orig = MonitoringFactoryTest.createTestProbe(user);
modifyActionHelper("success");
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeCreateTestCase.java b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeCreateTestCase.java
index c26e6c3..57e914f 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeCreateTestCase.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeCreateTestCase.java
@@ -31,6 +31,7 @@ import com.redhat.rhn.testing.ForwardWrapper;
import com.redhat.rhn.testing.RhnBaseTestCase;
import com.redhat.rhn.testing.RhnMockHttpServletRequest;
import com.redhat.rhn.testing.RhnMockHttpSession;
+import com.redhat.rhn.testing.UserTestUtils;
import org.apache.commons.lang.StringUtils;
import org.hibernate.HibernateException;
@@ -69,6 +70,7 @@ public abstract class ProbeCreateTestCase extends RhnBaseTestCase {
public final void testMissingParams() throws Exception {
modifyActionHelper(RhnHelper.DEFAULT_FORWARD);
+ UserTestUtils.addMonitoringScoutOrg(user);
Probe orig = MonitoringFactoryTest.createTestProbe(user);
ah.getForm().set(RhnAction.SUBMITTED, Boolean.TRUE);
@@ -134,6 +136,7 @@ public abstract class ProbeCreateTestCase extends RhnBaseTestCase {
public final void testThresholdParamsAscending() throws Exception {
// bugzilla 161387
+ UserTestUtils.addMonitoringScoutOrg(user);
Probe orig = MonitoringFactoryTest.createTestProbe(user);
modifyActionHelper(RhnHelper.DEFAULT_FORWARD);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeDeleteActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeDeleteActionTest.java
index 5791585..6410299 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeDeleteActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeDeleteActionTest.java
@@ -27,6 +27,7 @@ import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.manager.monitoring.MonitoringManager;
import com.redhat.rhn.testing.ActionHelper;
import com.redhat.rhn.testing.RhnBaseTestCase;
+import com.redhat.rhn.testing.UserTestUtils;
import org.apache.struts.action.ActionForward;
@@ -51,6 +52,7 @@ public class ProbeDeleteActionTest extends RhnBaseTestCase {
user = ah.getUser();
user.addRole(RoleFactory.ORG_ADMIN);
Server s = ServerFactoryTest.createTestServer(user, true);
+ UserTestUtils.addMonitoringScoutOrg(user);
probe = MonitoringFactoryTest.createTestProbe(user);
ah.getForm().setFormName("probeEditForm");
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeDetailsActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeDetailsActionTest.java
index 0bf096e..c79fe56 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeDetailsActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeDetailsActionTest.java
@@ -34,6 +34,7 @@ import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper;
import com.redhat.rhn.manager.monitoring.test.MonitoringManagerTest;
import com.redhat.rhn.testing.ActionHelper;
import com.redhat.rhn.testing.RhnBaseTestCase;
+import com.redhat.rhn.testing.UserTestUtils;
import org.apache.struts.action.ActionForward;
@@ -65,6 +66,7 @@ public class ProbeDetailsActionTest extends RhnBaseTestCase {
user = ah.getUser();
user.addRole(RoleFactory.ORG_ADMIN);
s = ServerFactoryTest.createTestServer(user, true);
+ UserTestUtils.addMonitoringScoutOrg(user);
probe = MonitoringFactoryTest.createTestProbe(user);
ProbeState newState = new ProbeState((SatCluster)
user.getOrg().getMonitoringScouts().iterator().next());
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeEditActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeEditActionTest.java
index 2db8668..d70f01a 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeEditActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeEditActionTest.java
@@ -27,6 +27,7 @@ import com.redhat.rhn.frontend.action.systems.monitoring.ProbeEditAction;
import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.testing.ActionHelper;
import com.redhat.rhn.testing.RhnBaseTestCase;
+import com.redhat.rhn.testing.UserTestUtils;
import org.apache.struts.action.ActionForward;
@@ -55,6 +56,7 @@ public class ProbeEditActionTest extends RhnBaseTestCase {
user.addRole(RoleFactory.ORG_ADMIN);
Server s = ServerFactoryTest.createTestServer(user, true);
+ UserTestUtils.addMonitoringScoutOrg(user);
probe = MonitoringFactoryTest.createTestProbe(user);
ah.getForm().setFormName("probeEditForm");
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeGraphActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeGraphActionTest.java
index ae65f46..c3af8fa 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeGraphActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeGraphActionTest.java
@@ -51,6 +51,7 @@ public class ProbeGraphActionTest extends RhnBaseTestCase {
testTime = new Timestamp(System.currentTimeMillis());
user = UserTestUtils.createUserInOrgOne();
server = ServerFactoryTest.createTestServer(user, false);
+ UserTestUtils.addMonitoringScoutOrg(user);
probe = MonitoringFactoryTest.createTestProbe(user);
action = new ProbeGraphAction();
--
1.8.1.4
_______________________________________________
Spacewalk-devel mailing list
Spacewalk-devel@redhat.com
https://www.redhat.com/mailman/listinfo/spacewalk-devel
