Ajustes nos testes das extensões referentes à correção do

ResourceBundleProducer.

Ajustes nos testes das extensões referentes à correção do
ResourceBundleProducer.
Cleverson Sacramento
1 parent 880e82dd
Showing 3 changed files with 28 additions and 22 deletions Show diff stats
impl/extension/jpa/src/test/java/br/gov/frameworkdemoiselle/internal/producer/EntityManagerFactoryProducerTest.java
impl/extension/jpa/src/test/java/br/gov/frameworkdemoiselle/internal/producer/EntityManagerProducerTest.java
impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/template/AbstractEditPageBeanTest.java
@@ -9,6 +9,7 @@ import static org.powermock.reflect.Whitebox.setInternalState;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 import javax.persistence.EntityManagerFactory;
@@ -39,7 +40,7 @@ public class EntityManagerFactoryProducerTest {
 	@Before
 	public void setUp() {
 		logger = createMock(Logger.class);
-		bundle = new ResourceBundleProducer().create("demoiselle-jpa-bundle");
+		bundle = new ResourceBundleProducer().create("demoiselle-jpa-bundle", Locale.getDefault());
 		producer = new EntityManagerFactoryProducer();
 		cache = Collections.synchronizedMap(new HashMap<String, EntityManagerFactory>());
 		setInternalState(producer, Map.class, cache);
@@ -46,6 +46,7 @@ import static org.powermock.reflect.Whitebox.setInternalState;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 import javax.enterprise.inject.spi.Annotated;
@@ -86,11 +87,11 @@ public class EntityManagerProducerTest {
 	private Annotated annotated;
 	private Name name;
-	
+
 	private EntityManagerFactory emf;
-	
+
 	private Map<String, EntityManager> cache;
-	
+
 	private EntityManager em;
 	@Before
@@ -105,7 +106,7 @@ public class EntityManagerProducerTest {
 		replay(emf, Persistence.class);
 		producer = new EntityManagerProducer();
-		bundle = new ResourceBundleProducer().create("demoiselle-jpa-bundle");
+		bundle = new ResourceBundleProducer().create("demoiselle-jpa-bundle", Locale.getDefault());
 		logger = createMock(Logger.class);
 		setInternalState(producer, ResourceBundle.class, bundle);
@@ -126,14 +127,14 @@ public class EntityManagerProducerTest {
 		producer.close();
 		verify(em);
 	}
-	
+
 	@Test
 	public void testGetCache() {
 		cache = Collections.synchronizedMap(new HashMap<String, EntityManager>());
 		setInternalState(producer, Map.class, cache);
 		Assert.assertEquals(cache, producer.getCache());
 	}
-	
+
 	@After
 	public void tearDown() {
 		producer = null;
@@ -166,16 +167,16 @@ public class EntityManagerProducerTest {
 	@Test
 	public void testCreateWithPersistenceUnitNameFromPersistenceXML() {
-		
+
 		Map<String, EntityManagerFactory> cache = Collections
-		.synchronizedMap(new HashMap<String, EntityManagerFactory>());
-		
+				.synchronizedMap(new HashMap<String, EntityManagerFactory>());
+
 		cache.put("pu1", emf);
-		
+
 		EntityManagerFactoryProducer entityManagerFactoryProducer = createMock(EntityManagerFactoryProducer.class);
-		
+
 		expect(entityManagerFactoryProducer.getCache()).andReturn(cache);
-		
+
 		expect(annotated.isAnnotationPresent(Name.class)).andReturn(false);
 		expect(ip.getAnnotated()).andReturn(annotated).anyTimes();
 		expect(config.getPersistenceUnitName()).andReturn(null);
@@ -183,7 +184,7 @@ public class EntityManagerProducerTest {
 		replay(annotated, ip, config, entityManagerFactoryProducer);
 		setInternalState(producer, EntityManagerFactoryProducer.class, entityManagerFactoryProducer);
-		
+
 		EntityManagerProxy entityManagerProxy = (EntityManagerProxy) producer.create(ip, config);
 		assertNotNull(entityManagerProxy);
 	}
@@ -47,6 +47,8 @@ import static org.powermock.api.easymock.PowerMock.replayAll;
 import static org.powermock.api.easymock.PowerMock.verifyAll;
 import static org.powermock.reflect.Whitebox.setInternalState;
+import java.util.Locale;
+
 import javax.faces.component.UIViewRoot;
 import javax.faces.context.FacesContext;
 import javax.faces.convert.Converter;
@@ -70,7 +72,8 @@ 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, Faces.class })
+@PrepareForTest({ Parameter.class, Beans.class, Reflections.class, Converter.class, FacesContext.class, Util.class,
+		Faces.class })
 public class AbstractEditPageBeanTest {
 	private AbstractEditPageBean<Contact, Object> pageBean;
@@ -79,7 +82,7 @@ public class AbstractEditPageBeanTest {
 	@Before
 	public void before() {
-		bundle = new ResourceBundleProducer().create("demoiselle-jsf-bundle");
+		bundle = new ResourceBundleProducer().create("demoiselle-jsf-bundle", Locale.getDefault());
 		pageBean = new AbstractEditPageBean<Contact, Object>() {
@@ -242,23 +245,23 @@ public class AbstractEditPageBeanTest {
 	@SuppressWarnings("unchecked")
 	public void testGetLongId() {
 		mockStatic(Faces.class);
-		
+
 		FacesContext facesContext = createMock(FacesContext.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(Faces.getConverter(Long.class)).andReturn(converter);
 		expect(converter.getAsObject(facesContext, viewRoot, value)).andReturn(Long.valueOf(value));
-		
+
 		replayAll();
 		assertEquals(Long.valueOf(value), pageBean.getId());
 		verifyAll();
@@ -276,7 +279,8 @@ public class AbstractEditPageBeanTest {
 		try {
 			pageBean.getId();
 		} catch (DemoiselleException cause) {
-			assertEquals(bundle.getString("id-converter-not-found", Contact.class.getCanonicalName()), cause.getMessage());
+			assertEquals(bundle.getString("id-converter-not-found", Contact.class.getCanonicalName()),
+					cause.getMessage());
 		}
 		verifyAll();