Download as
Browse Code »

Commit 77d7a60ddcb7d77b551f6e2f9dd1c9bab33a10b2

Authored by Wilson Guimarães
1 parent 25e25c89
Exists in master

Ajustes nos testes.

Showing 3 changed files with 15 additions and 13 deletions   Show diff stats
impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/template/AbstractListPageBean.java
  Diff comments   View file @77d7a60
... ... @@ -80,7 +80,6 @@ public abstract class AbstractListPageBean<T, I> extends AbstractPageBean implem
80 80  
81 81 @Override
82 82 public DataModel<T> getDataModel() {
83   - System.out.println("MODIFICADO!!!!!##@#@#@@");
84 83 if (this.dataModel == null) {
85 84 this.dataModel = new ListDataModel<T>(this.getResultList());
86 85 }
... ...
impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/template/AbstractEditPageBeanTest.java
  Diff comments   View file @77d7a60
... ... @@ -62,6 +62,7 @@ import org.powermock.reflect.Whitebox;
62 62 import br.gov.frameworkdemoiselle.DemoiselleException;
63 63 import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
64 64 import br.gov.frameworkdemoiselle.util.Beans;
  65 +import br.gov.frameworkdemoiselle.util.Faces;
65 66 import br.gov.frameworkdemoiselle.util.Parameter;
66 67 import br.gov.frameworkdemoiselle.util.Reflections;
67 68 import br.gov.frameworkdemoiselle.util.ResourceBundle;
... ... @@ -69,7 +70,7 @@ import br.gov.frameworkdemoiselle.util.ResourceBundle;
69 70 import com.sun.faces.util.Util;
70 71  
71 72 @RunWith(PowerMockRunner.class)
72   -@PrepareForTest({ Parameter.class, Beans.class, Reflections.class, Converter.class, FacesContext.class, Util.class })
  73 +@PrepareForTest({ Parameter.class, Beans.class, Reflections.class, Converter.class, FacesContext.class, Util.class, Faces.class })
73 74 public class AbstractEditPageBeanTest {
74 75  
75 76 private AbstractEditPageBean<Contact, Object> pageBean;
... ... @@ -231,7 +232,6 @@ public class AbstractEditPageBeanTest {
231 232  
232 233 String value = "1";
233 234 expect(parameter.getValue()).andReturn(value);
234   - expect(Util.getConverterForClass(String.class, facesContext)).andReturn(null);
235 235  
236 236 replayAll();
237 237 assertEquals(value, pageBean.getId());
... ... @@ -241,23 +241,24 @@ public class AbstractEditPageBeanTest {
241 241 @Test
242 242 @SuppressWarnings("unchecked")
243 243 public void testGetLongId() {
244   - mockStatic(Util.class);
245   -
  244 + mockStatic(Faces.class);
  245 +
246 246 FacesContext facesContext = createMock(FacesContext.class);
247   - UIViewRoot viewRoot = createMock(UIViewRoot.class);
248 247 Converter converter = createMock(Converter.class);
  248 + UIViewRoot viewRoot = createMock(UIViewRoot.class);
249 249 Parameter<String> parameter = createMock(Parameter.class);
250   -
  250 +
251 251 setInternalState(pageBean, "facesContext", facesContext);
252 252 setInternalState(pageBean, "id", parameter);
253 253 setInternalState(pageBean, "idClass", Long.class, AbstractEditPageBean.class);
254   -
  254 +
255 255 String value = "1";
  256 +
256 257 expect(parameter.getValue()).andReturn(value);
257 258 expect(facesContext.getViewRoot()).andReturn(viewRoot);
258   - expect(Util.getConverterForClass(Long.class, facesContext)).andReturn(converter);
  259 + expect(Faces.getConverter(Long.class)).andReturn(converter);
259 260 expect(converter.getAsObject(facesContext, viewRoot, value)).andReturn(Long.valueOf(value));
260   -
  261 +
261 262 replayAll();
262 263 assertEquals(Long.valueOf(value), pageBean.getId());
263 264 verifyAll();
... ... @@ -270,7 +271,6 @@ public class AbstractEditPageBeanTest {
270 271 setInternalState(pageBean, "facesContext", facesContext);
271 272 setInternalState(pageBean, "idClass", Contact.class, AbstractEditPageBean.class);
272 273 setInternalState(pageBean, "bundle", bundle);
273   - expect(Util.getConverterForClass(Contact.class, facesContext)).andReturn(null);
274 274  
275 275 replayAll();
276 276 try {
... ...
impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/util/FacesTest.java
  Diff comments   View file @77d7a60
... ... @@ -46,6 +46,7 @@ import java.util.HashMap;
46 46 import java.util.List;
47 47 import java.util.Map;
48 48  
  49 +import javax.faces.application.Application;
49 50 import javax.faces.application.FacesMessage;
50 51 import javax.faces.component.UIViewRoot;
51 52 import javax.faces.context.FacesContext;
... ... @@ -176,12 +177,14 @@ public class FacesTest {
176 177 @SuppressWarnings("static-access")
177 178 @Test
178 179 public void testGetConverter() {
  180 + Application application = PowerMock.createMock(Application.class);
179 181 Converter converter = PowerMock.createMock(Converter.class);
180 182 PowerMock.mockStatic(Util.class);
181 183  
182 184 expect(Beans.getReference(FacesContext.class)).andReturn(facesContext);
183   - expect(Util.getConverterForClass(getClass(), facesContext)).andReturn(converter);
184   -
  185 + expect(facesContext.getApplication()).andReturn(application);
  186 + expect(application.createConverter(getClass())).andReturn(converter);
  187 +
185 188 replayAll();
186 189 assertEquals(converter, faces.getConverter(getClass()));
187 190 verifyAll();
... ...