java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
| 8 -
java/code/src/com/redhat/rhn/frontend/action/schedule/test/PackageListSetupActionTest.java
| 66 ++++------
java/code/src/com/redhat/rhn/frontend/events/test/NewUserEventTest.java
| 4
3 files changed, 37 insertions(+), 41 deletions(-)
New commits:
commit a24e4f0f95ec214d5dd539346a4b15b4a6bf93d5
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Fri Nov 20 17:39:19 2009 -0500
unit test fixes
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
index 631e68f..41363e6 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
@@ -73,7 +73,7 @@ public class KickstartData {
private Set childChannels;
private Set defaultRegTokens;
private Set preserveFileLists;
- private Set<KickstartPackage> ksPackages;
+ private Set<KickstartPackage> ksPackages = new
HashSet<KickstartPackage>();
private Collection<KickstartCommand> commands = new
HashSet<KickstartCommand>();
private Set ips; // rhnKickstartIpRange
private Set<KickstartScript> scripts; // rhnKickstartScript
@@ -1238,8 +1238,10 @@ public class KickstartData {
cloned.setKickstartDefaults(this.getKickstartDefaults().deepCopy(cloned));
}
cloned.setOrg(this.getOrg());
- for (KickstartPackage kp : this.getKsPackages()) {
- cloned.getKsPackages().add(kp.deepCopy(cloned));
+ if (this.getKsPackages() != null) {
+ for (KickstartPackage kp : this.getKsPackages()) {
+ cloned.getKsPackages().add(kp.deepCopy(cloned));
+ }
}
if (this.getPreserveFileLists() != null) {
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/schedule/test/PackageListSetupActionTest.java
b/java/code/src/com/redhat/rhn/frontend/action/schedule/test/PackageListSetupActionTest.java
index 1b12b18..4300bd4 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/schedule/test/PackageListSetupActionTest.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/schedule/test/PackageListSetupActionTest.java
@@ -19,61 +19,55 @@ import com.redhat.rhn.domain.action.Action;
import com.redhat.rhn.domain.action.ActionFactory;
import com.redhat.rhn.domain.action.server.test.ServerActionTest;
import com.redhat.rhn.domain.action.test.ActionFactoryTest;
+import com.redhat.rhn.domain.kickstart.KickstartVirtualizationType;
import com.redhat.rhn.domain.role.RoleFactory;
import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.server.test.ServerFactoryTest;
import com.redhat.rhn.frontend.action.common.BadParameterException;
+import com.redhat.rhn.frontend.action.kickstart.KickstartDetailsEditAction;
import com.redhat.rhn.frontend.action.schedule.PackageListSetupAction;
+import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.manager.action.ActionManager;
import com.redhat.rhn.testing.ActionHelper;
-import com.redhat.rhn.testing.RhnBaseTestCase;
+import com.redhat.rhn.testing.RhnMockStrutsTestCase;
/**
* PackageListSetupActionTest
* @version $Rev$
*/
-public class PackageListSetupActionTest extends RhnBaseTestCase {
+public class PackageListSetupActionTest extends RhnMockStrutsTestCase {
public void testPeformExecute() throws Exception {
- PackageListSetupAction action = new PackageListSetupAction();
- ActionHelper sah = new ActionHelper();
- sah.setUpAction(action);
- sah.getRequest().setupAddParameter("aid", (String)null);
- try {
- sah.executeAction();
- fail();
- }
- catch (BadParameterException e) {
- //no op
- }
-
- sah.setupClampListBounds();
- sah.getRequest().setupAddParameter("aid", "-99999");
- sah.getRequest().setupAddParameter("returnvisit", (String) null);
- try {
- sah.executeAction();
- fail();
- }
- catch (LookupException e) {
- //no op
- }
-
- sah.getUser().addRole(RoleFactory.ORG_ADMIN);
- Action a = ActionFactoryTest.createAction(sah.getUser(),
ActionFactory.TYPE_ERRATA);
- Server server = ServerFactoryTest.createTestServer(sah.getUser(), true);
+ setRequestPathInfo("/schedule/PackageList");
+
+ user.addRole(RoleFactory.ORG_ADMIN);
+ Action a = ActionFactoryTest.createAction(user, ActionFactory.TYPE_ERRATA);
+ Server server = ServerFactoryTest.createTestServer(user, true);
ServerActionTest.createServerAction(server, a);
ActionManager.storeAction(a);
+ addRequestParameter("aid", a.getId().toString());
+ addRequestParameter("newset", (String)null);
+ addRequestParameter("returnvisit", (String) null);
+ actionPerform();
+ assertNotNull(getRequest().getAttribute("dataset"));
+ assertNotNull(getRequest().getAttribute("actionname"));
+ }
- sah.getRequest().setupAddParameter("aid", a.getId().toString());
- sah.setupClampListBounds();
- sah.getRequest().setupAddParameter("newset", (String)null);
- sah.getRequest().setupAddParameter("returnvisit", (String) null);
+ public void testPerformExecuteBad() {
+ setRequestPathInfo("/schedule/PackageList");
- sah.executeAction();
- assertNotNull(sah.getRequest().getAttribute("pageList"));
- assertNotNull(sah.getRequest().getAttribute("actionname"));
- assertNotNull(sah.getRequest().getAttribute("user"));
+ addRequestParameter("aid", (String) null);
+ actionPerform();
+ assertTrue(getActualForward().contains("errors/badparam.jsp"));
+ }
+
+
+ public void testPerformExecuteBad2() {
+ setRequestPathInfo("/schedule/PackageList");
+ addRequestParameter("aid", "-99999");
+ actionPerform();
+ assertTrue(getActualForward().contains("errors/lookup.jsp"));
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/events/test/NewUserEventTest.java
b/java/code/src/com/redhat/rhn/frontend/events/test/NewUserEventTest.java
index 722f1e2..3afecca 100644
--- a/java/code/src/com/redhat/rhn/frontend/events/test/NewUserEventTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/events/test/NewUserEventTest.java
@@ -73,10 +73,10 @@ public class NewUserEventTest extends RhnBaseTestCase {
"someserver.rhndev.redhat.com/rhn/users/ActiveList.do");
assertTrue(mailer.getBody().contains("Your Spacewalk login:
testUser") ||
- mailer.getBody().contains("Your RHN Satellite login:
testUser"));
+ mailer.getBody().contains("Your RHN login:
testUser"));
assertTrue(mailer.getBody().contains("Your Spacewalk email address: "
+
"redhatJavaTest(a)redhat.com") ||
- mailer.getBody().contains("Your RHN Satellite email address:
" +
+ mailer.getBody().contains("Your RHN email address: " +
"redhatJavaTest(a)redhat.com"));
}
Show replies by date