java/code/src/com/redhat/rhn/domain/server/Server.java | 2 -
java/code/src/com/redhat/rhn/domain/server/test/ServerFactoryTest.java | 17
+++++++---
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 2 -
java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java | 5 +-
4 files changed, 17 insertions(+), 9 deletions(-)
New commits:
commit 57bf2f53af37fae61efd22abe98b1fcc81e41087
Author: Partha Aji <paji(a)redhat.com>
Date: Tue Jun 29 21:28:29 2010 -0400
More unit test fixes
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 9344469..0c18647 100644
--- a/java/code/src/com/redhat/rhn/domain/server/Server.java
+++ b/java/code/src/com/redhat/rhn/domain/server/Server.java
@@ -1662,7 +1662,7 @@ public class Server extends BaseDomainHelper implements Identifiable
{
/**
* @return this list of history events for this server
*/
- public Set getHistory() {
+ public Set<ServerHistoryEvent> getHistory() {
return history;
}
diff --git a/java/code/src/com/redhat/rhn/domain/server/test/ServerFactoryTest.java
b/java/code/src/com/redhat/rhn/domain/server/test/ServerFactoryTest.java
index 30e2c0b..0c3ddd2 100644
--- a/java/code/src/com/redhat/rhn/domain/server/test/ServerFactoryTest.java
+++ b/java/code/src/com/redhat/rhn/domain/server/test/ServerFactoryTest.java
@@ -865,10 +865,19 @@ public class ServerFactoryTest extends RhnBaseTestCase {
ServerFactory.save(serverTest);
TestUtils.saveAndFlush(event1);
- event1 = (ServerHistoryEvent) reload(event1);
-
- assertEquals(((ServerHistoryEvent) serverTest.getHistory().toArray()[0]),
- event1);
+ Long eventId = event1.getId();
+ Long sid = serverTest.getId();
+
+ HibernateFactory.getSession().clear();
+ serverTest = ServerFactory.lookupById(sid);
+ boolean hasEvent = false;
+ for (ServerHistoryEvent she : serverTest.getHistory()) {
+ if (eventId.equals(she.getId())) {
+ hasEvent = true;
+ break;
+ }
+ }
+ assertTrue(hasEvent);
}
diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
index 2b2e47c..45fcd76 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -969,7 +969,7 @@ public class SystemManager extends BaseManager {
* @param sid Server id
* @return entitlements - ArrayList of entitlements
*/
- public static ArrayList getServerEntitlements(Long sid) {
+ public static List getServerEntitlements(Long sid) {
ArrayList entitlements = new ArrayList();
SelectMode m = ModeFactory.getMode("General_queries",
"system_entitlements");
diff --git a/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java
b/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java
index fc46a56..7288de3 100644
--- a/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java
+++ b/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java
@@ -94,7 +94,6 @@ import org.hibernate.Hibernate;
import org.hibernate.Session;
import java.sql.SQLException;
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -579,9 +578,9 @@ public class SystemManagerTest extends RhnBaseTestCase {
// create a new server
User user = UserTestUtils.findNewUser("testUser",
"testOrg");
Server server = ServerFactoryTest.createTestServer(user);
- ArrayList entitlements = SystemManager.getServerEntitlements(server.getId());
+ List entitlements = SystemManager.getServerEntitlements(server.getId());
assertFalse(entitlements.isEmpty());
- assertTrue(entitlements.contains(EntitlementManager.UPDATE));
+ assertTrue(entitlements.contains(EntitlementManager.MANAGEMENT));
}
public void testClientCapability() throws Exception {
Show replies by date