From 77d7a60ddcb7d77b551f6e2f9dd1c9bab33a10b2 Mon Sep 17 00:00:00 2001 From: Wilson Guimarães Date: Fri, 6 Jan 2012 10:55:50 -0300 Subject: [PATCH] Ajustes nos testes. --- impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/template/AbstractListPageBean.java | 1 - impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/template/AbstractEditPageBeanTest.java | 20 ++++++++++---------- impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/util/FacesTest.java | 7 +++++-- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/template/AbstractListPageBean.java b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/template/AbstractListPageBean.java index b329d62..107f78d 100644 --- a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/template/AbstractListPageBean.java +++ b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/template/AbstractListPageBean.java @@ -80,7 +80,6 @@ public abstract class AbstractListPageBean extends AbstractPageBean implem @Override public DataModel getDataModel() { - System.out.println("MODIFICADO!!!!!##@#@#@@"); if (this.dataModel == null) { this.dataModel = new ListDataModel(this.getResultList()); } diff --git a/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/template/AbstractEditPageBeanTest.java b/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/template/AbstractEditPageBeanTest.java index 48dc0ca..8ab67c4 100644 --- a/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/template/AbstractEditPageBeanTest.java +++ b/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/template/AbstractEditPageBeanTest.java @@ -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 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 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 { diff --git a/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/util/FacesTest.java b/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/util/FacesTest.java index adf67a3..50a8302 100644 --- a/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/util/FacesTest.java +++ b/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/util/FacesTest.java @@ -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(); -- libgit2 0.21.2