You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by st...@apache.org on 2012/07/08 12:06:59 UTC
[2/2] git commit: DELTASPIKE-225 make toString(MessageContext) public
DELTASPIKE-225 make toString(MessageContext) public
also add more unit tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/0319ee6a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/0319ee6a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/0319ee6a
Branch: refs/heads/master
Commit: 0319ee6a736773f2733a68b6fa4c2af138bedf60
Parents: 1d09e78
Author: Mark Struberg <st...@apache.org>
Authored: Sun Jul 8 11:38:52 2012 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Sun Jul 8 11:38:52 2012 +0200
----------------------------------------------------------------------
.../deltaspike/core/api/message/Message.java | 11 +++++++++
.../core/impl/message/DefaultMessage.java | 1 +
.../test/core/api/message/MessageContextTest.java | 17 +++++++++++++++
3 files changed, 29 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/0319ee6a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/message/Message.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/message/Message.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/message/Message.java
index 329f89d..f03b54c 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/message/Message.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/message/Message.java
@@ -45,5 +45,16 @@ public interface Message
*/
Object[] getArguments();
+ /**
+ * Renders the Message to a String, using the {@link MessageContext}
+ * which created the Message.
+ */
+ String toString();
+
+ /**
+ * Renders the Message to a String, using an
+ * arbitrary {@link MessageContext}.
+ */
+ String toString(MessageContext messageContext);
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/0319ee6a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessage.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessage.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessage.java
index 27f7d02..8d9d38c 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessage.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessage.java
@@ -138,6 +138,7 @@ class DefaultMessage implements Message
return sb.toString();
}
+ @Override
public String toString(MessageContext messageContext)
{
return messageContext.message()
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/0319ee6a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageContextTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageContextTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageContextTest.java
index e24f1be..9408f9a 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageContextTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageContextTest.java
@@ -23,6 +23,7 @@ import org.apache.deltaspike.core.api.message.Message;
import org.apache.deltaspike.core.api.message.MessageContext;
import org.apache.deltaspike.core.impl.message.MessageBundleExtension;
import org.apache.deltaspike.test.category.SeCategory;
+import org.apache.deltaspike.test.category.Serializer;
import org.apache.deltaspike.test.util.ArchiveUtils;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
@@ -106,6 +107,20 @@ public class MessageContextTest
}
@Test
+ public void testArbitraryMessageContextRendering()
+ {
+ LocaleResolver localeResolver = new FixedGermanLocaleResolver();
+ Message message = messageContext
+ .localeResolver(localeResolver)
+ .messageResolver(new TestMessageResolver())
+ .message().template("{hello}").argument("hans");
+ Assert.assertEquals("Test Nachricht an hans", message.toString());
+
+ MessageContext messageContext2 = messageContext.clone().localeResolver(new FixedEnglishLocalResolver());
+ Assert.assertEquals("test message to hans", message.toString(messageContext2));
+ }
+
+ @Test
public void createInvalidMessageTest()
{
String messageText = messageContext.message().template("{xyz123}").toString();
@@ -145,6 +160,8 @@ public class MessageContextTest
m2.template("dumdidum").argument("nonono");
Assert.assertEquals(m1, m2);
+ Assert.assertEquals(m1.hashCode(), m2.hashCode());
+
m2.argument("toomuch");
Assert.assertFalse(m1.equals(m2));
Assert.assertFalse(m2.equals(m1));