From 80c58327faaa4873369f6bb949e62792c2f708e0 Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Wed, 15 Aug 2007 21:34:53 +0000
Subject: [PATCH] This commit is a step toward getting OpenDS internationalized. There are still issues to be resolved before we can declare that we are internationalized but this commit covers the bulk of changes needed at this time.
---
opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/cli/CliTest.java | 22 ++++++++--------------
1 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/cli/CliTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/cli/CliTest.java
index 7df824d..8f5712e 100755
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/cli/CliTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/cli/CliTest.java
@@ -33,13 +33,9 @@
import org.opends.admin.ads.ADSContext.ServerGroupProperty;
import org.opends.admin.ads.ADSContextException.ErrorType;
import org.opends.server.util.args.ArgumentException;
-import org.opends.server.util.args.SubCommandArgumentParser;
-import com.sleepycat.je.dbi.GetMode;
-
-import static org.opends.server.messages.AdminMessages.*;
-import static org.opends.server.messages.MessageHandler.*;
-import static org.opends.server.admin.client.cli.DsFrameworkCliReturnCode.*;
+import static org.opends.messages.AdminMessages.*;
+import org.opends.messages.Message;
/**
@@ -62,23 +58,21 @@
@Test
public void testReturnCodeMessageId()
{
- String invalidMsgId;
+ String invalidMsg;
String msg;
- int messageID;
+ Message message;
for (DsFrameworkCliReturnCode returnCode : DsFrameworkCliReturnCode
.values())
{
- if ((messageID = returnCode.getMessageId()) == MSGID_ADMIN_NO_MESSAGE)
+ if ((message = returnCode.getMessage()).equals(ERR_ADMIN_NO_MESSAGE.get()))
{
continue;
}
- invalidMsgId = "Unknown message for message ID " + messageID;
- // get the associated Msg
- msg = getMessage(messageID);
- if (msg.equals(invalidMsgId))
+ invalidMsg = "Unknown message for message ID " + message;
+ if (message.toString().equals(invalidMsg))
{
assertTrue(false, "ReturnCode \"" + returnCode
- + "\" is registered with a wrong message Id (" + messageID + ")");
+ + "\" is registered with a wrong message Id (" + message + ")");
}
}
}
--
Gitblit v1.10.0