From 2814060b34eb3d7e35737ef1fa7aeb9574697527 Mon Sep 17 00:00:00 2001 From: Cleverson Sacramento Date: Tue, 11 Dec 2012 16:21:17 -0300 Subject: [PATCH] Remoção de warnings --- impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/SecurityConfigTest.java | 3 +-- impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/MessageContextImplTest.java | 176 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------ impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/AuthorizationExceptionHandlerFactoryTest.java | 6 +++--- impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/ParameterImplTest.java | 29 ++++++++++++++--------------- 4 files changed, 104 insertions(+), 110 deletions(-) diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/SecurityConfigTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/SecurityConfigTest.java index 824e4a4..9d6a7a2 100644 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/SecurityConfigTest.java +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/SecurityConfigTest.java @@ -9,7 +9,6 @@ import br.gov.frameworkdemoiselle.internal.implementation.DefaultAuthenticator; import br.gov.frameworkdemoiselle.internal.implementation.DefaultAuthorizer; import br.gov.frameworkdemoiselle.security.Authenticator; import br.gov.frameworkdemoiselle.security.Authorizer; -import br.gov.frameworkdemoiselle.security.User; public class SecurityConfigTest { @@ -38,7 +37,7 @@ public class SecurityConfigTest { assertEquals("br.gov.frameworkdemoiselle.internal.implementation.DefaultAuthenticator", config .getAuthenticatorClass().getName()); } - + @Test public void testSetAuthorizerClass() { Authorizer authorizer = new DefaultAuthorizer(); diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/MessageContextImplTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/MessageContextImplTest.java index 8e831e2..f7ed8be 100644 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/MessageContextImplTest.java +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/MessageContextImplTest.java @@ -38,7 +38,6 @@ package br.gov.frameworkdemoiselle.internal.implementation; import static org.easymock.EasyMock.expect; import static org.powermock.api.easymock.PowerMock.mockStatic; -import static org.powermock.api.easymock.PowerMock.replay; import static org.powermock.api.easymock.PowerMock.replayAll; import java.util.Locale; @@ -51,10 +50,8 @@ import org.junit.runner.RunWith; import org.powermock.api.easymock.PowerMock; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import org.powermock.reflect.Whitebox; import org.slf4j.Logger; -import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer; import br.gov.frameworkdemoiselle.message.Message; import br.gov.frameworkdemoiselle.message.MessageContext; import br.gov.frameworkdemoiselle.message.SeverityType; @@ -68,19 +65,19 @@ public class MessageContextImplTest { MessageContext messageContext; Message m1; - + private ResourceBundle bundle; @SuppressWarnings("unused") @Before public void before() { messageContext = new MessageContextImpl(); - + Locale locale = Locale.getDefault(); - + mockStatic(Beans.class); expect(Beans.getReference(Locale.class)).andReturn(locale).anyTimes(); - + expect(Beans.getReference(ResourceBundle.class)).andReturn(bundle).anyTimes(); replayAll(Beans.class); @@ -150,20 +147,20 @@ public class MessageContextImplTest { messageContext.add(m1); Assert.assertTrue(messageContext.getMessages().size() == 1); Assert.assertTrue(messageContext.getMessages().get(0).getText().equals(m1.getText())); - Assert.assertTrue(messageContext.getMessages().get(0).getSeverity().equals(m1.getSeverity())); + Assert.assertTrue(messageContext.getMessages().get(0).getSeverity().equals(m1.getSeverity())); } - + @Test public void testClearMessages() { Assert.assertTrue(messageContext.getMessages().isEmpty()); messageContext.add(m1); - messageContext.add(m1, null); - + messageContext.add(m1, (Object[]) null); + Assert.assertTrue(messageContext.getMessages().size() == 2); - + messageContext.clear(); - + Assert.assertTrue(messageContext.getMessages().isEmpty()); } @@ -171,88 +168,87 @@ public class MessageContextImplTest { public void testGetMessages() { Assert.assertNotNull(messageContext.getMessages()); Assert.assertTrue(messageContext.getMessages().isEmpty()); - + messageContext.add("key1"); Assert.assertTrue(messageContext.getMessages().size() == 1); - + messageContext.add("key2"); Assert.assertTrue(messageContext.getMessages().size() == 2); - + Assert.assertTrue(messageContext.getMessages().get(0).getText().equals("key1")); Assert.assertTrue(messageContext.getMessages().get(1).getText().equals("key2")); } -// @Test -// public void testAddMessageObjectArray() { -// Object[] param = { "1", "2" }; -// messageContext.add(m1, param); - -// Assert.assertTrue(messageContext.getMessages().size() == 1); -// Assert.assertTrue(messageContext.getMessages().contains(m1)); -// Assert.assertNotNull(messageContext.getMessages().get(0).getParameters()); -// Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[0] == param[0]); -// Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[1] == param[1]); -// } - -// @Test -// public void testAddStringObjectArray() { -// String key = "my.key"; -// Object[] param = { "1", "2" }; -// messageContext.add(key, param); -// -// Assert.assertTrue(messageContext.getMessages().size() == 1); -// Assert.assertTrue(messageContext.getMessages().get(0).getText().equals(key)); -// Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[0] == param[0]); -// Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[1] == param[1]); -// } -// -// @Test -// public void testAddStringLocaleObjectArray() { -// String key = "my.key"; -// Object[] param = { "1", "2" }; -// Locale locale = Locale.CANADA_FRENCH; -// messageContext.add(key, locale, param); -// -// Assert.assertTrue(messageContext.getMessages().size() == 1); -// Assert.assertTrue(messageContext.getMessages().get(0).getText().equals(key)); -// Assert.assertTrue(messageContext.getMessages().get(0).getLocale().equals(locale)); -// Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[0] == param[0]); -// Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[1] == param[1]); -// } -// -// @Test -// public void testAddStringLocaleSeverityTypeObjectArray() { -// String key = "my.key"; -// Object[] param = { "1", "2" }; -// Locale locale = Locale.CANADA_FRENCH; -// SeverityType severity = SeverityType.ERROR; -// messageContext.add(key, locale, severity, param); -// -// Assert.assertTrue(messageContext.getMessages().size() == 1); -// Assert.assertTrue(messageContext.getMessages().get(0).getText().equals(key)); -// Assert.assertTrue(messageContext.getMessages().get(0).getLocale().equals(locale)); -// Assert.assertTrue(messageContext.getMessages().get(0).getSeverity().equals(severity)); -// Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[0] == param[0]); -// Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[1] == param[1]); -// } -// -// @Test -// public void testAddStringLocaleSeverityTypeStringObjectArray() { -// String key = "my.key"; -// Object[] param = { "1", "2" }; -// Locale locale = Locale.CANADA_FRENCH; -// SeverityType severity = SeverityType.ERROR; -// String resource = "myresourcename"; -// messageContext.add(key, locale, severity, resource, param); -// -// Assert.assertTrue(messageContext.getMessages().size() == 1); -// Assert.assertTrue(messageContext.getMessages().get(0).getText().equals(key)); -// Assert.assertTrue(messageContext.getMessages().get(0).getLocale().equals(locale)); -// Assert.assertTrue(messageContext.getMessages().get(0).getSeverity().equals(severity)); -// Assert.assertTrue(messageContext.getMessages().get(0).getResourceName().equals(resource)); -// Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[0] == param[0]); -// Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[1] == param[1]); -// } - - -} \ No newline at end of file + // @Test + // public void testAddMessageObjectArray() { + // Object[] param = { "1", "2" }; + // messageContext.add(m1, param); + + // Assert.assertTrue(messageContext.getMessages().size() == 1); + // Assert.assertTrue(messageContext.getMessages().contains(m1)); + // Assert.assertNotNull(messageContext.getMessages().get(0).getParameters()); + // Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[0] == param[0]); + // Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[1] == param[1]); + // } + + // @Test + // public void testAddStringObjectArray() { + // String key = "my.key"; + // Object[] param = { "1", "2" }; + // messageContext.add(key, param); + // + // Assert.assertTrue(messageContext.getMessages().size() == 1); + // Assert.assertTrue(messageContext.getMessages().get(0).getText().equals(key)); + // Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[0] == param[0]); + // Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[1] == param[1]); + // } + // + // @Test + // public void testAddStringLocaleObjectArray() { + // String key = "my.key"; + // Object[] param = { "1", "2" }; + // Locale locale = Locale.CANADA_FRENCH; + // messageContext.add(key, locale, param); + // + // Assert.assertTrue(messageContext.getMessages().size() == 1); + // Assert.assertTrue(messageContext.getMessages().get(0).getText().equals(key)); + // Assert.assertTrue(messageContext.getMessages().get(0).getLocale().equals(locale)); + // Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[0] == param[0]); + // Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[1] == param[1]); + // } + // + // @Test + // public void testAddStringLocaleSeverityTypeObjectArray() { + // String key = "my.key"; + // Object[] param = { "1", "2" }; + // Locale locale = Locale.CANADA_FRENCH; + // SeverityType severity = SeverityType.ERROR; + // messageContext.add(key, locale, severity, param); + // + // Assert.assertTrue(messageContext.getMessages().size() == 1); + // Assert.assertTrue(messageContext.getMessages().get(0).getText().equals(key)); + // Assert.assertTrue(messageContext.getMessages().get(0).getLocale().equals(locale)); + // Assert.assertTrue(messageContext.getMessages().get(0).getSeverity().equals(severity)); + // Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[0] == param[0]); + // Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[1] == param[1]); + // } + // + // @Test + // public void testAddStringLocaleSeverityTypeStringObjectArray() { + // String key = "my.key"; + // Object[] param = { "1", "2" }; + // Locale locale = Locale.CANADA_FRENCH; + // SeverityType severity = SeverityType.ERROR; + // String resource = "myresourcename"; + // messageContext.add(key, locale, severity, resource, param); + // + // Assert.assertTrue(messageContext.getMessages().size() == 1); + // Assert.assertTrue(messageContext.getMessages().get(0).getText().equals(key)); + // Assert.assertTrue(messageContext.getMessages().get(0).getLocale().equals(locale)); + // Assert.assertTrue(messageContext.getMessages().get(0).getSeverity().equals(severity)); + // Assert.assertTrue(messageContext.getMessages().get(0).getResourceName().equals(resource)); + // Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[0] == param[0]); + // Assert.assertTrue(messageContext.getMessages().get(0).getParameters()[1] == param[1]); + // } + +} diff --git a/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/AuthorizationExceptionHandlerFactoryTest.java b/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/AuthorizationExceptionHandlerFactoryTest.java index a73b95a..787ad16 100644 --- a/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/AuthorizationExceptionHandlerFactoryTest.java +++ b/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/AuthorizationExceptionHandlerFactoryTest.java @@ -35,7 +35,7 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. */ package br.gov.frameworkdemoiselle.internal.implementation; -import org.junit.Ignore; + import static junit.framework.Assert.assertEquals; import static org.easymock.EasyMock.expect; import static org.powermock.api.easymock.PowerMock.replayAll; @@ -54,7 +54,7 @@ public class AuthorizationExceptionHandlerFactoryTest { @Test public void testGetExceptionHandler() { - + ExceptionHandler jsfExceptionHandler = PowerMock.createMock(ExceptionHandler.class); ExceptionHandlerFactory jsfFactory = PowerMock.createMock(ExceptionHandlerFactory.class); @@ -69,7 +69,7 @@ public class AuthorizationExceptionHandlerFactoryTest { assertEquals(handler.getWrapped(), jsfExceptionHandler); verifyAll(); - + } } diff --git a/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/ParameterImplTest.java b/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/ParameterImplTest.java index 45798ee..4c6263e 100644 --- a/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/ParameterImplTest.java +++ b/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/ParameterImplTest.java @@ -54,7 +54,6 @@ import javax.enterprise.inject.spi.InjectionPoint; import javax.faces.convert.Converter; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; -import javax.swing.text.View; import org.easymock.EasyMock; import org.junit.Before; @@ -155,7 +154,7 @@ public class ParameterImplTest { public void testGetValueWhenSessionScopedAndParameterValueNotNull() { this.prepareForTestWithKeyFromNameAnnotation(); expect(Faces.getConverter(EasyMock.anyObject(Class.class))).andReturn(converter); - + mockStatic(Beans.class); expect(Beans.getReference(HttpServletRequest.class)).andReturn(request).anyTimes(); @@ -179,7 +178,7 @@ public class ParameterImplTest { @Test public void testGetValueWhenSessionScopedAndParameterValueNull() { this.prepareForTestWithKeyFromNameAnnotation(); - + mockStatic(Beans.class); expect(Beans.getReference(HttpServletRequest.class)).andReturn(request).anyTimes(); @@ -200,17 +199,17 @@ public class ParameterImplTest { public void testGetValueWhenRequestScoped() { this.prepareForTestWithKeyFromNameAnnotation(); expect(Faces.getConverter(EasyMock.anyObject(Class.class))).andReturn(converter); - + mockStatic(Beans.class); expect(Beans.getReference(HttpServletRequest.class)).andReturn(request).anyTimes(); - + expect(annotated.isAnnotationPresent(SessionScoped.class)).andReturn(false); expect(annotated.isAnnotationPresent(RequestScoped.class)).andReturn(true); expect(annotated.isAnnotationPresent(ViewScoped.class)).andReturn(false); expect(request.getParameter(EasyMock.anyObject(String.class))).andReturn("1"); expect(request.getSession()).andReturn(session).anyTimes(); expect(Faces.convert("1", converter)).andReturn("return"); - + replayAll(); param = new ParameterImpl(ip); assertEquals("return", param.getValue()); @@ -221,11 +220,11 @@ public class ParameterImplTest { public void testGetValueWhenViewScopedWithParamValueNotNull() { this.prepareForTestWithKeyFromNameAnnotation(); expect(Faces.getConverter(EasyMock.anyObject(Class.class))).andReturn(converter); - Map map = new HashMap(); - + Map map = new HashMap(); + mockStatic(Beans.class); expect(Beans.getReference(HttpServletRequest.class)).andReturn(request).anyTimes(); - + expect(annotated.isAnnotationPresent(SessionScoped.class)).andReturn(false); expect(annotated.isAnnotationPresent(RequestScoped.class)).andReturn(false); expect(annotated.isAnnotationPresent(ViewScoped.class)).andReturn(true); @@ -243,12 +242,12 @@ public class ParameterImplTest { @Test public void testGetValueWhenViewScopedWithParamValueNull() { this.prepareForTestWithKeyFromNameAnnotation(); - Map map = new HashMap(); + Map map = new HashMap(); map.put("name", "ops"); mockStatic(Beans.class); expect(Beans.getReference(HttpServletRequest.class)).andReturn(request).anyTimes(); - + expect(annotated.isAnnotationPresent(SessionScoped.class)).andReturn(false); expect(annotated.isAnnotationPresent(RequestScoped.class)).andReturn(false); expect(annotated.isAnnotationPresent(ViewScoped.class)).andReturn(true); @@ -269,13 +268,13 @@ public class ParameterImplTest { mockStatic(Beans.class); expect(Beans.getReference(HttpServletRequest.class)).andReturn(request).anyTimes(); - + expect(annotated.isAnnotationPresent(SessionScoped.class)).andReturn(false); expect(annotated.isAnnotationPresent(RequestScoped.class)).andReturn(false); expect(annotated.isAnnotationPresent(ViewScoped.class)).andReturn(false); expect(request.getParameter(EasyMock.anyObject(String.class))).andReturn("1"); expect(Faces.convert("1", converter)).andReturn("return"); - + replayAll(); param = new ParameterImpl(ip); assertEquals("return", param.getValue()); @@ -288,7 +287,7 @@ public class ParameterImplTest { mockStatic(Beans.class); expect(Beans.getReference(HttpServletRequest.class)).andReturn(request).anyTimes(); - + expect(annotated.isAnnotationPresent(SessionScoped.class)).andReturn(false); expect(annotated.isAnnotationPresent(RequestScoped.class)).andReturn(false); expect(annotated.isAnnotationPresent(ViewScoped.class)).andReturn(false); @@ -307,7 +306,7 @@ public class ParameterImplTest { mockStatic(Beans.class); expect(Beans.getReference(HttpServletRequest.class)).andReturn(request).anyTimes(); - + expect(annotated.isAnnotationPresent(SessionScoped.class)).andReturn(true); expect(annotated.isAnnotationPresent(RequestScoped.class)).andReturn(false); expect(annotated.isAnnotationPresent(ViewScoped.class)).andReturn(false); -- libgit2 0.21.2