java/code/src/com/redhat/rhn/frontend/events/SsmDeleteServersAction.java | 2
+-
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java | 4
+++-
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 3ca2eb76dd09a312d7c3eeb2db60c42c9d5aedc4
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jan 31 17:19:14 2013 +0100
906345 - reuse the ssm.server.delete.operationname message
diff --git a/java/code/src/com/redhat/rhn/frontend/events/SsmDeleteServersAction.java
b/java/code/src/com/redhat/rhn/frontend/events/SsmDeleteServersAction.java
index ed72dc9..e1c7183 100644
--- a/java/code/src/com/redhat/rhn/frontend/events/SsmDeleteServersAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/events/SsmDeleteServersAction.java
@@ -29,7 +29,7 @@ import java.util.List;
* @version $Revision$
*/
public class SsmDeleteServersAction extends AbstractDatabaseAction {
- public static final String OPERATION_NAME = "Server Delete";
+ public static final String OPERATION_NAME =
"ssm.server.delete.operationname";
/** {@inheritDoc} */
protected void doExecute(EventMessage msg) {
diff --git
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java
index b365024..af5a8f3 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.common.db.datasource.ModeFactory;
import com.redhat.rhn.common.db.datasource.WriteMode;
import com.redhat.rhn.common.hibernate.HibernateFactory;
+import com.redhat.rhn.common.localization.LocalizationService;
import com.redhat.rhn.domain.action.Action;
import com.redhat.rhn.domain.action.ActionFactory;
import com.redhat.rhn.domain.action.script.ScriptActionDetails;
@@ -742,7 +743,8 @@ public class SystemHandlerTest extends BaseHandlerTestCase {
List<OperationDetailsDto> ops = SsmOperationManager.allOperations(admin);
for (OperationDetailsDto op : ops) {
- assertEquals(op.getDescription(), SsmDeleteServersAction.OPERATION_NAME);
+ assertEquals(op.getDescription(), LocalizationService.getInstance().
+ getMessage(SsmDeleteServersAction.OPERATION_NAME));
}
}
Show replies by date