Download as
Browse Code »

Commit 52f99101032630ec60b55d6e84127dee3b2f6fae

Authored by Cleverson Sacramento
2 parents cb21fdc9 1bbe3f46
Exists in master

Merge branch '2.3' of https://github.com/demoiselle/framework.git into 2.3

Showing 2 changed files with 29 additions and 35 deletions   Show diff stats
impl/core/src/test/java/br/gov/frameworkdemoiselle/message/DefaultMessageTest.java
  Diff comments   View file @52f9910
... ... @@ -17,26 +17,26 @@
17 17 * Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
18 18 */
19 19 package br.gov.frameworkdemoiselle.message;
20   -import org.junit.Ignore;
  20 +
21 21 import static org.easymock.EasyMock.expect;
22 22 import static org.junit.Assert.assertEquals;
23 23 import static org.junit.Assert.assertSame;
24   -import static org.powermock.api.easymock.PowerMock.expectPrivate;
25 24 import static org.powermock.api.easymock.PowerMock.mockStatic;
26 25 import static org.powermock.api.easymock.PowerMock.replayAll;
  26 +import static org.powermock.api.easymock.PowerMock.replay;
27 27 import static org.powermock.api.easymock.PowerMock.verifyAll;
28 28  
29 29 import java.util.Arrays;
  30 +import java.util.Locale;
30 31  
31   -import org.easymock.EasyMock;
32 32 import org.junit.After;
33 33 import org.junit.Before;
34 34 import org.junit.Test;
35 35 import org.junit.runner.RunWith;
36   -import org.powermock.api.easymock.PowerMock;
37 36 import org.powermock.core.classloader.annotations.PrepareForTest;
38 37 import org.powermock.modules.junit4.PowerMockRunner;
39 38  
  39 +import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
