java/code/src/com/redhat/rhn/common/finder/test/FileFinderTest.java | 2 java/code/src/com/redhat/rhn/domain/server/NetworkInterface.java | 9 ++ java/code/src/com/redhat/rhn/domain/server/test/GuestBuilder.java | 2 java/code/src/com/redhat/rhn/domain/server/test/HostBuilder.java | 1 java/code/src/com/redhat/rhn/domain/server/test/NetworkInterfaceTest.java | 8 ++ java/code/src/com/redhat/rhn/domain/server/test/RamTest.java | 31 +++++----- java/code/src/com/redhat/rhn/domain/server/test/VirtualInstanceManufacturer.java | 1 java/code/src/com/redhat/rhn/frontend/action/errata/test/AffectedSystemsActionTest.java | 2 java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartManagerTest.java | 14 ++++ java/spacewalk-java.spec | 12 +++ rel-eng/packages/spacewalk-java | 2 11 files changed, 63 insertions(+), 21 deletions(-)
New commits: commit 19a910ac20448d9d79a2dae709fb34766fb659e1 Author: Tomas Lestach tlestach@redhat.com Date: Thu Mar 22 18:29:30 2012 +0100
Automatic commit of package [spacewalk-java] release [1.8.24-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index f71245f..626e089 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -22,7 +22,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.8.23 +Version: 1.8.24 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -603,6 +603,16 @@ fi %{jardir}/postgresql-jdbc.jar
%changelog +* Thu Mar 22 2012 Tomas Lestach tlestach@redhat.com 1.8.24-1 +- fix ServerFactoryVirtualizationTest (tlestach@redhat.com) +- fix ServerFactoryTest (tlestach@redhat.com) +- fix VirtualInstanceFactoryTest (tlestach@redhat.com) +- fix RamTest (tlestach@redhat.com) +- fix ServerTest (tlestach@redhat.com) +- fix AffectedSystemsActionTest (tlestach@redhat.com) +- fix KickstartManagerTest (tlestach@redhat.com) +- Revert "fix FileFinderTest.testFindFilesSubDir" (tlestach@redhat.com) + * Wed Mar 21 2012 Tomas Lestach tlestach@redhat.com 1.8.23-1 - fix LocalizationServiceTest (tlestach@redhat.com) - fix AuthFilterTest (tlestach@redhat.com) diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 8ec5e6f..0d8603a 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.8.23-1 java/ +1.8.24-1 java/
commit 1901a6180f63a07df4a7dfd437feac81b50c3718 Author: Tomas Lestach tlestach@redhat.com Date: Thu Mar 22 18:20:34 2012 +0100
fix ServerFactoryVirtualizationTest
diff --git a/java/code/src/com/redhat/rhn/domain/server/test/VirtualInstanceManufacturer.java b/java/code/src/com/redhat/rhn/domain/server/test/VirtualInstanceManufacturer.java index 9274583..19c0412 100644 --- a/java/code/src/com/redhat/rhn/domain/server/test/VirtualInstanceManufacturer.java +++ b/java/code/src/com/redhat/rhn/domain/server/test/VirtualInstanceManufacturer.java @@ -51,6 +51,7 @@ public class VirtualInstanceManufacturer { guest.setTotalMemory(new Long(1024 * DEFAULT_GUEST_RAM_MB)); guest.setState(state); guest.setNumberOfCPUs(new Integer(1)); + guest.setConfirmed(0L);
return guest; }
commit ad2a2e9144650478991671118635823e966ce85a Author: Tomas Lestach tlestach@redhat.com Date: Thu Mar 22 18:09:50 2012 +0100
fix ServerFactoryTest
diff --git a/java/code/src/com/redhat/rhn/domain/server/test/HostBuilder.java b/java/code/src/com/redhat/rhn/domain/server/test/HostBuilder.java index 5a9fa3c..1e260ca 100644 --- a/java/code/src/com/redhat/rhn/domain/server/test/HostBuilder.java +++ b/java/code/src/com/redhat/rhn/domain/server/test/HostBuilder.java @@ -199,6 +199,7 @@ public class HostBuilder { RhnBaseTestCase.assertNotNull(guest); virtualInstance.setGuestSystem(guest); } + virtualInstance.setConfirmed(host != null ? 1L : 0L); if (host != null) { host.addGuest(virtualInstance); HibernateFactory.getSession().save(host);
commit 699c4af83e056015b8dc96bedb7732dce9d9a692 Author: Tomas Lestach tlestach@redhat.com Date: Thu Mar 22 17:55:16 2012 +0100
fix VirtualInstanceFactoryTest
diff --git a/java/code/src/com/redhat/rhn/domain/server/test/GuestBuilder.java b/java/code/src/com/redhat/rhn/domain/server/test/GuestBuilder.java index a2a64c0..51e920f 100644 --- a/java/code/src/com/redhat/rhn/domain/server/test/GuestBuilder.java +++ b/java/code/src/com/redhat/rhn/domain/server/test/GuestBuilder.java @@ -105,6 +105,7 @@ public class GuestBuilder { public GuestBuilder createUnregisteredGuest() { guest = new VirtualInstance(); guest.setUuid(TestUtils.randomString()); + guest.setConfirmed(0L);
return this; } @@ -121,6 +122,7 @@ public class GuestBuilder { guest = new VirtualInstance(); guest.setUuid(TestUtils.randomString()); guest.setGuestSystem(ServerFactoryTest.createTestServer(owner)); + guest.setConfirmed(0L);
return this; }
commit f26e2ed5999969d321bd76fbdea50d91416da96c Author: Tomas Lestach tlestach@redhat.com Date: Thu Mar 22 17:40:21 2012 +0100
fix RamTest
diff --git a/java/code/src/com/redhat/rhn/domain/server/test/RamTest.java b/java/code/src/com/redhat/rhn/domain/server/test/RamTest.java index 68b0a41..3be3933 100644 --- a/java/code/src/com/redhat/rhn/domain/server/test/RamTest.java +++ b/java/code/src/com/redhat/rhn/domain/server/test/RamTest.java @@ -15,7 +15,6 @@ package com.redhat.rhn.domain.server.test;
import com.redhat.rhn.common.hibernate.HibernateFactory; -import com.redhat.rhn.domain.server.Ram; import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.testing.RhnBaseTestCase; @@ -41,21 +40,24 @@ public class RamTest extends RhnBaseTestCase { assertNotNull(server); assertNotNull(server.getId());
- Ram ram = new Ram(); - ram.setServer(server); - ram.setRam(1024); - ram.setSwap(256); - - TestUtils.saveAndFlush(ram); - verifyInDb(ram.getId(), 1024, 256); - assertEquals(1, TestUtils.removeObject(ram)); - // can't seem to be able to delete a server, would be nice - // to be able to clean up after ourselves. - //assertEquals(1, TestUtils.removeObject(server)); + server.setRam(1024); + server.setSwap(256); + + TestUtils.saveAndFlush(server); + verifyInDb(server.getId(), 1024, 256); + + server.setRam(2048); + server.setSwap(512); + + TestUtils.saveAndFlush(server); + verifyInDb(server.getId(), 2048, 512); + + assertEquals(1, TestUtils.removeObject(server)); }
- private void verifyInDb(Long id, long ram, long swap) throws Exception { + private void verifyInDb(Long serverId, long ram, long swap) + throws Exception { // Now lets manually test to see if the user got updated Session session = null; Connection c = null; @@ -67,11 +69,10 @@ public class RamTest extends RhnBaseTestCase { assertNotNull(c); ps = c.prepareStatement( "SELECT ID, RAM, SWAP FROM RHNRAM " + - " WHERE ID = " + id); + " WHERE SERVER_ID = " + serverId); rs = ps.executeQuery(); rs.next();
- assertEquals(id.longValue(), rs.getLong("ID")); assertEquals(ram, rs.getLong("RAM")); assertEquals(swap, rs.getLong("SWAP")); }
commit ef65d21c7b38d1c499db8bd0babfe762651b0e03 Author: Tomas Lestach tlestach@redhat.com Date: Thu Mar 22 15:15:37 2012 +0100
fix ServerTest
diff --git a/java/code/src/com/redhat/rhn/domain/server/test/NetworkInterfaceTest.java b/java/code/src/com/redhat/rhn/domain/server/test/NetworkInterfaceTest.java index b7df398..b055177 100644 --- a/java/code/src/com/redhat/rhn/domain/server/test/NetworkInterfaceTest.java +++ b/java/code/src/com/redhat/rhn/domain/server/test/NetworkInterfaceTest.java @@ -17,6 +17,7 @@ package com.redhat.rhn.domain.server.test; import com.redhat.rhn.common.hibernate.HibernateFactory; import com.redhat.rhn.domain.server.NetworkInterface; import com.redhat.rhn.domain.server.Server; +import com.redhat.rhn.domain.server.ServerNetAddress4; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.testing.RhnBaseTestCase; import com.redhat.rhn.testing.TestUtils; @@ -89,9 +90,14 @@ public class NetworkInterfaceTest extends RhnBaseTestCase { NetworkInterface netint = new NetworkInterface(); netint.setHwaddr(macAddress); netint.setModule("test"); - netint.setName(networkName); + ServerNetAddress4 netAddr = new ServerNetAddress4(); + netAddr.setAddress(ipAddress); + netint.setSa4(netAddr); server.addNetworkInterface(netint); + netint = (NetworkInterface) TestUtils.saveAndReload(netint); + netAddr.setInterfaceId(netint.getInterfaceId()); + TestUtils.saveAndFlush(netAddr); return netint; } }
commit 6cb5ba2c89e05575fc50bcd1ff26e224af985b65 Author: Tomas Lestach tlestach@redhat.com Date: Thu Mar 22 14:59:36 2012 +0100
fix AffectedSystemsActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/test/AffectedSystemsActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/errata/test/AffectedSystemsActionTest.java index 868aef0..15bfa35 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/errata/test/AffectedSystemsActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/errata/test/AffectedSystemsActionTest.java @@ -63,7 +63,7 @@ public class AffectedSystemsActionTest extends MockObjectTestCase {
ActionForward sameForward = action.applyErrata((ActionMapping)mapping.proxy(), form, request, response); - assertEquals("path?lower=10&eid=12345", sameForward.getPath()); + assertEquals("path?eid=12345&lower=10", sameForward.getPath()); mapping.verify();
//With systems selected
commit d4ee93b2cd61804b4951e3b7f88f34fd51bb3220 Author: Tomas Lestach tlestach@redhat.com Date: Thu Mar 22 14:26:10 2012 +0100
fix KickstartManagerTest
diff --git a/java/code/src/com/redhat/rhn/domain/server/NetworkInterface.java b/java/code/src/com/redhat/rhn/domain/server/NetworkInterface.java index fb52722..ca109bd 100644 --- a/java/code/src/com/redhat/rhn/domain/server/NetworkInterface.java +++ b/java/code/src/com/redhat/rhn/domain/server/NetworkInterface.java @@ -21,7 +21,6 @@ import com.redhat.rhn.manager.kickstart.IpAddress; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; - import org.hibernate.Session;
import java.io.Serializable; @@ -340,4 +339,12 @@ public class NetworkInterface extends BaseDomainHelper implements return sa6; }
+ /** + * Setter for sa4 + * @param sa4In sa4 + */ + public void setSa4(ServerNetAddress4 sa4In) { + this.sa4 = sa4In; + } + } diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartManagerTest.java b/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartManagerTest.java index 322fc28..bb012d3 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartManagerTest.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartManagerTest.java @@ -19,6 +19,7 @@ import com.redhat.rhn.domain.kickstart.KickstartIpRange; import com.redhat.rhn.domain.kickstart.test.KickstartDataTest; import com.redhat.rhn.domain.server.NetworkInterface; import com.redhat.rhn.domain.server.Server; +import com.redhat.rhn.domain.server.ServerNetAddress4; import com.redhat.rhn.domain.server.test.ServerFactoryTest; import com.redhat.rhn.manager.kickstart.KickstartManager; import com.redhat.rhn.testing.BaseTestCaseWithUser; @@ -42,7 +43,11 @@ public class KickstartManagerTest extends BaseTestCaseWithUser { Server serv = ServerFactoryTest.createTestServer(user); NetworkInterface nic = new NetworkInterface(); nic.setName("eth0"); + nic.setHwaddr("aa:aa:aa"); nic.setServer(serv); + ServerNetAddress4 netAddr = new ServerNetAddress4(); + netAddr.setAddress("192.168.0.122"); + nic.setSa4(netAddr); serv.getNetworkInterfaces().add(nic);
@@ -76,6 +81,9 @@ public class KickstartManagerTest extends BaseTestCaseWithUser { nic = new NetworkInterface(); nic.setName("eth1"); nic.setHwaddr("aa:aa:aa"); + ServerNetAddress4 netAddr = new ServerNetAddress4(); + netAddr.setAddress("192.168.0.123"); + nic.setSa4(netAddr); nic.setServer(serv); serv.getNetworkInterfaces().add(nic);
@@ -110,6 +118,9 @@ public class KickstartManagerTest extends BaseTestCaseWithUser { nic.setName("eth0"); nic.setHwaddr("aa:aa:aa"); nic.setServer(serv); + ServerNetAddress4 netAddr = new ServerNetAddress4(); + netAddr.setAddress("1.2.3.4"); + nic.setSa4(netAddr); serv.getNetworkInterfaces().add(nic);
@@ -139,6 +150,9 @@ public class KickstartManagerTest extends BaseTestCaseWithUser { nic.setName("eth0"); nic.setHwaddr("aa:aa:aa"); nic.setServer(serv); + ServerNetAddress4 netAddr = new ServerNetAddress4(); + netAddr.setAddress("1.2.3.4"); + nic.setSa4(netAddr); serv.getNetworkInterfaces().add(nic);
commit 6c7c2957eb5341845253faa66d8fb42deb263434 Author: Tomas Lestach tlestach@redhat.com Date: Thu Mar 22 11:22:15 2012 +0100
Revert "fix FileFinderTest.testFindFilesSubDir"
This reverts commit d050d344294546034bbe04e63978499404322c76. test setup changed
diff --git a/java/code/src/com/redhat/rhn/common/finder/test/FileFinderTest.java b/java/code/src/com/redhat/rhn/common/finder/test/FileFinderTest.java index a7462cc..fdcde6b 100644 --- a/java/code/src/com/redhat/rhn/common/finder/test/FileFinderTest.java +++ b/java/code/src/com/redhat/rhn/common/finder/test/FileFinderTest.java @@ -42,7 +42,7 @@ public class FileFinderTest extends RhnBaseTestCase { assertNotNull(f);
List result = f.find(".class"); - assertEquals(4, result.size()); + assertEquals(6, result.size()); }
public void testFindExcluding() throws Exception {