java/code/src/com/redhat/rhn/domain/server/Server.java
| 2
java/code/src/com/redhat/rhn/domain/server/test/ServerFactoryVirtualizationTest.java
| 29 +++----
java/code/src/com/redhat/rhn/domain/server/test/ServerTest.java
| 3
java/code/src/com/redhat/rhn/frontend/action/channel/test/ChannelEntitlementSetupActionTest.java
| 3
java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSoftwareSubscriptionsActionTest.java
| 19 ++++-
java/code/src/com/redhat/rhn/frontend/action/multiorg/test/SoftwareEntitlementsActionTest.java
| 4 -
java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/test/SystemEntitlementsSubmitActionTest.java
| 38 ----------
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/test/SystemDetailsEditActionTest.java
| 14 ++-
8 files changed, 48 insertions(+), 64 deletions(-)
New commits:
commit 6f7dadd39aa633e627a56e38d48c38582c509abe
Author: Partha Aji <paji(a)redhat.com>
Date: Tue Jun 29 19:03:58 2010 -0400
Cleared more unit test
diff --git a/java/code/src/com/redhat/rhn/domain/server/Server.java
b/java/code/src/com/redhat/rhn/domain/server/Server.java
index 3ee4e16..9344469 100644
--- a/java/code/src/com/redhat/rhn/domain/server/Server.java
+++ b/java/code/src/com/redhat/rhn/domain/server/Server.java
@@ -1404,7 +1404,7 @@ public class Server extends BaseDomainHelper implements Identifiable
{
}
private boolean canDeleteGuest(VirtualInstance guest) {
- for (VirtualInstance g : guests) {
+ for (VirtualInstance g : getGuests()) {
if (g.getId().equals(guest.getId())) {
return true;
}
diff --git
a/java/code/src/com/redhat/rhn/domain/server/test/ServerFactoryVirtualizationTest.java
b/java/code/src/com/redhat/rhn/domain/server/test/ServerFactoryVirtualizationTest.java
index 55b7f6d..d915982 100644
---
a/java/code/src/com/redhat/rhn/domain/server/test/ServerFactoryVirtualizationTest.java
+++
b/java/code/src/com/redhat/rhn/domain/server/test/ServerFactoryVirtualizationTest.java
@@ -14,6 +14,7 @@
*/
package com.redhat.rhn.domain.server.test;
+import com.redhat.rhn.common.hibernate.HibernateFactory;
import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.server.ServerFactory;
import com.redhat.rhn.domain.server.VirtualInstance;
@@ -65,28 +66,26 @@ public class ServerFactoryVirtualizationTest extends RhnBaseTestCase
{
}
public void testDeleteGuestFromHostAndSaveHost() throws Exception {
- VirtualInstance virtualInstance =
+ VirtualInstance guest =
virtualInstanceFactory.newRegisteredGuestWithHost();
-
- Server host = virtualInstance.getHostSystem();
-
+ Long guestId = guest.getGuestSystem().getId();
+ Server host = guest.getHostSystem();
ServerFactory.save(host);
- flushAndEvict(host);
- flushAndEvict(virtualInstance);
+ Long hostId = host.getId();
- Long guestId = virtualInstance.getGuestSystem().getId();
+ HibernateFactory.getSession().save(guest);
+ HibernateFactory.getSession().clear();
- Server retrievedHost = ServerFactory.lookupById(host.getId());
- retrievedHost.deleteGuest(virtualInstance);
+ Server retrievedHost = ServerFactory.lookupById(hostId);
+ assertFalse(retrievedHost.getGuests().isEmpty());
- //ServerFactory.save(retrievedHost);
- flushAndEvict(virtualInstance);
- flushAndEvict(retrievedHost);
-
- Server serverWithoutGuest = ServerFactory.lookupById(host.getId());
+ assertTrue(retrievedHost.deleteGuest(guest));
+
+ HibernateFactory.getSession().clear();
+ Server serverWithoutGuest = ServerFactory.lookupById(hostId);
Server deletedGuest = ServerFactory.lookupById(guestId);
- assertFalse(serverWithoutGuest.getGuests().contains(virtualInstance));
+ assertFalse(serverWithoutGuest.getGuests().contains(deletedGuest));
assertNull("guest system was not deleted", deletedGuest);
}
diff --git a/java/code/src/com/redhat/rhn/domain/server/test/ServerTest.java
b/java/code/src/com/redhat/rhn/domain/server/test/ServerTest.java
index 96f5a1c..996ca5b 100644
--- a/java/code/src/com/redhat/rhn/domain/server/test/ServerTest.java
+++ b/java/code/src/com/redhat/rhn/domain/server/test/ServerTest.java
@@ -14,6 +14,7 @@
*/
package com.redhat.rhn.domain.server.test;
+import com.redhat.rhn.common.hibernate.HibernateFactory;
import com.redhat.rhn.domain.role.RoleFactory;
import com.redhat.rhn.domain.server.Capability;
import com.redhat.rhn.domain.server.EntitlementServerGroup;
@@ -60,6 +61,8 @@ public class ServerTest extends BaseTestCaseWithUser {
Server s = ServerTestUtils.createTestSystem(user);
SystemManager.removeAllServerEntitlements(s.getId());
UserTestUtils.addManagement(s.getCreator().getOrg());
+ HibernateFactory.getSession().clear();
+ s = ServerFactory.lookupById(s.getId());
s.setBaseEntitlement(EntitlementManager.MANAGEMENT);
TestUtils.saveAndFlush(s);
s = (Server) reload(s);
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/channel/test/ChannelEntitlementSetupActionTest.java
b/java/code/src/com/redhat/rhn/frontend/action/channel/test/ChannelEntitlementSetupActionTest.java
index 2540bf6..1718f82 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/channel/test/ChannelEntitlementSetupActionTest.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/channel/test/ChannelEntitlementSetupActionTest.java
@@ -21,6 +21,7 @@ import com.redhat.rhn.domain.role.RoleFactory;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.channel.ChannelEntitlementSetupAction;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper;
import com.redhat.rhn.testing.ActionHelper;
import com.redhat.rhn.testing.RhnBaseTestCase;
@@ -45,7 +46,7 @@ public class ChannelEntitlementSetupActionTest extends RhnBaseTestCase
{
sah.setupProcessPagination();
sah.setupClampListBounds();
sah.executeAction();
- DataResult dr = (DataResult)
sah.getRequest().getAttribute("pageList");
+ DataResult dr = (DataResult) sah.getRequest().getAttribute(ListHelper.DATA_SET);
assertNotEmpty(dr);
}
}
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 796d5d7..1a59843 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
@@ -14,17 +14,21 @@
*/
package com.redhat.rhn.frontend.action.multiorg.test;
+import com.redhat.rhn.common.localization.LocalizationService;
import com.redhat.rhn.domain.channel.ChannelFamily;
import com.redhat.rhn.domain.channel.test.ChannelFamilyFactoryTest;
import com.redhat.rhn.domain.org.OrgFactory;
import com.redhat.rhn.domain.role.RoleFactory;
import com.redhat.rhn.domain.user.UserFactory;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper;
import com.redhat.rhn.testing.RhnMockStrutsTestCase;
import com.redhat.rhn.testing.TestUtils;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
/**
* OrgSoftwareSubscriptionsActionTest
@@ -38,8 +42,10 @@ public class OrgSoftwareSubscriptionsActionTest extends
RhnMockStrutsTestCase {
addRequestParameter(RequestContext.ORG_ID, user.getOrg().getId().toString());
setRequestPathInfo("/admin/multiorg/OrgSoftwareSubscriptions");
actionPerform();
- assertTrue(getActualForward().contains("oid=" +
user.getOrg().getId()));
assertNotNull(request.getAttribute("org"));
+ assertNotNull(request.getAttribute(ListHelper.DATA_SET));
+ List pl = (List) request.getAttribute(ListHelper.DATA_SET);
+ assertTrue(pl.size() > 0);
}
public void testExecuteSubmit() throws Exception {
@@ -51,7 +57,14 @@ public class OrgSoftwareSubscriptionsActionTest extends
RhnMockStrutsTestCase {
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();
actionPerform();
assertTrue(getActualForward().contains("oid=" +
user.getOrg().getId()));
@@ -64,8 +77,8 @@ public class OrgSoftwareSubscriptionsActionTest extends
RhnMockStrutsTestCase {
assertEquals(10, cfm.getMaxMembers(user.getOrg()).longValue());
// Check the setup request params
- assertNotNull(request.getAttribute("pageList"));
- List pl = (List) request.getAttribute("pageList");
+ assertNotNull(request.getAttribute(ListHelper.DATA_SET));
+ List pl = (List) request.getAttribute(ListHelper.DATA_SET);
assertTrue(pl.size() > 0);
}
}
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/SoftwareEntitlementsActionTest.java
b/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/SoftwareEntitlementsActionTest.java
index 117052e..9785552 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/SoftwareEntitlementsActionTest.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/SoftwareEntitlementsActionTest.java
@@ -17,7 +17,7 @@ package com.redhat.rhn.frontend.action.multiorg.test;
import com.redhat.rhn.domain.role.RoleFactory;
import com.redhat.rhn.domain.server.test.ServerFactoryTest;
import com.redhat.rhn.frontend.dto.SoftwareEntitlementDto;
-import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper;
import com.redhat.rhn.testing.RhnMockStrutsTestCase;
import com.redhat.rhn.testing.TestUtils;
@@ -38,7 +38,7 @@ public class SoftwareEntitlementsActionTest extends
RhnMockStrutsTestCase {
setRequestPathInfo("/admin/multiorg/SoftwareEntitlements");
actionPerform();
List<SoftwareEntitlementDto> entitlements =
(List<SoftwareEntitlementDto>)
- request.getAttribute(RequestContext.PAGE_LIST);
+ request.getAttribute(ListHelper.DATA_SET);
assertNotNull(entitlements);
}
}
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/test/SystemEntitlementsSubmitActionTest.java
b/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/test/SystemEntitlementsSubmitActionTest.java
index 715a1c7..cbb71b1 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/test/SystemEntitlementsSubmitActionTest.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/test/SystemEntitlementsSubmitActionTest.java
@@ -201,25 +201,6 @@ public class SystemEntitlementsSubmitActionTest extends
RhnMockStrutsTestCase {
verifyActionMessage(failure(MANAGEMENT));
}
-
-
-
- /**
- * @throws Exception on server init failure
- */
- public void testUpdateOnly() throws Exception {
- Server server = ServerFactoryTest.createTestServer(user, true,
- ServerConstants.getServerGroupTypeUpdateEntitled());
- /*
- * this should Succeed because the org only has groups type = Update
- * that has available subscriptions > 0..
- */
- dispatch(SystemEntitlementsSubmitAction.KEY_UPDATE_ENTITLED, server);
- assertTrue(SystemManager.hasEntitlement(server.getId(),
- EntitlementManager.UPDATE));
- verifyActionMessage(success(UPDATE));
- }
-
/**
* @throws Exception on server init failure
@@ -338,25 +319,6 @@ public class SystemEntitlementsSubmitActionTest extends
RhnMockStrutsTestCase {
*
* @throws Exception on server init failure
*/
- public void testUnentitleForUpdate() throws Exception {
- Server server1 = ServerFactoryTest.createTestServer(user, true,
- ServerConstants.getServerGroupTypeUpdateEntitled());
-
- assertTrue(SystemManager.hasEntitlement(server1.getId(),
- EntitlementManager.UPDATE));
-
-
-
- dispatch(SystemEntitlementsSubmitAction.KEY_UNENTITLED, server1);
- verifyActionMessage(success(UNENTITLED));
- assertFalse(SystemManager.hasEntitlement(server1.getId(),
- EntitlementManager.UPDATE));
- }
-
- /**
- *
- * @throws Exception on server init failure
- */
public void testUnentitleForManagement() throws Exception {
Server server1 = ServerFactoryTest.createTestServer(user, true,
ServerConstants.getServerGroupTypeEnterpriseEntitled());
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/test/SystemDetailsEditActionTest.java
b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/test/SystemDetailsEditActionTest.java
index 2a2ee18..274d442 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/test/SystemDetailsEditActionTest.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/test/SystemDetailsEditActionTest.java
@@ -14,6 +14,7 @@
*/
package com.redhat.rhn.frontend.action.systems.sdc.test;
+import com.redhat.rhn.common.hibernate.HibernateFactory;
import com.redhat.rhn.domain.entitlement.Entitlement;
import com.redhat.rhn.domain.entitlement.VirtualizationEntitlement;
import com.redhat.rhn.domain.server.Server;
@@ -174,14 +175,19 @@ public class SystemDetailsEditActionTest extends
RhnMockStrutsTestCase {
public void testSetBaseEntitlement() throws Exception {
UserTestUtils.addManagement(user.getOrg());
- SystemManager.removeAllServerEntitlements(s.getId());
- request.addParameter(SystemDetailsEditAction.NAME, s.getName());
+ Long id = s.getId();
+ String name = s.getName();
+ HibernateFactory.getSession().clear();
+ SystemManager.removeAllServerEntitlements(id);
+ s = ServerFactory.lookupById(id);
+ assertTrue(s.getBaseEntitlement() == null);
+
+ request.addParameter(SystemDetailsEditAction.NAME, name);
request.addParameter(SystemDetailsEditAction.BASE_ENTITLEMENT,
EntitlementManager.MANAGEMENT.getLabel());
addSubmitted();
actionPerform();
- s = (Server) TestUtils.reload(s);
-
+ s = ServerFactory.lookupById(id);
assertTrue(s.getBaseEntitlement().equals(EntitlementManager.MANAGEMENT));
}