diff --git a/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/context/ViewContextTest.java b/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/context/ViewContextTest.java index 1364c33..d3e94ef 100644 --- a/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/context/ViewContextTest.java +++ b/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/context/ViewContextTest.java @@ -35,7 +35,7 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. */ package br.gov.frameworkdemoiselle.internal.context; -import org.junit.Ignore; + import static junit.framework.Assert.assertEquals; import java.util.Map; @@ -53,7 +53,7 @@ import org.powermock.modules.junit4.PowerMockRunner; import br.gov.frameworkdemoiselle.annotation.ViewScoped; import br.gov.frameworkdemoiselle.util.Faces; -@Ignore + @RunWith(PowerMockRunner.class) @PrepareForTest({ Faces.class }) public class ViewContextTest { @@ -142,4 +142,13 @@ public class ViewContextTest { public void testIsActive() { assertEquals(true, context.isActive()); } + + @Test + public void testSetActive() { + context.setActive(false); + assertEquals(false, context.isActive()); + } + } + + diff --git a/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/ApplicationExceptionHandlerFactoryTest.java b/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/ApplicationExceptionHandlerFactoryTest.java index 06efdd4..6e5fe7a 100644 --- a/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/ApplicationExceptionHandlerFactoryTest.java +++ b/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/ApplicationExceptionHandlerFactoryTest.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; @@ -48,7 +48,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.powermock.api.easymock.PowerMock; import org.powermock.modules.junit4.PowerMockRunner; -@Ignore + @RunWith(PowerMockRunner.class) public class ApplicationExceptionHandlerFactoryTest { diff --git a/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/AuthenticationExceptionHandlerFactoryTest.java b/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/AuthenticationExceptionHandlerFactoryTest.java index fd60dbe..d8a163f 100644 --- a/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/AuthenticationExceptionHandlerFactoryTest.java +++ b/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/AuthenticationExceptionHandlerFactoryTest.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; @@ -48,13 +48,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.powermock.api.easymock.PowerMock; import org.powermock.modules.junit4.PowerMockRunner; -@Ignore + @RunWith(PowerMockRunner.class) public class AuthenticationExceptionHandlerFactoryTest { @Test public void testGetExceptionHandler() { - + ExceptionHandler jsfExceptionHandler = PowerMock.createMock(ExceptionHandler.class); ExceptionHandlerFactory jsfFactory = PowerMock.createMock(ExceptionHandlerFactory.class); @@ -69,7 +69,7 @@ public class AuthenticationExceptionHandlerFactoryTest { assertEquals(handler.getWrapped(), jsfExceptionHandler); verifyAll(); - + } } diff --git a/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/AuthenticationExceptionHandlerTest.java b/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/AuthenticationExceptionHandlerTest.java index f2f47ff..f2436dd 100644 --- a/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/AuthenticationExceptionHandlerTest.java +++ b/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/AuthenticationExceptionHandlerTest.java @@ -1,134 +1,134 @@ -///* -// * Demoiselle Framework -// * Copyright (C) 2010 SERPRO -// * ---------------------------------------------------------------------------- -// * This file is part of Demoiselle Framework. -// * -// * Demoiselle Framework is free software; you can redistribute it and/or -// * modify it under the terms of the GNU Lesser General Public License version 3 -// * as published by the Free Software Foundation. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have received a copy of the GNU Lesser General Public License version 3 -// * along with this program; if not, see -// * or write to the Free Software Foundation, Inc., 51 Franklin Street, -// * Fifth Floor, Boston, MA 02110-1301, USA. -// * ---------------------------------------------------------------------------- -// * Este arquivo é parte do Framework Demoiselle. -// * -// * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou -// * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação -// * do Software Livre (FSF). -// * -// * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA -// * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou -// * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português -// * para maiores detalhes. -// * -// * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título -// * "LICENCA.txt", junto com esse programa. Se não, acesse -// * ou escreva para a Fundação do Software Livre (FSF) Inc., -// * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. -// */ -//package br.gov.frameworkdemoiselle.internal.implementation; -// -//import static junit.framework.Assert.assertFalse; -//import static junit.framework.Assert.assertTrue; -//import static org.easymock.EasyMock.expect; -//import static org.powermock.api.easymock.PowerMock.createMock; -//import static org.powermock.api.easymock.PowerMock.expectLastCall; -//import static org.powermock.api.easymock.PowerMock.mockStatic; -//import static org.powermock.api.easymock.PowerMock.replayAll; -//import static org.powermock.api.easymock.PowerMock.verifyAll; -// -//import java.util.ArrayList; -//import java.util.Collection; -// -//import javax.faces.context.ExceptionHandler; -//import javax.faces.event.ExceptionQueuedEvent; -//import javax.faces.event.ExceptionQueuedEventContext; -// -//import org.junit.Before; -//import org.junit.Test; -//import org.junit.runner.RunWith; -//import org.powermock.core.classloader.annotations.PrepareForTest; -//import org.powermock.modules.junit4.PowerMockRunner; -// -//import br.gov.frameworkdemoiselle.security.NotLoggedInException; -//import br.gov.frameworkdemoiselle.util.Beans; -// -//@RunWith(PowerMockRunner.class) -//@PrepareForTest({ Beans.class, CoreBundle.class }) -//public class AuthenticationExceptionHandlerTest { -// -// private AuthenticationExceptionHandler handler; -// -// private ExceptionQueuedEventContext eventContext; -// -// private Collection events; -// -// @Before -// public void setUp() { -// -// mockStatic(Beans.class); -// -// events = new ArrayList(); -// ExceptionHandler jsfExceptionHandler = createMock(ExceptionHandler.class); -// handler = new AuthenticationExceptionHandler(jsfExceptionHandler); -// eventContext = createMock(ExceptionQueuedEventContext.class); -// ExceptionQueuedEvent event = createMock(ExceptionQueuedEvent.class); -// -// expect(event.getSource()).andReturn(eventContext); -// expect(handler.getUnhandledExceptionQueuedEvents()).andReturn(events).times(2); -// -// events.add(event); -// -// } -// -// @Test -// public void testHandleNotLoggedInException() { -// -// NotLoggedInException exception = new NotLoggedInException(""); -// -// SecurityObserver observer = createMock(SecurityObserver.class); -// expect(Beans.getReference(SecurityObserver.class)).andReturn(observer); -// expect(eventContext.getException()).andReturn(exception); -// -// observer.redirectToLoginPage(); -// expectLastCall(); -// -// replayAll(); -// -// handler.handle(); -// -// assertTrue(events.isEmpty()); -// -// verifyAll(); -// -// } -// -// @Test -// public void testHandleAnyException() { -// -// Exception exception = new Exception(); -// -// expect(eventContext.getException()).andReturn(exception); -// -// handler.getWrapped().handle(); -// expectLastCall(); -// -// replayAll(); -// -// handler.handle(); -// -// assertFalse(events.isEmpty()); -// -// verifyAll(); -// -// } -// -//} +/* + * Demoiselle Framework + * Copyright (C) 2010 SERPRO + * ---------------------------------------------------------------------------- + * This file is part of Demoiselle Framework. + * + * Demoiselle Framework is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License version 3 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License version 3 + * along with this program; if not, see + * or write to the Free Software Foundation, Inc., 51 Franklin Street, + * Fifth Floor, Boston, MA 02110-1301, USA. + * ---------------------------------------------------------------------------- + * Este arquivo é parte do Framework Demoiselle. + * + * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou + * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação + * do Software Livre (FSF). + * + * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA + * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou + * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português + * para maiores detalhes. + * + * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título + * "LICENCA.txt", junto com esse programa. Se não, acesse + * ou escreva para a Fundação do Software Livre (FSF) Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. + */ +package br.gov.frameworkdemoiselle.internal.implementation; + +import static junit.framework.Assert.assertFalse; +import static junit.framework.Assert.assertTrue; +import static org.easymock.EasyMock.expect; +import static org.powermock.api.easymock.PowerMock.createMock; +import static org.powermock.api.easymock.PowerMock.expectLastCall; +import static org.powermock.api.easymock.PowerMock.mockStatic; +import static org.powermock.api.easymock.PowerMock.replayAll; +import static org.powermock.api.easymock.PowerMock.verifyAll; + +import java.util.ArrayList; +import java.util.Collection; + +import javax.faces.context.ExceptionHandler; +import javax.faces.event.ExceptionQueuedEvent; +import javax.faces.event.ExceptionQueuedEventContext; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.powermock.core.classloader.annotations.PrepareForTest; +import org.powermock.modules.junit4.PowerMockRunner; + +import br.gov.frameworkdemoiselle.security.NotLoggedInException; +import br.gov.frameworkdemoiselle.util.Beans; + +@RunWith(PowerMockRunner.class) +@PrepareForTest({ Beans.class}) +public class AuthenticationExceptionHandlerTest { + + private AuthenticationExceptionHandler handler; + + private ExceptionQueuedEventContext eventContext; + + private Collection events; + + @Before + public void setUp() { + + mockStatic(Beans.class); + + events = new ArrayList(); + ExceptionHandler jsfExceptionHandler = createMock(ExceptionHandler.class); + handler = new AuthenticationExceptionHandler(jsfExceptionHandler); + eventContext = createMock(ExceptionQueuedEventContext.class); + ExceptionQueuedEvent event = createMock(ExceptionQueuedEvent.class); + + expect(event.getSource()).andReturn(eventContext); + expect(handler.getUnhandledExceptionQueuedEvents()).andReturn(events).times(2); + + events.add(event); + + } + + @Test + public void testHandleNotLoggedInException() { + + NotLoggedInException exception = new NotLoggedInException(""); + + SecurityObserver observer = createMock(SecurityObserver.class); + expect(Beans.getReference(SecurityObserver.class)).andReturn(observer); + expect(eventContext.getException()).andReturn(exception); + + observer.redirectToLoginPage(); + expectLastCall(); + + replayAll(); + + handler.handle(); + + assertTrue(events.isEmpty()); + + verifyAll(); + + } + + @Test + public void testHandleAnyException() { + + Exception exception = new Exception(); + + expect(eventContext.getException()).andReturn(exception); + + handler.getWrapped().handle(); + expectLastCall(); + + replayAll(); + + handler.handle(); + + assertFalse(events.isEmpty()); + + verifyAll(); + + } + +} 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 b2c2005..a73b95a 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 @@ -48,7 +48,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.powermock.api.easymock.PowerMock; import org.powermock.modules.junit4.PowerMockRunner; -@Ignore + @RunWith(PowerMockRunner.class) public class AuthorizationExceptionHandlerFactoryTest { diff --git a/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/MessagePhaseListenerTest.java b/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/MessagePhaseListenerTest.java index 3866bf0..a35e1f2 100644 --- a/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/MessagePhaseListenerTest.java +++ b/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/MessagePhaseListenerTest.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 org.easymock.EasyMock.expect; import static org.powermock.api.easymock.PowerMock.mockStatic; import static org.powermock.api.easymock.PowerMock.replayAll; @@ -62,7 +62,7 @@ import br.gov.frameworkdemoiselle.message.Message; import br.gov.frameworkdemoiselle.message.MessageContext; import br.gov.frameworkdemoiselle.util.Beans; import br.gov.frameworkdemoiselle.util.Faces; -@Ignore + @RunWith(PowerMockRunner.class) @PrepareForTest({ LoggerProducer.class, Beans.class, Faces.class }) public class MessagePhaseListenerTest { diff --git a/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/RedirectExceptionHandlerFactoryTest.java b/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/RedirectExceptionHandlerFactoryTest.java index f324fa2..a490467 100644 --- a/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/RedirectExceptionHandlerFactoryTest.java +++ b/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/RedirectExceptionHandlerFactoryTest.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; @@ -48,13 +48,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.powermock.api.easymock.PowerMock; import org.powermock.modules.junit4.PowerMockRunner; -@Ignore + @RunWith(PowerMockRunner.class) public class RedirectExceptionHandlerFactoryTest { @Test public void testGetExceptionHandler() { - + ExceptionHandler jsfExceptionHandler = PowerMock.createMock(ExceptionHandler.class); ExceptionHandlerFactory jsfFactory = PowerMock.createMock(ExceptionHandlerFactory.class); @@ -69,7 +69,7 @@ public class RedirectExceptionHandlerFactoryTest { assertEquals(handler.getWrapped(), jsfExceptionHandler); verifyAll(); - + } } diff --git a/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/RedirectExceptionHandlerTest.java b/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/RedirectExceptionHandlerTest.java index 3bea714..863c936 100644 --- a/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/RedirectExceptionHandlerTest.java +++ b/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/RedirectExceptionHandlerTest.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.assertFalse; import static junit.framework.Assert.assertTrue; import static org.easymock.EasyMock.expect; @@ -57,7 +57,7 @@ import org.junit.runner.RunWith; import org.powermock.modules.junit4.PowerMockRunner; import br.gov.frameworkdemoiselle.annotation.Redirect; -@Ignore + @RunWith(PowerMockRunner.class) public class RedirectExceptionHandlerTest { @@ -66,7 +66,7 @@ public class RedirectExceptionHandlerTest { private ExceptionQueuedEventContext eventContext; private Collection events; - + @SuppressWarnings("serial") @Redirect class AnnotatedException extends RuntimeException { @@ -86,18 +86,18 @@ public class RedirectExceptionHandlerTest { expect(handler.getUnhandledExceptionQueuedEvents()).andReturn(events).times(2); } - + @Test public void testHandleAnAnnotatedException() { AnnotatedException exception = new AnnotatedException(); - + expect(eventContext.getException()).andReturn(exception); - + replayAll(); handler.handle(); - + assertTrue(events.isEmpty()); verifyAll(); @@ -108,16 +108,16 @@ public class RedirectExceptionHandlerTest { public void testHandleAnyException() { Exception exception = new Exception(); - + expect(eventContext.getException()).andReturn(exception); - + handler.getWrapped().handle(); expectLastCall(); - + replayAll(); handler.handle(); - + assertFalse(events.isEmpty()); verifyAll(); diff --git a/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/template/AbstractListPageBeanTest.java b/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/template/AbstractListPageBeanTest.java index 5f2951a..9cc5f1f 100644 --- a/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/template/AbstractListPageBeanTest.java +++ b/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/template/AbstractListPageBeanTest.java @@ -35,7 +35,7 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. */ package br.gov.frameworkdemoiselle.template; -import org.junit.Ignore; + import static org.easymock.EasyMock.expect; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -62,7 +62,7 @@ import br.gov.frameworkdemoiselle.internal.implementation.PaginationImpl; import br.gov.frameworkdemoiselle.pagination.Pagination; import br.gov.frameworkdemoiselle.pagination.PaginationContext; import br.gov.frameworkdemoiselle.util.Reflections; -@Ignore + @RunWith(PowerMockRunner.class) @PrepareForTest({ Reflections.class, PaginationContext.class, Pagination.class }) public class AbstractListPageBeanTest { diff --git a/impl/extension/jta/src/test/java/br/gov/frameworkdemoiselle/transaction/JTATransactionTest.java b/impl/extension/jta/src/test/java/br/gov/frameworkdemoiselle/transaction/JTATransactionTest.java index 15f9532..87835a2 100644 --- a/impl/extension/jta/src/test/java/br/gov/frameworkdemoiselle/transaction/JTATransactionTest.java +++ b/impl/extension/jta/src/test/java/br/gov/frameworkdemoiselle/transaction/JTATransactionTest.java @@ -1,5 +1,5 @@ package br.gov.frameworkdemoiselle.transaction; -import org.junit.Ignore; + import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.expectLastCall; @@ -25,7 +25,7 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import br.gov.frameworkdemoiselle.util.Beans; -@Ignore + @RunWith(PowerMockRunner.class) @PrepareForTest({ Beans.class }) public class JTATransactionTest { diff --git a/impl/extension/se/src/test/java/br/gov/frameworkdemoiselle/internal/producer/SeLocaleProducerTest.java b/impl/extension/se/src/test/java/br/gov/frameworkdemoiselle/internal/producer/SeLocaleProducerTest.java index 23e047a..26df54f 100644 --- a/impl/extension/se/src/test/java/br/gov/frameworkdemoiselle/internal/producer/SeLocaleProducerTest.java +++ b/impl/extension/se/src/test/java/br/gov/frameworkdemoiselle/internal/producer/SeLocaleProducerTest.java @@ -5,7 +5,7 @@ import java.util.Locale; import junit.framework.Assert; import org.junit.Test; -@Ignore + public class SeLocaleProducerTest { @Test -- libgit2 0.21.2