Download as
Browse Code »

Commit b17f5cb6ea9bb9afd1c6b4ef419e460913ec0bbc

Authored by Dancovich
2 parents dcc1ddee 2c5f218f
Exists in master

Merge branch 'master' of https://github.com/demoiselle/framework

Showing 3 changed files with 139 additions and 122 deletions   Show diff stats
impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/MessageContextImplTest.java
  Diff comments   View file @b17f5cb
... ... @@ -34,123 +34,136 @@
34 34 * ou escreva para a Fundação do Software Livre (FSF) Inc.,
35 35 * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
36 36 */
37   -//package br.gov.frameworkdemoiselle.internal.implementation;
38   -//
39   -//import java.util.Locale;
40   -//
41   -//import junit.framework.Assert;
42   -//
43   -//import org.junit.Before;
44   -//import org.junit.Test;
45   -//import org.junit.runner.RunWith;
46   -//import org.powermock.api.easymock.PowerMock;
47   -//import org.powermock.modules.junit4.PowerMockRunner;
48   -//import org.powermock.reflect.Whitebox;
49   -//import org.slf4j.Logger;
50   -//
51   -//import br.gov.frameworkdemoiselle.message.Message;
52   -//import br.gov.frameworkdemoiselle.message.MessageContext;
53   -//import br.gov.frameworkdemoiselle.message.SeverityType;
54   -//import br.gov.frameworkdemoiselle.util.ResourceBundle;
55   -//
56   -//@RunWith(PowerMockRunner.class)
57   -//public class MessageContextImplTest {
58   -//
59   -// MessageContext messageContext;
60   -//
61   -// Message m1;
62   -//
63   -// @SuppressWarnings("unused")
64   -// @Before
65   -// public void before() {
66   -// messageContext = new MessageContextImpl();
67   -//
68   -// Logger logger = PowerMock.createMock(Logger.class);
69   -// ResourceBundle bundle = new ResourceBundle(ResourceBundle.getBundle("demoiselle-core-bundle"));
70   -//
71   -// Whitebox.setInternalState(messageContext, "logger", logger);
72   -// Whitebox.setInternalState(messageContext, "bundle", bundle);
73   -//
74   -// m1 = new Message() {
75   -//
76   -// private String key = "m1.message";
77   -//
78   -// private String resourceName = "messages";
79   -//
80   -// private Locale locale = Locale.getDefault();
81   -//
82   -// private SeverityType severityType = SeverityType.INFO;
83   -//
84   -// private Object[] parameters = {};
85   -//
86   -// public String getText() {
87   -// return key;
88   -// }
89   -//
90   -// public void setKey(String key) {
91   -// this.key = key;
92   -// }
93   -//
94   -// public String getResourceName() {
95   -// return resourceName;
96   -// }
97   -//
98   -// public void setResourceName(String resourceName) {
99   -// this.resourceName = resourceName;
100   -// }
101   -//
102   -// public Locale getLocale() {
103   -// return locale;
104   -// }
105   -//
106   -// public void setLocale(Locale locale) {
107   -// this.locale = locale;
108   -// }
109   -//
110   -// public SeverityType getSeverity() {
111   -// return severityType;
112   -// }
113   -//
114   -// public void setSeverityType(SeverityType severityType) {
115   -// this.severityType = severityType;
116   -// }
117   -//
118   -// public Object[] getParameters() {
119   -// return parameters;
120   -// }
121   -//
122   -// public Message setParameters(Object[] parameters) {
123   -// this.parameters = parameters;
124   -// return this;
125   -// }
126   -//
127   -// public String getStringMessage() {
128   -// return "stringMessage";
129   -// }
130   -// };
131   -// }
132   -//
  37 +package br.gov.frameworkdemoiselle.internal.implementation;
  38 +
  39 +import static org.easymock.EasyMock.expect;
  40 +import static org.powermock.api.easymock.PowerMock.mockStatic;
  41 +import static org.powermock.api.easymock.PowerMock.replay;
  42 +import static org.powermock.api.easymock.PowerMock.replayAll;
  43 +
  44 +import java.util.Locale;
  45 +
  46 +import junit.framework.Assert;
  47 +
  48 +import org.junit.Before;
  49 +import org.junit.Test;
  50 +import org.junit.runner.RunWith;
  51 +import org.powermock.api.easymock.PowerMock;
  52 +import org.powermock.core.classloader.annotations.PrepareForTest;
  53 +import org.powermock.modules.junit4.PowerMockRunner;
  54 +import org.powermock.reflect.Whitebox;
  55 +import org.slf4j.Logger;
  56 +
  57 +import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
  58 +import br.gov.frameworkdemoiselle.message.Message;
  59 +import br.gov.frameworkdemoiselle.message.MessageContext;
  60 +import br.gov.frameworkdemoiselle.message.SeverityType;
  61 +import br.gov.frameworkdemoiselle.util.Beans;
  62 +import br.gov.frameworkdemoiselle.util.ResourceBundle;
  63 +
  64 +@RunWith(PowerMockRunner.class)
  65 +@PrepareForTest({ Beans.class, ResourceBundle.class })
  66 +public class MessageContextImplTest {
  67 +
  68 + MessageContext messageContext;
  69 +
  70 + Message m1;
  71 +
  72 + private ResourceBundle bundle;
  73 +
  74 + @SuppressWarnings("unused")
  75 + @Before
  76 + public void before() {
  77 + messageContext = new MessageContextImpl();
  78 +
  79 + Locale locale = Locale.getDefault();
  80 +
  81 + mockStatic(Beans.class);
  82 + expect(Beans.getReference(Locale.class)).andReturn(locale).anyTimes();
  83 +
  84 + expect(Beans.getReference(ResourceBundle.class)).andReturn(bundle).anyTimes();
  85 + replayAll(Beans.class);
  86 +
  87 + Logger logger = PowerMock.createMock(Logger.class);
  88 +
  89 + m1 = new Message() {
  90 +
  91 + private String key = "m1.message";
  92 +
  93 + private String resourceName = "messages";
  94 +
  95 + private Locale locale = Locale.getDefault();
  96 +
  97 + private SeverityType severityType = SeverityType.INFO;
  98 +
  99 + private Object[] parameters = {};
  100 +
  101 + public String getText() {
  102 + return key;
  103 + }
  104 +
  105 + public void setKey(String key) {
  106 + this.key = key;
  107 + }
  108 +
  109 + public String getResourceName() {
  110 + return resourceName;
  111 + }
  112 +
  113 + public void setResourceName(String resourceName) {
  114 + this.resourceName = resourceName;
  115 + }
  116 +
  117 + public Locale getLocale() {
  118 + return locale;
  119 + }
  120 +
  121 + public void setLocale(Locale locale) {
  122 + this.locale = locale;
  123 + }
  124 +
  125 + public SeverityType getSeverity() {
  126 + return severityType;
  127 + }
  128 +
  129 + public void setSeverityType(SeverityType severityType) {
  130 + this.severityType = severityType;
  131 + }
  132 +
  133 + public Object[] getParameters() {
  134 + return parameters;
  135 + }
  136 +
  137 + public Message setParameters(Object[] parameters) {
  138 + this.parameters = parameters;
  139 + return this;
  140 + }
  141 +
  142 + public String getStringMessage() {
  143 + return "stringMessage";
  144 + }
  145 + };
  146 + }
  147 +
133 148 // @Test
134 149 // public void testAddMessage() {
135 150 // messageContext.add(m1);
136 151 // Assert.assertTrue(messageContext.getMessages().size() == 1);
137 152 // Assert.assertTrue(messageContext.getMessages().contains(m1));
138   -//
139 153 // }
140   -//
  154 +
141 155 // @Test
142 156 // public void testAddMessageObjectArray() {
143 157 // Object[] param = { "1", "2" };
144 158 // messageContext.add(m1, param);
145   -//
  159 +
146 160 // Assert.assertTrue(messageContext.getMessages().size() == 1);
147 161 // Assert.assertTrue(messageContext.getMessages().contains(m1));
148 162 // Assert.assertNotNull(messageContext.getMessages().get(0).getParameters());
149 163 // Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[0] == param[0]);
150 164 // Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[1] == param[1]);
151   -//
152 165 // }
153   -//
  166 +
154 167 // @Test
155 168 // public void testAddStringObjectArray() {
156 169 // String key = "my.key";
... ... @@ -210,20 +223,20 @@
210 223 // Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[0] == param[0]);
211 224 // Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[1] == param[1]);
212 225 // }
213   -//
214   -// @Test
215   -// public void testGetMessages() {
216   -// Assert.assertNotNull(messageContext.getMessages());
217   -// Assert.assertTrue(messageContext.getMessages().isEmpty());
218   -//
219   -// messageContext.add("key1");
220   -// Assert.assertTrue(messageContext.getMessages().size() == 1);
221   -//
222   -// messageContext.add("key2");
223   -// Assert.assertTrue(messageContext.getMessages().size() == 2);
224   -//
225   -// Assert.assertTrue(messageContext.getMessages().get(0).getText().equals("key1"));
226   -// Assert.assertTrue(messageContext.getMessages().get(1).getText().equals("key2"));
227   -// }
228   -//
229   -//}
  226 +
  227 + @Test
  228 + public void testGetMessages() {
  229 + Assert.assertNotNull(messageContext.getMessages());
  230 + Assert.assertTrue(messageContext.getMessages().isEmpty());
  231 +
  232 + messageContext.add("key1");
  233 + Assert.assertTrue(messageContext.getMessages().size() == 1);
  234 +
  235 + messageContext.add("key2");
  236 + Assert.assertTrue(messageContext.getMessages().size() == 2);
  237 +
  238 + Assert.assertTrue(messageContext.getMessages().get(0).getText().equals("key1"));
  239 + Assert.assertTrue(messageContext.getMessages().get(1).getText().equals("key2"));
  240 + }
  241 +
  242 +}
