java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
| 2 +-
java/code/src/com/redhat/rhn/domain/channel/test/ChannelFactoryTest.java
| 10 +++++-----
java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataConfirmSetupActionTest.java
| 1 -
java/code/src/com/redhat/rhn/frontend/servlets/test/AuthFilterTest.java
| 3 +++
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/test/ChannelSoftwareHandlerTest.java
| 4 ++--
java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java
| 2 +-
java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java
| 2 +-
7 files changed, 13 insertions(+), 11 deletions(-)
New commits:
commit f58202116cb231298783720578f55d3b6b94b0c3
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Tue Dec 8 11:54:43 2009 -0500
unit test fixes
diff --git a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
index 18e3ae6..0ded30d 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
@@ -582,7 +582,7 @@ public class ChannelFactory extends HibernateFactory {
* @param checksum checksum label
* @return ChecksumType instance for given label
*/
- public static ChecksumType findChecksumByLabel(String checksum) {
+ public static ChecksumType findChecksumTypeByLabel(String checksum) {
Map params = new HashMap();
params.put("label", checksum);
return (ChecksumType)
diff --git a/java/code/src/com/redhat/rhn/domain/channel/test/ChannelFactoryTest.java
b/java/code/src/com/redhat/rhn/domain/channel/test/ChannelFactoryTest.java
index 61b5a95..2e05906 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/test/ChannelFactoryTest.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/test/ChannelFactoryTest.java
@@ -388,15 +388,15 @@ public class ChannelFactoryTest extends RhnBaseTestCase {
public void testfindChecksumByLabel() {
assertNull("Checksum found for null label",
- ChannelFactory.findChecksumByLabel(null));
+ ChannelFactory.findChecksumTypeByLabel(null));
assertNull("Checksum found for invalid label",
- ChannelFactory.findChecksumByLabel("some-invalid_checksum"));
+
ChannelFactory.findChecksumTypeByLabel("some-invalid_checksum"));
- ChecksumType ct = ChannelFactory.findChecksumByLabel("sha-256");
+ ChecksumType ct = ChannelFactory.findChecksumTypeByLabel("sha256");
assertNotNull(ct);
- assertEquals("sha-256", ct.getLabel());
+ assertEquals("sha256", ct.getLabel());
- ChecksumType ct2 = ChannelFactory.findChecksumByLabel("sha1");
+ ChecksumType ct2 = ChannelFactory.findChecksumTypeByLabel("sha1");
assertNotNull(ct2);
assertEquals("sha1", ct2.getLabel());
}
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataConfirmSetupActionTest.java
b/java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataConfirmSetupActionTest.java
index eb7f7d1..fde328f 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataConfirmSetupActionTest.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataConfirmSetupActionTest.java
@@ -35,7 +35,6 @@ public class ErrataConfirmSetupActionTest extends RhnMockStrutsTestCase
{
//Note: 2 invocations of getParameter("use_date") will be called by
DatePicker
addRequestParameter(DatePicker.USE_DATE, "true");
actionPerform();
- assertNotNull(request.getAttribute("pageList"));
assertNotNull(request.getAttribute("system"));
Server server2 = (Server) request.getAttribute("system");
assertEquals(server, server2);
diff --git a/java/code/src/com/redhat/rhn/frontend/servlets/test/AuthFilterTest.java
b/java/code/src/com/redhat/rhn/frontend/servlets/test/AuthFilterTest.java
index c76701d..f0f80f6 100644
--- a/java/code/src/com/redhat/rhn/frontend/servlets/test/AuthFilterTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/servlets/test/AuthFilterTest.java
@@ -21,6 +21,8 @@ import org.jmock.Mock;
import org.jmock.MockObjectTestCase;
import org.jmock.core.Constraint;
+import java.util.Vector;
+
import javax.servlet.FilterChain;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
@@ -78,6 +80,7 @@ public class AuthFilterTest extends MockObjectTestCase {
mockRequest.stubs().method("getRequestDispatcher").withAnyArguments().will(
returnValue((RequestDispatcher)mockDispatcher.proxy()));
+ mockRequest.stubs().method("getHeaders").will(returnValue(new
Vector().elements()));
filter.setAuthenticationService((AuthenticationService)mockAuthService.proxy());
}
diff --git
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/test/ChannelSoftwareHandlerTest.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/test/ChannelSoftwareHandlerTest.java
index fc2e77a..bc71360 100644
---
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/test/ChannelSoftwareHandlerTest.java
+++
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/test/ChannelSoftwareHandlerTest.java
@@ -518,7 +518,7 @@ public class ChannelSoftwareHandlerTest extends BaseHandlerTestCase {
ChannelSoftwareHandler csh = new ChannelSoftwareHandler();
addRole(admin, RoleFactory.CHANNEL_ADMIN);
int i = csh.create(adminKey, "api-test-checksum-chan-label",
- "apiTestCSChanName", "apiTestSummary",
"channel-ia32", null, "sha-256");
+ "apiTestCSChanName", "apiTestSummary",
"channel-ia32", null, "sha256");
assertEquals(1, i);
Channel c = ChannelFactory.lookupByLabel(admin.getOrg(),
"api-test-checksum-chan-label");
@@ -529,7 +529,7 @@ public class ChannelSoftwareHandlerTest extends BaseHandlerTestCase {
assertNotNull(ca);
assertNotNull(c.getChannelArch());
assertEquals(ca.getLabel(), c.getChannelArch().getLabel());
- assertEquals(c.getChecksumType(), "sha-256");
+ assertEquals(c.getChecksumType(), "sha256");
}
public void testCreateUnauthUser() {
diff --git a/java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java
b/java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java
index e6f9d0c..5564a40 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java
@@ -260,7 +260,7 @@ public class CreateChannelCommand {
throw new IllegalArgumentException("Invalid architecture label");
}
- ChecksumType ct = ChannelFactory.findChecksumByLabel(checksum);
+ ChecksumType ct = ChannelFactory.findChecksumTypeByLabel(checksum);
Channel c = ChannelFactory.createChannel();
diff --git a/java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java
b/java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java
index 9300ae9..aabdbb2 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java
@@ -67,7 +67,7 @@ public class UpdateChannelCommand extends CreateChannelCommand {
throw new IllegalArgumentException("Invalid architecture label");
}
- ChecksumType ct = ChannelFactory.findChecksumByLabel(checksum);
+ ChecksumType ct = ChannelFactory.findChecksumTypeByLabel(checksum);
if (!ct.getLabel().equals(c.getChecksum().getLabel()) &&
c.getPackageCount() > 0) {
// schedule repo re generation if the checksum type changed
Show replies by date