java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java | 11
++++------
java/spacewalk-java.spec | 5 +++-
rel-eng/packages/spacewalk-java | 2 -
3 files changed, 10 insertions(+), 8 deletions(-)
New commits:
commit 49c75739f926c637ba4c97dd0319bb94ee7b0c80
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Thu Dec 16 16:26:48 2010 -0500
Automatic commit of package [spacewalk-java] release [1.3.28-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index d6b9240..cf43c9c 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.3.27
+Version: 1.3.28
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -456,6 +456,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Dec 16 2010 Aron Parsons <aparsons(a)redhat.com> 1.3.28-1
+- fix testSystemSearch JUnit test (aparsons(a)redhat.com)
+
* Tue Dec 14 2010 Jan Pazdziora 1.3.27-1
- Checkstyle: bumping up the max method length to 180 lines.
- checkstyle fix (aparsons(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index d414b55..61817c3 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.3.27-1 java/
+1.3.28-1 java/
commit 9d4a84d50842a03f61fd2496cb5b5af922c58c47
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Thu Dec 16 16:15:45 2010 -0500
fix testSystemSearch JUnit test
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 44090d9..1bc468f 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
@@ -59,7 +59,6 @@ import com.redhat.rhn.domain.server.ServerConstants;
import com.redhat.rhn.domain.server.ServerFactory;
import com.redhat.rhn.domain.server.ServerGroup;
import com.redhat.rhn.domain.server.ServerGroupFactory;
-import com.redhat.rhn.domain.server.ServerUuid;
import com.redhat.rhn.domain.server.VirtualInstance;
import com.redhat.rhn.domain.server.test.CPUTest;
import com.redhat.rhn.domain.server.test.CustomDataValueTest;
@@ -69,7 +68,7 @@ import com.redhat.rhn.domain.server.test.LocationTest;
import com.redhat.rhn.domain.server.test.NetworkTest;
import com.redhat.rhn.domain.server.test.ServerFactoryTest;
import com.redhat.rhn.domain.server.test.ServerGroupTest;
-import com.redhat.rhn.domain.server.test.ServerUuidTest;
+import com.redhat.rhn.domain.server.test.VirtualInstanceManufacturer;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.domain.user.UserFactory;
import com.redhat.rhn.frontend.dto.CustomDataKeyOverview;
@@ -725,9 +724,9 @@ public class SystemManagerTest extends RhnBaseTestCase {
s.setLocation(loc);
/* UUID setup */
- ServerUuid uuid = ServerUuidTest.createTestServerUuid();
- uuid.setServer(s);
- s.setServerUuid(uuid);
+ VirtualInstanceManufacturer vim = new VirtualInstanceManufacturer(user);
+ VirtualInstance vi = vim.newUnregisteredGuest();
+ vi.setGuestSystem(s);
/* custom data value */
CustomDataValue value = CustomDataValueTest.createTestCustomDataValue(user,
@@ -768,7 +767,7 @@ public class SystemManagerTest extends RhnBaseTestCase {
map.put("systemsearch_location_building", loc.getBuilding());
map.put("systemsearch_location_room", loc.getRoom());
map.put("systemsearch_location_rack", loc.getRack());
- map.put("systemsearch_uuid", uuid.getUuid());
+ map.put("systemsearch_uuid", s.getVirtualInstance().getUuid());
Iterator i = map.keySet().iterator();