[Spacewalk-devel] [PATCH] OrgSoftwareSubscriptionsActionTest: always create test channel families

[Silvio Moioli]

In OrgSoftwareSubscriptionsActionTest, a test channel family is
correctly set up for a test method but not in another. I simply moved
common initialization code in setUp().

See attached patch.

Regards,
-- 
Silvio Moioli
SUSE LINUX Products GmbH
Maxfeldstraße 5, 90409 Nürnberg Germany




>From a0de8207ea118718c9396eada12b6ecbf519a8ed Mon Sep 17 00:00:00 2001
From: Silvio Moioli <smoi...@suse.de>
Date: Mon, 9 Sep 2013 17:08:03 +0200
Subject: [PATCH 07/22] OrgSoftwareSubscriptionsActionTest: do not assume
 channel family subscriptions

---
 .../test/OrgSoftwareSubscriptionsActionTest.java   | 31 +++++++++++++++++-----
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSoftwareSubscriptionsActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSoftwareSubscriptionsActionTest.java
index b1414ff..946f3ee 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSoftwareSubscriptionsActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSoftwareSubscriptionsActionTest.java
@@ -36,6 +36,30 @@ import java.util.Map;
  */
 public class OrgSoftwareSubscriptionsActionTest extends RhnPostMockStrutsTestCase {
 
+
+    /** The channel family. */
+    private ChannelFamily cfm;
+
+    /**
+     * Sets up channel family and subscriptions.
+     *
+     * @throws Exception if problems arise
+     * @see com.redhat.rhn.testing.RhnPostMockStrutsTestCase#setUp()
+     */
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+
+        cfm = ChannelFamilyFactoryTest.createTestChannelFamily(UserFactory
+                        .findRandomOrgAdmin(OrgFactory.getSatelliteOrg()));
+        System.out.println("CFM TEST ID is " + cfm.getId().toString());
+        Map<String, String> subsMap = new HashMap<String, String>();
+        subsMap.put(cfm.getId().toString(), "10");
+        request.getSession().setAttribute(
+                "OrgSoftwareSubscriptions" + user.getOrg().getId().toString(), subsMap);
+
+    }
+
     public void testExecute() throws Exception {
         user.getOrg().addRole(RoleFactory.SAT_ADMIN);
         user.addRole(RoleFactory.SAT_ADMIN);
@@ -52,17 +76,10 @@ public class OrgSoftwareSubscriptionsActionTest extends RhnPostMockStrutsTestCas
         user.getOrg().addRole(RoleFactory.SAT_ADMIN);
         user.addRole(RoleFactory.SAT_ADMIN);
         addRequestParameter(RequestContext.ORG_ID, user.getOrg().getId().toString());
-        ChannelFamily cfm = ChannelFamilyFactoryTest.createTestChannelFamily(
-                UserFactory.findRandomOrgAdmin(OrgFactory.getSatelliteOrg()));
-        System.out.println("CFM TEST ID is " + cfm.getId().toString());
         addRequestParameter(cfm.getId().toString(), "10");
         addRequestParameter("updateOrganizations", "1");
         LocalizationService ls = LocalizationService.getInstance();
         addRequestParameter("dispatch", ls.getMessage("orgdetails.jsp.submit"));
-        Map<String, String> subsMap = new HashMap<String, String>();
-        subsMap.put(cfm.getId().toString(), "10");
-        request.getSession().setAttribute("OrgSoftwareSubscriptions" +
-                                user.getOrg().getId().toString(), subsMap);
         setRequestPathInfo("/admin/multiorg/OrgSoftwareSubscriptions");
 
         addSubmitted();
-- 
1.8.1.4





_______________________________________________
Spacewalk-devel mailing list
Spacewalk-devel@redhat.com
https://www.redhat.com/mailman/listinfo/spacewalk-devel