Ajustes nos testes.

Wilson Guimarães
1 parent 25e25c89
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
impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/template/AbstractEditPageBeanTest.java
impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/util/FacesTest.java
@@ -80,7 +80,6 @@ public abstract class AbstractListPageBean&lt;T, I&gt; extends AbstractPageBean implem
 	@Override
 	public DataModel<T> getDataModel() {
-		System.out.println("MODIFICADO!!!!!##@#@#@@");
 		if (this.dataModel == null) {
 			this.dataModel = new ListDataModel<T>(this.getResultList());
 		}
@@ -62,6 +62,7 @@ import org.powermock.reflect.Whitebox;
 import br.gov.frameworkdemoiselle.DemoiselleException;
 import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
 import br.gov.frameworkdemoiselle.util.Beans;
+import br.gov.frameworkdemoiselle.util.Faces;
 import br.gov.frameworkdemoiselle.util.Parameter;
 import br.gov.frameworkdemoiselle.util.Reflections;
 import br.gov.frameworkdemoiselle.util.ResourceBundle;
@@ -69,7 +70,7 @@ import br.gov.frameworkdemoiselle.util.ResourceBundle;
 import com.sun.faces.util.Util;
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({ Parameter.class, Beans.class, Reflections.class, Converter.class, FacesContext.class, Util.class })
+@PrepareForTest({ Parameter.class, Beans.class, Reflections.class, Converter.class, FacesContext.class, Util.class, Faces.class })
 public class AbstractEditPageBeanTest {
 	private AbstractEditPageBean<Contact, Object> pageBean;
@@ -231,7 +232,6 @@ public class AbstractEditPageBeanTest {
 		String value = "1";
 		expect(parameter.getValue()).andReturn(value);
-		expect(Util.getConverterForClass(String.class, facesContext)).andReturn(null);
 		replayAll();
 		assertEquals(value, pageBean.getId());
@@ -241,23 +241,24 @@ public class AbstractEditPageBeanTest {
 	@Test
 	@SuppressWarnings("unchecked")
 	public void testGetLongId() {
-		mockStatic(Util.class);
-
+		mockStatic(Faces.class);
+		
 		FacesContext facesContext = createMock(FacesContext.class);
-		UIViewRoot viewRoot = createMock(UIViewRoot.class);
 		Converter converter = createMock(Converter.class);
+		UIViewRoot viewRoot = createMock(UIViewRoot.class);
 		Parameter<String> parameter = createMock(Parameter.class);
-
+		
 		setInternalState(pageBean, "facesContext", facesContext);
 		setInternalState(pageBean, "id", parameter);
 		setInternalState(pageBean, "idClass", Long.class, AbstractEditPageBean.class);
-
+		
 		String value = "1";
+		
 		expect(parameter.getValue()).andReturn(value);
 		expect(facesContext.getViewRoot()).andReturn(viewRoot);
-		expect(Util.getConverterForClass(Long.class, facesContext)).andReturn(converter);
+		expect(Faces.getConverter(Long.class)).andReturn(converter);
 		expect(converter.getAsObject(facesContext, viewRoot, value)).andReturn(Long.valueOf(value));
-
+		
 		replayAll();
 		assertEquals(Long.valueOf(value), pageBean.getId());
 		verifyAll();
@@ -270,7 +271,6 @@ public class AbstractEditPageBeanTest {
 		setInternalState(pageBean, "facesContext", facesContext);
 		setInternalState(pageBean, "idClass", Contact.class, AbstractEditPageBean.class);
 		setInternalState(pageBean, "bundle", bundle);
-		expect(Util.getConverterForClass(Contact.class, facesContext)).andReturn(null);
 		replayAll();
 		try {
@@ -46,6 +46,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import javax.faces.application.Application;
 import javax.faces.application.FacesMessage;
 import javax.faces.component.UIViewRoot;
 import javax.faces.context.FacesContext;
@@ -176,12 +177,14 @@ public class FacesTest {
 	@SuppressWarnings("static-access")
 	@Test
 	public void testGetConverter() {
+		Application application = PowerMock.createMock(Application.class);
 		Converter converter = PowerMock.createMock(Converter.class);
 		PowerMock.mockStatic(Util.class);
 		expect(Beans.getReference(FacesContext.class)).andReturn(facesContext);
-		expect(Util.getConverterForClass(getClass(), facesContext)).andReturn(converter);
-
+		expect(facesContext.getApplication()).andReturn(application);
+		expect(application.createConverter(getClass())).andReturn(converter);
+		
 		replayAll();
 		assertEquals(converter, faces.getConverter(getClass()));
 		verifyAll();
	@@ -80,7 +80,6 @@ public abstract class AbstractListPageBean<T, I> extends AbstractPageBean implem		@@ -80,7 +80,6 @@ public abstract class AbstractListPageBean<T, I> extends AbstractPageBean implem
80		80
81	@Override	81	@Override
82	public DataModel<T> getDataModel() {	82	public DataModel<T> getDataModel() {
83	- System.out.println("MODIFICADO!!!!!##@#@#@@");
84	if (this.dataModel == null) {	83	if (this.dataModel == null) {
85	this.dataModel = new ListDataModel<T>(this.getResultList());	84	this.dataModel = new ListDataModel<T>(this.getResultList());
86	}	85	}