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/07 22:34:26 UTC
git commit: DELTASPIKE-225 add more unit tests
Updated Branches:
refs/heads/master d4db08916 -> a8edf4ac4
DELTASPIKE-225 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/a8edf4ac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/a8edf4ac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/a8edf4ac
Branch: refs/heads/master
Commit: a8edf4ac4a23a6f310d1bdf3b018991ea2a1673b
Parents: d4db089
Author: Mark Struberg <st...@apache.org>
Authored: Sat Jul 7 18:12:37 2012 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Sat Jul 7 22:34:00 2012 +0200
----------------------------------------------------------------------
.../core/impl/message/DefaultMessage.java | 30 +++++++-------
.../test/core/api/message/MessageContextTest.java | 23 +++++++++++
.../broken/BrokenMessageBundleOnClassTest.java | 2 +-
3 files changed, 39 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/a8edf4ac/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 d6eac2e..27f7d02 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
@@ -50,18 +50,6 @@ class DefaultMessage implements Message
this.messageContext = messageContext;
}
- DefaultMessage(MessageContext messageContext,
- String messageTemplate,
- Object... arguments)
- {
- reset();
-
- this.messageContext = messageContext;
- this.messageTemplate = messageTemplate;
-
- Collections.addAll(this.arguments, arguments);
- }
-
protected void reset()
{
messageTemplate = null;
@@ -103,6 +91,11 @@ class DefaultMessage implements Message
// first try to pickup the message via the MessageResolver
String template = getTemplate();
+ if (template == null)
+ {
+ return "";
+ }
+
String ret = template;
MessageResolver messageResolver = messageContext.getMessageResolver();
if (messageResolver != null)
@@ -170,15 +163,22 @@ class DefaultMessage implements Message
return false;
}
- Message that = (Message) o;
+ Message other = (Message) o;
+
+ if (getTemplate() == null && other.getTemplate() != null)
+ {
+ return false;
+ }
- if (!getTemplate().equals(that.getTemplate()))
+ if (getTemplate() != null && !getTemplate().equals(other.getTemplate()))
{
return false;
}
//noinspection RedundantIfStatement
- if (arguments != null ? !Arrays.equals(arguments.toArray(), that.getArguments()) : that.getArguments() != null)
+ if (arguments != null
+ ? !Arrays.equals(arguments.toArray(), other.getArguments())
+ : other.getArguments() != null)
{
return false;
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/a8edf4ac/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 c64073c..4ee6b86 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
@@ -19,6 +19,7 @@
package org.apache.deltaspike.test.core.api.message;
import org.apache.deltaspike.core.api.message.LocaleResolver;
+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;
@@ -127,4 +128,26 @@ public class MessageContextTest
Assert.assertEquals("???xyz123??? [123, 456, 789]", messageText);
}
+
+ @Test
+ public void testMessageEquals()
+ {
+ Message m1 = messageContext.message();
+ Message m2 = messageContext.message();
+ Message m3 = messageContext.messageResolver(new TestMessageResolver()).message();
+
+ Assert.assertEquals(m1, m1);
+ Assert.assertEquals(m1, m2);
+ Assert.assertEquals(m1, m3);
+ Assert.assertEquals(m3, m1);
+ Assert.assertEquals(m2, m3);
+
+ m1.template("dumdidum").argument("nonono");
+ m2.template("dumdidum").argument("nonono");
+ Assert.assertEquals(m1, m2);
+
+ m2.argument("toomuch");
+ Assert.assertFalse(m1.equals(m2));
+ Assert.assertFalse(m2.equals(m1));
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/a8edf4ac/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/broken/BrokenMessageBundleOnClassTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/broken/BrokenMessageBundleOnClassTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/broken/BrokenMessageBundleOnClassTest.java
index 66cbfe2..8a3a034 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/broken/BrokenMessageBundleOnClassTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/broken/BrokenMessageBundleOnClassTest.java
@@ -58,7 +58,7 @@ public class BrokenMessageBundleOnClassTest
* cannot contain other archives.
*/
@Deployment
- @ShouldThrowException(IllegalStateException.class)
+ @ShouldThrowException(Exception.class)
public static WebArchive deploy()
{
JavaArchive testJar = ShrinkWrap