java/code/src/com/redhat/rhn/domain/entitlement/test/VirtualizationEntitlementTestCase.java | 42 ---------- java/code/src/com/redhat/rhn/frontend/action/test/LoginExpiredSatTestCase.java | 36 -------- java/code/src/com/redhat/rhn/frontend/action/test/LoginExpiredTest.java | 36 ++++++++ 3 files changed, 36 insertions(+), 78 deletions(-)
New commits: commit a353adcabc1bb8ef3b6a42ff23ac2b11e5a517b0 Author: Silvio Moioli smoioli@suse.de Date: Mon Dec 9 08:17:56 2013 +0100
VirtualizationEntitlementTestCase: dead code removed
diff --git a/java/code/src/com/redhat/rhn/domain/entitlement/test/VirtualizationEntitlementTestCase.java b/java/code/src/com/redhat/rhn/domain/entitlement/test/VirtualizationEntitlementTestCase.java deleted file mode 100644 index 551cc93..0000000 --- a/java/code/src/com/redhat/rhn/domain/entitlement/test/VirtualizationEntitlementTestCase.java +++ /dev/null @@ -1,42 +0,0 @@ -/** - * Copyright (c) 2009--2010 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.domain.entitlement.test; - -import com.redhat.rhn.domain.entitlement.VirtualizationEntitlement; -import com.redhat.rhn.manager.entitlement.EntitlementManager; - - -/** - * VirtualizationEntitlementTestCase - * @version $Rev$ - */ -public class VirtualizationEntitlementTestCase extends BaseEntitlementTestCase { - - /** - * {@inheritDoc} - */ - protected void createEntitlement() { - ent = new VirtualizationEntitlement(); - - } - - /** - * {@inheritDoc} - */ - protected String getLabel() { - return EntitlementManager.VIRTUALIZATION_ENTITLED; - } - -}
commit fc30335cca665d96f38f6ce5d4754e052f80b26b Author: Silvio Moioli smoioli@suse.de Date: Mon Dec 9 08:18:41 2013 +0100
LoginExpiredSatTestCase: rename to respect test convention
diff --git a/java/code/src/com/redhat/rhn/frontend/action/test/LoginExpiredSatTestCase.java b/java/code/src/com/redhat/rhn/frontend/action/test/LoginExpiredSatTestCase.java deleted file mode 100644 index 6396469..0000000 --- a/java/code/src/com/redhat/rhn/frontend/action/test/LoginExpiredSatTestCase.java +++ /dev/null @@ -1,36 +0,0 @@ -/** - * Copyright (c) 2009--2010 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.frontend.action.test; - -import com.redhat.rhn.manager.satellite.test.CertificateManagerTest; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; - - -/** - * LoginExpiredSatTestCase - * @version $Rev$ - */ -public class LoginExpiredSatTestCase extends RhnMockStrutsTestCase { - - public void testExpiredSatCert() throws Exception { - CertificateManagerTest.expireSatelliteCertificate(); - - setRequestPathInfo("/LoginSubmit"); - actionPerform(); - verifyActionMessage("satellite.expired"); - assertEquals("/WEB-INF/pages/common/login.jsp", getActualForward()); - } - -} diff --git a/java/code/src/com/redhat/rhn/frontend/action/test/LoginExpiredTest.java b/java/code/src/com/redhat/rhn/frontend/action/test/LoginExpiredTest.java new file mode 100644 index 0000000..511ddac --- /dev/null +++ b/java/code/src/com/redhat/rhn/frontend/action/test/LoginExpiredTest.java @@ -0,0 +1,36 @@ +/** + * Copyright (c) 2009--2010 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.frontend.action.test; + +import com.redhat.rhn.manager.satellite.test.CertificateManagerTest; +import com.redhat.rhn.testing.RhnMockStrutsTestCase; + + +/** + * LoginExpiredTest + * @version $Rev$ + */ +public class LoginExpiredTest extends RhnMockStrutsTestCase { + + public void testExpiredSatCert() throws Exception { + CertificateManagerTest.expireSatelliteCertificate(); + + setRequestPathInfo("/LoginSubmit"); + actionPerform(); + verifyActionMessage("satellite.expired"); + assertEquals("/WEB-INF/pages/common/login.jsp", getActualForward()); + } + +}
spacewalk-commits@lists.fedorahosted.org