40 40 import br.gov.frameworkdemoiselle.util.Beans;
41 41 import br.gov.frameworkdemoiselle.util.ResourceBundle;
42 42 import br.gov.frameworkdemoiselle.util.Strings;
... ... @@ -55,14 +55,17 @@ public class DefaultMessageTest {
55 55  
56 56 @Before
57 57 public void setUp() throws Exception {
58   - bundle = PowerMock.createMock(ResourceBundle.class);
59   - expect(bundle.getString(MOCK_RESOURCE_BUNDLE_KEY)).andReturn(MOCK_RESOURCE_BUNDLE_VALUE).anyTimes();
60   - expectPrivate(bundle, "handleGetObject", EasyMock.anyObject(String.class))
61   - .andReturn(MOCK_RESOURCE_BUNDLE_VALUE).anyTimes();
  58 + Locale locale = Locale.getDefault();
  59 +
  60 + mockStatic(Beans.class);
  61 + expect(Beans.getReference(Locale.class)).andReturn(locale).anyTimes();
  62 + replay(Beans.class);
  63 +
  64 + bundle = ResourceBundleProducer.create("teste-message");
62 65  
63 66 mockStatic(Beans.class);
64 67 expect(Beans.getReference(ResourceBundle.class)).andReturn(bundle).anyTimes();
65   - replayAll(bundle, Beans.class);
  68 + replayAll(Beans.class);
66 69 }
67 70  
68 71 @After
... ... @@ -125,7 +128,7 @@ public class DefaultMessageTest {
125 128 text = MOCK_RESOURCE_BUNDLE_KEY;
126 129 params = new Object[] { "1", "2" };
127 130 message = new DefaultMessage(text, params);
128   - assertEquals(Strings.getString(bundle.getString(text), params), message.getText());
  131 + assertEquals(Strings.getString(bundle.getString("key"), params), message.getText());
129 132 }
130 133  
131 134 @Test
... ... @@ -143,7 +146,7 @@ public class DefaultMessageTest {
143 146 message = new DefaultMessage(text, SeverityType.FATAL, params);
144 147 assertEquals(
145 148 "DefaultMessage [originalText=" + text + ", parsedText="
146   - + Strings.getString(bundle.getString(text), params) + ", severity=FATAL, params="
  149 + + Strings.getString(bundle.getString("key"), params) + ", severity=FATAL, params="
147 150 + Arrays.toString(params) + ", bundle=" + bundle.toString() + "]", message.toString());
148 151 }
149 152  
... ... @@ -160,7 +163,7 @@ public class DefaultMessageTest {
160 163  
161 164 enum MessagesEnum implements Message {
162 165  
163   - FIRST_KEY("first-key"), SECOND_KEY("second-key", SeverityType.WARN), THIRD_KEY, FOURTH_KEY(SeverityType.FATAL), LITERAL_TEXT(
  166 + FIRST_KEY("{first-key}"), SECOND_KEY("{second-key}", SeverityType.WARN), THIRD_KEY("{THIRD_KEY}"), FOURTH_KEY("{FOURTH_KEY}",SeverityType.FATAL), LITERAL_TEXT(
164 167 "This is a literal text");
165 168  
166 169 private final DefaultMessage msg;
... ... @@ -193,17 +196,8 @@ public class DefaultMessageTest {
193 196  
194 197 }
195 198  
196   - @Ignore
197 199 @Test
198   - public void testMessagesEnum() {
199   -
200   - bundle = PowerMock.createMock(ResourceBundle.class);
201   - expect(bundle.getString("first-key")).andReturn("First message text");
202   - expect(bundle.getString("second-key")).andReturn("Second message text");
203   - expect(bundle.getString("THIRD_KEY")).andReturn("Third message text");
204   - expect(bundle.getString("FOURTH_KEY")).andReturn("Fourth message text");
205   - replayAll(bundle);
206   -
  200 + public void testMessagesEnum() throws Exception {
207 201 message = MessagesEnum.FIRST_KEY;
208 202 assertEquals(SeverityType.INFO, message.getSeverity());
209 203 assertEquals("First message text", message.getText());
... ... @@ -227,7 +221,7 @@ public class DefaultMessageTest {
227 221  
228 222 enum ErrorMessages implements Message {
229 223  
230   - FIRST_ERROR_KEY, SECOND_ERROR_KEY("second-error-key"), LITERAL_ERROR_TEXT("This is a literal error text");
  224 + ERROR_KEY("{error-key}"), LITERAL_ERROR_TEXT("This is a literal error text");
231 225  
232 226 private final DefaultMessage msg;
233 227  
... ... @@ -251,16 +245,11 @@ public class DefaultMessageTest {
251 245  
252 246 }
253 247  
254   - @Ignore
255 248 @Test
256 249 public void testErrorMessagesEnum() {
257   - message = ErrorMessages.FIRST_ERROR_KEY;
258   - assertEquals(SeverityType.ERROR, message.getSeverity());
259   - assertEquals("First error message text", message.getText());
260   -
261   - message = ErrorMessages.SECOND_ERROR_KEY;
  250 + message = ErrorMessages.ERROR_KEY;
262 251 assertEquals(SeverityType.ERROR, message.getSeverity());
263   - assertEquals("Second error message text", message.getText());
  252 + assertEquals("Error message text", message.getText());
264 253  
265 254 message = ErrorMessages.LITERAL_ERROR_TEXT;
266 255 assertEquals(SeverityType.ERROR, message.getSeverity());
... ... @@ -269,19 +258,18 @@ public class DefaultMessageTest {
269 258  
270 259 interface MessagesInterface {
271 260  
272   - final Message FIRST_KEY = new DefaultMessage("first-key");
  261 + final Message FIRST_KEY = new DefaultMessage("{first-key}");
273 262  
274   - final Message SECOND_KEY = new DefaultMessage("second-key", SeverityType.WARN);
  263 + final Message SECOND_KEY = new DefaultMessage("{second-key}", SeverityType.WARN);
275 264  
276   - final Message THIRD_KEY = new DefaultMessage("THIRD_KEY");
  265 + final Message THIRD_KEY = new DefaultMessage("{THIRD_KEY}");
277 266  
278   - final Message FOURTH_KEY = new DefaultMessage("FOURTH_KEY", SeverityType.FATAL);
  267 + final Message FOURTH_KEY = new DefaultMessage("{FOURTH_KEY}", SeverityType.FATAL);
279 268  
280 269 final Message LITERAL_TEXT = new DefaultMessage("This is a literal text");
281 270  
282 271 }
283 272  
284   - @Ignore
285 273 @Test
286 274 public void testMessagesInterface() {
287 275 message = MessagesInterface.FIRST_KEY;
... ...
impl/core/src/test/resources/test-message.properties 0 → 100644
  Diff comments   View file @52f9910
... ... @@ -0,0 +1,6 @@
  1 +first-key=First message text
  2 +second-key=Second message text
  3 +THIRD_KEY=Third message text
  4 +FOURTH_KEY=Fourth message text
  5 +key=param {0} and param {1}
  6 +error-key=Error message text
0 7 \ No newline at end of file
... ...