230 243 \ No newline at end of file
... ...
pom.xml
  Diff comments   View file @b17f5cb
... ... @@ -45,7 +45,7 @@
45 45 <parent>
46 46 <groupId>br.gov.frameworkdemoiselle</groupId>
47 47 <artifactId>demoiselle-build-parent</artifactId>
48   - <version>3</version>
  48 + <version>4</version>
49 49 <relativePath>../internal/parent/build/demoiselle</relativePath>
50 50 </parent>
51 51  
... ... @@ -96,7 +96,8 @@
96 96 <connection>scm:git:git@github.com:demoiselle/${project.alias}.git</connection>
97 97 <developerConnection>scm:git:git@github.com:demoiselle/${project.alias}.git</developerConnection>
98 98 <url>http://github.com/demoiselle/${project.alias}</url>
99   - </scm>
  99 + <tag>HEAD</tag>
  100 + </scm>
100 101  
101 102 <repositories>
102 103 <repository>
... ... @@ -132,6 +133,5 @@
132 133  
133 134 <properties>
134 135 <project.alias>framework</project.alias>
135   - <project.nextVersion>2.3.0-SNAPSHOT</project.nextVersion>
136 136 </properties>
137 137 </project>
... ...
site/apt/release-notes.apt
  Diff comments   View file @b17f5cb
... ... @@ -38,7 +38,11 @@
38 38  
39 39 Notas de Versão
40 40  
41   -* v2.3.0-RC2
  41 +* v2.3.0-RC3
  42 +
  43 + * {{{http://sourceforge.net/apps/mantisbt/demoiselle/view.php?id=0000869}0000869}} [Task] Atualização para versão 2.3.2 do plugin de release.
  44 +
  45 +* {{{../2.3.0-RC2/}v2.3.0-RC2}}
42 46  
43 47 * {{{http://sourceforge.net/apps/mantisbt/demoiselle/view.php?id=0000864}0000864}} [Bug] Correção no redirecionamento de URL na extensão JSF.
44 48  
... ...