From 750b7bea9c16a22eb1b933b865196d312cdc0fd1 Mon Sep 17 00:00:00 2001 From: Cleverson Sacramento Date: Tue, 27 Aug 2013 14:26:46 -0300 Subject: [PATCH] Configurando os testes das extensões com JBoss AS7 --- impl/core/pom.xml | 11 +++++++++++ impl/core/src/main/java/br/gov/frameworkdemoiselle/exception/ExceptionHandlerInterceptor.java | 55 ++++++++++++++++++++++++++----------------------------- impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/CoreBootstrap.java | 4 ++-- impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/ManagementBootstrap.java | 2 +- impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/ContextManager.java | 75 ++++++++++++++++++++++++++++++++++++++++++++++++--------------------------- impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/AnnotatedMethodProcessor.java | 4 ++-- impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationLoader.java | 8 ++++---- impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultAuthenticator.java | 4 ++-- impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultAuthorizer.java | 4 ++-- impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultTransaction.java | 4 ++-- impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/MessageContextImpl.java | 8 ++++---- impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/NotificationManagerImpl.java | 2 +- impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/SecurityContextImpl.java | 4 ++-- impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/StrategySelector.java | 8 +------- impl/core/src/main/java/br/gov/frameworkdemoiselle/transaction/TransactionalInterceptor.java | 24 +++++++++++++----------- impl/core/src/main/java/br/gov/frameworkdemoiselle/util/Beans.java | 73 +++++++++++++++++++++++++++++++++++-------------------------------------- impl/core/src/main/resources/META-INF/beans.xml | 40 ---------------------------------------- impl/extension/jdbc/pom.xml | 55 +++---------------------------------------------------- impl/extension/jdbc/src/main/resources/META-INF/beans.xml | 40 ---------------------------------------- impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerMultipleConnectionsTest.java | 3 ++- impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerNoConnectionDriverTest.java | 3 ++- impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerNoConnectionUrlTest.java | 3 ++- impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithJndiTest.java | 6 +++--- impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithNameTest.java | 1 + impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithoutJndiTest.java | 7 +++---- impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithoutNameTest.java | 12 ++++++------ impl/extension/jdbc/src/test/resources/arquillian.xml | 6 +++--- impl/extension/jdbc/src/test/resources/glassfish-resources.xml | 48 ------------------------------------------------ impl/extension/jdbc/src/test/resources/producer/multiple-connections/demoiselle.properties | 2 +- impl/extension/jdbc/src/test/resources/producer/with-jndi/demoiselle.properties | 2 +- impl/extension/jmx/pom.xml | 12 +++++++----- impl/extension/jpa/pom.xml | 368 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- impl/extension/jpa/src/test/java/template/JPACrudTest.java | 5 ----- impl/extension/jpa/src/test/java/transaction/manual/JPATransactionTest.java | 29 ++++++++++++++--------------- impl/extension/jpa/src/test/resources/arquillian.xml | 45 +-------------------------------------------- impl/extension/jpa/src/test/resources/glassfish-resources.xml | 57 --------------------------------------------------------- impl/extension/jpa/src/test/resources/logging.properties | 39 --------------------------------------- impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/bootstrap/JsfBootstrapTest.java | 252 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------ impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/ApplicationExceptionHandlerFactoryTest.java | 150 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------- impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/ApplicationExceptionHandlerTest.java | 412 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/AuthenticationExceptionHandlerFactoryTest.java | 150 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------- impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/AuthenticationExceptionHandlerTest.java | 268 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------- impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/AuthorizationExceptionHandlerFactoryTest.java | 150 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------- impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/AuthorizationExceptionHandlerTest.java | 342 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------------------------------------------------- impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/FileRendererImplTest.java | 656 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/ParameterImplTest.java | 744 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/RedirectExceptionHandlerFactoryTest.java | 150 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------- impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/RedirectExceptionHandlerTest.java | 254 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------- impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/template/AbstractEditPageBeanTest.java | 654 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/template/AbstractListPageBeanTest.java | 396 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/template/AbstractPageTest.java | 320 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------------------------- impl/extension/jta/src/test/java/br/gov/frameworkdemoiselle/transaction/JTATransactionTest.java | 451 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- impl/extension/se/src/test/java/br/gov/frameworkdemoiselle/internal/bootstrap/SeBootstrapTest.java | 208 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------- impl/extension/servlet/src/test/java/br/gov/frameworkdemoiselle/internal/producer/HttpServletRequestProducerTest.java | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------- impl/extension/servlet/src/test/java/br/gov/frameworkdemoiselle/internal/producer/HttpServletResponseProducerTest.java | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------- impl/extension/servlet/src/test/java/br/gov/frameworkdemoiselle/internal/producer/HttpSessionProducerTest.java | 158 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------- impl/extension/servlet/src/test/java/br/gov/frameworkdemoiselle/internal/producer/ServletLocaleProducerTest.java | 168 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------ impl/extension/servlet/src/test/java/br/gov/frameworkdemoiselle/internal/proxy/HttpServletRequestProxyTest.java | 90 +++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------- parent/bom/pom.xml | 46 ++-------------------------------------------- parent/extension/pom.xml | 145 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------- 60 files changed, 3481 insertions(+), 4084 deletions(-) delete mode 100644 impl/extension/jdbc/src/test/resources/glassfish-resources.xml delete mode 100644 impl/extension/jpa/src/test/resources/glassfish-resources.xml delete mode 100644 impl/extension/jpa/src/test/resources/logging.properties diff --git a/impl/core/pom.xml b/impl/core/pom.xml index 6d51c29..684626a 100755 --- a/impl/core/pom.xml +++ b/impl/core/pom.xml @@ -76,6 +76,13 @@ import pom + + org.jboss.arquillian + arquillian-bom + ${arquillian.bom.version} + import + pom + @@ -189,6 +196,7 @@ org.jboss.arquillian.container arquillian-weld-se-embedded-1.1 + ${arquillian.weld.version} test @@ -268,6 +276,9 @@ + 1.1.1.Final + 1.0.0.CR7 + 2.4.0-BETA2-SNAPSHOT diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/exception/ExceptionHandlerInterceptor.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/exception/ExceptionHandlerInterceptor.java index 0b98ac3..df47768 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/exception/ExceptionHandlerInterceptor.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/exception/ExceptionHandlerInterceptor.java @@ -59,22 +59,20 @@ import br.gov.frameworkdemoiselle.util.ResourceBundle; /** *

- * Intercepts some thrown exceptions, and calls the appropriate method. These interceptor works only in - * classes annotated with @Contoller. Above we discribe which kind of exception is intercepted and - * what is an appropriate method. + * Intercepts some thrown exceptions, and calls the appropriate method. These interceptor works only in classes + * annotated with @Contoller. Above we discribe which kind of exception is intercepted and what is an appropriate + * method. *

- * To be interceptable, the thrown exception must be from a type which is annotated with - * @ApplicationException. + * To be interceptable, the thrown exception must be from a type which is annotated with @ApplicationException. *

- * An appropriate method must be annotated with @ExceptionHandler, and receive as parameter some - * exception that could be thrown for it's class (which have to be annotated with @ApplicationException). - * So, when this method is called, it's receive the thrown exception as parameter. In the same class shouldn't - * be more than one method annotated with @ExceptionHandler and receiving the same type of exception. + * An appropriate method must be annotated with @ExceptionHandler, and receive as parameter some exception that + * could be thrown for it's class (which have to be annotated with @ApplicationException). So, when this method + * is called, it's receive the thrown exception as parameter. In the same class shouldn't be more than one method + * annotated with @ExceptionHandler and receiving the same type of exception. *

*

* The examples below shows how these interceptor works: *

- * *

* * 
@@ -86,24 +84,23 @@ import br.gov.frameworkdemoiselle.util.ResourceBundle;
  * public class CustomExceptionHandler {
  * 
  * 	public void throwException() {
- *		throw new CustomException();
- *	}
- *	
- *	@ExceptionHandler
- *	public void handler(CustomException exception) {
- *		...
- *	}
- *
+ * 		throw new CustomException();
+ * 	}
+ * 
+ * 	@ExceptionHandler
+ * public void handler(CustomException exception) {
+ * 	...
  * }
+ * }
+ * 
  *
- *
* + * *

- * When the method throwException throw a CustomException, once CustomException is annotated - * with @ApplicationException and CustomExceptionHandle is annotated with @Controller, the interceptor will - * looking for some method (in CustomExceptionHandle) annotated with @ExceptionHandle and that receive a - * CustomException as parameter to call. In the case shown, the method handler is called when a - * CustomException is thrown. + * When the method throwException throw a CustomException, once CustomException is annotated with @ApplicationException + * and CustomExceptionHandle is annotated with @Controller, the interceptor will looking for some method (in + * CustomExceptionHandle) annotated with @ExceptionHandle and that receive a CustomException as parameter to call. In + * the case shown, the method handler is called when a CustomException is thrown. *

* * @author SERPRO @@ -114,12 +111,12 @@ public class ExceptionHandlerInterceptor implements Serializable { private static final long serialVersionUID = 1L; - private static transient ResourceBundle bundle; + private transient ResourceBundle bundle; - private static transient Logger logger; + private transient Logger logger; private final Map, Map, Method>> cache = new HashMap, Map, Method>>(); - + private boolean handleException(final Exception cause, final Object target) throws Exception { getLogger().info(getBundle().getString("handling-exception", cause.getClass().getCanonicalName())); @@ -248,7 +245,7 @@ public class ExceptionHandlerInterceptor implements Serializable { return result; } - private static ResourceBundle getBundle() { + private ResourceBundle getBundle() { if (bundle == null) { bundle = Beans.getReference(ResourceBundle.class, new NameQualifier("demoiselle-core-bundle")); } @@ -256,7 +253,7 @@ public class ExceptionHandlerInterceptor implements Serializable { return bundle; } - private static Logger getLogger() { + private Logger getLogger() { if (logger == null) { logger = Beans.getReference(Logger.class, new NameQualifier(ExceptionHandlerInterceptor.class.getName())); } diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/CoreBootstrap.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/CoreBootstrap.java index 583a2f5..2bcda1a 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/CoreBootstrap.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/CoreBootstrap.java @@ -59,7 +59,7 @@ public class CoreBootstrap implements Extension { private Logger logger; - private static transient ResourceBundle bundle; + private transient ResourceBundle bundle; private Logger getLogger() { if (this.logger == null) { @@ -69,7 +69,7 @@ public class CoreBootstrap implements Extension { return this.logger; } - private static ResourceBundle getBundle() { + private ResourceBundle getBundle() { if (bundle == null) { bundle = new ResourceBundle("demoiselle-core-bundle", Locale.getDefault()); } diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/ManagementBootstrap.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/ManagementBootstrap.java index d261904..a6f32a4 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/ManagementBootstrap.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/ManagementBootstrap.java @@ -29,7 +29,7 @@ import br.gov.frameworkdemoiselle.util.ResourceBundle; public class ManagementBootstrap implements Extension { - protected static List> types = Collections.synchronizedList(new ArrayList>()); + protected List> types = Collections.synchronizedList(new ArrayList>()); private List> managementExtensionCache = Collections .synchronizedList(new ArrayList>()); diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/ContextManager.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/ContextManager.java index 1fa1c42..934d97f 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/ContextManager.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/ContextManager.java @@ -3,8 +3,10 @@ package br.gov.frameworkdemoiselle.internal.context; import java.lang.annotation.Annotation; import java.util.ArrayList; import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Locale; +import java.util.Map; import javax.enterprise.context.ContextNotActiveException; import javax.enterprise.context.spi.Context; @@ -41,16 +43,43 @@ import br.gov.frameworkdemoiselle.util.ResourceBundle; */ public final class ContextManager { - private static List contexts = Collections - .synchronizedList(new ArrayList()); + private static final Map> contextsCache = Collections + .synchronizedMap(new HashMap>()); - private static boolean initialized = false; + private static final Map initializedCache = Collections + .synchronizedMap(new HashMap()); - private static transient ResourceBundle bundle; + private ContextManager() { + } - private static Logger logger; + private synchronized static List getContexts() { + List contexts = contextsCache.get(getCurrentClassLoader()); - private ContextManager() { + if (contexts == null) { + contexts = Collections.synchronizedList(new ArrayList()); + contextsCache.put(getCurrentClassLoader(), contexts); + } + + return contexts; + } + + private synchronized static boolean isInitialized() { + Boolean initialized = initializedCache.get(getCurrentClassLoader()); + + if (initialized == null) { + initialized = false; + initializedCache.put(getCurrentClassLoader(), initialized); + } + + return initialized; + } + + private static void setInitialized(boolean initialized) { + initializedCache.put(getCurrentClassLoader(), initialized); + } + + private static ClassLoader getCurrentClassLoader() { + return Thread.currentThread().getContextClassLoader(); } /** @@ -66,12 +95,12 @@ public final class ContextManager { * The CDI event indicating all beans have been discovered. */ public static void initialize(AfterBeanDiscovery event) { - if (initialized) { + if (isInitialized()) { return; } add(new StaticContext(), event); - initialized = true; + setInitialized(true); } /** @@ -92,7 +121,7 @@ public final class ContextManager { * The CDI event indicating all beans have been discovered. */ public static void add(CustomContext context, AfterBeanDiscovery event) { - for (CustomContextCounter contextCounter : contexts) { + for (CustomContextCounter contextCounter : getContexts()) { if (contextCounter.isSame(context.getClass(), context.getScope())) { ContextManager.getLogger().trace( @@ -109,7 +138,7 @@ public final class ContextManager { context.setActive(false); event.addContext(context); - contexts.add(new CustomContextCounter(context)); + getContexts().add(new CustomContextCounter(context)); } /** @@ -137,11 +166,11 @@ public final class ContextManager { */ public static synchronized void activate(Class customContextClass, Class scope) { - if (!initialized) { + if (!isInitialized()) { throw new DemoiselleException(getBundle().getString("custom-context-manager-not-initialized")); } - for (CustomContextCounter context : contexts) { + for (CustomContextCounter context : getContexts()) { if (context.isSame(customContextClass, scope)) { context.activate(); return; @@ -177,11 +206,11 @@ public final class ContextManager { */ public static synchronized void deactivate(Class customContextClass, Class scope) { - if (!initialized) { + if (!isInitialized()) { throw new DemoiselleException(getBundle().getString("custom-context-manager-not-initialized")); } - for (CustomContextCounter context : contexts) { + for (CustomContextCounter context : getContexts()) { if (context.isSame(customContextClass, scope)) { context.deactivate(); return; @@ -198,28 +227,20 @@ public final class ContextManager { *

*/ public static synchronized void shutdown() { - for (CustomContextCounter context : contexts) { + for (CustomContextCounter context : getContexts()) { context.shutdown(); } - contexts.clear(); - initialized = false; + getContexts().clear(); + setInitialized(false); } static Logger getLogger() { - if (logger == null) { - logger = LoggerProducer.create(ContextManager.class); - } - - return logger; + return LoggerProducer.create(ContextManager.class); } static ResourceBundle getBundle() { - if (bundle == null) { - bundle = new ResourceBundle("demoiselle-core-bundle", Locale.getDefault()); - } - - return bundle; + return new ResourceBundle("demoiselle-core-bundle", Locale.getDefault()); } } diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/AnnotatedMethodProcessor.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/AnnotatedMethodProcessor.java index 7fb2752..99d423e 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/AnnotatedMethodProcessor.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/AnnotatedMethodProcessor.java @@ -60,7 +60,7 @@ public class AnnotatedMethodProcessor implements Comparable annotatedMethod; - private transient static ResourceBundle bundle; + private transient ResourceBundle bundle; public AnnotatedMethodProcessor(final AnnotatedMethod annotatedMethod) { this.annotatedMethod = annotatedMethod; @@ -131,7 +131,7 @@ public class AnnotatedMethodProcessor implements ComparableManages methods annotated with {@link Transactional}. If there's no active transaction - * the moment a {@link Transactional} method is called, this interceptor will activate one. If a {@link Transactional} method - * that activated a transaction returns, this method will commit the active transaction. If the {@link Transactional} method - * throws an exception caught outside of the method (or uncaught), this interceptor will mark the transaction for rollback.

- * *

- * This method is not intended to be called directly, instead the CDI provider will call this method when a {@link Transactional} method - * is called. + * Manages methods annotated with {@link Transactional}. If there's no active transaction the moment a + * {@link Transactional} method is called, this interceptor will activate one. If a {@link Transactional} method + * that activated a transaction returns, this method will commit the active transaction. If the + * {@link Transactional} method throws an exception caught outside of the method (or uncaught), this interceptor + * will mark the transaction for rollback. + *

+ *

+ * This method is not intended to be called directly, instead the CDI provider will call this method when a + * {@link Transactional} method is called. *

*/ @AroundInvoke @@ -183,7 +185,7 @@ public class TransactionalInterceptor implements Serializable { } } - private static ResourceBundle getBundle() { + private ResourceBundle getBundle() { if (bundle == null) { bundle = Beans.getReference(ResourceBundle.class, new NameQualifier("demoiselle-core-bundle")); } @@ -191,7 +193,7 @@ public class TransactionalInterceptor implements Serializable { return bundle; } - private static Logger getLogger() { + private Logger getLogger() { if (logger == null) { logger = Beans.getReference(Logger.class, new NameQualifier(TransactionalInterceptor.class.getName())); } diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/util/Beans.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/util/Beans.java index a7ae36b..7fa0a4b 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/util/Beans.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/util/Beans.java @@ -40,7 +40,10 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Member; import java.lang.reflect.Type; import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; import java.util.HashSet; +import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; @@ -54,7 +57,8 @@ import br.gov.frameworkdemoiselle.DemoiselleException; /** *

- * Utilizes a {@link BeanManager}, obtained in the bootstrap process, to provide custom operations for obtaining contextual references for beans. + * Utilizes a {@link BeanManager}, obtained in the bootstrap process, to provide custom operations for obtaining + * contextual references for beans. *

* All its public methods are static. * @@ -62,40 +66,41 @@ import br.gov.frameworkdemoiselle.DemoiselleException; */ public final class Beans { - private static transient ResourceBundle bundle; - - private static BeanManager manager; + private static final Map beanManagerCache = Collections + .synchronizedMap(new HashMap()); private Beans() { } public static void setBeanManager(BeanManager beanManager) { - manager = beanManager; + beanManagerCache.put(getCurrentClassLoader(), beanManager); } public static BeanManager getBeanManager() { - return manager; + return beanManagerCache.get(getCurrentClassLoader()); + } + + private static ClassLoader getCurrentClassLoader() { + return Thread.currentThread().getContextClassLoader(); } /** - * Obtains a injectble instance of a bean, which have the given required type and qualifiers, - * and are available for injection in the point where this method was call. + * Obtains a injectble instance of a bean, which have the given required type and qualifiers, and are available for + * injection in the point where this method was call. * * @param beanClass - * the beanClass which instace is requested to be obtained. + * the beanClass which instace is requested to be obtained. * @param qualifiers - * a set of qualifiers with any quantity of elements (zero including). - * @return Type - * a instace of the injected beanClass. + * a set of qualifiers with any quantity of elements (zero including). + * @return Type a instace of the injected beanClass. * @throws DemoiselleException - * if no bean are avaliable to be injected for the given Class and qualifiers. - * + * if no bean are avaliable to be injected for the given Class and qualifiers. */ public static T getReference(final Class beanClass, Annotation... qualifiers) { T instance; try { - instance = (T) getReference(manager.getBeans(beanClass, qualifiers), beanClass, qualifiers); + instance = (T) getReference(getBeanManager().getBeans(beanClass, qualifiers), beanClass, qualifiers); } catch (NoSuchElementException cause) { StringBuffer buffer = new StringBuffer(); @@ -114,22 +119,20 @@ public final class Beans { } /** - * Obtains a injectble instance of a bean, which have the given required type - * and are available for injection in the point where this method was call. + * Obtains a injectble instance of a bean, which have the given required type and are available for injection in the + * point where this method was call. * * @param beanClass - * the beanClass which instace is requested to be obtained. - * @return Type - * a instace of the injected beanClass. + * the beanClass which instace is requested to be obtained. + * @return Type a instace of the injected beanClass. * @throws DemoiselleException - * if no bean are avaliable to be injected for the given Class. - * + * if no bean are avaliable to be injected for the given Class. */ public static T getReference(final Class beanClass) { T instance; try { - instance = (T) getReference(manager.getBeans(beanClass), beanClass); + instance = (T) getReference(getBeanManager().getBeans(beanClass), beanClass); } catch (NoSuchElementException cause) { String message = getBundle().getString("bean-not-found", beanClass.getCanonicalName()); @@ -140,23 +143,21 @@ public final class Beans { } /** - * Obtains a injectble instance of a bean, which have the given EL name - * and are available for injection in the point where this method was call. + * Obtains a injectble instance of a bean, which have the given EL name and are available for injection in the point + * where this method was call. * * @param beanName - * the EL name for the requested bean. - * @return Type - * a instace of the injected beanClass. + * the EL name for the requested bean. + * @return Type a instace of the injected beanClass. * @throws DemoiselleException - * if no bean are avaliable to be injected for the given bean name. - * + * if no bean are avaliable to be injected for the given bean name. */ @SuppressWarnings("unchecked") public static T getReference(String beanName) { T instance; try { - instance = (T) getReference(manager.getBeans(beanName)); + instance = (T) getReference(getBeanManager().getBeans(beanName)); } catch (NoSuchElementException cause) { String message = getBundle().getString("bean-not-found", beanName); @@ -169,11 +170,11 @@ public final class Beans { @SuppressWarnings("unchecked") private static T getReference(Set> beans, Class beanClass, Annotation... qualifiers) { Bean bean = beans.iterator().next(); - CreationalContext context = manager.createCreationalContext(bean); + CreationalContext context = getBeanManager().createCreationalContext(bean); Type beanType = beanClass == null ? bean.getBeanClass() : beanClass; InjectionPoint injectionPoint = new CustomInjectionPoint(bean, beanType, qualifiers); - return (T) manager.getInjectableReference(injectionPoint, context); + return (T) getBeanManager().getInjectableReference(injectionPoint, context); } private static T getReference(Set> beans) { @@ -181,11 +182,7 @@ public final class Beans { } private static ResourceBundle getBundle() { - if (bundle == null) { - bundle = Beans.getReference(ResourceBundle.class, new NameQualifier("demoiselle-core-bundle")); - } - - return bundle; + return Beans.getReference(ResourceBundle.class, new NameQualifier("demoiselle-core-bundle")); } static class CustomInjectionPoint implements InjectionPoint { diff --git a/impl/core/src/main/resources/META-INF/beans.xml b/impl/core/src/main/resources/META-INF/beans.xml index 527e828..e69de29 100644 --- a/impl/core/src/main/resources/META-INF/beans.xml +++ b/impl/core/src/main/resources/META-INF/beans.xml @@ -1,40 +0,0 @@ - - - - \ No newline at end of file diff --git a/impl/extension/jdbc/pom.xml b/impl/extension/jdbc/pom.xml index ecf2ab3..e8b33f9 100755 --- a/impl/extension/jdbc/pom.xml +++ b/impl/extension/jdbc/pom.xml @@ -71,38 +71,6 @@ commons-dbcp commons-dbcp - - - - junit - junit - test - - - org.jboss.arquillian.junit - arquillian-junit-container - test - - - org.jboss.shrinkwrap.resolver - shrinkwrap-resolver-impl-maven - test - - - org.jboss.arquillian.container - arquillian-glassfish-embedded-3.1 - test - - - org.glassfish.main.extras - glassfish-embedded-all - test - - - hsqldb - hsqldb - test - @@ -135,26 +103,9 @@ arquillian-test - br.gov.frameworkdemoiselle - demoiselle-core - - - javax.enterprise - cdi-api - - - validation-api - javax.validation - - - org.slf4j - slf4j-api - - - org.javassist - javassist - - + hsqldb + hsqldb + runtime diff --git a/impl/extension/jdbc/src/main/resources/META-INF/beans.xml b/impl/extension/jdbc/src/main/resources/META-INF/beans.xml index 527e828..e69de29 100644 --- a/impl/extension/jdbc/src/main/resources/META-INF/beans.xml +++ b/impl/extension/jdbc/src/main/resources/META-INF/beans.xml @@ -1,40 +0,0 @@ - - - - \ No newline at end of file diff --git a/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerMultipleConnectionsTest.java b/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerMultipleConnectionsTest.java index 2a2ca4b..4fecf1a 100644 --- a/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerMultipleConnectionsTest.java +++ b/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerMultipleConnectionsTest.java @@ -16,6 +16,7 @@ import org.junit.runner.RunWith; import test.Tests; import br.gov.frameworkdemoiselle.annotation.Name; +//@Ignore @RunWith(Arquillian.class) public class ConnectionProducerMultipleConnectionsTest { @@ -49,7 +50,7 @@ public class ConnectionProducerMultipleConnectionsTest { assertEquals(conn1.getMetaData().getURL(), "jdbc:hsqldb:hsql1"); assertEquals(conn2.getMetaData().getURL(), "jdbc:hsqldb:hsql2"); assertEquals(conn3.getMetaData().getURL(), "jdbc:hsqldb:hsql3"); - assertEquals(conn4.getMetaData().getURL(), "jdbc:derby:target/databases/derby"); + assertEquals(conn4.getMetaData().getURL(), "jdbc:h2:mem:test"); } } diff --git a/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerNoConnectionDriverTest.java b/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerNoConnectionDriverTest.java index d482414..18c3b70 100644 --- a/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerNoConnectionDriverTest.java +++ b/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerNoConnectionDriverTest.java @@ -14,6 +14,7 @@ import org.junit.runner.RunWith; import test.Tests; import br.gov.frameworkdemoiselle.annotation.Name; +//@Ignore @RunWith(Arquillian.class) public class ConnectionProducerNoConnectionDriverTest { @@ -31,7 +32,7 @@ public class ConnectionProducerNoConnectionDriverTest { } /** - * TODO Refinar a exceção esperada + * TODO Refinar a exceção esperada */ @Test(expected = Exception.class) public void failOnCreateConnection() { diff --git a/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerNoConnectionUrlTest.java b/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerNoConnectionUrlTest.java index 9eaa986..3e837d9 100644 --- a/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerNoConnectionUrlTest.java +++ b/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerNoConnectionUrlTest.java @@ -14,6 +14,7 @@ import org.junit.runner.RunWith; import test.Tests; import br.gov.frameworkdemoiselle.annotation.Name; +//@Ignore @RunWith(Arquillian.class) public class ConnectionProducerNoConnectionUrlTest { @@ -31,7 +32,7 @@ public class ConnectionProducerNoConnectionUrlTest { } /** - * TODO Refinar a exceção esperada + * TODO Refinar a exceção esperada */ @Test(expected = Exception.class) public void failOnCreateConnection() { diff --git a/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithJndiTest.java b/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithJndiTest.java index 3daf3ea..558cb83 100644 --- a/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithJndiTest.java +++ b/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithJndiTest.java @@ -16,6 +16,7 @@ import org.junit.runner.RunWith; import test.Tests; import br.gov.frameworkdemoiselle.annotation.Name; +//@Ignore @RunWith(Arquillian.class) public class ConnectionProducerWithJndiTest { @@ -34,7 +35,6 @@ public class ConnectionProducerWithJndiTest { @Test public void createConnection() throws SQLException { - assertEquals(conn1.getMetaData().getURL(), "jdbc:derby:target/databases/derby"); + assertEquals(conn1.getMetaData().getURL(), "jdbc:h2:mem:test"); } - -} \ No newline at end of file +} diff --git a/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithNameTest.java b/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithNameTest.java index c490a05..936f99e 100644 --- a/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithNameTest.java +++ b/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithNameTest.java @@ -15,6 +15,7 @@ import org.junit.runner.RunWith; import test.Tests; import br.gov.frameworkdemoiselle.annotation.Name; +//@Ignore @RunWith(Arquillian.class) public class ConnectionProducerWithNameTest { diff --git a/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithoutJndiTest.java b/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithoutJndiTest.java index 53161f9..95f3e0f 100644 --- a/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithoutJndiTest.java +++ b/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithoutJndiTest.java @@ -1,7 +1,5 @@ package connection.producer; -import static org.junit.Assert.assertEquals; - import java.sql.Connection; import java.sql.SQLException; @@ -17,6 +15,7 @@ import org.junit.runner.RunWith; import test.Tests; import br.gov.frameworkdemoiselle.annotation.Name; +//@Ignore @RunWith(Arquillian.class) public class ConnectionProducerWithoutJndiTest { @@ -33,9 +32,9 @@ public class ConnectionProducerWithoutJndiTest { return deployment; } - @Test(expected=Exception.class) + @Test(expected = Exception.class) public void createConnection() throws SQLException { conn1.get(); } -} \ No newline at end of file +} diff --git a/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithoutNameTest.java b/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithoutNameTest.java index 9913654..3cd0118 100644 --- a/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithoutNameTest.java +++ b/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithoutNameTest.java @@ -9,30 +9,30 @@ import javax.inject.Inject; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import test.Tests; +//@Ignore @RunWith(Arquillian.class) public class ConnectionProducerWithoutNameTest { private static String PATH = "src/test/resources/producer/without-name"; - + @Inject private Connection connection; - + @Deployment public static WebArchive createDeployment() { WebArchive deployment = Tests.createDeployment(ConnectionProducerWithoutNameTest.class); deployment.addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties"); return deployment; } - + @Test - public void createConnection(){ + public void createConnection() { assertNotNull(connection); } - + } diff --git a/impl/extension/jdbc/src/test/resources/arquillian.xml b/impl/extension/jdbc/src/test/resources/arquillian.xml index c34bde0..b5fb9f7 100644 --- a/impl/extension/jdbc/src/test/resources/arquillian.xml +++ b/impl/extension/jdbc/src/test/resources/arquillian.xml @@ -43,10 +43,10 @@ target/deployments - + + - src/test/resources/glassfish-resources.xml - + target/jboss-as-${jboss.as.version} diff --git a/impl/extension/jdbc/src/test/resources/glassfish-resources.xml b/impl/extension/jdbc/src/test/resources/glassfish-resources.xml deleted file mode 100644 index ca2bc9d..0000000 --- a/impl/extension/jdbc/src/test/resources/glassfish-resources.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/impl/extension/jdbc/src/test/resources/producer/multiple-connections/demoiselle.properties b/impl/extension/jdbc/src/test/resources/producer/multiple-connections/demoiselle.properties index 4afe324..3f8bc88 100644 --- a/impl/extension/jdbc/src/test/resources/producer/multiple-connections/demoiselle.properties +++ b/impl/extension/jdbc/src/test/resources/producer/multiple-connections/demoiselle.properties @@ -13,6 +13,6 @@ frameworkdemoiselle.persistence.conn3.url=jdbc:hsqldb:hsql3 frameworkdemoiselle.persistence.conn3.username=sa frameworkdemoiselle.persistence.conn3.password= -frameworkdemoiselle.persistence.conn4.jndi.name=jdbc/arquillian +frameworkdemoiselle.persistence.conn4.jndi.name=java:jboss/datasources/ExampleDS frameworkdemoiselle.persistence.default.datasource.name=conn3 \ No newline at end of file diff --git a/impl/extension/jdbc/src/test/resources/producer/with-jndi/demoiselle.properties b/impl/extension/jdbc/src/test/resources/producer/with-jndi/demoiselle.properties index b8e38bc..00b222f 100644 --- a/impl/extension/jdbc/src/test/resources/producer/with-jndi/demoiselle.properties +++ b/impl/extension/jdbc/src/test/resources/producer/with-jndi/demoiselle.properties @@ -1 +1 @@ -frameworkdemoiselle.persistence.conn1.jndi.name=jdbc/arquillian \ No newline at end of file +frameworkdemoiselle.persistence.conn1.jndi.name=java:jboss/datasources/ExampleDS \ No newline at end of file diff --git a/impl/extension/jmx/pom.xml b/impl/extension/jmx/pom.xml index 16c140f..cda365f 100644 --- a/impl/extension/jmx/pom.xml +++ b/impl/extension/jmx/pom.xml @@ -40,7 +40,7 @@ demoiselle-jmx Demoiselle Framework JMX Extension Demoiselle Framework JMX Extension - + demoiselle-extension-parent br.gov.frameworkdemoiselle @@ -76,11 +76,13 @@ weld-se-core test + org.hibernate hibernate-validator @@ -92,7 +94,7 @@ test - + sonatype-nexus-snapshots @@ -117,14 +119,14 @@ - + http://www.frameworkdemoiselle.gov.br - + SERPRO - Serviço Federal de Processamento de Dados http://www.serpro.gov.br - + GNU Lesser General Public License, Version 3 diff --git a/impl/extension/jpa/pom.xml b/impl/extension/jpa/pom.xml index d99dd27..d6eeb15 100755 --- a/impl/extension/jpa/pom.xml +++ b/impl/extension/jpa/pom.xml @@ -66,335 +66,11 @@ http://www.serpro.gov.br - - - - src/test/resources - true - - - - - - maven-dependency-plugin - - - unpack - process-test-classes - - unpack - - - - - org.jboss.as - jboss-as-dist - ${jbossas.version} - zip - false - target - - - - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.16 - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - org.apache.maven.plugins - - - maven-dependency-plugin - - - [2.1,) - - - unpack - - - - - - - - - - - - - - org.eclipse.persistence javax.persistence - - - - junit - junit - test - - - org.jboss.arquillian.junit - arquillian-junit-container - test - - - - - - - org.jboss.as - jboss-as-arquillian-container-managed - ${jbossas.version} - test - - - org.jboss.arquillian.protocol - arquillian-protocol-servlet - - - - - - - - - - - - - org.jboss.shrinkwrap.resolver - shrinkwrap-resolver-impl-maven - test - - - - - - - - - - - - - - @@ -425,57 +101,13 @@ arquillian-test - - br.gov.frameworkdemoiselle - demoiselle-core - - - javax.enterprise - cdi-api - - - validation-api - javax.validation - - - - org.slf4j - slf4j-api - - - org.javassist - javassist - - - - org.eclipse.persistence javax.persistence provided - - - - - 7.1.1.Final - diff --git a/impl/extension/jpa/src/test/java/template/JPACrudTest.java b/impl/extension/jpa/src/test/java/template/JPACrudTest.java index a7499cf..4c5e7bc 100644 --- a/impl/extension/jpa/src/test/java/template/JPACrudTest.java +++ b/impl/extension/jpa/src/test/java/template/JPACrudTest.java @@ -31,11 +31,6 @@ public class JPACrudTest { } @Test - public void x() { - - } - - @Test public void successfullyInserted() { populate(1, 0); diff --git a/impl/extension/jpa/src/test/java/transaction/manual/JPATransactionTest.java b/impl/extension/jpa/src/test/java/transaction/manual/JPATransactionTest.java index 5f9dfe4..fd93d97 100644 --- a/impl/extension/jpa/src/test/java/transaction/manual/JPATransactionTest.java +++ b/impl/extension/jpa/src/test/java/transaction/manual/JPATransactionTest.java @@ -4,13 +4,12 @@ import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertNull; import static junit.framework.Assert.assertTrue; +import static junit.framework.Assert.fail; import javax.inject.Inject; import javax.persistence.EntityManager; import javax.persistence.TransactionRequiredException; -import junit.framework.Assert; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.shrinkwrap.api.spec.WebArchive; @@ -124,32 +123,32 @@ public class JPATransactionTest { assertNull(persisted1); assertNull(persisted2); } - + @Test - public void checkEntityManagerCreatedAfterTransaction(){ + public void checkEntityManagerCreatedAfterTransaction() { Transaction transaction = transactionContext.getCurrentTransaction(); String id = createId("id-5"); MyEntity1 entity1 = new MyEntity1(); entity1.setId(id); entity1.setDescription("Test description"); - - Assert.assertFalse(transaction.isActive()); + + assertFalse(transaction.isActive()); transaction.begin(); - Assert.assertTrue(transaction.isActive()); - + assertTrue(transaction.isActive()); + EntityManager em1 = Beans.getReference(EntityManager.class, new NameQualifier("pu3")); - - try{ + + try { em1.persist(entity1); transaction.commit(); + + } catch (TransactionRequiredException te) { + fail("Entity Manager não ingressou em transação já em curso: " + te.getMessage()); } - catch(TransactionRequiredException te){ - Assert.fail("Entity Manager não ingressou em transação já em curso: "+te.getMessage()); - } - + entity1 = em1.find(MyEntity1.class, id); - Assert.assertEquals("Test description", entity1.getDescription()); + assertEquals("Test description", entity1.getDescription()); } private String createId(String id) { diff --git a/impl/extension/jpa/src/test/resources/arquillian.xml b/impl/extension/jpa/src/test/resources/arquillian.xml index 7850012..b3989a0 100644 --- a/impl/extension/jpa/src/test/resources/arquillian.xml +++ b/impl/extension/jpa/src/test/resources/arquillian.xml @@ -46,51 +46,8 @@ - target/jboss-as-${jbossas.version} + target/jboss-as-${jboss.as.version} - - - - - - - - diff --git a/impl/extension/jpa/src/test/resources/glassfish-resources.xml b/impl/extension/jpa/src/test/resources/glassfish-resources.xml deleted file mode 100644 index c4e65a3..0000000 --- a/impl/extension/jpa/src/test/resources/glassfish-resources.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/impl/extension/jpa/src/test/resources/logging.properties b/impl/extension/jpa/src/test/resources/logging.properties deleted file mode 100644 index ba0fa45..0000000 --- a/impl/extension/jpa/src/test/resources/logging.properties +++ /dev/null @@ -1,39 +0,0 @@ -# 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. - -handlers=java.util.logging.ConsoleHandler -java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter -java.util.logging.SimpleFormatter.format=%4$s: %5$s%n -java.util.logging.ConsoleHandler.level=FINEST \ No newline at end of file diff --git a/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/bootstrap/JsfBootstrapTest.java b/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/bootstrap/JsfBootstrapTest.java index 1f21ce9..0f535fa 100644 --- a/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/bootstrap/JsfBootstrapTest.java +++ b/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/bootstrap/JsfBootstrapTest.java @@ -1,126 +1,126 @@ -/* - * 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.bootstrap; - -import static org.easymock.EasyMock.expect; -import static org.powermock.api.easymock.PowerMock.createMock; -import static org.powermock.api.easymock.PowerMock.mockStatic; -import static org.powermock.api.easymock.PowerMock.replay; -import static org.powermock.api.easymock.PowerMock.verifyAll; - -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; - -import javax.enterprise.inject.spi.AfterBeanDiscovery; -import javax.enterprise.inject.spi.AfterDeploymentValidation; - -import junit.framework.Assert; - -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; -import org.powermock.reflect.Whitebox; - -import br.gov.frameworkdemoiselle.internal.context.AbstractCustomContext; -import br.gov.frameworkdemoiselle.internal.context.ContextManager; -import br.gov.frameworkdemoiselle.internal.context.ViewContext; -import br.gov.frameworkdemoiselle.lifecycle.AfterShutdownProccess; -import br.gov.frameworkdemoiselle.util.Beans; - -@RunWith(PowerMockRunner.class) -@PrepareForTest({ Beans.class, ContextManager.class }) -@Ignore -public class JsfBootstrapTest { - - private JsfBootstrap bootstrap; - - private AfterBeanDiscovery event; - - @Before - public void before() { - event = createMock(AfterBeanDiscovery.class); - mockStatic(Beans.class); - expect(Beans.getReference(Locale.class)).andReturn(Locale.getDefault()).anyTimes(); - replay(Beans.class); - bootstrap = new JsfBootstrap(); - } - - @Test - public void testStoreContexts() { - bootstrap.storeContexts(event); - replay(event); - - Assert.assertEquals(event, Whitebox.getInternalState(bootstrap, "afterBeanDiscoveryEvent")); - List context = Whitebox.getInternalState(bootstrap, "tempContexts"); - Assert.assertEquals(1, context.size()); - verifyAll(); - } - - @Test - public void testAddContexts() { - List tempContexts = new ArrayList(); - AbstractCustomContext tempContext = new ViewContext(); - tempContexts.add(tempContext); - Whitebox.setInternalState(bootstrap, "tempContexts", tempContexts); - Whitebox.setInternalState(bootstrap, "afterBeanDiscoveryEvent", event); - - AfterDeploymentValidation afterDeploymentValidation = createMock(AfterDeploymentValidation.class); - - event.addContext(tempContext); - - replay(event, afterDeploymentValidation); - - bootstrap.addContexts(afterDeploymentValidation); - verifyAll(); - } - - @Test - public void testRemoveContexts() { - bootstrap.storeContexts(event); - - AfterShutdownProccess afterShutdownProccess = createMock(AfterShutdownProccess.class); - replay(event, afterShutdownProccess); - bootstrap.removeContexts(afterShutdownProccess); - - 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.bootstrap; +// +//import static org.easymock.EasyMock.expect; +//import static org.powermock.api.easymock.PowerMock.createMock; +//import static org.powermock.api.easymock.PowerMock.mockStatic; +//import static org.powermock.api.easymock.PowerMock.replay; +//import static org.powermock.api.easymock.PowerMock.verifyAll; +// +//import java.util.ArrayList; +//import java.util.List; +//import java.util.Locale; +// +//import javax.enterprise.inject.spi.AfterBeanDiscovery; +//import javax.enterprise.inject.spi.AfterDeploymentValidation; +// +//import junit.framework.Assert; +// +//import org.junit.Before; +//import org.junit.Ignore; +//import org.junit.Test; +//import org.junit.runner.RunWith; +//import org.powermock.core.classloader.annotations.PrepareForTest; +//import org.powermock.modules.junit4.PowerMockRunner; +//import org.powermock.reflect.Whitebox; +// +//import br.gov.frameworkdemoiselle.internal.context.AbstractCustomContext; +//import br.gov.frameworkdemoiselle.internal.context.ContextManager; +//import br.gov.frameworkdemoiselle.internal.context.ViewContext; +//import br.gov.frameworkdemoiselle.lifecycle.AfterShutdownProccess; +//import br.gov.frameworkdemoiselle.util.Beans; +// +//@RunWith(PowerMockRunner.class) +//@PrepareForTest({ Beans.class, ContextManager.class }) +//@Ignore +//public class JsfBootstrapTest { +// +// private JsfBootstrap bootstrap; +// +// private AfterBeanDiscovery event; +// +// @Before +// public void before() { +// event = createMock(AfterBeanDiscovery.class); +// mockStatic(Beans.class); +// expect(Beans.getReference(Locale.class)).andReturn(Locale.getDefault()).anyTimes(); +// replay(Beans.class); +// bootstrap = new JsfBootstrap(); +// } +// +// @Test +// public void testStoreContexts() { +// bootstrap.storeContexts(event); +// replay(event); +// +// Assert.assertEquals(event, Whitebox.getInternalState(bootstrap, "afterBeanDiscoveryEvent")); +// List context = Whitebox.getInternalState(bootstrap, "tempContexts"); +// Assert.assertEquals(1, context.size()); +// verifyAll(); +// } +// +// @Test +// public void testAddContexts() { +// List tempContexts = new ArrayList(); +// AbstractCustomContext tempContext = new ViewContext(); +// tempContexts.add(tempContext); +// Whitebox.setInternalState(bootstrap, "tempContexts", tempContexts); +// Whitebox.setInternalState(bootstrap, "afterBeanDiscoveryEvent", event); +// +// AfterDeploymentValidation afterDeploymentValidation = createMock(AfterDeploymentValidation.class); +// +// event.addContext(tempContext); +// +// replay(event, afterDeploymentValidation); +// +// bootstrap.addContexts(afterDeploymentValidation); +// verifyAll(); +// } +// +// @Test +// public void testRemoveContexts() { +// bootstrap.storeContexts(event); +// +// AfterShutdownProccess afterShutdownProccess = createMock(AfterShutdownProccess.class); +// replay(event, afterShutdownProccess); +// bootstrap.removeContexts(afterShutdownProccess); +// +// verifyAll(); +// } +// +//} 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 6e5fe7a..cc75c93 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 @@ -1,75 +1,75 @@ -/* - * 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.assertEquals; -import static org.easymock.EasyMock.expect; -import static org.powermock.api.easymock.PowerMock.replayAll; -import static org.powermock.api.easymock.PowerMock.verifyAll; - -import javax.faces.context.ExceptionHandler; -import javax.faces.context.ExceptionHandlerFactory; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.powermock.api.easymock.PowerMock; -import org.powermock.modules.junit4.PowerMockRunner; - -@RunWith(PowerMockRunner.class) -public class ApplicationExceptionHandlerFactoryTest { - - @Test - public void testGetExceptionHandler() { - - ExceptionHandler jsfExceptionHandler = PowerMock.createMock(ExceptionHandler.class); - - ExceptionHandlerFactory jsfFactory = PowerMock.createMock(ExceptionHandlerFactory.class); - - ApplicationExceptionHandlerFactory handlerFactory = new ApplicationExceptionHandlerFactory(jsfFactory); - expect(jsfFactory.getExceptionHandler()).andReturn(jsfExceptionHandler); - - replayAll(); - - ApplicationExceptionHandler handler = (ApplicationExceptionHandler) handlerFactory.getExceptionHandler(); - - assertEquals(handler.getWrapped(), jsfExceptionHandler); - - 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.assertEquals; +//import static org.easymock.EasyMock.expect; +//import static org.powermock.api.easymock.PowerMock.replayAll; +//import static org.powermock.api.easymock.PowerMock.verifyAll; +// +//import javax.faces.context.ExceptionHandler; +//import javax.faces.context.ExceptionHandlerFactory; +// +//import org.junit.Test; +//import org.junit.runner.RunWith; +//import org.powermock.api.easymock.PowerMock; +//import org.powermock.modules.junit4.PowerMockRunner; +// +//@RunWith(PowerMockRunner.class) +//public class ApplicationExceptionHandlerFactoryTest { +// +// @Test +// public void testGetExceptionHandler() { +// +// ExceptionHandler jsfExceptionHandler = PowerMock.createMock(ExceptionHandler.class); +// +// ExceptionHandlerFactory jsfFactory = PowerMock.createMock(ExceptionHandlerFactory.class); +// +// ApplicationExceptionHandlerFactory handlerFactory = new ApplicationExceptionHandlerFactory(jsfFactory); +// expect(jsfFactory.getExceptionHandler()).andReturn(jsfExceptionHandler); +// +// replayAll(); +// +// ApplicationExceptionHandler handler = (ApplicationExceptionHandler) handlerFactory.getExceptionHandler(); +// +// assertEquals(handler.getWrapped(), jsfExceptionHandler); +// +// verifyAll(); +// +// } +// +//} diff --git a/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/ApplicationExceptionHandlerTest.java b/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/ApplicationExceptionHandlerTest.java index 890c685..a959cfe 100644 --- a/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/ApplicationExceptionHandlerTest.java +++ b/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/ApplicationExceptionHandlerTest.java @@ -1,206 +1,206 @@ -/* - * 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.context.FacesContext; -import javax.faces.event.ExceptionQueuedEvent; -import javax.faces.event.ExceptionQueuedEventContext; -import javax.faces.event.PhaseId; - -import org.junit.Before; -import org.junit.Test; -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 br.gov.frameworkdemoiselle.exception.ApplicationException; -import br.gov.frameworkdemoiselle.internal.configuration.ExceptionHandlerConfig; -import br.gov.frameworkdemoiselle.util.Beans; -import br.gov.frameworkdemoiselle.util.Faces; - -@RunWith(PowerMockRunner.class) -@PrepareForTest({ Beans.class, FacesContext.class, Faces.class }) -public class ApplicationExceptionHandlerTest { - - private ApplicationExceptionHandler handler; - - private ExceptionQueuedEventContext eventContext; - - private ExceptionHandlerConfig config; - - private FacesContext facesContext; - - private Collection events; - - @SuppressWarnings("serial") - @ApplicationException - class AnnotatedAppException extends RuntimeException { - } - - @SuppressWarnings("serial") - class SomeException extends RuntimeException { - } - - @Before - public void setUp() { - - mockStatic(Beans.class); - mockStatic(FacesContext.class); - - events = new ArrayList(); - ExceptionHandler jsfExceptionHandler = createMock(ExceptionHandler.class); - handler = new ApplicationExceptionHandler(jsfExceptionHandler); - eventContext = PowerMock.createMock(ExceptionQueuedEventContext.class); - ExceptionQueuedEvent event = PowerMock.createMock(ExceptionQueuedEvent.class); - config = PowerMock.createMock(ExceptionHandlerConfig.class); - facesContext = PowerMock.createMock(FacesContext.class); - - expect(event.getSource()).andReturn(eventContext); - expect(Beans.getReference(ExceptionHandlerConfig.class)).andReturn(config); - expect(FacesContext.getCurrentInstance()).andReturn(facesContext).anyTimes(); - expect(handler.getUnhandledExceptionQueuedEvents()).andReturn(events).times(2); - - events.add(event); - - } - - @Test - public void testHandleAnApplicationExceptionNotOnRenderResponse() { - - mockStatic(Faces.class); - - AnnotatedAppException exception = new AnnotatedAppException(); - PhaseId phaseId = PowerMock.createMock(PhaseId.class); - - expect(eventContext.getException()).andReturn(exception); - expect(facesContext.getCurrentPhaseId()).andReturn(phaseId); - expect(config.isHandleApplicationException()).andReturn(true); - - Faces.addMessage(exception); - expectLastCall(); - - replayAll(); - - handler.handle(); - - assertTrue(events.isEmpty()); - - verifyAll(); - - } - - @Test - public void testHandleAnApplicationExceptionOnRenderResponse() { - - AnnotatedAppException exception = new AnnotatedAppException(); - // PhaseId phaseId = PhaseId.RENDER_RESPONSE; - - expect(eventContext.getException()).andReturn(exception); - // expect(facesContext.getCurrentPhaseId()).andReturn(phaseId); - expect(config.isHandleApplicationException()).andReturn(false); - - handler.getWrapped().handle(); - expectLastCall(); - - replayAll(); - - handler.handle(); - - assertFalse(events.isEmpty()); - - verifyAll(); - - } - - @Test - public void testHandleAnyException() { - - SomeException exception = new SomeException(); - // PhaseId phaseId = PowerMock.createMock(PhaseId.class); - - expect(eventContext.getException()).andReturn(exception); - // expect(facesContext.getCurrentPhaseId()).andReturn(phaseId); - expect(config.isHandleApplicationException()).andReturn(true); - - handler.getWrapped().handle(); - expectLastCall(); - - replayAll(); - - handler.handle(); - - assertFalse(events.isEmpty()); - - verifyAll(); - - } - - @Test - public void testDoNotHandleApplicationExceptions() { - - AnnotatedAppException exception = new AnnotatedAppException(); - - expect(eventContext.getException()).andReturn(exception); - expect(config.isHandleApplicationException()).andReturn(false); - - 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.context.FacesContext; +//import javax.faces.event.ExceptionQueuedEvent; +//import javax.faces.event.ExceptionQueuedEventContext; +//import javax.faces.event.PhaseId; +// +//import org.junit.Before; +//import org.junit.Test; +//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 br.gov.frameworkdemoiselle.exception.ApplicationException; +//import br.gov.frameworkdemoiselle.internal.configuration.ExceptionHandlerConfig; +//import br.gov.frameworkdemoiselle.util.Beans; +//import br.gov.frameworkdemoiselle.util.Faces; +// +//@RunWith(PowerMockRunner.class) +//@PrepareForTest({ Beans.class, FacesContext.class, Faces.class }) +//public class ApplicationExceptionHandlerTest { +// +// private ApplicationExceptionHandler handler; +// +// private ExceptionQueuedEventContext eventContext; +// +// private ExceptionHandlerConfig config; +// +// private FacesContext facesContext; +// +// private Collection events; +// +// @SuppressWarnings("serial") +// @ApplicationException +// class AnnotatedAppException extends RuntimeException { +// } +// +// @SuppressWarnings("serial") +// class SomeException extends RuntimeException { +// } +// +// @Before +// public void setUp() { +// +// mockStatic(Beans.class); +// mockStatic(FacesContext.class); +// +// events = new ArrayList(); +// ExceptionHandler jsfExceptionHandler = createMock(ExceptionHandler.class); +// handler = new ApplicationExceptionHandler(jsfExceptionHandler); +// eventContext = PowerMock.createMock(ExceptionQueuedEventContext.class); +// ExceptionQueuedEvent event = PowerMock.createMock(ExceptionQueuedEvent.class); +// config = PowerMock.createMock(ExceptionHandlerConfig.class); +// facesContext = PowerMock.createMock(FacesContext.class); +// +// expect(event.getSource()).andReturn(eventContext); +// expect(Beans.getReference(ExceptionHandlerConfig.class)).andReturn(config); +// expect(FacesContext.getCurrentInstance()).andReturn(facesContext).anyTimes(); +// expect(handler.getUnhandledExceptionQueuedEvents()).andReturn(events).times(2); +// +// events.add(event); +// +// } +// +// @Test +// public void testHandleAnApplicationExceptionNotOnRenderResponse() { +// +// mockStatic(Faces.class); +// +// AnnotatedAppException exception = new AnnotatedAppException(); +// PhaseId phaseId = PowerMock.createMock(PhaseId.class); +// +// expect(eventContext.getException()).andReturn(exception); +// expect(facesContext.getCurrentPhaseId()).andReturn(phaseId); +// expect(config.isHandleApplicationException()).andReturn(true); +// +// Faces.addMessage(exception); +// expectLastCall(); +// +// replayAll(); +// +// handler.handle(); +// +// assertTrue(events.isEmpty()); +// +// verifyAll(); +// +// } +// +// @Test +// public void testHandleAnApplicationExceptionOnRenderResponse() { +// +// AnnotatedAppException exception = new AnnotatedAppException(); +// // PhaseId phaseId = PhaseId.RENDER_RESPONSE; +// +// expect(eventContext.getException()).andReturn(exception); +// // expect(facesContext.getCurrentPhaseId()).andReturn(phaseId); +// expect(config.isHandleApplicationException()).andReturn(false); +// +// handler.getWrapped().handle(); +// expectLastCall(); +// +// replayAll(); +// +// handler.handle(); +// +// assertFalse(events.isEmpty()); +// +// verifyAll(); +// +// } +// +// @Test +// public void testHandleAnyException() { +// +// SomeException exception = new SomeException(); +// // PhaseId phaseId = PowerMock.createMock(PhaseId.class); +// +// expect(eventContext.getException()).andReturn(exception); +// // expect(facesContext.getCurrentPhaseId()).andReturn(phaseId); +// expect(config.isHandleApplicationException()).andReturn(true); +// +// handler.getWrapped().handle(); +// expectLastCall(); +// +// replayAll(); +// +// handler.handle(); +// +// assertFalse(events.isEmpty()); +// +// verifyAll(); +// +// } +// +// @Test +// public void testDoNotHandleApplicationExceptions() { +// +// AnnotatedAppException exception = new AnnotatedAppException(); +// +// expect(eventContext.getException()).andReturn(exception); +// expect(config.isHandleApplicationException()).andReturn(false); +// +// 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/AuthenticationExceptionHandlerFactoryTest.java b/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/AuthenticationExceptionHandlerFactoryTest.java index d8a163f..2749dea 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 @@ -1,75 +1,75 @@ -/* - * 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.assertEquals; -import static org.easymock.EasyMock.expect; -import static org.powermock.api.easymock.PowerMock.replayAll; -import static org.powermock.api.easymock.PowerMock.verifyAll; - -import javax.faces.context.ExceptionHandler; -import javax.faces.context.ExceptionHandlerFactory; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.powermock.api.easymock.PowerMock; -import org.powermock.modules.junit4.PowerMockRunner; - -@RunWith(PowerMockRunner.class) -public class AuthenticationExceptionHandlerFactoryTest { - - @Test - public void testGetExceptionHandler() { - - ExceptionHandler jsfExceptionHandler = PowerMock.createMock(ExceptionHandler.class); - - ExceptionHandlerFactory jsfFactory = PowerMock.createMock(ExceptionHandlerFactory.class); - - AuthenticationExceptionHandlerFactory handlerFactory = new AuthenticationExceptionHandlerFactory(jsfFactory); - expect(jsfFactory.getExceptionHandler()).andReturn(jsfExceptionHandler); - - replayAll(); - - AuthenticationExceptionHandler handler = (AuthenticationExceptionHandler) handlerFactory.getExceptionHandler(); - - assertEquals(handler.getWrapped(), jsfExceptionHandler); - - 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.assertEquals; +//import static org.easymock.EasyMock.expect; +//import static org.powermock.api.easymock.PowerMock.replayAll; +//import static org.powermock.api.easymock.PowerMock.verifyAll; +// +//import javax.faces.context.ExceptionHandler; +//import javax.faces.context.ExceptionHandlerFactory; +// +//import org.junit.Test; +//import org.junit.runner.RunWith; +//import org.powermock.api.easymock.PowerMock; +//import org.powermock.modules.junit4.PowerMockRunner; +// +//@RunWith(PowerMockRunner.class) +//public class AuthenticationExceptionHandlerFactoryTest { +// +// @Test +// public void testGetExceptionHandler() { +// +// ExceptionHandler jsfExceptionHandler = PowerMock.createMock(ExceptionHandler.class); +// +// ExceptionHandlerFactory jsfFactory = PowerMock.createMock(ExceptionHandlerFactory.class); +// +// AuthenticationExceptionHandlerFactory handlerFactory = new AuthenticationExceptionHandlerFactory(jsfFactory); +// expect(jsfFactory.getExceptionHandler()).andReturn(jsfExceptionHandler); +// +// replayAll(); +// +// AuthenticationExceptionHandler handler = (AuthenticationExceptionHandler) handlerFactory.getExceptionHandler(); +// +// 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 f2436dd..d9c738d 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}) -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 787ad16..e1e698a 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 @@ -1,75 +1,75 @@ -/* - * 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.assertEquals; -import static org.easymock.EasyMock.expect; -import static org.powermock.api.easymock.PowerMock.replayAll; -import static org.powermock.api.easymock.PowerMock.verifyAll; - -import javax.faces.context.ExceptionHandler; -import javax.faces.context.ExceptionHandlerFactory; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.powermock.api.easymock.PowerMock; -import org.powermock.modules.junit4.PowerMockRunner; - -@RunWith(PowerMockRunner.class) -public class AuthorizationExceptionHandlerFactoryTest { - - @Test - public void testGetExceptionHandler() { - - ExceptionHandler jsfExceptionHandler = PowerMock.createMock(ExceptionHandler.class); - - ExceptionHandlerFactory jsfFactory = PowerMock.createMock(ExceptionHandlerFactory.class); - - AuthorizationExceptionHandlerFactory handlerFactory = new AuthorizationExceptionHandlerFactory(jsfFactory); - expect(jsfFactory.getExceptionHandler()).andReturn(jsfExceptionHandler); - - replayAll(); - - AuthorizationExceptionHandler handler = (AuthorizationExceptionHandler) handlerFactory.getExceptionHandler(); - - assertEquals(handler.getWrapped(), jsfExceptionHandler); - - 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.assertEquals; +//import static org.easymock.EasyMock.expect; +//import static org.powermock.api.easymock.PowerMock.replayAll; +//import static org.powermock.api.easymock.PowerMock.verifyAll; +// +//import javax.faces.context.ExceptionHandler; +//import javax.faces.context.ExceptionHandlerFactory; +// +//import org.junit.Test; +//import org.junit.runner.RunWith; +//import org.powermock.api.easymock.PowerMock; +//import org.powermock.modules.junit4.PowerMockRunner; +// +//@RunWith(PowerMockRunner.class) +//public class AuthorizationExceptionHandlerFactoryTest { +// +// @Test +// public void testGetExceptionHandler() { +// +// ExceptionHandler jsfExceptionHandler = PowerMock.createMock(ExceptionHandler.class); +// +// ExceptionHandlerFactory jsfFactory = PowerMock.createMock(ExceptionHandlerFactory.class); +// +// AuthorizationExceptionHandlerFactory handlerFactory = new AuthorizationExceptionHandlerFactory(jsfFactory); +// expect(jsfFactory.getExceptionHandler()).andReturn(jsfExceptionHandler); +// +// replayAll(); +// +// AuthorizationExceptionHandler handler = (AuthorizationExceptionHandler) handlerFactory.getExceptionHandler(); +// +// assertEquals(handler.getWrapped(), jsfExceptionHandler); +// +// verifyAll(); +// +// } +// +//} diff --git a/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/AuthorizationExceptionHandlerTest.java b/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/AuthorizationExceptionHandlerTest.java index eb5a66d..52d7c66 100644 --- a/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/AuthorizationExceptionHandlerTest.java +++ b/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/AuthorizationExceptionHandlerTest.java @@ -1,171 +1,171 @@ -/* - * 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.context.FacesContext; -import javax.faces.event.ExceptionQueuedEvent; -import javax.faces.event.ExceptionQueuedEventContext; -import javax.faces.event.PhaseId; - -import org.junit.Before; -import org.junit.Test; -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 br.gov.frameworkdemoiselle.security.AuthorizationException; -import br.gov.frameworkdemoiselle.util.Faces; - -@RunWith(PowerMockRunner.class) -@PrepareForTest({ FacesContext.class, Faces.class }) -public class AuthorizationExceptionHandlerTest { - - private AuthorizationExceptionHandler handler; - - private ExceptionQueuedEventContext eventContext; - - private Collection events; - - private FacesContext facesContext; - - @Before - public void setUp() { - - mockStatic(FacesContext.class); - - events = new ArrayList(); - ExceptionHandler jsfExceptionHandler = createMock(ExceptionHandler.class); - handler = new AuthorizationExceptionHandler(jsfExceptionHandler); - eventContext = createMock(ExceptionQueuedEventContext.class); - ExceptionQueuedEvent event = createMock(ExceptionQueuedEvent.class); - facesContext = PowerMock.createMock(FacesContext.class); - - expect(event.getSource()).andReturn(eventContext); - events.add(event); - expect(handler.getUnhandledExceptionQueuedEvents()).andReturn(events).times(2); - expect(FacesContext.getCurrentInstance()).andReturn(facesContext).anyTimes(); - - - } - - @Test - public void testHandleAnAuthorizationExceptionNotOnRenderResponse() { - - mockStatic(Faces.class); - -// ResourceBundle bundle = new ResourceBundle(ResourceBundle.getBundle("demoiselle-core-bundle")); - - AuthorizationException exception = new AuthorizationException(""); - PhaseId phaseId = PowerMock.createMock(PhaseId.class); - - expect(eventContext.getException()).andReturn(exception); - expect(facesContext.getCurrentPhaseId()).andReturn(phaseId); - - Faces.addMessage(exception); - expectLastCall(); - - replayAll(); - - handler.handle(); - - assertTrue(events.isEmpty()); - - verifyAll(); - - } - - @Test - public void testHandleAnAuthorizationExceptionOnRenderResponse() { - -// ResourceBundle bundle = new ResourceBundle(ResourceBundle.getBundle("demoiselle-core-bundle")); - - AuthorizationException exception = new AuthorizationException(""); - PhaseId phaseId = PhaseId.RENDER_RESPONSE; - - expect(eventContext.getException()).andReturn(exception); - expect(facesContext.getCurrentPhaseId()).andReturn(phaseId); - - handler.getWrapped().handle(); - expectLastCall(); - - replayAll(); - - handler.handle(); - - assertFalse(events.isEmpty()); - - verifyAll(); - - } - - @Test - public void testHandleAnyException() { - - Exception exception = new Exception(); - PhaseId phaseId = PowerMock.createMock(PhaseId.class); - - expect(eventContext.getException()).andReturn(exception); - expect(facesContext.getCurrentPhaseId()).andReturn(phaseId); - - 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.context.FacesContext; +//import javax.faces.event.ExceptionQueuedEvent; +//import javax.faces.event.ExceptionQueuedEventContext; +//import javax.faces.event.PhaseId; +// +//import org.junit.Before; +//import org.junit.Test; +//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 br.gov.frameworkdemoiselle.security.AuthorizationException; +//import br.gov.frameworkdemoiselle.util.Faces; +// +//@RunWith(PowerMockRunner.class) +//@PrepareForTest({ FacesContext.class, Faces.class }) +//public class AuthorizationExceptionHandlerTest { +// +// private AuthorizationExceptionHandler handler; +// +// private ExceptionQueuedEventContext eventContext; +// +// private Collection events; +// +// private FacesContext facesContext; +// +// @Before +// public void setUp() { +// +// mockStatic(FacesContext.class); +// +// events = new ArrayList(); +// ExceptionHandler jsfExceptionHandler = createMock(ExceptionHandler.class); +// handler = new AuthorizationExceptionHandler(jsfExceptionHandler); +// eventContext = createMock(ExceptionQueuedEventContext.class); +// ExceptionQueuedEvent event = createMock(ExceptionQueuedEvent.class); +// facesContext = PowerMock.createMock(FacesContext.class); +// +// expect(event.getSource()).andReturn(eventContext); +// events.add(event); +// expect(handler.getUnhandledExceptionQueuedEvents()).andReturn(events).times(2); +// expect(FacesContext.getCurrentInstance()).andReturn(facesContext).anyTimes(); +// +// +// } +// +// @Test +// public void testHandleAnAuthorizationExceptionNotOnRenderResponse() { +// +// mockStatic(Faces.class); +// +//// ResourceBundle bundle = new ResourceBundle(ResourceBundle.getBundle("demoiselle-core-bundle")); +// +// AuthorizationException exception = new AuthorizationException(""); +// PhaseId phaseId = PowerMock.createMock(PhaseId.class); +// +// expect(eventContext.getException()).andReturn(exception); +// expect(facesContext.getCurrentPhaseId()).andReturn(phaseId); +// +// Faces.addMessage(exception); +// expectLastCall(); +// +// replayAll(); +// +// handler.handle(); +// +// assertTrue(events.isEmpty()); +// +// verifyAll(); +// +// } +// +// @Test +// public void testHandleAnAuthorizationExceptionOnRenderResponse() { +// +//// ResourceBundle bundle = new ResourceBundle(ResourceBundle.getBundle("demoiselle-core-bundle")); +// +// AuthorizationException exception = new AuthorizationException(""); +// PhaseId phaseId = PhaseId.RENDER_RESPONSE; +// +// expect(eventContext.getException()).andReturn(exception); +// expect(facesContext.getCurrentPhaseId()).andReturn(phaseId); +// +// handler.getWrapped().handle(); +// expectLastCall(); +// +// replayAll(); +// +// handler.handle(); +// +// assertFalse(events.isEmpty()); +// +// verifyAll(); +// +// } +// +// @Test +// public void testHandleAnyException() { +// +// Exception exception = new Exception(); +// PhaseId phaseId = PowerMock.createMock(PhaseId.class); +// +// expect(eventContext.getException()).andReturn(exception); +// expect(facesContext.getCurrentPhaseId()).andReturn(phaseId); +// +// 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/FileRendererImplTest.java b/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/FileRendererImplTest.java index 5c41703..b5cea23 100644 --- a/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/FileRendererImplTest.java +++ b/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/FileRendererImplTest.java @@ -1,328 +1,328 @@ -/* - * 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 java.io.ByteArrayInputStream; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; - -import javax.faces.context.FacesContext; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletResponse; - -import junit.framework.Assert; - -import org.easymock.EasyMock; -import org.junit.Before; -import org.junit.Test; -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.util.Faces; -import br.gov.frameworkdemoiselle.util.FileRenderer; -import br.gov.frameworkdemoiselle.util.FileRenderer.ContentType; - -@RunWith(PowerMockRunner.class) -@PrepareForTest({ Faces.class }) -public class FileRendererImplTest { - - private Logger logger; - - private FileRenderer renderer; - - private FacesContext facesContext; - - private HttpServletResponse response; - - @Before - public void before() { - renderer = new FileRendererImpl(); - - logger = PowerMock.createMock(Logger.class); - Whitebox.setInternalState(renderer, "logger", logger); - - facesContext = PowerMock.createMock(FacesContext.class); - Whitebox.setInternalState(renderer, "context", facesContext); - - response = PowerMock.createMock(HttpServletResponse.class); - Whitebox.setInternalState(renderer, "response", response); - } - - @Test - public void testRenderBytesFail() { - byte[] bytes = "Test".getBytes(); - String fileName = "fileName.pdf"; - - logger.debug(EasyMock.anyObject(String.class)); - EasyMock.expectLastCall().anyTimes(); - - IOException exception = new IOException(); - logger.info("Erro na geração do relatório. Incluíndo a exceção de erro em um FacesMessage", exception); - EasyMock.expectLastCall().anyTimes(); - - response.setContentType(ContentType.PDF.getContentType()); - EasyMock.expectLastCall().times(1); - - response.setContentLength(bytes.length); - EasyMock.expectLastCall().times(1); - - response.setHeader("Content-Disposition", "filename=\"" + fileName + "\""); - EasyMock.expectLastCall().times(1); - - facesContext.responseComplete(); - EasyMock.expectLastCall().times(1); - - try { - EasyMock.expect(response.getOutputStream()).andThrow(exception); - } catch (IOException e) { - Assert.fail(); - } - - PowerMock.mockStatic(Faces.class); - Faces.addMessage(exception); - - PowerMock.replayAll(); - renderer.render(bytes, ContentType.PDF, fileName); - PowerMock.verifyAll(); - } - - @Test - public void testRenderBytesSuccess() throws IOException { - byte[] bytes = "Test".getBytes(); - String fileName = "fileName.pdf"; - - logger.debug(EasyMock.anyObject(String.class)); - EasyMock.expectLastCall().anyTimes(); - - facesContext.responseComplete(); - EasyMock.expectLastCall().times(1); - - response.setContentType(ContentType.PDF.getContentType()); - EasyMock.expectLastCall().times(1); - - response.setContentLength(bytes.length); - EasyMock.expectLastCall().times(1); - - response.setHeader("Content-Disposition", "filename=\"" + fileName + "\""); - EasyMock.expectLastCall().times(1); - - ServletOutputStream stream = PowerMock.createMock(ServletOutputStream.class); - stream.write(bytes, 0, bytes.length); - EasyMock.expectLastCall().times(1); - - stream.flush(); - EasyMock.expectLastCall().times(1); - - stream.close(); - EasyMock.expectLastCall().times(1); - - EasyMock.expect(response.getOutputStream()).andReturn(stream).times(3); - - PowerMock.replayAll(); - renderer.render(bytes, ContentType.PDF, fileName); - PowerMock.verifyAll(); - } - - @Test - public void testRenderStreamFail() { - byte[] bytes = "Test".getBytes(); - InputStream stream = new ByteArrayInputStream(bytes); - String fileName = "fileName.pdf"; - - logger.debug(EasyMock.anyObject(String.class)); - EasyMock.expectLastCall().anyTimes(); - - IOException exception = new IOException(); - logger.info("Erro na geração do relatório. Incluíndo a exceção de erro em um FacesMessage", exception); - EasyMock.expectLastCall().anyTimes(); - - response.setContentType(ContentType.PDF.getContentType()); - EasyMock.expectLastCall().times(1); - - response.setContentLength(bytes.length); - EasyMock.expectLastCall().times(1); - - response.setHeader("Content-Disposition", "filename=\"" + fileName + "\""); - EasyMock.expectLastCall().times(1); - - facesContext.responseComplete(); - EasyMock.expectLastCall().times(1); - - try { - EasyMock.expect(response.getOutputStream()).andThrow(exception); - } catch (IOException e) { - Assert.fail(); - } - - PowerMock.mockStatic(Faces.class); - Faces.addMessage(exception); - - PowerMock.replayAll(); - renderer.render(stream, ContentType.PDF, fileName, false); - PowerMock.verifyAll(); - } - - @Test - public void testRenderStreamSuccess() throws IOException { - byte[] bytes = "Test".getBytes(); - InputStream inputStream = new ByteArrayInputStream(bytes); - - String fileName = "fileName.pdf"; - - logger.debug(EasyMock.anyObject(String.class)); - EasyMock.expectLastCall().anyTimes(); - - facesContext.responseComplete(); - EasyMock.expectLastCall().times(1); - - response.setContentType(ContentType.PDF.getContentType()); - EasyMock.expectLastCall().times(1); - - response.setContentLength(bytes.length); - EasyMock.expectLastCall().times(1); - - response.setHeader("Content-Disposition", "filename=\"" + fileName + "\""); - EasyMock.expectLastCall().times(1); - - ServletOutputStream stream = new ServletOutputStream() { - - @Override - public void write(int b) throws IOException { - Assert.assertTrue(true); - } - }; - - EasyMock.expect(response.getOutputStream()).andReturn(stream).times(3); - - PowerMock.replayAll(); - renderer.render(inputStream, ContentType.PDF, fileName); - PowerMock.verifyAll(); - } - - @Test - public void testRenderFileFail() throws IOException { - - File file = new File("fileName"); - file.createNewFile(); - - String fileName = "fileName.pdf"; - - logger.debug(EasyMock.anyObject(String.class)); - EasyMock.expectLastCall().anyTimes(); - - IOException exception = new IOException(); - logger.info("Erro na geração do relatório. Incluíndo a exceção de erro em um FacesMessage", exception); - EasyMock.expectLastCall().anyTimes(); - - response.setContentType(ContentType.PDF.getContentType()); - EasyMock.expectLastCall().times(1); - - response.setContentLength((int) file.length()); - EasyMock.expectLastCall().times(1); - - response.setHeader("Content-Disposition", "filename=\"" + fileName + "\""); - EasyMock.expectLastCall().times(1); - - facesContext.responseComplete(); - EasyMock.expectLastCall().times(1); - - try { - EasyMock.expect(response.getOutputStream()).andThrow(exception); - } catch (IOException e) { - Assert.fail(); - } - - PowerMock.mockStatic(Faces.class); - Faces.addMessage(exception); - - PowerMock.replayAll(); - renderer.render(file, ContentType.PDF, fileName); - PowerMock.verifyAll(); - - file.delete(); - } - - @Test - public void testRenderFileNotFoundException() throws IOException { - - File file = new File("fileName"); - file.createNewFile(); - - String fileName = "fileName.pdf"; - - logger.debug(EasyMock.anyObject(String.class)); - EasyMock.expectLastCall().anyTimes(); - - IOException exception = new IOException(); - logger.info("Erro na geração do relatório. Incluíndo a exceção de erro em um FacesMessage", exception); - EasyMock.expectLastCall().anyTimes(); - - response.setContentType(ContentType.PDF.getContentType()); - EasyMock.expectLastCall().times(1); - - response.setContentLength((int) file.length()); - EasyMock.expectLastCall().times(1); - - response.setHeader("Content-Disposition", "filename=\"" + fileName + "\""); - EasyMock.expectLastCall().times(1); - - facesContext.responseComplete(); - EasyMock.expectLastCall().times(1); - - try { - EasyMock.expect(response.getOutputStream()).andThrow(exception); - } catch (IOException e) { - Assert.fail(); - } - - - - PowerMock.mockStatic(Faces.class); - Faces.addMessage(exception); - - PowerMock.replayAll(); - renderer.render(file, ContentType.PDF, fileName); - PowerMock.verifyAll(); - - file.delete(); - } -} +///* +// * 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 java.io.ByteArrayInputStream; +//import java.io.File; +//import java.io.IOException; +//import java.io.InputStream; +// +//import javax.faces.context.FacesContext; +//import javax.servlet.ServletOutputStream; +//import javax.servlet.http.HttpServletResponse; +// +//import junit.framework.Assert; +// +//import org.easymock.EasyMock; +//import org.junit.Before; +//import org.junit.Test; +//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.util.Faces; +//import br.gov.frameworkdemoiselle.util.FileRenderer; +//import br.gov.frameworkdemoiselle.util.FileRenderer.ContentType; +// +//@RunWith(PowerMockRunner.class) +//@PrepareForTest({ Faces.class }) +//public class FileRendererImplTest { +// +// private Logger logger; +// +// private FileRenderer renderer; +// +// private FacesContext facesContext; +// +// private HttpServletResponse response; +// +// @Before +// public void before() { +// renderer = new FileRendererImpl(); +// +// logger = PowerMock.createMock(Logger.class); +// Whitebox.setInternalState(renderer, "logger", logger); +// +// facesContext = PowerMock.createMock(FacesContext.class); +// Whitebox.setInternalState(renderer, "context", facesContext); +// +// response = PowerMock.createMock(HttpServletResponse.class); +// Whitebox.setInternalState(renderer, "response", response); +// } +// +// @Test +// public void testRenderBytesFail() { +// byte[] bytes = "Test".getBytes(); +// String fileName = "fileName.pdf"; +// +// logger.debug(EasyMock.anyObject(String.class)); +// EasyMock.expectLastCall().anyTimes(); +// +// IOException exception = new IOException(); +// logger.info("Erro na geração do relatório. Incluíndo a exceção de erro em um FacesMessage", exception); +// EasyMock.expectLastCall().anyTimes(); +// +// response.setContentType(ContentType.PDF.getContentType()); +// EasyMock.expectLastCall().times(1); +// +// response.setContentLength(bytes.length); +// EasyMock.expectLastCall().times(1); +// +// response.setHeader("Content-Disposition", "filename=\"" + fileName + "\""); +// EasyMock.expectLastCall().times(1); +// +// facesContext.responseComplete(); +// EasyMock.expectLastCall().times(1); +// +// try { +// EasyMock.expect(response.getOutputStream()).andThrow(exception); +// } catch (IOException e) { +// Assert.fail(); +// } +// +// PowerMock.mockStatic(Faces.class); +// Faces.addMessage(exception); +// +// PowerMock.replayAll(); +// renderer.render(bytes, ContentType.PDF, fileName); +// PowerMock.verifyAll(); +// } +// +// @Test +// public void testRenderBytesSuccess() throws IOException { +// byte[] bytes = "Test".getBytes(); +// String fileName = "fileName.pdf"; +// +// logger.debug(EasyMock.anyObject(String.class)); +// EasyMock.expectLastCall().anyTimes(); +// +// facesContext.responseComplete(); +// EasyMock.expectLastCall().times(1); +// +// response.setContentType(ContentType.PDF.getContentType()); +// EasyMock.expectLastCall().times(1); +// +// response.setContentLength(bytes.length); +// EasyMock.expectLastCall().times(1); +// +// response.setHeader("Content-Disposition", "filename=\"" + fileName + "\""); +// EasyMock.expectLastCall().times(1); +// +// ServletOutputStream stream = PowerMock.createMock(ServletOutputStream.class); +// stream.write(bytes, 0, bytes.length); +// EasyMock.expectLastCall().times(1); +// +// stream.flush(); +// EasyMock.expectLastCall().times(1); +// +// stream.close(); +// EasyMock.expectLastCall().times(1); +// +// EasyMock.expect(response.getOutputStream()).andReturn(stream).times(3); +// +// PowerMock.replayAll(); +// renderer.render(bytes, ContentType.PDF, fileName); +// PowerMock.verifyAll(); +// } +// +// @Test +// public void testRenderStreamFail() { +// byte[] bytes = "Test".getBytes(); +// InputStream stream = new ByteArrayInputStream(bytes); +// String fileName = "fileName.pdf"; +// +// logger.debug(EasyMock.anyObject(String.class)); +// EasyMock.expectLastCall().anyTimes(); +// +// IOException exception = new IOException(); +// logger.info("Erro na geração do relatório. Incluíndo a exceção de erro em um FacesMessage", exception); +// EasyMock.expectLastCall().anyTimes(); +// +// response.setContentType(ContentType.PDF.getContentType()); +// EasyMock.expectLastCall().times(1); +// +// response.setContentLength(bytes.length); +// EasyMock.expectLastCall().times(1); +// +// response.setHeader("Content-Disposition", "filename=\"" + fileName + "\""); +// EasyMock.expectLastCall().times(1); +// +// facesContext.responseComplete(); +// EasyMock.expectLastCall().times(1); +// +// try { +// EasyMock.expect(response.getOutputStream()).andThrow(exception); +// } catch (IOException e) { +// Assert.fail(); +// } +// +// PowerMock.mockStatic(Faces.class); +// Faces.addMessage(exception); +// +// PowerMock.replayAll(); +// renderer.render(stream, ContentType.PDF, fileName, false); +// PowerMock.verifyAll(); +// } +// +// @Test +// public void testRenderStreamSuccess() throws IOException { +// byte[] bytes = "Test".getBytes(); +// InputStream inputStream = new ByteArrayInputStream(bytes); +// +// String fileName = "fileName.pdf"; +// +// logger.debug(EasyMock.anyObject(String.class)); +// EasyMock.expectLastCall().anyTimes(); +// +// facesContext.responseComplete(); +// EasyMock.expectLastCall().times(1); +// +// response.setContentType(ContentType.PDF.getContentType()); +// EasyMock.expectLastCall().times(1); +// +// response.setContentLength(bytes.length); +// EasyMock.expectLastCall().times(1); +// +// response.setHeader("Content-Disposition", "filename=\"" + fileName + "\""); +// EasyMock.expectLastCall().times(1); +// +// ServletOutputStream stream = new ServletOutputStream() { +// +// @Override +// public void write(int b) throws IOException { +// Assert.assertTrue(true); +// } +// }; +// +// EasyMock.expect(response.getOutputStream()).andReturn(stream).times(3); +// +// PowerMock.replayAll(); +// renderer.render(inputStream, ContentType.PDF, fileName); +// PowerMock.verifyAll(); +// } +// +// @Test +// public void testRenderFileFail() throws IOException { +// +// File file = new File("fileName"); +// file.createNewFile(); +// +// String fileName = "fileName.pdf"; +// +// logger.debug(EasyMock.anyObject(String.class)); +// EasyMock.expectLastCall().anyTimes(); +// +// IOException exception = new IOException(); +// logger.info("Erro na geração do relatório. Incluíndo a exceção de erro em um FacesMessage", exception); +// EasyMock.expectLastCall().anyTimes(); +// +// response.setContentType(ContentType.PDF.getContentType()); +// EasyMock.expectLastCall().times(1); +// +// response.setContentLength((int) file.length()); +// EasyMock.expectLastCall().times(1); +// +// response.setHeader("Content-Disposition", "filename=\"" + fileName + "\""); +// EasyMock.expectLastCall().times(1); +// +// facesContext.responseComplete(); +// EasyMock.expectLastCall().times(1); +// +// try { +// EasyMock.expect(response.getOutputStream()).andThrow(exception); +// } catch (IOException e) { +// Assert.fail(); +// } +// +// PowerMock.mockStatic(Faces.class); +// Faces.addMessage(exception); +// +// PowerMock.replayAll(); +// renderer.render(file, ContentType.PDF, fileName); +// PowerMock.verifyAll(); +// +// file.delete(); +// } +// +// @Test +// public void testRenderFileNotFoundException() throws IOException { +// +// File file = new File("fileName"); +// file.createNewFile(); +// +// String fileName = "fileName.pdf"; +// +// logger.debug(EasyMock.anyObject(String.class)); +// EasyMock.expectLastCall().anyTimes(); +// +// IOException exception = new IOException(); +// logger.info("Erro na geração do relatório. Incluíndo a exceção de erro em um FacesMessage", exception); +// EasyMock.expectLastCall().anyTimes(); +// +// response.setContentType(ContentType.PDF.getContentType()); +// EasyMock.expectLastCall().times(1); +// +// response.setContentLength((int) file.length()); +// EasyMock.expectLastCall().times(1); +// +// response.setHeader("Content-Disposition", "filename=\"" + fileName + "\""); +// EasyMock.expectLastCall().times(1); +// +// facesContext.responseComplete(); +// EasyMock.expectLastCall().times(1); +// +// try { +// EasyMock.expect(response.getOutputStream()).andThrow(exception); +// } catch (IOException e) { +// Assert.fail(); +// } +// +// +// +// PowerMock.mockStatic(Faces.class); +// Faces.addMessage(exception); +// +// PowerMock.replayAll(); +// renderer.render(file, ContentType.PDF, fileName); +// PowerMock.verifyAll(); +// +// file.delete(); +// } +//} 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 f4b7a67..904d32b 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 @@ -1,372 +1,372 @@ -/* - * 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 PURPaOSE. 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 org.easymock.EasyMock.expect; -import static org.junit.Assert.assertEquals; -import static org.powermock.api.easymock.PowerMock.createMock; -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.lang.reflect.Member; -import java.util.HashMap; -import java.util.Map; - -import javax.enterprise.context.RequestScoped; -import javax.enterprise.context.SessionScoped; -import javax.enterprise.inject.spi.Annotated; -import javax.enterprise.inject.spi.InjectionPoint; -import javax.faces.convert.Converter; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - -import org.easymock.EasyMock; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; -import org.powermock.reflect.Whitebox; - -import br.gov.frameworkdemoiselle.annotation.Name; -import br.gov.frameworkdemoiselle.annotation.ViewScoped; -import br.gov.frameworkdemoiselle.util.Beans; -import br.gov.frameworkdemoiselle.util.Faces; -import br.gov.frameworkdemoiselle.util.Reflections; - -@Ignore -@RunWith(PowerMockRunner.class) -@PrepareForTest({ Reflections.class, Faces.class, Beans.class }) -public class ParameterImplTest { - - private ParameterImpl param; - - private HttpServletRequest request; - - private InjectionPoint ip; - - private Converter converter; - - private Annotated annotated; - - private Name name; - - private HttpSession session; - - private Member member; - - @Before - public void before() { - ip = createMock(InjectionPoint.class); - request = createMock(HttpServletRequest.class); - session = createMock(HttpSession.class); - annotated = createMock(Annotated.class); - name = createMock(Name.class); - converter = createMock(Converter.class); - member = createMock(Member.class); - - mockStatic(Reflections.class); - mockStatic(Faces.class); - } - - private void prepareForTestWithKeyFromNameAnnotation() { - expect(ip.getAnnotated()).andReturn(annotated).anyTimes(); - expect(ip.getMember()).andReturn(null); - expect(annotated.isAnnotationPresent(Name.class)).andReturn(true); - expect(annotated.getAnnotation(Name.class)).andReturn(name); - expect(name.value()).andReturn("name"); - expect(Reflections.getGenericTypeArgument(EasyMock.anyObject(Member.class), EasyMock.anyInt())).andReturn( - Object.class); - } - - @Test - public void testConstructorCase1() { - this.prepareForTestWithKeyFromNameAnnotation(); - expect(Faces.getConverter(EasyMock.anyObject(Class.class))).andReturn(converter); - expect(annotated.isAnnotationPresent(ViewScoped.class)).andReturn(true); - expect(annotated.isAnnotationPresent(RequestScoped.class)).andReturn(true); - expect(annotated.isAnnotationPresent(SessionScoped.class)).andReturn(true); - - replayAll(); - param = new ParameterImpl(ip); - assertEquals("name", param.getKey()); - assertEquals(Object.class, Whitebox.getInternalState(param, "type")); - assertEquals(converter, param.getConverter()); - verifyAll(); - } - - @Test - public void testConstructorCase2() { - expect(member.getName()).andReturn("memberName"); - expect(ip.getAnnotated()).andReturn(annotated).anyTimes(); - expect(ip.getMember()).andReturn(member).anyTimes(); - expect(annotated.isAnnotationPresent(Name.class)).andReturn(false); - expect(annotated.isAnnotationPresent(ViewScoped.class)).andReturn(true); - expect(annotated.isAnnotationPresent(RequestScoped.class)).andReturn(true); - expect(annotated.isAnnotationPresent(SessionScoped.class)).andReturn(true); - expect(Reflections.getGenericTypeArgument(EasyMock.anyObject(Member.class), EasyMock.anyInt())).andReturn( - Object.class); - expect(Faces.getConverter(EasyMock.anyObject(Class.class))).andReturn(converter); - - replayAll(); - param = new ParameterImpl(ip); - assertEquals("memberName", param.getKey()); - assertEquals(Object.class, Whitebox.getInternalState(param, "type")); - assertEquals(converter, param.getConverter()); - verifyAll(); - } - - @Test - 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(); - - expect(Faces.convert("1", converter)).andReturn("return"); - expect(request.getSession()).andReturn(session).anyTimes(); - expect(request.getParameter(EasyMock.anyObject(String.class))).andReturn("1"); - expect(annotated.isAnnotationPresent(SessionScoped.class)).andReturn(true); - expect(annotated.isAnnotationPresent(ViewScoped.class)).andReturn(false); - expect(annotated.isAnnotationPresent(RequestScoped.class)).andReturn(false); - - expect(session.getAttribute("name")).andReturn("return"); - - session.setAttribute("name", "return"); - - replayAll(); - param = new ParameterImpl(ip); - assertEquals("return", param.getValue()); - verifyAll(); - } - - @Test - public void testGetValueWhenSessionScopedAndParameterValueNull() { - this.prepareForTestWithKeyFromNameAnnotation(); - - mockStatic(Beans.class); - expect(Beans.getReference(HttpServletRequest.class)).andReturn(request).anyTimes(); - - expect(request.getSession()).andReturn(session).anyTimes(); - expect(request.getParameter(EasyMock.anyObject(String.class))).andReturn(null); - expect(annotated.isAnnotationPresent(SessionScoped.class)).andReturn(true); - expect(annotated.isAnnotationPresent(RequestScoped.class)).andReturn(false); - expect(annotated.isAnnotationPresent(ViewScoped.class)).andReturn(false); - expect(session.getAttribute("name")).andReturn("return"); - - replayAll(); - param = new ParameterImpl(ip); - assertEquals("return", param.getValue()); - verifyAll(); - } - - @Test - 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()); - verifyAll(); - } - - @Test - public void testGetValueWhenViewScopedWithParamValueNotNull() { - this.prepareForTestWithKeyFromNameAnnotation(); - expect(Faces.getConverter(EasyMock.anyObject(Class.class))).andReturn(converter); - 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); - expect(request.getParameter(EasyMock.anyObject(String.class))).andReturn("1"); - expect(Faces.getViewMap()).andReturn(map); - expect(Faces.convert("1", converter)).andReturn("return"); - - replayAll(); - param = new ParameterImpl(ip); - assertEquals("return", param.getValue()); - assertEquals("return", map.get("name")); - verifyAll(); - } - - @Test - public void testGetValueWhenViewScopedWithParamValueNull() { - this.prepareForTestWithKeyFromNameAnnotation(); - 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); - expect(request.getParameter(EasyMock.anyObject(String.class))).andReturn(null); - expect(Faces.getViewMap()).andReturn(map); - - replayAll(); - param = new ParameterImpl(ip); - assertEquals("ops", param.getValue()); - assertEquals("ops", map.get("name")); - verifyAll(); - } - - @Test - public void testGetValueElseWithValueNull() { - 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(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()); - verifyAll(); - } - - @Test - public void testGetValueElseWithValueNotNull() { - this.prepareForTestWithKeyFromNameAnnotation(); - - 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"); - - replayAll(); - param = new ParameterImpl(ip); - Whitebox.setInternalState(param, "value", "myvalue"); - assertEquals("myvalue", param.getValue()); - verifyAll(); - } - - @Test - public void testSetValueIsSessionScoped() { - this.prepareForTestWithKeyFromNameAnnotation(); - - 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); - expect(request.getSession()).andReturn(session); - - session.setAttribute("name", 1L); - - replayAll(); - param = new ParameterImpl(ip); - param.setValue(1L); - verifyAll(); - } - - @Test - public void testSetValueIsViewScoped() { - this.prepareForTestWithKeyFromNameAnnotation(); - - Map map = new HashMap(); - - expect(annotated.isAnnotationPresent(SessionScoped.class)).andReturn(false); - expect(annotated.isAnnotationPresent(RequestScoped.class)).andReturn(false); - expect(annotated.isAnnotationPresent(ViewScoped.class)).andReturn(true); - expect(Faces.getViewMap()).andReturn(map); - - replayAll(); - param = new ParameterImpl(ip); - param.setValue(1L); - assertEquals(1L, map.get("name")); - verifyAll(); - } - - @Test - public void testSetValueElse() { - this.prepareForTestWithKeyFromNameAnnotation(); - - expect(annotated.isAnnotationPresent(SessionScoped.class)).andReturn(false); - expect(annotated.isAnnotationPresent(RequestScoped.class)).andReturn(false); - expect(annotated.isAnnotationPresent(ViewScoped.class)).andReturn(false); - - replayAll(); - param = new ParameterImpl(ip); - param.setValue(1L); - assertEquals(1L, Whitebox.getInternalState(param, "value")); - verifyAll(); - } - - @Test - public void testOthers() { - this.prepareForTestWithKeyFromNameAnnotation(); - - expect(annotated.isAnnotationPresent(SessionScoped.class)).andReturn(false); - expect(annotated.isAnnotationPresent(RequestScoped.class)).andReturn(true); - expect(annotated.isAnnotationPresent(ViewScoped.class)).andReturn(false); - - replayAll(); - param = new ParameterImpl(ip); - param.setValue(1L); - 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 PURPaOSE. 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 org.easymock.EasyMock.expect; +//import static org.junit.Assert.assertEquals; +//import static org.powermock.api.easymock.PowerMock.createMock; +//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.lang.reflect.Member; +//import java.util.HashMap; +//import java.util.Map; +// +//import javax.enterprise.context.RequestScoped; +//import javax.enterprise.context.SessionScoped; +//import javax.enterprise.inject.spi.Annotated; +//import javax.enterprise.inject.spi.InjectionPoint; +//import javax.faces.convert.Converter; +//import javax.servlet.http.HttpServletRequest; +//import javax.servlet.http.HttpSession; +// +//import org.easymock.EasyMock; +//import org.junit.Before; +//import org.junit.Ignore; +//import org.junit.Test; +//import org.junit.runner.RunWith; +//import org.powermock.core.classloader.annotations.PrepareForTest; +//import org.powermock.modules.junit4.PowerMockRunner; +//import org.powermock.reflect.Whitebox; +// +//import br.gov.frameworkdemoiselle.annotation.Name; +//import br.gov.frameworkdemoiselle.annotation.ViewScoped; +//import br.gov.frameworkdemoiselle.util.Beans; +//import br.gov.frameworkdemoiselle.util.Faces; +//import br.gov.frameworkdemoiselle.util.Reflections; +// +//@Ignore +//@RunWith(PowerMockRunner.class) +//@PrepareForTest({ Reflections.class, Faces.class, Beans.class }) +//public class ParameterImplTest { +// +// private ParameterImpl param; +// +// private HttpServletRequest request; +// +// private InjectionPoint ip; +// +// private Converter converter; +// +// private Annotated annotated; +// +// private Name name; +// +// private HttpSession session; +// +// private Member member; +// +// @Before +// public void before() { +// ip = createMock(InjectionPoint.class); +// request = createMock(HttpServletRequest.class); +// session = createMock(HttpSession.class); +// annotated = createMock(Annotated.class); +// name = createMock(Name.class); +// converter = createMock(Converter.class); +// member = createMock(Member.class); +// +// mockStatic(Reflections.class); +// mockStatic(Faces.class); +// } +// +// private void prepareForTestWithKeyFromNameAnnotation() { +// expect(ip.getAnnotated()).andReturn(annotated).anyTimes(); +// expect(ip.getMember()).andReturn(null); +// expect(annotated.isAnnotationPresent(Name.class)).andReturn(true); +// expect(annotated.getAnnotation(Name.class)).andReturn(name); +// expect(name.value()).andReturn("name"); +// expect(Reflections.getGenericTypeArgument(EasyMock.anyObject(Member.class), EasyMock.anyInt())).andReturn( +// Object.class); +// } +// +// @Test +// public void testConstructorCase1() { +// this.prepareForTestWithKeyFromNameAnnotation(); +// expect(Faces.getConverter(EasyMock.anyObject(Class.class))).andReturn(converter); +// expect(annotated.isAnnotationPresent(ViewScoped.class)).andReturn(true); +// expect(annotated.isAnnotationPresent(RequestScoped.class)).andReturn(true); +// expect(annotated.isAnnotationPresent(SessionScoped.class)).andReturn(true); +// +// replayAll(); +// param = new ParameterImpl(ip); +// assertEquals("name", param.getKey()); +// assertEquals(Object.class, Whitebox.getInternalState(param, "type")); +// assertEquals(converter, param.getConverter()); +// verifyAll(); +// } +// +// @Test +// public void testConstructorCase2() { +// expect(member.getName()).andReturn("memberName"); +// expect(ip.getAnnotated()).andReturn(annotated).anyTimes(); +// expect(ip.getMember()).andReturn(member).anyTimes(); +// expect(annotated.isAnnotationPresent(Name.class)).andReturn(false); +// expect(annotated.isAnnotationPresent(ViewScoped.class)).andReturn(true); +// expect(annotated.isAnnotationPresent(RequestScoped.class)).andReturn(true); +// expect(annotated.isAnnotationPresent(SessionScoped.class)).andReturn(true); +// expect(Reflections.getGenericTypeArgument(EasyMock.anyObject(Member.class), EasyMock.anyInt())).andReturn( +// Object.class); +// expect(Faces.getConverter(EasyMock.anyObject(Class.class))).andReturn(converter); +// +// replayAll(); +// param = new ParameterImpl(ip); +// assertEquals("memberName", param.getKey()); +// assertEquals(Object.class, Whitebox.getInternalState(param, "type")); +// assertEquals(converter, param.getConverter()); +// verifyAll(); +// } +// +// @Test +// 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(); +// +// expect(Faces.convert("1", converter)).andReturn("return"); +// expect(request.getSession()).andReturn(session).anyTimes(); +// expect(request.getParameter(EasyMock.anyObject(String.class))).andReturn("1"); +// expect(annotated.isAnnotationPresent(SessionScoped.class)).andReturn(true); +// expect(annotated.isAnnotationPresent(ViewScoped.class)).andReturn(false); +// expect(annotated.isAnnotationPresent(RequestScoped.class)).andReturn(false); +// +// expect(session.getAttribute("name")).andReturn("return"); +// +// session.setAttribute("name", "return"); +// +// replayAll(); +// param = new ParameterImpl(ip); +// assertEquals("return", param.getValue()); +// verifyAll(); +// } +// +// @Test +// public void testGetValueWhenSessionScopedAndParameterValueNull() { +// this.prepareForTestWithKeyFromNameAnnotation(); +// +// mockStatic(Beans.class); +// expect(Beans.getReference(HttpServletRequest.class)).andReturn(request).anyTimes(); +// +// expect(request.getSession()).andReturn(session).anyTimes(); +// expect(request.getParameter(EasyMock.anyObject(String.class))).andReturn(null); +// expect(annotated.isAnnotationPresent(SessionScoped.class)).andReturn(true); +// expect(annotated.isAnnotationPresent(RequestScoped.class)).andReturn(false); +// expect(annotated.isAnnotationPresent(ViewScoped.class)).andReturn(false); +// expect(session.getAttribute("name")).andReturn("return"); +// +// replayAll(); +// param = new ParameterImpl(ip); +// assertEquals("return", param.getValue()); +// verifyAll(); +// } +// +// @Test +// 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()); +// verifyAll(); +// } +// +// @Test +// public void testGetValueWhenViewScopedWithParamValueNotNull() { +// this.prepareForTestWithKeyFromNameAnnotation(); +// expect(Faces.getConverter(EasyMock.anyObject(Class.class))).andReturn(converter); +// 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); +// expect(request.getParameter(EasyMock.anyObject(String.class))).andReturn("1"); +// expect(Faces.getViewMap()).andReturn(map); +// expect(Faces.convert("1", converter)).andReturn("return"); +// +// replayAll(); +// param = new ParameterImpl(ip); +// assertEquals("return", param.getValue()); +// assertEquals("return", map.get("name")); +// verifyAll(); +// } +// +// @Test +// public void testGetValueWhenViewScopedWithParamValueNull() { +// this.prepareForTestWithKeyFromNameAnnotation(); +// 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); +// expect(request.getParameter(EasyMock.anyObject(String.class))).andReturn(null); +// expect(Faces.getViewMap()).andReturn(map); +// +// replayAll(); +// param = new ParameterImpl(ip); +// assertEquals("ops", param.getValue()); +// assertEquals("ops", map.get("name")); +// verifyAll(); +// } +// +// @Test +// public void testGetValueElseWithValueNull() { +// 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(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()); +// verifyAll(); +// } +// +// @Test +// public void testGetValueElseWithValueNotNull() { +// this.prepareForTestWithKeyFromNameAnnotation(); +// +// 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"); +// +// replayAll(); +// param = new ParameterImpl(ip); +// Whitebox.setInternalState(param, "value", "myvalue"); +// assertEquals("myvalue", param.getValue()); +// verifyAll(); +// } +// +// @Test +// public void testSetValueIsSessionScoped() { +// this.prepareForTestWithKeyFromNameAnnotation(); +// +// 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); +// expect(request.getSession()).andReturn(session); +// +// session.setAttribute("name", 1L); +// +// replayAll(); +// param = new ParameterImpl(ip); +// param.setValue(1L); +// verifyAll(); +// } +// +// @Test +// public void testSetValueIsViewScoped() { +// this.prepareForTestWithKeyFromNameAnnotation(); +// +// Map map = new HashMap(); +// +// expect(annotated.isAnnotationPresent(SessionScoped.class)).andReturn(false); +// expect(annotated.isAnnotationPresent(RequestScoped.class)).andReturn(false); +// expect(annotated.isAnnotationPresent(ViewScoped.class)).andReturn(true); +// expect(Faces.getViewMap()).andReturn(map); +// +// replayAll(); +// param = new ParameterImpl(ip); +// param.setValue(1L); +// assertEquals(1L, map.get("name")); +// verifyAll(); +// } +// +// @Test +// public void testSetValueElse() { +// this.prepareForTestWithKeyFromNameAnnotation(); +// +// expect(annotated.isAnnotationPresent(SessionScoped.class)).andReturn(false); +// expect(annotated.isAnnotationPresent(RequestScoped.class)).andReturn(false); +// expect(annotated.isAnnotationPresent(ViewScoped.class)).andReturn(false); +// +// replayAll(); +// param = new ParameterImpl(ip); +// param.setValue(1L); +// assertEquals(1L, Whitebox.getInternalState(param, "value")); +// verifyAll(); +// } +// +// @Test +// public void testOthers() { +// this.prepareForTestWithKeyFromNameAnnotation(); +// +// expect(annotated.isAnnotationPresent(SessionScoped.class)).andReturn(false); +// expect(annotated.isAnnotationPresent(RequestScoped.class)).andReturn(true); +// expect(annotated.isAnnotationPresent(ViewScoped.class)).andReturn(false); +// +// replayAll(); +// param = new ParameterImpl(ip); +// param.setValue(1L); +// verifyAll(); +// } +// +//} 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 a490467..7bd175d 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 @@ -1,75 +1,75 @@ -/* - * 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.assertEquals; -import static org.easymock.EasyMock.expect; -import static org.powermock.api.easymock.PowerMock.replayAll; -import static org.powermock.api.easymock.PowerMock.verifyAll; - -import javax.faces.context.ExceptionHandler; -import javax.faces.context.ExceptionHandlerFactory; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.powermock.api.easymock.PowerMock; -import org.powermock.modules.junit4.PowerMockRunner; - -@RunWith(PowerMockRunner.class) -public class RedirectExceptionHandlerFactoryTest { - - @Test - public void testGetExceptionHandler() { - - ExceptionHandler jsfExceptionHandler = PowerMock.createMock(ExceptionHandler.class); - - ExceptionHandlerFactory jsfFactory = PowerMock.createMock(ExceptionHandlerFactory.class); - - RedirectExceptionHandlerFactory handlerFactory = new RedirectExceptionHandlerFactory(jsfFactory); - expect(jsfFactory.getExceptionHandler()).andReturn(jsfExceptionHandler); - - replayAll(); - - RedirectExceptionHandler handler = (RedirectExceptionHandler) handlerFactory.getExceptionHandler(); - - assertEquals(handler.getWrapped(), jsfExceptionHandler); - - 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.assertEquals; +//import static org.easymock.EasyMock.expect; +//import static org.powermock.api.easymock.PowerMock.replayAll; +//import static org.powermock.api.easymock.PowerMock.verifyAll; +// +//import javax.faces.context.ExceptionHandler; +//import javax.faces.context.ExceptionHandlerFactory; +// +//import org.junit.Test; +//import org.junit.runner.RunWith; +//import org.powermock.api.easymock.PowerMock; +//import org.powermock.modules.junit4.PowerMockRunner; +// +//@RunWith(PowerMockRunner.class) +//public class RedirectExceptionHandlerFactoryTest { +// +// @Test +// public void testGetExceptionHandler() { +// +// ExceptionHandler jsfExceptionHandler = PowerMock.createMock(ExceptionHandler.class); +// +// ExceptionHandlerFactory jsfFactory = PowerMock.createMock(ExceptionHandlerFactory.class); +// +// RedirectExceptionHandlerFactory handlerFactory = new RedirectExceptionHandlerFactory(jsfFactory); +// expect(jsfFactory.getExceptionHandler()).andReturn(jsfExceptionHandler); +// +// replayAll(); +// +// RedirectExceptionHandler handler = (RedirectExceptionHandler) handlerFactory.getExceptionHandler(); +// +// 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 863c936..7465c35 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 @@ -1,127 +1,127 @@ -/* - * 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.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.modules.junit4.PowerMockRunner; - -import br.gov.frameworkdemoiselle.annotation.Redirect; - -@RunWith(PowerMockRunner.class) -public class RedirectExceptionHandlerTest { - - private RedirectExceptionHandler handler; - - private ExceptionQueuedEventContext eventContext; - - private Collection events; - - @SuppressWarnings("serial") - @Redirect - class AnnotatedException extends RuntimeException { - } - - @Before - public void setUp() { - - ExceptionHandler jsfExceptionHandler = createMock(ExceptionHandler.class); - ExceptionQueuedEvent event = createMock(ExceptionQueuedEvent.class); - eventContext = createMock(ExceptionQueuedEventContext.class); - handler = new RedirectExceptionHandler(jsfExceptionHandler); - events = new ArrayList(); - - expect(event.getSource()).andReturn(eventContext); - events.add(event); - 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(); - - } - - @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.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.modules.junit4.PowerMockRunner; +// +//import br.gov.frameworkdemoiselle.annotation.Redirect; +// +//@RunWith(PowerMockRunner.class) +//public class RedirectExceptionHandlerTest { +// +// private RedirectExceptionHandler handler; +// +// private ExceptionQueuedEventContext eventContext; +// +// private Collection events; +// +// @SuppressWarnings("serial") +// @Redirect +// class AnnotatedException extends RuntimeException { +// } +// +// @Before +// public void setUp() { +// +// ExceptionHandler jsfExceptionHandler = createMock(ExceptionHandler.class); +// ExceptionQueuedEvent event = createMock(ExceptionQueuedEvent.class); +// eventContext = createMock(ExceptionQueuedEventContext.class); +// handler = new RedirectExceptionHandler(jsfExceptionHandler); +// events = new ArrayList(); +// +// expect(event.getSource()).andReturn(eventContext); +// events.add(event); +// 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(); +// +// } +// +// @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/template/AbstractEditPageBeanTest.java b/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/template/AbstractEditPageBeanTest.java index f986eb4..f8f5c2c 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 @@ -1,327 +1,327 @@ -/* - * 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.template; - -import static org.easymock.EasyMock.expect; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.powermock.api.easymock.PowerMock.createMock; -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 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; - -import org.junit.Before; -import org.junit.Test; -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 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; - -import com.sun.faces.util.Util; - -@RunWith(PowerMockRunner.class) -@PrepareForTest({ Parameter.class, Beans.class, Reflections.class, Converter.class, FacesContext.class, Util.class, - Faces.class }) -public class AbstractEditPageBeanTest { - - private AbstractEditPageBean pageBean; - - private ResourceBundle bundle; - - @Before - public void before() { - bundle = new ResourceBundleProducer().create("demoiselle-jsf-bundle", Locale.getDefault()); - - pageBean = new AbstractEditPageBean() { - - private static final long serialVersionUID = 1L; - - @Override - public String update() { - return null; - } - - @Override - public String insert() { - return null; - } - - @Override - public String delete() { - return null; - } - - @Override - protected void handleLoad() { - } - }; - } - - @Test - public void testClear() { - Parameter param = PowerMock.createMock(Parameter.class); - - assertNull(Whitebox.getInternalState(pageBean, "bean")); - assertNull(Whitebox.getInternalState(pageBean, "id")); - - setInternalState(pageBean, "bean", new Contact()); - setInternalState(pageBean, "id", param); - - pageBean.clear(); - - assertNull(Whitebox.getInternalState(pageBean, "bean")); - assertNull(Whitebox.getInternalState(pageBean, "id")); - } - - @Test - public void testCreateBean() { - mockStatic(Beans.class); - Contact c = new Contact(); - expect(Beans.getReference(Contact.class)).andReturn(c); - - replayAll(); - assertEquals(c, pageBean.createBean()); - verifyAll(); - } - - @Test - public void testGetBean() { - - pageBean = new AbstractEditPageBean() { - - private static final long serialVersionUID = 1L; - - private boolean updateMode = false; - - @Override - public String update() { - return null; - } - - @Override - public String insert() { - return null; - } - - @Override - public String delete() { - return null; - } - - @Override - protected void handleLoad() { - this.setBean(new Contact(200L)); - } - - public boolean isUpdateMode() { - return updateMode; - } - - }; - - Contact c = new Contact(); - assertNull(Whitebox.getInternalState(pageBean, "bean")); - setInternalState(pageBean, "bean", c); - assertEquals(c, pageBean.getBean()); - - mockStatic(Beans.class); - expect(Beans.getReference(Contact.class)).andReturn(c); - - pageBean.clear(); - - replayAll(); - assertEquals(c, pageBean.getBean()); - verifyAll(); - - pageBean.clear(); - - setInternalState(pageBean, "updateMode", true); - assertEquals(Long.valueOf(200), pageBean.getBean().getId()); - } - - @Test - public void testGetBeanClass() { - mockStatic(Reflections.class); - expect(Reflections.getGenericTypeArgument(pageBean.getClass(), 0)).andReturn(Object.class); - - assertNull(Whitebox.getInternalState(pageBean, "beanClass")); - - replayAll(); - assertEquals(Object.class, pageBean.getBeanClass()); - verifyAll(); - - setInternalState(pageBean, "beanClass", Contact.class, AbstractEditPageBean.class); - assertEquals(Contact.class, pageBean.getBeanClass()); - } - - @Test - public void testGetIdClass() { - mockStatic(Reflections.class); - expect(Reflections.getGenericTypeArgument(pageBean.getClass(), 1)).andReturn(Object.class); - - assertNull(Whitebox.getInternalState(pageBean, "idClass")); - - replayAll(); - assertEquals(Object.class, pageBean.getIdClass()); - verifyAll(); - - Whitebox.setInternalState(pageBean, "idClass", Long.class, AbstractEditPageBean.class); - assertEquals(Long.class, pageBean.getIdClass()); - } - - @Test - @SuppressWarnings("unchecked") - public void testGetStringId() { - mockStatic(Util.class); - - FacesContext facesContext = createMock(FacesContext.class); - Parameter parameter = createMock(Parameter.class); - - setInternalState(pageBean, "facesContext", facesContext); - setInternalState(pageBean, "id", parameter); - setInternalState(pageBean, "idClass", String.class, AbstractEditPageBean.class); - - String value = "1"; - expect(parameter.getValue()).andReturn(value); - - replayAll(); - assertEquals(value, pageBean.getId()); - verifyAll(); - } - - @Test - @SuppressWarnings("unchecked") - public void testGetLongId() { - mockStatic(Faces.class); - - FacesContext facesContext = createMock(FacesContext.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(Faces.getConverter(Long.class)).andReturn(converter); - expect(converter.getAsObject(facesContext, viewRoot, value)).andReturn(Long.valueOf(value)); - - replayAll(); - assertEquals(Long.valueOf(value), pageBean.getId()); - verifyAll(); - } - - @Test - public void testGetNotStringIdWithNullConverter() { - FacesContext facesContext = createMock(FacesContext.class); - - setInternalState(pageBean, "facesContext", facesContext); - setInternalState(pageBean, "idClass", Contact.class, AbstractEditPageBean.class); - setInternalState(pageBean, "bundle", bundle); - - replayAll(); - try { - pageBean.getId(); - } catch (DemoiselleException cause) { - assertEquals(bundle.getString("id-converter-not-found", Contact.class.getCanonicalName()), - cause.getMessage()); - } - - verifyAll(); - } - - @SuppressWarnings("serial") - @Test - public void testUpdateMode() { - - pageBean = new AbstractEditPageBean() { - - private Long id = null; - - @Override - public String update() { - return null; - } - - @Override - public String insert() { - return null; - } - - @Override - public String delete() { - return null; - } - - @Override - protected void handleLoad() { - this.setBean(new Contact(200L)); - } - - public Long getId() { - return id; - } - - }; - - assertFalse(pageBean.isUpdateMode()); - setInternalState(pageBean, "id", 1L); - assertTrue(pageBean.isUpdateMode()); - } -} +///* +// * 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.template; +// +//import static org.easymock.EasyMock.expect; +//import static org.junit.Assert.assertEquals; +//import static org.junit.Assert.assertFalse; +//import static org.junit.Assert.assertNull; +//import static org.junit.Assert.assertTrue; +//import static org.powermock.api.easymock.PowerMock.createMock; +//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 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; +// +//import org.junit.Before; +//import org.junit.Test; +//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 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; +// +//import com.sun.faces.util.Util; +// +//@RunWith(PowerMockRunner.class) +//@PrepareForTest({ Parameter.class, Beans.class, Reflections.class, Converter.class, FacesContext.class, Util.class, +// Faces.class }) +//public class AbstractEditPageBeanTest { +// +// private AbstractEditPageBean pageBean; +// +// private ResourceBundle bundle; +// +// @Before +// public void before() { +// bundle = new ResourceBundleProducer().create("demoiselle-jsf-bundle", Locale.getDefault()); +// +// pageBean = new AbstractEditPageBean() { +// +// private static final long serialVersionUID = 1L; +// +// @Override +// public String update() { +// return null; +// } +// +// @Override +// public String insert() { +// return null; +// } +// +// @Override +// public String delete() { +// return null; +// } +// +// @Override +// protected void handleLoad() { +// } +// }; +// } +// +// @Test +// public void testClear() { +// Parameter param = PowerMock.createMock(Parameter.class); +// +// assertNull(Whitebox.getInternalState(pageBean, "bean")); +// assertNull(Whitebox.getInternalState(pageBean, "id")); +// +// setInternalState(pageBean, "bean", new Contact()); +// setInternalState(pageBean, "id", param); +// +// pageBean.clear(); +// +// assertNull(Whitebox.getInternalState(pageBean, "bean")); +// assertNull(Whitebox.getInternalState(pageBean, "id")); +// } +// +// @Test +// public void testCreateBean() { +// mockStatic(Beans.class); +// Contact c = new Contact(); +// expect(Beans.getReference(Contact.class)).andReturn(c); +// +// replayAll(); +// assertEquals(c, pageBean.createBean()); +// verifyAll(); +// } +// +// @Test +// public void testGetBean() { +// +// pageBean = new AbstractEditPageBean() { +// +// private static final long serialVersionUID = 1L; +// +// private boolean updateMode = false; +// +// @Override +// public String update() { +// return null; +// } +// +// @Override +// public String insert() { +// return null; +// } +// +// @Override +// public String delete() { +// return null; +// } +// +// @Override +// protected void handleLoad() { +// this.setBean(new Contact(200L)); +// } +// +// public boolean isUpdateMode() { +// return updateMode; +// } +// +// }; +// +// Contact c = new Contact(); +// assertNull(Whitebox.getInternalState(pageBean, "bean")); +// setInternalState(pageBean, "bean", c); +// assertEquals(c, pageBean.getBean()); +// +// mockStatic(Beans.class); +// expect(Beans.getReference(Contact.class)).andReturn(c); +// +// pageBean.clear(); +// +// replayAll(); +// assertEquals(c, pageBean.getBean()); +// verifyAll(); +// +// pageBean.clear(); +// +// setInternalState(pageBean, "updateMode", true); +// assertEquals(Long.valueOf(200), pageBean.getBean().getId()); +// } +// +// @Test +// public void testGetBeanClass() { +// mockStatic(Reflections.class); +// expect(Reflections.getGenericTypeArgument(pageBean.getClass(), 0)).andReturn(Object.class); +// +// assertNull(Whitebox.getInternalState(pageBean, "beanClass")); +// +// replayAll(); +// assertEquals(Object.class, pageBean.getBeanClass()); +// verifyAll(); +// +// setInternalState(pageBean, "beanClass", Contact.class, AbstractEditPageBean.class); +// assertEquals(Contact.class, pageBean.getBeanClass()); +// } +// +// @Test +// public void testGetIdClass() { +// mockStatic(Reflections.class); +// expect(Reflections.getGenericTypeArgument(pageBean.getClass(), 1)).andReturn(Object.class); +// +// assertNull(Whitebox.getInternalState(pageBean, "idClass")); +// +// replayAll(); +// assertEquals(Object.class, pageBean.getIdClass()); +// verifyAll(); +// +// Whitebox.setInternalState(pageBean, "idClass", Long.class, AbstractEditPageBean.class); +// assertEquals(Long.class, pageBean.getIdClass()); +// } +// +// @Test +// @SuppressWarnings("unchecked") +// public void testGetStringId() { +// mockStatic(Util.class); +// +// FacesContext facesContext = createMock(FacesContext.class); +// Parameter parameter = createMock(Parameter.class); +// +// setInternalState(pageBean, "facesContext", facesContext); +// setInternalState(pageBean, "id", parameter); +// setInternalState(pageBean, "idClass", String.class, AbstractEditPageBean.class); +// +// String value = "1"; +// expect(parameter.getValue()).andReturn(value); +// +// replayAll(); +// assertEquals(value, pageBean.getId()); +// verifyAll(); +// } +// +// @Test +// @SuppressWarnings("unchecked") +// public void testGetLongId() { +// mockStatic(Faces.class); +// +// FacesContext facesContext = createMock(FacesContext.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(Faces.getConverter(Long.class)).andReturn(converter); +// expect(converter.getAsObject(facesContext, viewRoot, value)).andReturn(Long.valueOf(value)); +// +// replayAll(); +// assertEquals(Long.valueOf(value), pageBean.getId()); +// verifyAll(); +// } +// +// @Test +// public void testGetNotStringIdWithNullConverter() { +// FacesContext facesContext = createMock(FacesContext.class); +// +// setInternalState(pageBean, "facesContext", facesContext); +// setInternalState(pageBean, "idClass", Contact.class, AbstractEditPageBean.class); +// setInternalState(pageBean, "bundle", bundle); +// +// replayAll(); +// try { +// pageBean.getId(); +// } catch (DemoiselleException cause) { +// assertEquals(bundle.getString("id-converter-not-found", Contact.class.getCanonicalName()), +// cause.getMessage()); +// } +// +// verifyAll(); +// } +// +// @SuppressWarnings("serial") +// @Test +// public void testUpdateMode() { +// +// pageBean = new AbstractEditPageBean() { +// +// private Long id = null; +// +// @Override +// public String update() { +// return null; +// } +// +// @Override +// public String insert() { +// return null; +// } +// +// @Override +// public String delete() { +// return null; +// } +// +// @Override +// protected void handleLoad() { +// this.setBean(new Contact(200L)); +// } +// +// public Long getId() { +// return id; +// } +// +// }; +// +// assertFalse(pageBean.isUpdateMode()); +// setInternalState(pageBean, "id", 1L); +// assertTrue(pageBean.isUpdateMode()); +// } +//} 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 14d3d58..eda40e6 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 @@ -1,198 +1,198 @@ -/* - * 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.template; - -import static org.easymock.EasyMock.expect; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.powermock.api.easymock.PowerMock.replayAll; -import static org.powermock.api.easymock.PowerMock.verifyAll; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.faces.model.ListDataModel; - -import org.junit.Before; -import org.junit.Test; -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 br.gov.frameworkdemoiselle.internal.implementation.PaginationImpl; -import br.gov.frameworkdemoiselle.pagination.Pagination; -import br.gov.frameworkdemoiselle.pagination.PaginationContext; -import br.gov.frameworkdemoiselle.util.Reflections; - -@RunWith(PowerMockRunner.class) -@PrepareForTest({ Reflections.class, PaginationContext.class, Pagination.class }) -public class AbstractListPageBeanTest { - - private MySimplePageBean pageBean; - - @Before - public void before() { - pageBean = new MySimplePageBean(); - } - - @SuppressWarnings("rawtypes") - @Test - public void testClear() { - assertNull(Whitebox.getInternalState(pageBean, "dataModel")); - assertNull(Whitebox.getInternalState(pageBean, "resultList")); - - Whitebox.setInternalState(pageBean, "resultList", new ArrayList()); - Whitebox.setInternalState(pageBean, "dataModel", new ListDataModel()); - - pageBean.clear(); - - assertNull(Whitebox.getInternalState(pageBean, "dataModel")); - assertNull(Whitebox.getInternalState(pageBean, "resultList")); - } - - @Test - public void testGetBeanClass() { - assertNull(Whitebox.getInternalState(pageBean, "beanClass")); - - PowerMock.mockStatic(Reflections.class); - expect(Reflections.getGenericTypeArgument(pageBean.getClass(), 0)).andReturn(Object.class); - - PowerMock.replayAll(); - assertEquals(Object.class, pageBean.getBeanClass()); - PowerMock.verifyAll(); - - Whitebox.setInternalState(pageBean, "beanClass", Contact.class, AbstractListPageBean.class); - - assertEquals(Contact.class, pageBean.getBeanClass()); - } - - @Test - public void testGetDataModel() { - assertNull(Whitebox.getInternalState(pageBean, "dataModel")); - assertEquals(ListDataModel.class, pageBean.getDataModel().getClass()); - - ListDataModel ldm = new ListDataModel(); - Whitebox.setInternalState(pageBean, "dataModel", ldm); - - assertEquals(ldm, pageBean.getDataModel()); - } - - @Test - public void testGetResultList() { - assertNull(Whitebox.getInternalState(pageBean, "resultList")); - - List list = pageBean.getResultList(); - assertTrue(list.size() == 2); - - list = new ArrayList(); - Whitebox.setInternalState(pageBean, "resultList", list); - assertTrue(list.size() == 0); - assertEquals(list, pageBean.getResultList()); - } - - @Test - public void testList() { - this.testClear(); - assertEquals(pageBean.getCurrentView(), pageBean.list()); - } - - @Test - public void testSelection() { - Map map = new HashMap(); - map.put(1L, true); - Whitebox.setInternalState(pageBean, "selection", map); - assertEquals(map, pageBean.getSelection()); - assertEquals(true, pageBean.getSelection().get(1L)); - - pageBean.setSelection(null); - assertNull(Whitebox.getInternalState(pageBean, "selection")); - pageBean.setSelection(map); - assertEquals(map, pageBean.getSelection()); - assertEquals(true, pageBean.getSelection().get(1L)); - } - - @Test - public void testPagination() { - Pagination pagination = new PaginationImpl(); - PaginationContext pc = PowerMock.createMock(PaginationContext.class); - expect(pc.getPagination(Contact.class, true)).andReturn(pagination); - - replayAll(); - Whitebox.setInternalState(pageBean, "paginationContext", pc); - assertEquals(pageBean.getPagination(), pagination); - verifyAll(); - } - - @Test - public void testClearSelection() { - pageBean.clearSelection(); - assertEquals(true, pageBean.getSelectedList().isEmpty()); - } - - @Test - public void testGetSelectedList() { - Map map = new HashMap(); - map.put(1L, true); - map.put(2L, true); - pageBean.setSelection(map); - assertEquals(2, pageBean.getSelectedList().size()); - } - -} - -@SuppressWarnings("serial") -class MySimplePageBean extends AbstractListPageBean { - - @Override - protected List handleResultList() { - List list = new ArrayList(); - list.add(new Contact()); - list.add(new Contact()); - return list; - } - - @Override - public String getCurrentView() { - return "currentView"; - } - -} +///* +// * 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.template; +// +//import static org.easymock.EasyMock.expect; +//import static org.junit.Assert.assertEquals; +//import static org.junit.Assert.assertNull; +//import static org.junit.Assert.assertTrue; +//import static org.powermock.api.easymock.PowerMock.replayAll; +//import static org.powermock.api.easymock.PowerMock.verifyAll; +// +//import java.util.ArrayList; +//import java.util.HashMap; +//import java.util.List; +//import java.util.Map; +// +//import javax.faces.model.ListDataModel; +// +//import org.junit.Before; +//import org.junit.Test; +//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 br.gov.frameworkdemoiselle.internal.implementation.PaginationImpl; +//import br.gov.frameworkdemoiselle.pagination.Pagination; +//import br.gov.frameworkdemoiselle.pagination.PaginationContext; +//import br.gov.frameworkdemoiselle.util.Reflections; +// +//@RunWith(PowerMockRunner.class) +//@PrepareForTest({ Reflections.class, PaginationContext.class, Pagination.class }) +//public class AbstractListPageBeanTest { +// +// private MySimplePageBean pageBean; +// +// @Before +// public void before() { +// pageBean = new MySimplePageBean(); +// } +// +// @SuppressWarnings("rawtypes") +// @Test +// public void testClear() { +// assertNull(Whitebox.getInternalState(pageBean, "dataModel")); +// assertNull(Whitebox.getInternalState(pageBean, "resultList")); +// +// Whitebox.setInternalState(pageBean, "resultList", new ArrayList()); +// Whitebox.setInternalState(pageBean, "dataModel", new ListDataModel()); +// +// pageBean.clear(); +// +// assertNull(Whitebox.getInternalState(pageBean, "dataModel")); +// assertNull(Whitebox.getInternalState(pageBean, "resultList")); +// } +// +// @Test +// public void testGetBeanClass() { +// assertNull(Whitebox.getInternalState(pageBean, "beanClass")); +// +// PowerMock.mockStatic(Reflections.class); +// expect(Reflections.getGenericTypeArgument(pageBean.getClass(), 0)).andReturn(Object.class); +// +// PowerMock.replayAll(); +// assertEquals(Object.class, pageBean.getBeanClass()); +// PowerMock.verifyAll(); +// +// Whitebox.setInternalState(pageBean, "beanClass", Contact.class, AbstractListPageBean.class); +// +// assertEquals(Contact.class, pageBean.getBeanClass()); +// } +// +// @Test +// public void testGetDataModel() { +// assertNull(Whitebox.getInternalState(pageBean, "dataModel")); +// assertEquals(ListDataModel.class, pageBean.getDataModel().getClass()); +// +// ListDataModel ldm = new ListDataModel(); +// Whitebox.setInternalState(pageBean, "dataModel", ldm); +// +// assertEquals(ldm, pageBean.getDataModel()); +// } +// +// @Test +// public void testGetResultList() { +// assertNull(Whitebox.getInternalState(pageBean, "resultList")); +// +// List list = pageBean.getResultList(); +// assertTrue(list.size() == 2); +// +// list = new ArrayList(); +// Whitebox.setInternalState(pageBean, "resultList", list); +// assertTrue(list.size() == 0); +// assertEquals(list, pageBean.getResultList()); +// } +// +// @Test +// public void testList() { +// this.testClear(); +// assertEquals(pageBean.getCurrentView(), pageBean.list()); +// } +// +// @Test +// public void testSelection() { +// Map map = new HashMap(); +// map.put(1L, true); +// Whitebox.setInternalState(pageBean, "selection", map); +// assertEquals(map, pageBean.getSelection()); +// assertEquals(true, pageBean.getSelection().get(1L)); +// +// pageBean.setSelection(null); +// assertNull(Whitebox.getInternalState(pageBean, "selection")); +// pageBean.setSelection(map); +// assertEquals(map, pageBean.getSelection()); +// assertEquals(true, pageBean.getSelection().get(1L)); +// } +// +// @Test +// public void testPagination() { +// Pagination pagination = new PaginationImpl(); +// PaginationContext pc = PowerMock.createMock(PaginationContext.class); +// expect(pc.getPagination(Contact.class, true)).andReturn(pagination); +// +// replayAll(); +// Whitebox.setInternalState(pageBean, "paginationContext", pc); +// assertEquals(pageBean.getPagination(), pagination); +// verifyAll(); +// } +// +// @Test +// public void testClearSelection() { +// pageBean.clearSelection(); +// assertEquals(true, pageBean.getSelectedList().isEmpty()); +// } +// +// @Test +// public void testGetSelectedList() { +// Map map = new HashMap(); +// map.put(1L, true); +// map.put(2L, true); +// pageBean.setSelection(map); +// assertEquals(2, pageBean.getSelectedList().size()); +// } +// +//} +// +//@SuppressWarnings("serial") +//class MySimplePageBean extends AbstractListPageBean { +// +// @Override +// protected List handleResultList() { +// List list = new ArrayList(); +// list.add(new Contact()); +// list.add(new Contact()); +// return list; +// } +// +// @Override +// public String getCurrentView() { +// return "currentView"; +// } +// +//} diff --git a/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/template/AbstractPageTest.java b/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/template/AbstractPageTest.java index 51183a8..0fb0bdb 100644 --- a/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/template/AbstractPageTest.java +++ b/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/template/AbstractPageTest.java @@ -1,160 +1,160 @@ -/* - * 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.template; - -import static org.easymock.EasyMock.expect; -import static org.junit.Assert.assertEquals; -import static org.powermock.api.easymock.PowerMock.replayAll; -import static org.powermock.api.easymock.PowerMock.verifyAll; - -import javax.faces.component.UIViewRoot; -import javax.faces.context.FacesContext; - -import org.junit.Before; -import org.junit.Test; -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 br.gov.frameworkdemoiselle.annotation.NextView; -import br.gov.frameworkdemoiselle.annotation.PreviousView; -import br.gov.frameworkdemoiselle.message.MessageContext; - -@RunWith(PowerMockRunner.class) -@PrepareForTest({ MessageContext.class }) -public class AbstractPageTest { - - private AbstractPageBean abstractPage; - - private FacesContext facesContext; - - private UIViewRoot viewRoot; - - @Before - public void before() { - facesContext = PowerMock.createMock(FacesContext.class); - viewRoot = PowerMock.createMock(UIViewRoot.class); - expect(facesContext.getViewRoot()).andReturn(viewRoot).anyTimes(); - expect(viewRoot.getViewId()).andReturn("viewId").anyTimes(); - } - - @Test - public void testGetCurrentView() { - abstractPage = new MyAbstractPage(); - Whitebox.setInternalState(abstractPage, "facesContext", facesContext); - - replayAll(); - assertEquals(abstractPage.getCurrentView(), "viewId"); - verifyAll(); - } - - @Test - public void testGetNextViewOK() { - abstractPage = new MyAbstractPage(); - - replayAll(); - assertEquals(abstractPage.getNextView(), "next_view"); - verifyAll(); - } - - @Test - public void testGetNextViewWhenNoAnnotation() { - abstractPage = new MyAbstractPageNoAnnotations(); - - replayAll(); - assertEquals(abstractPage.getNextView(), null); - verifyAll(); - } - - @Test - public void testGetNextViewAlreadySet() { - abstractPage = new MyAbstractPageNoAnnotations(); - Whitebox.setInternalState(abstractPage, "nextView", "next"); - - replayAll(); - assertEquals(abstractPage.getNextView(), "next"); - verifyAll(); - } - - @Test - public void testGetPreviousViewOK() { - abstractPage = new MyAbstractPage(); - - replayAll(); - assertEquals(abstractPage.getPreviousView(), "prevs"); - verifyAll(); - } - - @Test - public void testGetPreviousViewAlreadySet() { - abstractPage = new MyAbstractPageNoAnnotations(); - Whitebox.setInternalState(abstractPage, "previousView", "previous"); - - replayAll(); - assertEquals(abstractPage.getPreviousView(), "previous"); - verifyAll(); - } - - @Test - public void testGetPreviousViewWhenNoAnnotation() { - abstractPage = new MyAbstractPageNoAnnotations(); - - replayAll(); - assertEquals(abstractPage.getPreviousView(), null); - verifyAll(); - } - - @Test - public void testOtherTests() { - abstractPage = new MyAbstractPageNoAnnotations(); - assertEquals(null, abstractPage.getTitle()); - } -} - -@SuppressWarnings("serial") -@NextView("next_view") -@PreviousView("prevs") -class MyAbstractPage extends AbstractPageBean { - -} - -@SuppressWarnings("serial") -class MyAbstractPageNoAnnotations extends AbstractPageBean { - -} +///* +// * 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.template; +// +//import static org.easymock.EasyMock.expect; +//import static org.junit.Assert.assertEquals; +//import static org.powermock.api.easymock.PowerMock.replayAll; +//import static org.powermock.api.easymock.PowerMock.verifyAll; +// +//import javax.faces.component.UIViewRoot; +//import javax.faces.context.FacesContext; +// +//import org.junit.Before; +//import org.junit.Test; +//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 br.gov.frameworkdemoiselle.annotation.NextView; +//import br.gov.frameworkdemoiselle.annotation.PreviousView; +//import br.gov.frameworkdemoiselle.message.MessageContext; +// +//@RunWith(PowerMockRunner.class) +//@PrepareForTest({ MessageContext.class }) +//public class AbstractPageTest { +// +// private AbstractPageBean abstractPage; +// +// private FacesContext facesContext; +// +// private UIViewRoot viewRoot; +// +// @Before +// public void before() { +// facesContext = PowerMock.createMock(FacesContext.class); +// viewRoot = PowerMock.createMock(UIViewRoot.class); +// expect(facesContext.getViewRoot()).andReturn(viewRoot).anyTimes(); +// expect(viewRoot.getViewId()).andReturn("viewId").anyTimes(); +// } +// +// @Test +// public void testGetCurrentView() { +// abstractPage = new MyAbstractPage(); +// Whitebox.setInternalState(abstractPage, "facesContext", facesContext); +// +// replayAll(); +// assertEquals(abstractPage.getCurrentView(), "viewId"); +// verifyAll(); +// } +// +// @Test +// public void testGetNextViewOK() { +// abstractPage = new MyAbstractPage(); +// +// replayAll(); +// assertEquals(abstractPage.getNextView(), "next_view"); +// verifyAll(); +// } +// +// @Test +// public void testGetNextViewWhenNoAnnotation() { +// abstractPage = new MyAbstractPageNoAnnotations(); +// +// replayAll(); +// assertEquals(abstractPage.getNextView(), null); +// verifyAll(); +// } +// +// @Test +// public void testGetNextViewAlreadySet() { +// abstractPage = new MyAbstractPageNoAnnotations(); +// Whitebox.setInternalState(abstractPage, "nextView", "next"); +// +// replayAll(); +// assertEquals(abstractPage.getNextView(), "next"); +// verifyAll(); +// } +// +// @Test +// public void testGetPreviousViewOK() { +// abstractPage = new MyAbstractPage(); +// +// replayAll(); +// assertEquals(abstractPage.getPreviousView(), "prevs"); +// verifyAll(); +// } +// +// @Test +// public void testGetPreviousViewAlreadySet() { +// abstractPage = new MyAbstractPageNoAnnotations(); +// Whitebox.setInternalState(abstractPage, "previousView", "previous"); +// +// replayAll(); +// assertEquals(abstractPage.getPreviousView(), "previous"); +// verifyAll(); +// } +// +// @Test +// public void testGetPreviousViewWhenNoAnnotation() { +// abstractPage = new MyAbstractPageNoAnnotations(); +// +// replayAll(); +// assertEquals(abstractPage.getPreviousView(), null); +// verifyAll(); +// } +// +// @Test +// public void testOtherTests() { +// abstractPage = new MyAbstractPageNoAnnotations(); +// assertEquals(null, abstractPage.getTitle()); +// } +//} +// +//@SuppressWarnings("serial") +//@NextView("next_view") +//@PreviousView("prevs") +//class MyAbstractPage extends AbstractPageBean { +// +//} +// +//@SuppressWarnings("serial") +//class MyAbstractPageNoAnnotations extends AbstractPageBean { +// +//} 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 c5aa251..12b5138 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,231 +1,220 @@ -/* - * 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.transaction; - -import static org.easymock.EasyMock.createMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.expectLastCall; -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 static org.powermock.api.easymock.PowerMock.verify; -import static org.powermock.reflect.Whitebox.setInternalState; - -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.NotSupportedException; -import javax.transaction.RollbackException; -import javax.transaction.SystemException; -import javax.transaction.UserTransaction; - -import junit.framework.Assert; - -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.DemoiselleException; -import br.gov.frameworkdemoiselle.util.Beans; - -@RunWith(PowerMockRunner.class) -@PrepareForTest({ Beans.class }) -public class JTATransactionTest { - - private UserTransaction userTransaction; - - private JTATransaction jtaTransaction; - - @Before - public void setUp() { - userTransaction = createMock(UserTransaction.class); - jtaTransaction = new JTATransaction(); - - setInternalState(jtaTransaction, UserTransaction.class, userTransaction); - } - - @Test - public void testGetDElegateWithUserTransactionNull() throws SystemException { - mockStatic(Beans.class); - userTransaction = null; - setInternalState(jtaTransaction, UserTransaction.class, userTransaction); - userTransaction = createMock(UserTransaction.class); - expect(Beans.getReference(UserTransaction.class)).andReturn(userTransaction); - replayAll(); - - // Assert.assertEquals(userTransaction, jtaTransaction.getDelegate()); - } - - @Test - public void testGetDElegateWithUserTransactionIsNotNull() throws SystemException { - // Assert.assertEquals(userTransaction, jtaTransaction.getDelegate()); - } - - @Test - public void testIsActiveWithStatusEqualsActive() throws SystemException { - expect(userTransaction.getStatus()).andReturn(Integer.valueOf(0)); - replay(userTransaction); - Assert.assertTrue(this.jtaTransaction.isActive()); - } - - @Test - public void testIsActiveWithStatusEqualsMarkedRollback() throws SystemException { - expect(userTransaction.getStatus()).andReturn(Integer.valueOf(1)).times(2); - replay(userTransaction); - Assert.assertTrue(this.jtaTransaction.isActive()); - } - - @Test - public void testIsMarkedRollback() throws SystemException { - expect(userTransaction.getStatus()).andReturn(Integer.valueOf(1)); - replay(userTransaction); - Assert.assertTrue(this.jtaTransaction.isMarkedRollback()); - } - - @Test - public void testBegin() throws SystemException, NotSupportedException { - userTransaction.begin(); - replay(userTransaction); - this.jtaTransaction.begin(); - verify(); - } - - @Test - public void testCommit() throws SystemException, NotSupportedException, SecurityException, IllegalStateException, - RollbackException, HeuristicMixedException, HeuristicRollbackException { - userTransaction.commit(); - replay(userTransaction); - this.jtaTransaction.commit(); - verify(); - } - - @Test - public void testRollback() throws SystemException, NotSupportedException { - userTransaction.rollback(); - replay(userTransaction); - this.jtaTransaction.rollback(); - verify(); - } - - @Test - public void testSetRollbackOnly() throws SystemException, NotSupportedException { - userTransaction.setRollbackOnly(); - replay(userTransaction); - this.jtaTransaction.setRollbackOnly(); - verify(); - } - - @Test - public void testIsActiveThrowsSystemException() throws SystemException { - expect(userTransaction.getStatus()).andThrow(new SystemException()); - replay(userTransaction); - try { - this.jtaTransaction.isActive(); - Assert.fail(); - } catch (DemoiselleException cause) { - Assert.assertTrue(true); - } - } - - @Test - public void testIsMarkedRollbackThrowsSystemException() throws SystemException { - expect(userTransaction.getStatus()).andThrow(new SystemException()); - replay(userTransaction); - try { - this.jtaTransaction.isMarkedRollback(); - Assert.fail(); - } catch (DemoiselleException cause) { - Assert.assertTrue(true); - } - } - - @Test - public void testBeginThrowsException() throws SystemException, NotSupportedException { - userTransaction.begin(); - expectLastCall().andThrow(new SystemException()); - replay(userTransaction); - try { - this.jtaTransaction.begin(); - Assert.fail(); - } catch (DemoiselleException cause) { - Assert.assertTrue(true); - } - } - - @Test - public void testCommitThrowsException() throws SystemException, SecurityException, IllegalStateException, - RollbackException, HeuristicMixedException, HeuristicRollbackException { - userTransaction.commit(); - expectLastCall().andThrow(new SystemException()); - replay(userTransaction); - try { - this.jtaTransaction.commit(); - Assert.fail(); - } catch (DemoiselleException cause) { - Assert.assertTrue(true); - } - } - - @Test - public void testRollbackThrowsSystemException() throws SystemException { - userTransaction.rollback(); - expectLastCall().andThrow(new SystemException()); - replay(userTransaction); - try { - this.jtaTransaction.rollback(); - Assert.fail(); - } catch (DemoiselleException cause) { - Assert.assertTrue(true); - } - } - - @Test - public void testSetRollbackOnlyThrowsSystemException() throws SystemException { - userTransaction.setRollbackOnly(); - expectLastCall().andThrow(new SystemException()); - replay(userTransaction); - try { - this.jtaTransaction.setRollbackOnly(); - Assert.fail(); - } catch (DemoiselleException cause) { - Assert.assertTrue(true); - } - } - -} +///* +// * 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.transaction; +// +//import javax.transaction.HeuristicMixedException; +//import javax.transaction.HeuristicRollbackException; +//import javax.transaction.NotSupportedException; +//import javax.transaction.RollbackException; +//import javax.transaction.SystemException; +//import javax.transaction.UserTransaction; +// +//import junit.framework.Assert; +// +//import org.junit.Before; +//import org.junit.Test; +//import org.junit.runner.RunWith; +// +//import br.gov.frameworkdemoiselle.DemoiselleException; +//import br.gov.frameworkdemoiselle.util.Beans; +// +//@RunWith(PowerMockRunner.class) +//@PrepareForTest({ Beans.class }) +//public class JTATransactionTest { +// +// private UserTransaction userTransaction; +// +// private JTATransaction jtaTransaction; +// +// @Before +// public void setUp() { +// userTransaction = createMock(UserTransaction.class); +// jtaTransaction = new JTATransaction(); +// +// setInternalState(jtaTransaction, UserTransaction.class, userTransaction); +// } +// +// @Test +// public void testGetDElegateWithUserTransactionNull() throws SystemException { +// mockStatic(Beans.class); +// userTransaction = null; +// setInternalState(jtaTransaction, UserTransaction.class, userTransaction); +// userTransaction = createMock(UserTransaction.class); +// expect(Beans.getReference(UserTransaction.class)).andReturn(userTransaction); +// replayAll(); +// +// // Assert.assertEquals(userTransaction, jtaTransaction.getDelegate()); +// } +// +// @Test +// public void testGetDElegateWithUserTransactionIsNotNull() throws SystemException { +// // Assert.assertEquals(userTransaction, jtaTransaction.getDelegate()); +// } +// +// @Test +// public void testIsActiveWithStatusEqualsActive() throws SystemException { +// expect(userTransaction.getStatus()).andReturn(Integer.valueOf(0)); +// replay(userTransaction); +// Assert.assertTrue(this.jtaTransaction.isActive()); +// } +// +// @Test +// public void testIsActiveWithStatusEqualsMarkedRollback() throws SystemException { +// expect(userTransaction.getStatus()).andReturn(Integer.valueOf(1)).times(2); +// replay(userTransaction); +// Assert.assertTrue(this.jtaTransaction.isActive()); +// } +// +// @Test +// public void testIsMarkedRollback() throws SystemException { +// expect(userTransaction.getStatus()).andReturn(Integer.valueOf(1)); +// replay(userTransaction); +// Assert.assertTrue(this.jtaTransaction.isMarkedRollback()); +// } +// +// @Test +// public void testBegin() throws SystemException, NotSupportedException { +// userTransaction.begin(); +// replay(userTransaction); +// this.jtaTransaction.begin(); +// verify(); +// } +// +// @Test +// public void testCommit() throws SystemException, NotSupportedException, SecurityException, IllegalStateException, +// RollbackException, HeuristicMixedException, HeuristicRollbackException { +// userTransaction.commit(); +// replay(userTransaction); +// this.jtaTransaction.commit(); +// verify(); +// } +// +// @Test +// public void testRollback() throws SystemException, NotSupportedException { +// userTransaction.rollback(); +// replay(userTransaction); +// this.jtaTransaction.rollback(); +// verify(); +// } +// +// @Test +// public void testSetRollbackOnly() throws SystemException, NotSupportedException { +// userTransaction.setRollbackOnly(); +// replay(userTransaction); +// this.jtaTransaction.setRollbackOnly(); +// verify(); +// } +// +// @Test +// public void testIsActiveThrowsSystemException() throws SystemException { +// expect(userTransaction.getStatus()).andThrow(new SystemException()); +// replay(userTransaction); +// try { +// this.jtaTransaction.isActive(); +// Assert.fail(); +// } catch (DemoiselleException cause) { +// Assert.assertTrue(true); +// } +// } +// +// @Test +// public void testIsMarkedRollbackThrowsSystemException() throws SystemException { +// expect(userTransaction.getStatus()).andThrow(new SystemException()); +// replay(userTransaction); +// try { +// this.jtaTransaction.isMarkedRollback(); +// Assert.fail(); +// } catch (DemoiselleException cause) { +// Assert.assertTrue(true); +// } +// } +// +// @Test +// public void testBeginThrowsException() throws SystemException, NotSupportedException { +// userTransaction.begin(); +// expectLastCall().andThrow(new SystemException()); +// replay(userTransaction); +// try { +// this.jtaTransaction.begin(); +// Assert.fail(); +// } catch (DemoiselleException cause) { +// Assert.assertTrue(true); +// } +// } +// +// @Test +// public void testCommitThrowsException() throws SystemException, SecurityException, IllegalStateException, +// RollbackException, HeuristicMixedException, HeuristicRollbackException { +// userTransaction.commit(); +// expectLastCall().andThrow(new SystemException()); +// replay(userTransaction); +// try { +// this.jtaTransaction.commit(); +// Assert.fail(); +// } catch (DemoiselleException cause) { +// Assert.assertTrue(true); +// } +// } +// +// @Test +// public void testRollbackThrowsSystemException() throws SystemException { +// userTransaction.rollback(); +// expectLastCall().andThrow(new SystemException()); +// replay(userTransaction); +// try { +// this.jtaTransaction.rollback(); +// Assert.fail(); +// } catch (DemoiselleException cause) { +// Assert.assertTrue(true); +// } +// } +// +// @Test +// public void testSetRollbackOnlyThrowsSystemException() throws SystemException { +// userTransaction.setRollbackOnly(); +// expectLastCall().andThrow(new SystemException()); +// replay(userTransaction); +// try { +// this.jtaTransaction.setRollbackOnly(); +// Assert.fail(); +// } catch (DemoiselleException cause) { +// Assert.assertTrue(true); +// } +// } +// +//} diff --git a/impl/extension/se/src/test/java/br/gov/frameworkdemoiselle/internal/bootstrap/SeBootstrapTest.java b/impl/extension/se/src/test/java/br/gov/frameworkdemoiselle/internal/bootstrap/SeBootstrapTest.java index 03c2400..b0332b8 100644 --- a/impl/extension/se/src/test/java/br/gov/frameworkdemoiselle/internal/bootstrap/SeBootstrapTest.java +++ b/impl/extension/se/src/test/java/br/gov/frameworkdemoiselle/internal/bootstrap/SeBootstrapTest.java @@ -1,104 +1,104 @@ -/* - * 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.bootstrap; - -import static org.easymock.EasyMock.expect; -import static org.powermock.api.easymock.PowerMock.createMock; -import static org.powermock.api.easymock.PowerMock.mockStatic; -import static org.powermock.api.easymock.PowerMock.replay; -import static org.powermock.api.easymock.PowerMock.verifyAll; - -import java.util.List; -import java.util.Locale; - -import javax.enterprise.inject.spi.AfterBeanDiscovery; - -import junit.framework.Assert; - -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; -import org.powermock.reflect.Whitebox; - -import br.gov.frameworkdemoiselle.internal.context.AbstractCustomContext; -import br.gov.frameworkdemoiselle.internal.context.ContextManager; -import br.gov.frameworkdemoiselle.lifecycle.AfterShutdownProccess; -import br.gov.frameworkdemoiselle.util.Beans; - -@RunWith(PowerMockRunner.class) -@PrepareForTest({ Beans.class, ContextManager.class }) -@Ignore -public class SeBootstrapTest { - - private SeBootstrap seBootstrap; - - private AfterBeanDiscovery event; - - @Before - public void before() { - event = createMock(AfterBeanDiscovery.class); - mockStatic(Beans.class); - expect(Beans.getReference(Locale.class)).andReturn(Locale.getDefault()).anyTimes(); - replay(Beans.class); - seBootstrap = new SeBootstrap(); - } - - @Test - public void testStoreContext() { - seBootstrap.storeContexts(event); - replay(event); - - Assert.assertEquals(event, Whitebox.getInternalState(seBootstrap, "afterBeanDiscoveryEvent")); - List context = Whitebox.getInternalState(seBootstrap, "tempContexts"); - Assert.assertEquals(4, context.size()); - verifyAll(); - } - - @Test - public void testRemoveContexts() { - seBootstrap.storeContexts(event); - - AfterShutdownProccess afterShutdownProccess = createMock(AfterShutdownProccess.class); - replay(event, afterShutdownProccess); - seBootstrap.removeContexts(afterShutdownProccess); - - 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.bootstrap; +// +//import static org.easymock.EasyMock.expect; +//import static org.powermock.api.easymock.PowerMock.createMock; +//import static org.powermock.api.easymock.PowerMock.mockStatic; +//import static org.powermock.api.easymock.PowerMock.replay; +//import static org.powermock.api.easymock.PowerMock.verifyAll; +// +//import java.util.List; +//import java.util.Locale; +// +//import javax.enterprise.inject.spi.AfterBeanDiscovery; +// +//import junit.framework.Assert; +// +//import org.junit.Before; +//import org.junit.Ignore; +//import org.junit.Test; +//import org.junit.runner.RunWith; +//import org.powermock.core.classloader.annotations.PrepareForTest; +//import org.powermock.modules.junit4.PowerMockRunner; +//import org.powermock.reflect.Whitebox; +// +//import br.gov.frameworkdemoiselle.internal.context.AbstractCustomContext; +//import br.gov.frameworkdemoiselle.internal.context.ContextManager; +//import br.gov.frameworkdemoiselle.lifecycle.AfterShutdownProccess; +//import br.gov.frameworkdemoiselle.util.Beans; +// +//@RunWith(PowerMockRunner.class) +//@PrepareForTest({ Beans.class, ContextManager.class }) +//@Ignore +//public class SeBootstrapTest { +// +// private SeBootstrap seBootstrap; +// +// private AfterBeanDiscovery event; +// +// @Before +// public void before() { +// event = createMock(AfterBeanDiscovery.class); +// mockStatic(Beans.class); +// expect(Beans.getReference(Locale.class)).andReturn(Locale.getDefault()).anyTimes(); +// replay(Beans.class); +// seBootstrap = new SeBootstrap(); +// } +// +// @Test +// public void testStoreContext() { +// seBootstrap.storeContexts(event); +// replay(event); +// +// Assert.assertEquals(event, Whitebox.getInternalState(seBootstrap, "afterBeanDiscoveryEvent")); +// List context = Whitebox.getInternalState(seBootstrap, "tempContexts"); +// Assert.assertEquals(4, context.size()); +// verifyAll(); +// } +// +// @Test +// public void testRemoveContexts() { +// seBootstrap.storeContexts(event); +// +// AfterShutdownProccess afterShutdownProccess = createMock(AfterShutdownProccess.class); +// replay(event, afterShutdownProccess); +// seBootstrap.removeContexts(afterShutdownProccess); +// +// verifyAll(); +// } +// } diff --git a/impl/extension/servlet/src/test/java/br/gov/frameworkdemoiselle/internal/producer/HttpServletRequestProducerTest.java b/impl/extension/servlet/src/test/java/br/gov/frameworkdemoiselle/internal/producer/HttpServletRequestProducerTest.java index a978d12..0990219 100644 --- a/impl/extension/servlet/src/test/java/br/gov/frameworkdemoiselle/internal/producer/HttpServletRequestProducerTest.java +++ b/impl/extension/servlet/src/test/java/br/gov/frameworkdemoiselle/internal/producer/HttpServletRequestProducerTest.java @@ -1,82 +1,82 @@ -/* - * 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.producer; - -import static org.easymock.EasyMock.replay; -import static org.powermock.api.easymock.PowerMock.createMock; -import static org.powermock.api.easymock.PowerMock.verifyAll; - -import javax.servlet.http.HttpServletRequest; - -import junit.framework.Assert; - -import org.junit.Test; -import org.powermock.reflect.Whitebox; - -public class HttpServletRequestProducerTest { - - private HttpServletRequestProducer httpServletRequestProducer; - - private HttpServletRequest request; - - @Test - public void testCreate() { - request = createMock(HttpServletRequest.class); - replay(request); - - httpServletRequestProducer = new HttpServletRequestProducer(); - Whitebox.setInternalState(httpServletRequestProducer, "request", request); - - Assert.assertEquals(httpServletRequestProducer.create(), request); - - verifyAll(); - } - - @Test - public void testSetDelegate() { - request = createMock(HttpServletRequest.class); - replay(request); - - httpServletRequestProducer = new HttpServletRequestProducer(); - - httpServletRequestProducer.setDelegate(request); - Assert.assertEquals(Whitebox.getInternalState(httpServletRequestProducer, "request"), request); - - 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.producer; +// +//import static org.easymock.EasyMock.replay; +//import static org.powermock.api.easymock.PowerMock.createMock; +//import static org.powermock.api.easymock.PowerMock.verifyAll; +// +//import javax.servlet.http.HttpServletRequest; +// +//import junit.framework.Assert; +// +//import org.junit.Test; +//import org.powermock.reflect.Whitebox; +// +//public class HttpServletRequestProducerTest { +// +// private HttpServletRequestProducer httpServletRequestProducer; +// +// private HttpServletRequest request; +// +// @Test +// public void testCreate() { +// request = createMock(HttpServletRequest.class); +// replay(request); +// +// httpServletRequestProducer = new HttpServletRequestProducer(); +// Whitebox.setInternalState(httpServletRequestProducer, "request", request); +// +// Assert.assertEquals(httpServletRequestProducer.create(), request); +// +// verifyAll(); +// } +// +// @Test +// public void testSetDelegate() { +// request = createMock(HttpServletRequest.class); +// replay(request); +// +// httpServletRequestProducer = new HttpServletRequestProducer(); +// +// httpServletRequestProducer.setDelegate(request); +// Assert.assertEquals(Whitebox.getInternalState(httpServletRequestProducer, "request"), request); +// +// verifyAll(); +// } +// +//} diff --git a/impl/extension/servlet/src/test/java/br/gov/frameworkdemoiselle/internal/producer/HttpServletResponseProducerTest.java b/impl/extension/servlet/src/test/java/br/gov/frameworkdemoiselle/internal/producer/HttpServletResponseProducerTest.java index 43a86b3..3b2a5c1 100644 --- a/impl/extension/servlet/src/test/java/br/gov/frameworkdemoiselle/internal/producer/HttpServletResponseProducerTest.java +++ b/impl/extension/servlet/src/test/java/br/gov/frameworkdemoiselle/internal/producer/HttpServletResponseProducerTest.java @@ -1,82 +1,82 @@ -/* - * 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.producer; - -import static org.easymock.EasyMock.replay; -import static org.powermock.api.easymock.PowerMock.createMock; -import static org.powermock.api.easymock.PowerMock.verifyAll; - -import javax.servlet.http.HttpServletResponse; - -import junit.framework.Assert; - -import org.junit.Test; -import org.powermock.reflect.Whitebox; - -public class HttpServletResponseProducerTest { - - private HttpServletResponseProducer httpServletResponseProducer; - - private HttpServletResponse response; - - @Test - public void testCreate() { - response = createMock(HttpServletResponse.class); - replay(response); - - httpServletResponseProducer = new HttpServletResponseProducer(); - Whitebox.setInternalState(httpServletResponseProducer, "response", response); - - Assert.assertEquals(httpServletResponseProducer.create(), response); - - verifyAll(); - } - - @Test - public void testSetDelegate() { - response = createMock(HttpServletResponse.class); - replay(response); - - httpServletResponseProducer = new HttpServletResponseProducer(); - - httpServletResponseProducer.setDelegate(response); - Assert.assertEquals(Whitebox.getInternalState(httpServletResponseProducer, "response"), response); - - 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.producer; +// +//import static org.easymock.EasyMock.replay; +//import static org.powermock.api.easymock.PowerMock.createMock; +//import static org.powermock.api.easymock.PowerMock.verifyAll; +// +//import javax.servlet.http.HttpServletResponse; +// +//import junit.framework.Assert; +// +//import org.junit.Test; +//import org.powermock.reflect.Whitebox; +// +//public class HttpServletResponseProducerTest { +// +// private HttpServletResponseProducer httpServletResponseProducer; +// +// private HttpServletResponse response; +// +// @Test +// public void testCreate() { +// response = createMock(HttpServletResponse.class); +// replay(response); +// +// httpServletResponseProducer = new HttpServletResponseProducer(); +// Whitebox.setInternalState(httpServletResponseProducer, "response", response); +// +// Assert.assertEquals(httpServletResponseProducer.create(), response); +// +// verifyAll(); +// } +// +// @Test +// public void testSetDelegate() { +// response = createMock(HttpServletResponse.class); +// replay(response); +// +// httpServletResponseProducer = new HttpServletResponseProducer(); +// +// httpServletResponseProducer.setDelegate(response); +// Assert.assertEquals(Whitebox.getInternalState(httpServletResponseProducer, "response"), response); +// +// verifyAll(); +// } +// +//} diff --git a/impl/extension/servlet/src/test/java/br/gov/frameworkdemoiselle/internal/producer/HttpSessionProducerTest.java b/impl/extension/servlet/src/test/java/br/gov/frameworkdemoiselle/internal/producer/HttpSessionProducerTest.java index 68546ec..a4bc641 100644 --- a/impl/extension/servlet/src/test/java/br/gov/frameworkdemoiselle/internal/producer/HttpSessionProducerTest.java +++ b/impl/extension/servlet/src/test/java/br/gov/frameworkdemoiselle/internal/producer/HttpSessionProducerTest.java @@ -1,79 +1,79 @@ -/* - * 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.producer; - -import static org.easymock.EasyMock.createMock; -import static org.easymock.EasyMock.replay; -import static org.powermock.api.easymock.PowerMock.verifyAll; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - -import junit.framework.Assert; - -import org.easymock.EasyMock; -import org.junit.Test; - -public class HttpSessionProducerTest { - - private HttpSessionProducer httpSessionProducer; - - private HttpServletRequest request; - - @Test - public void testCreateWithRequestNull() { - httpSessionProducer = new HttpSessionProducer(); - Assert.assertNull(httpSessionProducer.create(null)); - - verifyAll(); - } - - @Test - public void testCreateWithRequest() { - request = createMock(HttpServletRequest.class); - HttpSession session = createMock(HttpSession.class); - EasyMock.expect(request.getSession()).andReturn(session); - replay(request, session); - - httpSessionProducer = new HttpSessionProducer(); - Assert.assertNotNull(httpSessionProducer.create(request)); - - 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.producer; +// +//import static org.easymock.EasyMock.createMock; +//import static org.easymock.EasyMock.replay; +//import static org.powermock.api.easymock.PowerMock.verifyAll; +// +//import javax.servlet.http.HttpServletRequest; +//import javax.servlet.http.HttpSession; +// +//import junit.framework.Assert; +// +//import org.easymock.EasyMock; +//import org.junit.Test; +// +//public class HttpSessionProducerTest { +// +// private HttpSessionProducer httpSessionProducer; +// +// private HttpServletRequest request; +// +// @Test +// public void testCreateWithRequestNull() { +// httpSessionProducer = new HttpSessionProducer(); +// Assert.assertNull(httpSessionProducer.create(null)); +// +// verifyAll(); +// } +// +// @Test +// public void testCreateWithRequest() { +// request = createMock(HttpServletRequest.class); +// HttpSession session = createMock(HttpSession.class); +// EasyMock.expect(request.getSession()).andReturn(session); +// replay(request, session); +// +// httpSessionProducer = new HttpSessionProducer(); +// Assert.assertNotNull(httpSessionProducer.create(request)); +// +// verifyAll(); +// +// } +// +//} diff --git a/impl/extension/servlet/src/test/java/br/gov/frameworkdemoiselle/internal/producer/ServletLocaleProducerTest.java b/impl/extension/servlet/src/test/java/br/gov/frameworkdemoiselle/internal/producer/ServletLocaleProducerTest.java index 3ae097a..ba7bf80 100644 --- a/impl/extension/servlet/src/test/java/br/gov/frameworkdemoiselle/internal/producer/ServletLocaleProducerTest.java +++ b/impl/extension/servlet/src/test/java/br/gov/frameworkdemoiselle/internal/producer/ServletLocaleProducerTest.java @@ -1,84 +1,84 @@ -/* - * 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.producer; - -import static org.easymock.EasyMock.createMock; -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.verifyAll; - -import javax.servlet.http.HttpServletRequest; - -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.util.Beans; - -@RunWith(PowerMockRunner.class) -@PrepareForTest(Beans.class) -public class ServletLocaleProducerTest { - - private ServletLocaleProducer servletLocaleProducer; - - private HttpServletRequest request; - - @Test - public void testCreate() { - request = createMock(HttpServletRequest.class); - - mockStatic(Beans.class); - expect(Beans.getReference(HttpServletRequest.class)).andReturn(request); - replay(Beans.class); - - servletLocaleProducer = new ServletLocaleProducer(); - servletLocaleProducer.create(); - - verifyAll(); - } - - @Test - public void testCreate2() { - servletLocaleProducer = new ServletLocaleProducer(); - servletLocaleProducer.create(); - - 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.producer; +// +//import static org.easymock.EasyMock.createMock; +//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.verifyAll; +// +//import javax.servlet.http.HttpServletRequest; +// +//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.util.Beans; +// +//@RunWith(PowerMockRunner.class) +//@PrepareForTest(Beans.class) +//public class ServletLocaleProducerTest { +// +// private ServletLocaleProducer servletLocaleProducer; +// +// private HttpServletRequest request; +// +// @Test +// public void testCreate() { +// request = createMock(HttpServletRequest.class); +// +// mockStatic(Beans.class); +// expect(Beans.getReference(HttpServletRequest.class)).andReturn(request); +// replay(Beans.class); +// +// servletLocaleProducer = new ServletLocaleProducer(); +// servletLocaleProducer.create(); +// +// verifyAll(); +// } +// +// @Test +// public void testCreate2() { +// servletLocaleProducer = new ServletLocaleProducer(); +// servletLocaleProducer.create(); +// +// verifyAll(); +// } +// +//} diff --git a/impl/extension/servlet/src/test/java/br/gov/frameworkdemoiselle/internal/proxy/HttpServletRequestProxyTest.java b/impl/extension/servlet/src/test/java/br/gov/frameworkdemoiselle/internal/proxy/HttpServletRequestProxyTest.java index 0013067..fc21ec6 100644 --- a/impl/extension/servlet/src/test/java/br/gov/frameworkdemoiselle/internal/proxy/HttpServletRequestProxyTest.java +++ b/impl/extension/servlet/src/test/java/br/gov/frameworkdemoiselle/internal/proxy/HttpServletRequestProxyTest.java @@ -1,45 +1,45 @@ -/* - * 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.proxy; - -import org.junit.runner.RunWith; -import org.powermock.modules.junit4.PowerMockRunner; - -@RunWith(PowerMockRunner.class) -public class HttpServletRequestProxyTest { - -} +///* +// * 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.proxy; +// +//import org.junit.runner.RunWith; +//import org.powermock.modules.junit4.PowerMockRunner; +// +//@RunWith(PowerMockRunner.class) +//public class HttpServletRequestProxyTest { +// +//} diff --git a/parent/bom/pom.xml b/parent/bom/pom.xml index f3990da..50af76a 100755 --- a/parent/bom/pom.xml +++ b/parent/bom/pom.xml @@ -109,13 +109,13 @@ demoiselle-jmx 2.4.0-BETA2-SNAPSHOT - + --> @@ -308,13 +308,6 @@ ${commons.dbcp.version} - - - org.glassfish.main.extras - glassfish-embedded-all - ${glassfish.embedded.version} - - hsqldb @@ -335,31 +328,6 @@ ${junit.version} - org.jboss.arquillian - arquillian-bom - ${arquillian.version} - import - pom - - - org.jboss.arquillian.container - arquillian-weld-se-embedded-1.1 - ${arquillian.weld.se.embedded.version} - - - org.jboss.arquillian.container - arquillian-glassfish-embedded-3.1 - ${arquillian.glassfish.embedded.version} - - - org.jboss.weld.se weld-se-core ${weld.version} @@ -430,16 +398,6 @@ 4.8.1 3.0 - 1.1.1.Final - - 1.0.0.CR7 - 1.0.0.Alpha6 - 1.0.0.CR4 - - 3.1.2.2 - 2.16 1.4.6 diff --git a/parent/extension/pom.xml b/parent/extension/pom.xml index 2d976a8..00540d1 100755 --- a/parent/extension/pom.xml +++ b/parent/extension/pom.xml @@ -75,16 +75,17 @@ import pom + + org.jboss.arquillian + arquillian-bom + ${arquillian.bom.version} + import + pom + - - - src/test/resources - true - - org.apache.maven.plugins @@ -106,6 +107,25 @@ org.apache.maven.plugins maven-surefire-plugin + + org.jacoco + jacoco-maven-plugin + ${jacoco.version} + + + + prepare-agent + + + + report + prepare-package + + report + + + + @@ -122,27 +142,27 @@ test - org.easymock - easymock + org.jboss.arquillian.junit + arquillian-junit-container test - org.powermock - powermock-module-junit4 + org.jboss.shrinkwrap.resolver + shrinkwrap-resolver-impl-maven test - org.powermock - powermock-api-easymock + org.jboss.arquillian.extension + arquillian-jacoco + ${arquillian.jacoco.version} test - @@ -169,4 +189,97 @@ + + + + arquillian-test + + + br.gov.frameworkdemoiselle + demoiselle-core + + + javax.enterprise + cdi-api + + + validation-api + javax.validation + + + org.slf4j + slf4j-api + + + org.javassist + javassist + + + + + + + arquillian-jbossas7-managed + + true + + + + + src/test/resources + true + + + + + maven-dependency-plugin + + + unpack + process-test-classes + + unpack + + + + + org.jboss.as + jboss-as-dist + ${jboss.as.version} + zip + false + target + + + + + + + + + + + org.jboss.as + jboss-as-arquillian-container-managed + ${jboss.as.version} + test + + + org.jboss.arquillian.protocol + arquillian-protocol-servlet + test + + + + + 7.1.1.Final + + + + + + 1.1.1.Final + 1.0.0.Alpha5 + 0.6.0.201210061924 + -- libgit2 0.21.2