java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java | 6 - java/code/src/com/redhat/rhn/frontend/action/common/test/BaseSetOperateOnDiffActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/configuration/test/ChannelFilesImportTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/errata/test/CloneConfirmActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/errata/test/ErrataConfirmActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/keys/test/CryptoKeyCreateActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/keys/test/CryptoKeyDeleteActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/kickstart/test/BaseKickstartEditTestCase.java | 4 java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartAdvancedOptionsActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartEditPackagesTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartIpRangeActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartPartitionActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/test/TreeActionTest.java | 8 + java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/MethodActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgCreateActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSoftwareSubscriptionsActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSystemSubscriptionsActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/satellite/test/BootstrapConfigActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/satellite/test/CertificateConfigActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/satellite/test/GeneralConfigActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/satellite/test/RestartActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/schedule/test/CompletedActionsSetupActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/schedule/test/FailedActionsSetupActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/schedule/test/PendingActionsSetupActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/test/SystemEntitlementsSubmitActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/test/PreservationListEditActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/systems/sdc/test/SystemDetailsEditActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataConfirmActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/systems/test/RegisteredSetupActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/VirtualGuestsActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/user/test/CreateUserActionTest.java | 4 java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java | 4 java/code/src/com/redhat/rhn/testing/RhnPostMockStrutsTestCase.java | 30 +++++++ java/spacewalk-java.spec | 42 +++++++++- rel-eng/packages/spacewalk-java | 2 36 files changed, 144 insertions(+), 68 deletions(-)
New commits: commit 4780a8086810dce0b4cf84c3110582ba1639d6fe Author: Tomas Lestach tlestach@redhat.com Date: Wed Apr 11 11:27:55 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.40-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index a1d852b..75b0361 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.39 +Version: 1.8.40 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -605,6 +605,46 @@ fi %{jardir}/postgresql-jdbc.jar
%changelog +* Wed Apr 11 2012 Tomas Lestach tlestach@redhat.com 1.8.40-1 +- fix BaseKickstartEditTestCase tests (tlestach@redhat.com) +- fix VirtualGuestsActionTest (tlestach@redhat.com) +- fix MethodActionTest (tlestach@redhat.com) +- fix PendingActionsSetupActionTest (tlestach@redhat.com) +- fix BootstrapConfigActionTest (tlestach@redhat.com) +- fix KickstartEditPackagesTest (tlestach@redhat.com) +- fix OrgSystemSubscriptionsActionTest (tlestach@redhat.com) +- fix SystemEntitlementsSubmitActionTest (tlestach@redhat.com) +- fix ChannelFilesImportTest (tlestach@redhat.com) +- fix RegisteredSetupActionTest (tlestach@redhat.com) +- fix OrgCreateActionTest (tlestach@redhat.com) +- fix ErrataActionTest (tlestach@redhat.com) +- fix FailedActionsSetupActionTest (tlestach@redhat.com) +- fix OrgSoftwareSubscriptionsActionTest (tlestach@redhat.com) +- fix TreeActionTest - need to set ks tree installtype (tlestach@redhat.com) +- fix TreeActionTest.testCreateRefresh (tlestach@redhat.com) +- fix TreeActionTest (tlestach@redhat.com) +- fix systems/test/ErrataConfirmActionTest (tlestach@redhat.com) +- fix errata/test/ErrataConfirmActionTest (tlestach@redhat.com) +- fix KickstartAdvancedOptionsActionTest (tlestach@redhat.com) +- fix CryptoKeyDeleteActionTest (tlestach@redhat.com) +- fix CompletedActionsSetupActionTest (tlestach@redhat.com) +- fix BaseSetOperateOnDiffActionTest (tlestach@redhat.com) +- fix GeneralConfigActionTest (tlestach@redhat.com) +- fix RestartActionTest (tlestach@redhat.com) +- fix KickstartIpRangeActionTest (tlestach@redhat.com) +- fix CryptoKeyCreateActionTest (tlestach@redhat.com) +- fix CertificateConfigActionTest (tlestach@redhat.com) +- fix SystemDetailsEditActionTest (tlestach@redhat.com) +- fix PreservationListEditActionTest (tlestach@redhat.com) +- fix KickstartPartitionActionTest (tlestach@redhat.com) +- fix CreateUserActionTest (tlestach@redhat.com) +- fix CloneConfirmActionTest (tlestach@redhat.com) +- create RhnPostMockStrutsTestCase for testing POST methods + (tlestach@redhat.com) +- statements cannot end with ";" for Oracle (tlestach@redhat.com) +- 787225 - the Log Size actually checks Log Size Growth. + (jpazdziora@redhat.com) + * Tue Apr 10 2012 Tomas Lestach tlestach@redhat.com 1.8.39-1 - fix ServerConfigHandlerTest revision comparism (tlestach@redhat.com) - fix ServerConfigHandlerTest.createRevision (tlestach@redhat.com) diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 11a2815..e9d4fdf 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.8.39-1 java/ +1.8.40-1 java/
commit aa8b4bcf7e0e385573ddb480aefa36303cb06825 Author: Tomas Lestach tlestach@redhat.com Date: Wed Apr 11 11:26:26 2012 +0200
fix BaseKickstartEditTestCase tests
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/BaseKickstartEditTestCase.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/BaseKickstartEditTestCase.java index c8b8a48..1cf60f9 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/BaseKickstartEditTestCase.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/BaseKickstartEditTestCase.java @@ -19,7 +19,7 @@ import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.kickstart.test.KickstartDataTest; import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import com.redhat.rhn.testing.TestUtils; import com.redhat.rhn.testing.UserTestUtils;
@@ -29,7 +29,7 @@ import java.util.List; * KickstartDetailsEditTest * @version $Rev: 1 $ */ -public class BaseKickstartEditTestCase extends RhnMockStrutsTestCase { +public class BaseKickstartEditTestCase extends RhnPostMockStrutsTestCase {
protected KickstartData ksdata;
commit 16b7733ba59559cc4e135e87f18ea1997d788f10 Author: Tomas Lestach tlestach@redhat.com Date: Wed Apr 11 11:25:29 2012 +0200
fix VirtualGuestsActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/VirtualGuestsActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/VirtualGuestsActionTest.java index 8897eb4..80bf3e9 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/VirtualGuestsActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/VirtualGuestsActionTest.java @@ -29,7 +29,7 @@ import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.taglibs.ListDisplayTag; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import com.redhat.rhn.testing.ServerTestUtils; import com.redhat.rhn.testing.TestUtils;
@@ -44,7 +44,7 @@ import java.util.Map; * VirtualGuestsListActionTest * @version $Rev$ */ -public class VirtualGuestsActionTest extends RhnMockStrutsTestCase { +public class VirtualGuestsActionTest extends RhnPostMockStrutsTestCase {
private RhnSet submitVirtualGuestsForm(String dispatch, Map requestParams) throws Exception {
commit 8bf75589018b55f319d37c4ba7d18096a7c4f802 Author: Tomas Lestach tlestach@redhat.com Date: Wed Apr 11 11:24:26 2012 +0200
fix MethodActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/MethodActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/MethodActionTest.java index 69bab53..6cc4942 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/MethodActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/MethodActionTest.java @@ -24,11 +24,11 @@ import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.RhnAction; import com.redhat.rhn.frontend.struts.RhnHelper; import com.redhat.rhn.manager.monitoring.ModifyMethodCommand; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import com.redhat.rhn.testing.TestUtils; import com.redhat.rhn.testing.UserTestUtils;
-public class MethodActionTest extends RhnMockStrutsTestCase { +public class MethodActionTest extends RhnPostMockStrutsTestCase {
private String expectedName = "Expected Method Name";
commit fe4ea1c5192eae52ba86d45c643e63b5bd5069b0 Author: Tomas Lestach tlestach@redhat.com Date: Wed Apr 11 11:23:22 2012 +0200
fix PendingActionsSetupActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/schedule/test/PendingActionsSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/schedule/test/PendingActionsSetupActionTest.java index bd60ba4..6bf094f 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/schedule/test/PendingActionsSetupActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/schedule/test/PendingActionsSetupActionTest.java @@ -24,14 +24,14 @@ import com.redhat.rhn.domain.server.test.ServerFactoryTest; import com.redhat.rhn.frontend.struts.RhnAction; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import com.redhat.rhn.testing.TestUtils;
/** * PendingActionsSetupActionTest * @version $Rev$ */ -public class PendingActionsSetupActionTest extends RhnMockStrutsTestCase { +public class PendingActionsSetupActionTest extends RhnPostMockStrutsTestCase {
commit 2d70e914f53b0875486fc86971296aacc9eb06a9 Author: Tomas Lestach tlestach@redhat.com Date: Wed Apr 11 11:22:32 2012 +0200
fix BootstrapConfigActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/test/BootstrapConfigActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/test/BootstrapConfigActionTest.java index b5bae12..aea657d 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/satellite/test/BootstrapConfigActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/test/BootstrapConfigActionTest.java @@ -19,7 +19,7 @@ import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.frontend.action.satellite.BootstrapConfigAction; import com.redhat.rhn.frontend.struts.RhnAction; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase;
import org.apache.struts.action.DynaActionForm;
@@ -27,7 +27,7 @@ import org.apache.struts.action.DynaActionForm; * BootstrapConfigActionTest * @version $Rev: 1 $ */ -public class BootstrapConfigActionTest extends RhnMockStrutsTestCase { +public class BootstrapConfigActionTest extends RhnPostMockStrutsTestCase {
/** * {@inheritDoc}
commit ebbc0972405157ef525a821ccea0836da41ace80 Author: Tomas Lestach tlestach@redhat.com Date: Wed Apr 11 11:21:40 2012 +0200
fix KickstartEditPackagesTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartEditPackagesTest.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartEditPackagesTest.java index 028f774..b5cde5b 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartEditPackagesTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartEditPackagesTest.java @@ -15,9 +15,9 @@ package com.redhat.rhn.frontend.action.kickstart.test;
import com.redhat.rhn.domain.kickstart.KickstartData; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase;
-public class KickstartEditPackagesTest extends RhnMockStrutsTestCase { +public class KickstartEditPackagesTest extends RhnPostMockStrutsTestCase {
public void testDisplay() throws Exception { KickstartData k = KickstartTestHelper.createTestKickStart(user);
commit 8e56af7c5fda9180efb72eb598ea72e470c1cfcd Author: Tomas Lestach tlestach@redhat.com Date: Wed Apr 11 11:18:54 2012 +0200
fix OrgSystemSubscriptionsActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSystemSubscriptionsActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSystemSubscriptionsActionTest.java index 6ff80c0..45421e5 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSystemSubscriptionsActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSystemSubscriptionsActionTest.java @@ -17,7 +17,7 @@ package com.redhat.rhn.frontend.action.multiorg.test; import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.manager.entitlement.EntitlementManager; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase;
import org.apache.struts.action.DynaActionForm;
@@ -25,7 +25,7 @@ import org.apache.struts.action.DynaActionForm; * OrgSubscriptionsActionTest * @version $Rev: 1 $ */ -public class OrgSystemSubscriptionsActionTest extends RhnMockStrutsTestCase { +public class OrgSystemSubscriptionsActionTest extends RhnPostMockStrutsTestCase {
public void testExecute() throws Exception { user.getOrg().addRole(RoleFactory.SAT_ADMIN);
commit 0e4037cf3e2865a8b6012b620fe433d1889be5dc Author: Tomas Lestach tlestach@redhat.com Date: Wed Apr 11 11:18:02 2012 +0200
fix SystemEntitlementsSubmitActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/test/SystemEntitlementsSubmitActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/test/SystemEntitlementsSubmitActionTest.java index a4db320..6336ded 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/test/SystemEntitlementsSubmitActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/test/SystemEntitlementsSubmitActionTest.java @@ -28,7 +28,7 @@ import com.redhat.rhn.frontend.action.systems.entitlements.SystemEntitlementsSub import com.redhat.rhn.frontend.struts.RhnAction; import com.redhat.rhn.manager.entitlement.EntitlementManager; import com.redhat.rhn.manager.system.SystemManager; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import com.redhat.rhn.testing.ServerGroupTestUtils; import com.redhat.rhn.testing.ServerTestUtils; import com.redhat.rhn.testing.TestUtils; @@ -40,7 +40,7 @@ import java.util.Iterator; * SystemEntitlementSubmitActionToast * @version $Rev$ */ -public class SystemEntitlementsSubmitActionTest extends RhnMockStrutsTestCase { +public class SystemEntitlementsSubmitActionTest extends RhnPostMockStrutsTestCase {
private static final String UPDATE = "system_entitlements.setToUpdateEntitled";
commit 5f3622950dc1d54b6d4705b8c31e1ec057fa8c30 Author: Tomas Lestach tlestach@redhat.com Date: Wed Apr 11 11:16:27 2012 +0200
fix ChannelFilesImportTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/test/ChannelFilesImportTest.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/test/ChannelFilesImportTest.java index dc04fe9..2023558 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/test/ChannelFilesImportTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/test/ChannelFilesImportTest.java @@ -17,7 +17,7 @@ package com.redhat.rhn.frontend.action.configuration.test; import com.redhat.rhn.domain.config.ConfigChannel; import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.testing.ConfigTestUtils; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import com.redhat.rhn.testing.UserTestUtils;
/** @@ -25,7 +25,7 @@ import com.redhat.rhn.testing.UserTestUtils; * ChannelFilesImportTest * @version $Rev$ */ -public class ChannelFilesImportTest extends RhnMockStrutsTestCase { +public class ChannelFilesImportTest extends RhnPostMockStrutsTestCase {
public void testExecuteNoFiles() throws Exception { UserTestUtils.addUserRole(user, RoleFactory.CONFIG_ADMIN);
commit ed04c02a3974fca2f0b69267c72c02cd79e79aa7 Author: Tomas Lestach tlestach@redhat.com Date: Wed Apr 11 11:14:46 2012 +0200
fix RegisteredSetupActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/test/RegisteredSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/test/RegisteredSetupActionTest.java index c148234..cd8b51c 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/test/RegisteredSetupActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/test/RegisteredSetupActionTest.java @@ -26,13 +26,13 @@ import com.redhat.rhn.domain.server.test.ServerGroupTest; import com.redhat.rhn.frontend.action.systems.RegisteredSetupAction; import com.redhat.rhn.frontend.struts.RhnAction; import com.redhat.rhn.manager.system.SystemManager; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase;
/** * RegisteredSetupActionTest * @version $Rev$ */ -public class RegisteredSetupActionTest extends RhnMockStrutsTestCase { +public class RegisteredSetupActionTest extends RhnPostMockStrutsTestCase {
public void setUp() throws Exception { super.setUp();
commit abaeeb0bc932cbca6e1b0084bf1844425b317b8f Author: Tomas Lestach tlestach@redhat.com Date: Wed Apr 11 11:06:41 2012 +0200
fix OrgCreateActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgCreateActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgCreateActionTest.java index c54f509..54af9e4 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgCreateActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgCreateActionTest.java @@ -15,14 +15,14 @@ package com.redhat.rhn.frontend.action.multiorg.test;
import com.redhat.rhn.domain.role.RoleFactory; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import com.redhat.rhn.testing.TestUtils;
/** * OrgCreateActionTest - test org create * @version $Rev: 119601 $ */ -public class OrgCreateActionTest extends RhnMockStrutsTestCase { +public class OrgCreateActionTest extends RhnPostMockStrutsTestCase {
public void testExecuteSubmit() throws Exception { user.getOrg().addRole(RoleFactory.SAT_ADMIN);
commit ea639d39c1e63faa6550c51974e546e24906e58b Author: Tomas Lestach tlestach@redhat.com Date: Wed Apr 11 11:04:44 2012 +0200
fix ErrataActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataActionTest.java index 09cfd6f..ed4e9be 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataActionTest.java @@ -30,13 +30,13 @@ import com.redhat.rhn.manager.errata.ErrataManager; import com.redhat.rhn.manager.errata.cache.ErrataCacheManager; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase;
/** * ErrataActionTest * @version $Rev$ */ -public class ErrataActionTest extends RhnMockStrutsTestCase { +public class ErrataActionTest extends RhnPostMockStrutsTestCase { public void testEmptySelection() throws Exception { String pathInfo = "/systems/details/ErrataList"; setRequestPathInfo(pathInfo);
commit f1ac6e32bb7abe7c105992ad9734d79530e75eb2 Author: Tomas Lestach tlestach@redhat.com Date: Wed Apr 11 10:55:47 2012 +0200
fix FailedActionsSetupActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/schedule/test/FailedActionsSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/schedule/test/FailedActionsSetupActionTest.java index 9477688..6db5f5e 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/schedule/test/FailedActionsSetupActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/schedule/test/FailedActionsSetupActionTest.java @@ -24,14 +24,14 @@ import com.redhat.rhn.domain.server.test.ServerFactoryTest; import com.redhat.rhn.frontend.struts.RhnAction; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import com.redhat.rhn.testing.TestUtils;
/** * FailedActionsSetupActionTest * @version $Rev$ */ -public class FailedActionsSetupActionTest extends RhnMockStrutsTestCase { +public class FailedActionsSetupActionTest extends RhnPostMockStrutsTestCase {
public void setUp() throws Exception {
commit 459c2a575f5feb2fc6d362e163b8d3256b86154d Author: Tomas Lestach tlestach@redhat.com Date: Wed Apr 11 10:52:22 2012 +0200
fix OrgSoftwareSubscriptionsActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSoftwareSubscriptionsActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSoftwareSubscriptionsActionTest.java index 59d4a5a..dcf370f 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSoftwareSubscriptionsActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSoftwareSubscriptionsActionTest.java @@ -22,7 +22,7 @@ import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.domain.user.UserFactory; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import com.redhat.rhn.testing.TestUtils;
import java.util.HashMap; @@ -34,7 +34,7 @@ import java.util.Map; * OrgSoftwareSubscriptionsActionTest * @version $Rev: 1 $ */ -public class OrgSoftwareSubscriptionsActionTest extends RhnMockStrutsTestCase { +public class OrgSoftwareSubscriptionsActionTest extends RhnPostMockStrutsTestCase {
public void testExecute() throws Exception { user.getOrg().addRole(RoleFactory.SAT_ADMIN);
commit 2120690474f83ec0d7ff8cf28d23cee75a7e51f6 Author: Tomas Lestach tlestach@redhat.com Date: Wed Apr 11 10:49:32 2012 +0200
fix TreeActionTest - need to set ks tree installtype
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/test/TreeActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/test/TreeActionTest.java index 8be218d..f210e54 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/test/TreeActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/test/TreeActionTest.java @@ -19,6 +19,7 @@ import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.channel.test.ChannelFactoryTest; import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.kickstart.KickstartFactory; +import com.redhat.rhn.domain.kickstart.KickstartInstallType; import com.redhat.rhn.domain.kickstart.KickstartableTree; import com.redhat.rhn.domain.kickstart.test.KickstartDataTest; import com.redhat.rhn.domain.kickstart.test.KickstartableTreeTest; @@ -208,6 +209,9 @@ public class TreeActionTest extends RhnPostMockStrutsTestCase { addRequestParameter(TreeCreateAction.CHANNEL_ID, c.getId().toString()); addRequestParameter(TreeCreateAction.LABEL, newLabel); + KickstartInstallType installtype = (KickstartInstallType) + TestUtils.lookupFromCacheById(1L, "KickstartInstallType.findById"); + addRequestParameter(TreeCreateAction.INSTALL_TYPE, installtype.getLabel()); actionPerform(); verifyNoActionErrors(); return newLabel;
commit e2b5f0a4e8da16604249b06c17c0c2535e8139bf Author: Tomas Lestach tlestach@redhat.com Date: Tue Apr 10 17:10:11 2012 +0200
fix TreeActionTest.testCreateRefresh
diff --git a/java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java b/java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java index 705dcfd..0def9ab 100644 --- a/java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java +++ b/java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java @@ -500,11 +500,11 @@ public class PackageManagerTest extends BaseTestCaseWithUser { Map params = new HashMap(); params.put("pkg_id", kickstartPkg.getId()); params.put("capability_id", kickstartCapability.getId()); - params.put("sense_id", "8"); + params.put("sense_id", 8); m.executeUpdate(params);
// Repeast for another sense: - params.put("sense_id", "268435464"); + params.put("sense_id", 268435464); m.executeUpdate(params); }
commit 2a3fd8c6bd9d7cb9992e90fec5490db4517c2d3f Author: Tomas Lestach tlestach@redhat.com Date: Tue Apr 10 17:06:46 2012 +0200
fix TreeActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/test/TreeActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/test/TreeActionTest.java index efddab8..8be218d 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/test/TreeActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/test/TreeActionTest.java @@ -30,7 +30,7 @@ import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.RhnAction; import com.redhat.rhn.manager.rhnpackage.test.PackageManagerTest; import com.redhat.rhn.testing.ChannelTestUtils; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import com.redhat.rhn.testing.TestUtils; import com.redhat.rhn.testing.UserTestUtils;
@@ -43,7 +43,7 @@ import java.util.List; * TreeCreateTest * @version $Rev: 1 $ */ -public class TreeActionTest extends RhnMockStrutsTestCase { +public class TreeActionTest extends RhnPostMockStrutsTestCase {
public void testCreateNonSubmit() throws Exception { UserTestUtils.addUserRole(user, RoleFactory.CONFIG_ADMIN);
commit 1a05b62356a79f95f575bfa9892add4d9b638517 Author: Tomas Lestach tlestach@redhat.com Date: Tue Apr 10 17:05:47 2012 +0200
fix systems/test/ErrataConfirmActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataConfirmActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataConfirmActionTest.java index fcc3073..82d1f91 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataConfirmActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataConfirmActionTest.java @@ -28,7 +28,7 @@ import com.redhat.rhn.frontend.context.Context; import com.redhat.rhn.manager.errata.ErrataManager; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase;
import java.util.TimeZone;
@@ -36,7 +36,7 @@ import java.util.TimeZone; * ErrataConfirmActionTest * @version $Rev$ */ -public class ErrataConfirmActionTest extends RhnMockStrutsTestCase { +public class ErrataConfirmActionTest extends RhnPostMockStrutsTestCase {
public void setUp() throws Exception { super.setUp();
commit d6632e802f1a99e6d23c506e3d13684e1c7572c8 Author: Tomas Lestach tlestach@redhat.com Date: Tue Apr 10 17:05:00 2012 +0200
fix errata/test/ErrataConfirmActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/test/ErrataConfirmActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/errata/test/ErrataConfirmActionTest.java index 3554be4..7bd0196 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/errata/test/ErrataConfirmActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/errata/test/ErrataConfirmActionTest.java @@ -23,14 +23,14 @@ import com.redhat.rhn.domain.server.test.ServerFactoryTest; import com.redhat.rhn.domain.user.UserFactory; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase;
/** * ErrataConfirmActionTest - test that ErrataConfirmAction correctly * schedules the Actions associated with the Errata * @version $Rev$ */ -public class ErrataConfirmActionTest extends RhnMockStrutsTestCase { +public class ErrataConfirmActionTest extends RhnPostMockStrutsTestCase {
public void testExecute() throws Exception { setRequestPathInfo("/errata/details/ErrataConfirmSubmit");
commit 91e66992a400aeb2922d4cd9f75a52d0aa073103 Author: Tomas Lestach tlestach@redhat.com Date: Tue Apr 10 17:03:44 2012 +0200
fix KickstartAdvancedOptionsActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartAdvancedOptionsActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartAdvancedOptionsActionTest.java index 9144edc..30d8402 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartAdvancedOptionsActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartAdvancedOptionsActionTest.java @@ -18,14 +18,14 @@ import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.kickstart.test.KickstartDataTest; import com.redhat.rhn.frontend.action.kickstart.KickstartAdvancedOptionsAction; import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import com.redhat.rhn.testing.TestUtils;
/** * KickstartAdvancedOptionsTest * @version $Rev: 1 $ */ -public class KickstartAdvancedOptionsActionTest extends RhnMockStrutsTestCase { +public class KickstartAdvancedOptionsActionTest extends RhnPostMockStrutsTestCase {
protected KickstartData ksdata; protected KickstartData ksdataOptions;
commit 8cf9a650729a6f37b92892fa09f3f3eba6ae78ee Author: Tomas Lestach tlestach@redhat.com Date: Tue Apr 10 17:02:54 2012 +0200
fix CryptoKeyDeleteActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/keys/test/CryptoKeyDeleteActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/keys/test/CryptoKeyDeleteActionTest.java index 9a4308b..79b92e7 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/keys/test/CryptoKeyDeleteActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/keys/test/CryptoKeyDeleteActionTest.java @@ -20,13 +20,13 @@ import com.redhat.rhn.frontend.action.keys.CryptoKeyCreateAction; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.manager.kickstart.crypto.CreateCryptoKeyCommand; import com.redhat.rhn.manager.kickstart.crypto.test.CryptoKeyCommandTest; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase;
/** * CryptoKeyDeleteActionTest * @version $Rev: 1 $ */ -public class CryptoKeyDeleteActionTest extends RhnMockStrutsTestCase { +public class CryptoKeyDeleteActionTest extends RhnPostMockStrutsTestCase {
private CreateCryptoKeyCommand cmd;
commit e146c2b2e94b5b77b446b526db203b2c5f1291f4 Author: Tomas Lestach tlestach@redhat.com Date: Tue Apr 10 17:02:00 2012 +0200
fix CompletedActionsSetupActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/schedule/test/CompletedActionsSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/schedule/test/CompletedActionsSetupActionTest.java index 7b1f534..71545f1 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/schedule/test/CompletedActionsSetupActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/schedule/test/CompletedActionsSetupActionTest.java @@ -24,14 +24,14 @@ import com.redhat.rhn.domain.server.test.ServerFactoryTest; import com.redhat.rhn.frontend.struts.RhnAction; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import com.redhat.rhn.testing.TestUtils;
/** * CompletedActionsSetupActionTest * @version $Rev$ */ -public class CompletedActionsSetupActionTest extends RhnMockStrutsTestCase { +public class CompletedActionsSetupActionTest extends RhnPostMockStrutsTestCase {
public void setUp() throws Exception { super.setUp();
commit 7399a59917ebb1a0446b686b53035935b06d89fc Author: Tomas Lestach tlestach@redhat.com Date: Tue Apr 10 17:01:04 2012 +0200
fix BaseSetOperateOnDiffActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/common/test/BaseSetOperateOnDiffActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/common/test/BaseSetOperateOnDiffActionTest.java index c0d7a1e..0808198 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/common/test/BaseSetOperateOnDiffActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/common/test/BaseSetOperateOnDiffActionTest.java @@ -24,14 +24,14 @@ import com.redhat.rhn.frontend.action.kickstart.ActivationKeysSubmitAction; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.taglibs.ListDisplayTag; import com.redhat.rhn.manager.rhnset.RhnSetDecl; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import com.redhat.rhn.testing.TestUtils;
/** * BaseSetOperateOnDiffActionTest * @version $Rev$ */ -public class BaseSetOperateOnDiffActionTest extends RhnMockStrutsTestCase { +public class BaseSetOperateOnDiffActionTest extends RhnPostMockStrutsTestCase {
// We use activation keys <-> to kickstart profile to test this. // I wanted to make sure we had a specific test class that was tied
commit f97e630360c97968f49e75bba24cd0e8a403f9c6 Author: Tomas Lestach tlestach@redhat.com Date: Tue Apr 10 17:00:10 2012 +0200
fix GeneralConfigActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/test/GeneralConfigActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/test/GeneralConfigActionTest.java index 07e3d31..296dcb7 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/satellite/test/GeneralConfigActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/test/GeneralConfigActionTest.java @@ -19,7 +19,7 @@ import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.frontend.action.satellite.GeneralConfigAction; import com.redhat.rhn.frontend.struts.RhnAction; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase;
import org.apache.struts.action.DynaActionForm;
@@ -31,7 +31,7 @@ import java.util.Map; * GeneralConfigActionTest * @version $Rev: 1 $ */ -public class GeneralConfigActionTest extends RhnMockStrutsTestCase { +public class GeneralConfigActionTest extends RhnPostMockStrutsTestCase { private static final String TEST_CONFIG_BOOLEAN = ConfigDefaults.WEB_IS_MONITORING_BACKEND;
commit 78d9017adf49b15944230ac203037505de37fa0d Author: Tomas Lestach tlestach@redhat.com Date: Tue Apr 10 16:58:46 2012 +0200
fix RestartActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/test/RestartActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/test/RestartActionTest.java index 3c6c0bd..41a1091 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/satellite/test/RestartActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/test/RestartActionTest.java @@ -18,7 +18,7 @@ import com.redhat.rhn.common.conf.Config; import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.frontend.action.satellite.RestartAction; import com.redhat.rhn.frontend.struts.RhnAction; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase;
import org.apache.struts.action.DynaActionForm;
@@ -26,7 +26,7 @@ import org.apache.struts.action.DynaActionForm; * RestartActionTest * @version $Rev: 1 $ */ -public class RestartActionTest extends RhnMockStrutsTestCase { +public class RestartActionTest extends RhnPostMockStrutsTestCase {
/** * {@inheritDoc}
commit 9a94d3ecd55dc68194eb88c7bd2e8226e8cbb748 Author: Tomas Lestach tlestach@redhat.com Date: Tue Apr 10 16:57:36 2012 +0200
fix KickstartIpRangeActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartIpRangeActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartIpRangeActionTest.java index 7258cfd..ae8f6fa 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartIpRangeActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartIpRangeActionTest.java @@ -23,7 +23,7 @@ import com.redhat.rhn.frontend.action.kickstart.KickstartIpRangeAction; import com.redhat.rhn.frontend.action.kickstart.KickstartIpRangeDeleteAction; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.manager.kickstart.IpAddress; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import com.redhat.rhn.testing.TestUtils;
import java.util.Date; @@ -32,7 +32,7 @@ import java.util.Date; * KickstartIpRangeActionTest * @version $Rev: 1 $ */ -public class KickstartIpRangeActionTest extends RhnMockStrutsTestCase { +public class KickstartIpRangeActionTest extends RhnPostMockStrutsTestCase {
protected KickstartData ksdata; protected KickstartIpRange ip1;
commit 53f173d06ac00c41721bf059b5d76b2bb81d9950 Author: Tomas Lestach tlestach@redhat.com Date: Tue Apr 10 16:45:53 2012 +0200
fix CryptoKeyCreateActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/keys/test/CryptoKeyCreateActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/keys/test/CryptoKeyCreateActionTest.java index 821534b..ccdfa4c 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/keys/test/CryptoKeyCreateActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/keys/test/CryptoKeyCreateActionTest.java @@ -19,14 +19,14 @@ import com.redhat.rhn.domain.kickstart.crypto.CryptoKey; import com.redhat.rhn.domain.kickstart.crypto.test.CryptoTest; import com.redhat.rhn.frontend.action.keys.CryptoKeyCreateAction; import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import com.redhat.rhn.testing.TestUtils;
/** * CryptoKeyCreateActionTest * @version $Rev: 1 $ */ -public class CryptoKeyCreateActionTest extends RhnMockStrutsTestCase { +public class CryptoKeyCreateActionTest extends RhnPostMockStrutsTestCase {
public void setUp() throws Exception { TestUtils.disableLocalizationLogging();
commit e26fe4db823ea45e38e4de21ced0bfbb94690302 Author: Tomas Lestach tlestach@redhat.com Date: Tue Apr 10 16:44:19 2012 +0200
fix CertificateConfigActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/test/CertificateConfigActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/test/CertificateConfigActionTest.java index 82b3ba0..59a75ae 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/satellite/test/CertificateConfigActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/test/CertificateConfigActionTest.java @@ -18,7 +18,7 @@ import com.redhat.rhn.common.conf.Config; import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.frontend.action.satellite.CertificateConfigAction; import com.redhat.rhn.frontend.struts.RhnAction; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import com.redhat.rhn.testing.TestUtils;
import org.apache.struts.action.DynaActionForm; @@ -27,7 +27,7 @@ import org.apache.struts.action.DynaActionForm; * CertificateConfigActionTest * @version $Rev: 1 $ */ -public class CertificateConfigActionTest extends RhnMockStrutsTestCase { +public class CertificateConfigActionTest extends RhnPostMockStrutsTestCase {
@Override public void setUp() throws Exception {
commit 62ef5130770c69a4b721ed9be4b1f65aa8d9385f Author: Tomas Lestach tlestach@redhat.com Date: Tue Apr 10 16:43:01 2012 +0200
fix SystemDetailsEditActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/test/SystemDetailsEditActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/test/SystemDetailsEditActionTest.java index f5b4e54..ec0c640 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/test/SystemDetailsEditActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/test/SystemDetailsEditActionTest.java @@ -24,7 +24,7 @@ import com.redhat.rhn.frontend.struts.RhnAction; import com.redhat.rhn.manager.entitlement.EntitlementManager; import com.redhat.rhn.manager.system.SystemManager; import com.redhat.rhn.testing.ChannelTestUtils; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import com.redhat.rhn.testing.ServerTestUtils; import com.redhat.rhn.testing.TestUtils; import com.redhat.rhn.testing.UserTestUtils; @@ -38,7 +38,7 @@ import java.util.List; * SystemDetailsEditActionTest * @version $Rev$ */ -public class SystemDetailsEditActionTest extends RhnMockStrutsTestCase { +public class SystemDetailsEditActionTest extends RhnPostMockStrutsTestCase {
protected Server s;
commit 39b258711c14860478ed507afc620975cb8330ec Author: Tomas Lestach tlestach@redhat.com Date: Tue Apr 10 16:40:40 2012 +0200
fix PreservationListEditActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/test/PreservationListEditActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/test/PreservationListEditActionTest.java index 511b8df..9606dca 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/test/PreservationListEditActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/test/PreservationListEditActionTest.java @@ -20,7 +20,7 @@ import com.redhat.rhn.domain.common.test.FileListTest; import com.redhat.rhn.frontend.action.systems.provisioning.BasePreservationListEditAction; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.RhnAction; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import com.redhat.rhn.testing.TestUtils; import com.redhat.rhn.testing.UserTestUtils;
@@ -28,7 +28,7 @@ import com.redhat.rhn.testing.UserTestUtils; * PreservationListEditActionTest * @version $Rev: 1 $ */ -public class PreservationListEditActionTest extends RhnMockStrutsTestCase { +public class PreservationListEditActionTest extends RhnPostMockStrutsTestCase {
public void testEditExecute() throws Exception { UserTestUtils.addProvisioning(user.getOrg());
commit b23ca87dccf91d1a762c866970d90aaafd9df3f1 Author: Tomas Lestach tlestach@redhat.com Date: Tue Apr 10 16:37:40 2012 +0200
fix KickstartPartitionActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartPartitionActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartPartitionActionTest.java index 104507c..9c5bfa9 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartPartitionActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartPartitionActionTest.java @@ -19,7 +19,7 @@ import com.redhat.rhn.domain.kickstart.test.KickstartDataTest; import com.redhat.rhn.frontend.action.kickstart.KickstartPartitionEditAction; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.RhnAction; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import com.redhat.rhn.testing.TestUtils;
import org.apache.struts.action.DynaActionForm; @@ -28,7 +28,7 @@ import org.apache.struts.action.DynaActionForm; * KickstartPreActionTest * @version $Rev: 1 $ */ -public class KickstartPartitionActionTest extends RhnMockStrutsTestCase { +public class KickstartPartitionActionTest extends RhnPostMockStrutsTestCase { private KickstartData ksdata;
@Override
commit 0cf98f16512048aaf38b9762fcf92cdd8a3e63e2 Author: Tomas Lestach tlestach@redhat.com Date: Tue Apr 10 16:31:04 2012 +0200
fix CreateUserActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/test/CreateUserActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/user/test/CreateUserActionTest.java index f2b4d7a..84a4a3d 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/user/test/CreateUserActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/user/test/CreateUserActionTest.java @@ -18,7 +18,7 @@ import com.redhat.rhn.common.messaging.MessageQueue; import com.redhat.rhn.frontend.action.user.CreateUserAction; import com.redhat.rhn.frontend.action.user.UserActionHelper; import com.redhat.rhn.testing.RhnMockDynaActionForm; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import com.redhat.rhn.testing.TestUtils; import com.redhat.rhn.webapp.RhnServletListener;
@@ -27,7 +27,7 @@ import com.redhat.rhn.webapp.RhnServletListener; * * @version $Rev: 1427 $ */ -public class CreateUserActionTest extends RhnMockStrutsTestCase { +public class CreateUserActionTest extends RhnPostMockStrutsTestCase {
private static RhnServletListener rl;
commit c764a6950f38227289c41d49fca2a63b7a3f399e Author: Tomas Lestach tlestach@redhat.com Date: Tue Apr 10 16:27:19 2012 +0200
fix CloneConfirmActionTest
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/test/CloneConfirmActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/errata/test/CloneConfirmActionTest.java index 43f4f78..e6ff304 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/errata/test/CloneConfirmActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/errata/test/CloneConfirmActionTest.java @@ -27,7 +27,7 @@ import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.manager.errata.ErrataManager; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase;
import java.util.ArrayList; import java.util.Iterator; @@ -37,7 +37,7 @@ import java.util.List; * CloneConfirmActionTest * @version $Rev$ */ -public class CloneConfirmActionTest extends RhnMockStrutsTestCase { +public class CloneConfirmActionTest extends RhnPostMockStrutsTestCase {
public void setUp() throws Exception { super.setUp();
commit 9e2676465a8f20f382b5c50ebe613a6f89183031 Author: Tomas Lestach tlestach@redhat.com Date: Tue Apr 10 16:26:23 2012 +0200
create RhnPostMockStrutsTestCase for testing POST methods
diff --git a/java/code/src/com/redhat/rhn/testing/RhnPostMockStrutsTestCase.java b/java/code/src/com/redhat/rhn/testing/RhnPostMockStrutsTestCase.java new file mode 100644 index 0000000..bd17b33 --- /dev/null +++ b/java/code/src/com/redhat/rhn/testing/RhnPostMockStrutsTestCase.java @@ -0,0 +1,30 @@ +/** + * Copyright (c) 2011 Red Hat, Inc. + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + */ +package com.redhat.rhn.testing; + +import servletunit.HttpServletRequestSimulator; + + +/** + * RhnPostMockStrutsTestCase + * @version $Rev$ + */ +public class RhnPostMockStrutsTestCase extends RhnMockStrutsTestCase { + + public void setUp() throws Exception { + super.setUp(); + request.setMethod(HttpServletRequestSimulator.POST); + } +}
commit aa6744f6909c412a1004e1f00cad078a2880d2ff Author: Tomas Lestach tlestach@redhat.com Date: Tue Apr 10 16:03:31 2012 +0200
statements cannot end with ";" for Oracle
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java b/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java index 5935e21..d3ff272 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java +++ b/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java @@ -382,6 +382,8 @@ public class AdvDataSourceTest extends RhnBaseTestCase { " id number" + " constraint adv_datasource_pk primary key" + ")"); + stmt.execute("insert into adv_datasource(foobar, id) " + + "values ('Blarg', 1)"); } else { c.rollback(); @@ -393,9 +395,9 @@ public class AdvDataSourceTest extends RhnBaseTestCase { " id numeric" + " constraint adv_datasource_pk primary key" + ");"); + stmt.execute("insert into adv_datasource(foobar, id) " + + "values ('Blarg', 1);"); } - stmt.execute("insert into adv_datasource(foobar, id) " + - "values ('Blarg', 1);"); c.commit(); } finally {
spacewalk-commits@lists.fedorahosted.org