http://git-wip-us.apache.org/repos/asf/james-project/blob/7adbc83c/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/handler/MockHandler.java ---------------------------------------------------------------------- diff --git a/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/handler/MockHandler.java b/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/handler/MockHandler.java index 04df8c0..5b68144 100644 --- a/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/handler/MockHandler.java +++ b/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/handler/MockHandler.java @@ -39,140 +39,113 @@ import org.apache.james.mpt.onami.test.reflection.HandleException; * @see org.apache.onami.test.reflection.ClassVisitor * @see Mock */ -public final class MockHandler - implements FieldHandler<Mock> -{ +public final class MockHandler implements FieldHandler<Mock> { - private static final Logger LOGGER = Logger.getLogger( MockHandler.class.getName() ); + private static final Logger LOGGER = Logger.getLogger(MockHandler.class.getName()); - private final HashMap<Field, Object> mockedObjects = new HashMap<Field, Object>( 1 ); + private final HashMap<Field, Object> mockedObjects = new HashMap<Field, Object>(1); /** * Return the mocked objects. - * + * * @param engine the {@link MockEngine} * @return the map of mocked objects */ - public HashMap<Field, Object> getMockedObject( MockEngine engine ) - { - createMockedObjectBymockFramekork( engine ); + public HashMap<Field, Object> getMockedObject(MockEngine engine) { + createMockedObjectBymockFramekork(engine); return mockedObjects; } - private void createMockedObjectBymockFramekork( MockEngine engine ) - { - for ( Entry<Field, Object> entry : mockedObjects.entrySet() ) - { - if ( entry.getValue() instanceof Class<?> ) - { + private void createMockedObjectBymockFramekork(MockEngine engine) { + for (Entry<Field, Object> entry : mockedObjects.entrySet()) { + if (entry.getValue() instanceof Class<?>) { Field field = entry.getKey(); - Mock mock = field.getAnnotation( Mock.class ); - mockedObjects.put( entry.getKey(), engine.createMock( (Class<?>) entry.getValue(), mock.type() ) ); + Mock mock = field.getAnnotation(Mock.class); + mockedObjects.put(entry.getKey(), engine.createMock((Class<?>) entry.getValue(), mock.type())); } } } - + /** * Invoked when the visitor founds an element with a {@link Mock} annotation. + * * @param annotation The {@link Mock} annotation type - * @param element the {@link Mock} annotated fiels - * @throws HandleException when an error occurs. + * @param element the {@link Mock} annotated fiels + * @throws HandleException when an error occurs. */ - @SuppressWarnings( "unchecked" ) - public void handle( final Mock annotation, final Field element ) - throws HandleException - { + @SuppressWarnings("unchecked") + public void handle(final Mock annotation, final Field element) + throws HandleException { final Class<? super Object> type = (Class<? super Object>) element.getDeclaringClass(); - if ( LOGGER.isLoggable( Level.FINER ) ) - { - LOGGER.finer( " Found annotated field: " + element ); + if (LOGGER.isLoggable(Level.FINER)) { + LOGGER.finer(" Found annotated field: " + element); } - if ( annotation.providedBy().length() > 0 ) - { + if (annotation.providedBy().length() > 0) { Class<?> providedClass = type; - if ( annotation.providerClass() != Object.class ) - { + if (annotation.providerClass() != Object.class) { providedClass = annotation.providerClass(); } - try - { - Method method = providedClass.getMethod( annotation.providedBy() ); - - if ( !element.getType().isAssignableFrom( method.getReturnType() ) ) - { - throw new HandleException( "Impossible to mock %s due to compatibility type, method provider %s#%s returns %s", - element.getDeclaringClass().getName(), - providedClass.getName(), - annotation.providedBy(), - method.getReturnType().getName() ); - } - try - { - Object mocked = getMockProviderForType( element.getType(), method, type ); - mockedObjects.put( element, mocked ); + try { + Method method = providedClass.getMethod(annotation.providedBy()); + + if (!element.getType().isAssignableFrom(method.getReturnType())) { + throw new HandleException("Impossible to mock %s due to compatibility type, method provider %s#%s returns %s", + element.getDeclaringClass().getName(), + providedClass.getName(), + annotation.providedBy(), + method.getReturnType().getName()); } - catch ( Throwable t ) - { - throw new HandleException( "Impossible to mock %s, method provider %s#%s raised an error: %s", - element.getDeclaringClass().getName(), - providedClass.getName(), - annotation.providedBy(), - t ); + try { + Object mocked = getMockProviderForType(element.getType(), method, type); + mockedObjects.put(element, mocked); + } catch (Throwable t) { + throw new HandleException("Impossible to mock %s, method provider %s#%s raised an error: %s", + element.getDeclaringClass().getName(), + providedClass.getName(), + annotation.providedBy(), + t); } + } catch (SecurityException e) { + throw new HandleException("Impossible to mock %s, impossible to access to method provider %s#%s: %s", + element.getDeclaringClass().getName(), + providedClass.getName(), + annotation.providedBy(), + e); + } catch (NoSuchMethodException e) { + throw new HandleException("Impossible to mock %s, the method provider %s#%s doesn't exist.", + element.getDeclaringClass().getName(), + providedClass.getName(), + annotation.providedBy()); } - catch ( SecurityException e ) - { - throw new HandleException( "Impossible to mock %s, impossible to access to method provider %s#%s: %s", - element.getDeclaringClass().getName(), - providedClass.getName(), - annotation.providedBy(), - e ); - } - catch ( NoSuchMethodException e ) - { - throw new HandleException( "Impossible to mock %s, the method provider %s#%s doesn't exist.", - element.getDeclaringClass().getName(), - providedClass.getName(), - annotation.providedBy() ); - } - } - else - { - mockedObjects.put( element, element.getType() ); + } else { + mockedObjects.put(element, element.getType()); } } - @SuppressWarnings( "unchecked" ) - private <T> T getMockProviderForType( T t, Method method, Class<?> cls ) - throws HandleException - { - if ( method.getReturnType() == t ) - { - try - { - if ( LOGGER.isLoggable( Level.FINER ) ) - { - LOGGER.finer( " ...invoke Provider method for Mock: " + method.getName() ); + @SuppressWarnings("unchecked") + private <T> T getMockProviderForType(T t, Method method, Class<?> cls) + throws HandleException { + if (method.getReturnType() == t) { + try { + if (LOGGER.isLoggable(Level.FINER)) { + LOGGER.finer(" ...invoke Provider method for Mock: " + method.getName()); } - if ( !Modifier.isPublic( method.getModifiers() ) || !Modifier.isStatic( method.getModifiers() ) ) - { - throw new HandleException( "Impossible to invoke method %s#%s. The method shuld be 'static public %s %s()", - cls.getName(), - method.getName(), - method.getReturnType().getName(), - method.getName() ); + if (!Modifier.isPublic(method.getModifiers()) || !Modifier.isStatic(method.getModifiers())) { + throw new HandleException("Impossible to invoke method %s#%s. The method shuld be 'static public %s %s()", + cls.getName(), + method.getName(), + method.getReturnType().getName(), + method.getName()); } - return (T) method.invoke( cls ); - } - catch ( Exception e ) - { - throw new RuntimeException( e ); + return (T) method.invoke(cls); + } catch (Exception e) { + throw new RuntimeException(e); } } - throw new HandleException( "The method: %s should return type %s", method, t ); + throw new HandleException("The method: %s should return type %s", method, t); } }
http://git-wip-us.apache.org/repos/asf/james-project/blob/7adbc83c/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/mock/MockEngine.java ---------------------------------------------------------------------- diff --git a/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/mock/MockEngine.java b/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/mock/MockEngine.java index b1bd7b8..c8b5f15 100644 --- a/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/mock/MockEngine.java +++ b/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/mock/MockEngine.java @@ -27,24 +27,23 @@ import org.apache.james.mpt.onami.test.annotation.MockObjType; * @see org.apache.onami.test.mock.framework.EasyMockFramework * @see org.apache.onami.test.mock.framework.MockitoFramework */ -public interface MockEngine -{ +public interface MockEngine { /** * Reset the mock objects * * @param objects to reset. */ - void resetMock( Object... objects ); + void resetMock(Object... objects); /** * Create a typed mock * - * @param <T> Class to mock - * @param cls Class to mock + * @param <T> Class to mock + * @param cls Class to mock * @param type the {@link MockObjType} * @return the mock object */ - <T> T createMock( Class<T> cls, MockObjType type ); + <T> T createMock(Class<T> cls, MockObjType type); } http://git-wip-us.apache.org/repos/asf/james-project/blob/7adbc83c/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/mock/framework/EasyMockFramework.java ---------------------------------------------------------------------- diff --git a/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/mock/framework/EasyMockFramework.java b/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/mock/framework/EasyMockFramework.java index c371dcc..9bd55d8 100644 --- a/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/mock/framework/EasyMockFramework.java +++ b/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/mock/framework/EasyMockFramework.java @@ -28,37 +28,32 @@ import org.easymock.EasyMock; * * @see MockEngine */ -public class EasyMockFramework - implements MockEngine -{ +public class EasyMockFramework implements MockEngine { /** * {@inheritDoc} */ - public void resetMock( Object... objects ) - { - EasyMock.reset( objects ); + public void resetMock(Object... objects) { + EasyMock.reset(objects); } /** * {@inheritDoc} */ - public <T> T createMock( Class<T> cls, MockObjType type ) - { - switch ( type ) - { + public <T> T createMock(Class<T> cls, MockObjType type) { + switch (type) { case EASY_MOCK_NICE: - return EasyMock.createNiceMock( cls ); + return EasyMock.createNiceMock(cls); case EASY_MOCK_STRICT: - return EasyMock.createStrictMock( cls ); + return EasyMock.createStrictMock(cls); case EASY_MOCK_NORMAL: case DEFAULT: - return EasyMock.createMock( cls ); + return EasyMock.createMock(cls); default: - throw new IllegalArgumentException( "Unsupported mock type '" + type + "' for Easy-Mock Framework." ); + throw new IllegalArgumentException("Unsupported mock type '" + type + "' for Easy-Mock Framework."); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/7adbc83c/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/mock/framework/MockitoFramework.java ---------------------------------------------------------------------- diff --git a/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/mock/framework/MockitoFramework.java b/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/mock/framework/MockitoFramework.java index 1f45448..5e6c5cb 100644 --- a/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/mock/framework/MockitoFramework.java +++ b/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/mock/framework/MockitoFramework.java @@ -32,24 +32,21 @@ import org.mockito.Mockito; * @see MockEngine */ public class MockitoFramework - implements MockEngine -{ + implements MockEngine { /** * {@inheritDoc} */ - public void resetMock( Object... objects ) - { - Mockito.reset( objects ); + public void resetMock(Object... objects) { + Mockito.reset(objects); } /** * {@inheritDoc} */ - public <T> T createMock( Class<T> cls, MockObjType type ) - { - checkArgument( DEFAULT == type, "Unsupported mock type '%s' for Mockito Framework.", type ); - return Mockito.mock( cls ); + public <T> T createMock(Class<T> cls, MockObjType type) { + checkArgument(DEFAULT == type, "Unsupported mock type '%s' for Mockito Framework.", type); + return Mockito.mock(cls); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/7adbc83c/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/reflection/AnnotationHandler.java ---------------------------------------------------------------------- diff --git a/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/reflection/AnnotationHandler.java b/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/reflection/AnnotationHandler.java index 5decb70..3ae233f 100644 --- a/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/reflection/AnnotationHandler.java +++ b/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/reflection/AnnotationHandler.java @@ -28,18 +28,17 @@ import java.lang.reflect.AnnotatedElement; * @param <A> whatever annotation type * @param <E> the element annotated with an annotation type */ -public interface AnnotationHandler<A extends Annotation, E extends AnnotatedElement> -{ +public interface AnnotationHandler<A extends Annotation, E extends AnnotatedElement> { /** * Invoked when {@link ClassVisitor} found an annotation into a class. * * @param annotation handled annotation - * @param element the element annotated with input annotation + * @param element the element annotated with input annotation * @throws HandleException if an error occurs while processing the annotated element - * and the related annotation + * and the related annotation */ - void handle( A annotation, E element ) + void handle(A annotation, E element) throws HandleException; } http://git-wip-us.apache.org/repos/asf/james-project/blob/7adbc83c/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/reflection/ClassHandler.java ---------------------------------------------------------------------- diff --git a/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/reflection/ClassHandler.java b/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/reflection/ClassHandler.java index abf3211..23eacb5 100644 --- a/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/reflection/ClassHandler.java +++ b/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/reflection/ClassHandler.java @@ -26,8 +26,6 @@ import java.lang.annotation.Annotation; * * @param <A> whatever annotation type */ -public interface ClassHandler<A extends Annotation> - extends AnnotationHandler<A, Class<?>> -{ +public interface ClassHandler<A extends Annotation> extends AnnotationHandler<A, Class<?>> { } http://git-wip-us.apache.org/repos/asf/james-project/blob/7adbc83c/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/reflection/ClassVisitor.java ---------------------------------------------------------------------- diff --git a/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/reflection/ClassVisitor.java b/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/reflection/ClassVisitor.java index ba2251b..a28e1ef 100644 --- a/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/reflection/ClassVisitor.java +++ b/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/reflection/ClassVisitor.java @@ -37,12 +37,11 @@ import com.google.common.collect.Multimap; * Visit the input class and all super classes and invokes handler to register annotations. * </p> */ -public final class ClassVisitor -{ +public final class ClassVisitor { private static final String JAVA_PACKAGE = "java"; - private static final Logger LOGGER = Logger.getLogger( ClassVisitor.class.getName() ); + private static final Logger LOGGER = Logger.getLogger(ClassVisitor.class.getName()); private final Multimap<Class<? extends Annotation>, AnnotationHandler<? extends Annotation, ? extends AnnotatedElement>> handlers = ArrayListMultimap.create(); @@ -50,58 +49,50 @@ public final class ClassVisitor /** * Registers an annotation handler. * - * @param <A> whatever annotation type + * @param <A> whatever annotation type * @param annotationType the annotation class to handle - * @param handler the related annotation handler + * @param handler the related annotation handler * @return the current {@code ClassVisitor} instance */ - public <A extends Annotation> ClassVisitor registerHandler( Class<A> annotationType, - AnnotationHandler<A, ? extends AnnotatedElement> handler ) - { - handlers.put( annotationType, handler ); + public <A extends Annotation> ClassVisitor registerHandler(Class<A> annotationType, + AnnotationHandler<A, ? extends AnnotatedElement> handler) { + handlers.put(annotationType, handler); return this; } /** * Visits all fields, methods and super classes of the input class. * - * @param <T> any type - * @param type The type + * @param <T> any type + * @param type The type * @throws HandleException when an error occurs. */ - public <T> void visit( final Class<? super T> type ) - throws HandleException - { - checkArgument( type != null, "Type to be visited cannot be null" ); - - if ( LOGGER.isLoggable( Level.FINER ) ) - { - LOGGER.finer( " Visit class: " + type ); + public <T> void visit(final Class<? super T> type) + throws HandleException { + checkArgument(type != null, "Type to be visited cannot be null"); + + if (LOGGER.isLoggable(Level.FINER)) { + LOGGER.finer(" Visit class: " + type); } - if ( type.getPackage() != null && type.getPackage().getName().startsWith( JAVA_PACKAGE ) ) - { + if (type.getPackage() != null && type.getPackage().getName().startsWith(JAVA_PACKAGE)) { return; } - handle( type ); - handle( type.getDeclaredFields() ); - handle( type.getDeclaredMethods() ); + handle(type); + handle(type.getDeclaredFields()); + handle(type.getDeclaredMethods()); - visit( (Class<? super T>) type.getSuperclass() ); + visit((Class<? super T>) type.getSuperclass()); } - @SuppressWarnings( "unchecked" ) - private void handle( AnnotatedElement... elements ) - throws HandleException - { - for ( AnnotatedElement element : elements ) - { - for ( Annotation annotation : element.getAnnotations() ) - { - for ( AnnotationHandler<? extends Annotation, ? extends AnnotatedElement> handler : handlers.get( annotation.annotationType() ) ) - { - ( (AnnotationHandler<Annotation, AnnotatedElement>) handler ).handle( annotation, element ); + @SuppressWarnings("unchecked") + private void handle(AnnotatedElement... elements) + throws HandleException { + for (AnnotatedElement element : elements) { + for (Annotation annotation : element.getAnnotations()) { + for (AnnotationHandler<? extends Annotation, ? extends AnnotatedElement> handler : handlers.get(annotation.annotationType())) { + ((AnnotationHandler<Annotation, AnnotatedElement>) handler).handle(annotation, element); } } } http://git-wip-us.apache.org/repos/asf/james-project/blob/7adbc83c/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/reflection/FieldHandler.java ---------------------------------------------------------------------- diff --git a/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/reflection/FieldHandler.java b/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/reflection/FieldHandler.java index b1906b0..9c98cdc 100644 --- a/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/reflection/FieldHandler.java +++ b/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/reflection/FieldHandler.java @@ -27,8 +27,6 @@ import java.lang.reflect.Field; * * @param <A> whatever annotation type */ -public interface FieldHandler<A extends Annotation> - extends AnnotationHandler<A, Field> -{ +public interface FieldHandler<A extends Annotation> extends AnnotationHandler<A, Field> { } http://git-wip-us.apache.org/repos/asf/james-project/blob/7adbc83c/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/reflection/HandleException.java ---------------------------------------------------------------------- diff --git a/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/reflection/HandleException.java b/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/reflection/HandleException.java index 50fb695..8da8143 100644 --- a/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/reflection/HandleException.java +++ b/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/reflection/HandleException.java @@ -24,33 +24,29 @@ import static java.lang.String.format; /** * Exception thrown by a {@link ClassVisitor} when a error occurs. */ -public final class HandleException - extends Exception -{ +public final class HandleException extends Exception { private static final long serialVersionUID = 1L; /** * Constructs a new HandleException with the specified detail message and cause. * - * @param message detail message - * @param cause the cause + * @param message detail message + * @param cause the cause */ - public HandleException( String message, Throwable cause ) - { - super( message, cause ); + public HandleException(String message, Throwable cause) { + super(message, cause); } /** * Constructs a new HandleException with the specified detail message. * * @param message a format string - * @param args arguments referenced by the format specifiers in the format string + * @param args arguments referenced by the format specifiers in the format string * @see String#format(String, Object...) */ - public HandleException( String message, Object...args ) - { - super( format( message, args ) ); + public HandleException(String message, Object... args) { + super(format(message, args)); } /** @@ -58,9 +54,8 @@ public final class HandleException * * @param cause the cause */ - public HandleException( Throwable cause ) - { - super( cause ); + public HandleException(Throwable cause) { + super(cause); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/7adbc83c/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/reflection/MethodHandler.java ---------------------------------------------------------------------- diff --git a/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/reflection/MethodHandler.java b/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/reflection/MethodHandler.java index cf4e8e2..6f43140 100644 --- a/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/reflection/MethodHandler.java +++ b/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/reflection/MethodHandler.java @@ -27,8 +27,6 @@ import java.lang.reflect.Method; * * @param <A> whatever annotation type */ -public interface MethodHandler<A extends Annotation> - extends AnnotationHandler<A, Method> -{ +public interface MethodHandler<A extends Annotation> extends AnnotationHandler<A, Method> { } http://git-wip-us.apache.org/repos/asf/james-project/blob/7adbc83c/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/AbstractEmptyTestCase.java ---------------------------------------------------------------------- diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/AbstractEmptyTestCase.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/AbstractEmptyTestCase.java index af71eca..b6f090e 100644 --- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/AbstractEmptyTestCase.java +++ b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/AbstractEmptyTestCase.java @@ -28,15 +28,13 @@ import org.junit.BeforeClass; /** * Utility class. Just for logging initialization. */ -abstract public class AbstractEmptyTestCase -{ +abstract public class AbstractEmptyTestCase { @BeforeClass public static void initLogging() - throws Exception - { - LogManager.getLogManager().readConfiguration( new FileInputStream( - new File( - "src/test/resources/log4j.properties" ) ) ); + throws Exception { + LogManager.getLogManager().readConfiguration(new FileInputStream( + new File( + "src/test/resources/log4j.properties"))); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/7adbc83c/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/AbstractMockTestCase.java ---------------------------------------------------------------------- diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/AbstractMockTestCase.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/AbstractMockTestCase.java index 8013c2f..729a995 100644 --- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/AbstractMockTestCase.java +++ b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/AbstractMockTestCase.java @@ -23,18 +23,15 @@ import org.apache.james.mpt.onami.test.annotation.Mock; import org.apache.james.mpt.onami.test.data.Service; import org.easymock.EasyMock; -abstract public class AbstractMockTestCase - extends AbstractEmptyTestCase -{ +abstract public class AbstractMockTestCase extends AbstractEmptyTestCase { // Create and inject a Provided EasyMock - @Mock( providedBy = "getMock" ) + @Mock(providedBy = "getMock") protected Service providedMock; - public static Service getMock() - { + public static Service getMock() { // Create the mock object and inject the dependency via Google-guice into HelloWorld - return EasyMock.createNiceMock( Service.class ); + return EasyMock.createNiceMock(Service.class); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/7adbc83c/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/AbstractMockitoTestCase.java ---------------------------------------------------------------------- diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/AbstractMockitoTestCase.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/AbstractMockitoTestCase.java index 55de444..a4c0432 100644 --- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/AbstractMockitoTestCase.java +++ b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/AbstractMockitoTestCase.java @@ -26,20 +26,17 @@ import org.apache.james.mpt.onami.test.annotation.MockType; import org.apache.james.mpt.onami.test.data.Service; import org.mockito.Mockito; -@MockFramework( MockType.MOCKITO ) -abstract public class AbstractMockitoTestCase - extends AbstractEmptyTestCase -{ +@MockFramework(MockType.MOCKITO) +abstract public class AbstractMockitoTestCase extends AbstractEmptyTestCase { // Create and inject a Provided EasyMock - @Mock( providedBy = "getMock" ) + @Mock(providedBy = "getMock") protected Service providedMock; // @MockProvider - public static Service getMock() - { + public static Service getMock() { // Create the mock object and inject the dependency via Google-guice into HelloWorld - return Mockito.mock( Service.class ); + return Mockito.mock(Service.class); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/7adbc83c/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/AbstractTestCase.java ---------------------------------------------------------------------- diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/AbstractTestCase.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/AbstractTestCase.java index b95dc05..ec6e0ca 100644 --- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/AbstractTestCase.java +++ b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/AbstractTestCase.java @@ -30,54 +30,43 @@ import com.google.inject.AbstractModule; import com.google.inject.Module; import com.google.inject.name.Names; -@RunWith( OnamiRunner.class ) -@GuiceModules( SimpleModule.class ) -abstract public class AbstractTestCase - extends AbstractEmptyTestCase -{ +@RunWith(OnamiRunner.class) +@GuiceModules(SimpleModule.class) +abstract public class AbstractTestCase extends AbstractEmptyTestCase { @GuiceProvidedModules - public static Module genericModule() - { - return new AbstractModule() - { + public static Module genericModule() { + return new AbstractModule() { @Override - protected void configure() - { - bind( String.class ).annotatedWith( Names.named( "test.info.inject" ) ).toInstance( "JUnice = JUnit + Guice" ); + protected void configure() { + bind(String.class).annotatedWith(Names.named("test.info.inject")).toInstance("JUnice = JUnit + Guice"); } }; } @GuiceProvidedModules - public static Iterable<Module> genericModule2() - { - AbstractModule a = new AbstractModule() - { + public static Iterable<Module> genericModule2() { + AbstractModule a = new AbstractModule() { @Override - protected void configure() - { - bind( String.class ).annotatedWith( Names.named( "test.info.inject2" ) ).toInstance( "JUnice = JUnit + Guice Iterable" ); + protected void configure() { + bind(String.class).annotatedWith(Names.named("test.info.inject2")).toInstance("JUnice = JUnit + Guice Iterable"); } }; ArrayList<Module> al = new ArrayList<Module>(); - al.add( a ); + al.add(a); return al; } @GuiceProvidedModules - public static Module[] genericModule3() - { - AbstractModule a = new AbstractModule() - { + public static Module[] genericModule3() { + AbstractModule a = new AbstractModule() { @Override - protected void configure() - { - bind( String.class ).annotatedWith( Names.named( "test.info.inject3" ) ).toInstance( "JUnice = JUnit + Guice Array" ); + protected void configure() { + bind(String.class).annotatedWith(Names.named("test.info.inject3")).toInstance("JUnice = JUnit + Guice Array"); } }; - return new Module[] { a }; + return new Module[]{a}; } } http://git-wip-us.apache.org/repos/asf/james-project/blob/7adbc83c/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/InjectDependingMockObjectTestCase.java ---------------------------------------------------------------------- diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/InjectDependingMockObjectTestCase.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/InjectDependingMockObjectTestCase.java index 7701d12..092c98a 100644 --- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/InjectDependingMockObjectTestCase.java +++ b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/InjectDependingMockObjectTestCase.java @@ -22,6 +22,8 @@ package org.apache.james.mpt.onami.test; import java.util.ArrayList; import java.util.List; +import javax.inject.Inject; + import org.apache.james.mpt.onami.test.annotation.Mock; import org.apache.james.mpt.onami.test.data.HelloWorld; import org.apache.james.mpt.onami.test.data.Service; @@ -32,13 +34,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import com.google.inject.AbstractModule; -import javax.inject.Inject; import com.google.inject.Injector; import com.google.inject.TypeLiteral; -@RunWith( OnamiRunner.class ) -public class InjectDependingMockObjectTestCase -{ +@RunWith(OnamiRunner.class) +public class InjectDependingMockObjectTestCase { @Mock static private Service service; @@ -49,39 +49,34 @@ public class InjectDependingMockObjectTestCase private HelloWorld helloWorld; @Before - public void setUp() - { + public void setUp() { final List<Service> list = new ArrayList<Service>(); - list.add( service ); + list.add(service); - AbstractModule listAbstractModule = new AbstractModule() - { + AbstractModule listAbstractModule = new AbstractModule() { @Override - protected void configure() - { - bind( new TypeLiteral<List<Service>>() - { - } ).toInstance( list ); + protected void configure() { + bind(new TypeLiteral<List<Service>>() { + }).toInstance(list); } }; - Injector cInjector = injector.createChildInjector( listAbstractModule ); - helloWorld = cInjector.getInstance( HelloWorld.class ); + Injector cInjector = injector.createChildInjector(listAbstractModule); + helloWorld = cInjector.getInstance(HelloWorld.class); // required for optional dependencies - cInjector.injectMembers( helloWorld ); + cInjector.injectMembers(helloWorld); } @Test - public void testMock() - { - Assert.assertNotNull( helloWorld ); - Assert.assertNotNull( service ); - EasyMock.expect( service.go() ).andReturn( "Ciao" ); + public void testMock() { + Assert.assertNotNull(helloWorld); + Assert.assertNotNull(service); + EasyMock.expect(service.go()).andReturn("Ciao"); EasyMock.expectLastCall().once(); - EasyMock.replay( service ); + EasyMock.replay(service); helloWorld.sayHalloByServiceLists(); - EasyMock.verify( service ); + EasyMock.verify(service); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/7adbc83c/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/InjectFromSuperClassTestCase.java ---------------------------------------------------------------------- diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/InjectFromSuperClassTestCase.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/InjectFromSuperClassTestCase.java index e3ac6a4..0561394 100644 --- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/InjectFromSuperClassTestCase.java +++ b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/InjectFromSuperClassTestCase.java @@ -19,39 +19,37 @@ package org.apache.james.mpt.onami.test; +import javax.inject.Inject; + import org.junit.Assert; import org.junit.Test; -import javax.inject.Inject; import com.google.inject.name.Named; -public class InjectFromSuperClassTestCase - extends AbstractTestCase -{ +public class InjectFromSuperClassTestCase extends AbstractTestCase { @Inject - @Named( "test.info.inject" ) + @Named("test.info.inject") private String info; @Inject - @Named( "test.info.inject2" ) + @Named("test.info.inject2") private String infoFromIterable; @Inject - @Named( "test.info.inject3" ) + @Named("test.info.inject3") private String infoFromArray; @Test - public void testInjectFromSuperClass() - { - Assert.assertNotNull( info ); - Assert.assertEquals( "JUnice = JUnit + Guice", info ); + public void testInjectFromSuperClass() { + Assert.assertNotNull(info); + Assert.assertEquals("JUnice = JUnit + Guice", info); - Assert.assertNotNull( infoFromIterable ); - Assert.assertEquals( "JUnice = JUnit + Guice Iterable", infoFromIterable ); + Assert.assertNotNull(infoFromIterable); + Assert.assertEquals("JUnice = JUnit + Guice Iterable", infoFromIterable); - Assert.assertNotNull( infoFromArray ); - Assert.assertEquals( "JUnice = JUnit + Guice Array", infoFromArray ); + Assert.assertNotNull(infoFromArray); + Assert.assertEquals("JUnice = JUnit + Guice Array", infoFromArray); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/7adbc83c/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/InjectJSR330ModuleClassTestCase.java ---------------------------------------------------------------------- diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/InjectJSR330ModuleClassTestCase.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/InjectJSR330ModuleClassTestCase.java index 7ea72c5..78a98a0 100644 --- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/InjectJSR330ModuleClassTestCase.java +++ b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/InjectJSR330ModuleClassTestCase.java @@ -29,26 +29,22 @@ import org.junit.runner.RunWith; import com.google.inject.AbstractModule; import com.google.inject.name.Names; -@RunWith( OnamiRunner.class ) -public class InjectJSR330ModuleClassTestCase - extends AbstractModule -{ +@RunWith(OnamiRunner.class) +public class InjectJSR330ModuleClassTestCase extends AbstractModule { @Override - public void configure() - { - bind( Integer.class ).annotatedWith( Names.named( "numeber.version" ) ).toInstance( 10 ); + public void configure() { + bind(Integer.class).annotatedWith(Names.named("numeber.version")).toInstance(10); } @Inject - @Named( "numeber.version" ) + @Named("numeber.version") private Integer version; @Test - public void testInjectModuleClass() - { - Assert.assertNotNull( version ); - Assert.assertEquals( 10, version.intValue() ); + public void testInjectModuleClass() { + Assert.assertNotNull(version); + Assert.assertEquals(10, version.intValue()); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/7adbc83c/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/InjectMockObjectTestCase.java ---------------------------------------------------------------------- diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/InjectMockObjectTestCase.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/InjectMockObjectTestCase.java index 66eefe6..46956a6 100644 --- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/InjectMockObjectTestCase.java +++ b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/InjectMockObjectTestCase.java @@ -19,6 +19,8 @@ package org.apache.james.mpt.onami.test; +import javax.inject.Inject; + import org.apache.james.mpt.onami.test.annotation.GuiceModules; import org.apache.james.mpt.onami.test.annotation.Mock; import org.apache.james.mpt.onami.test.data.HelloWorld; @@ -29,14 +31,11 @@ import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import javax.inject.Inject; import com.google.inject.Injector; -@RunWith( OnamiRunner.class ) -@GuiceModules( SimpleModule.class ) -public class InjectMockObjectTestCase - extends AbstractMockTestCase -{ +@RunWith(OnamiRunner.class) +@GuiceModules(SimpleModule.class) +public class InjectMockObjectTestCase extends AbstractMockTestCase { // Create and inject a simple EasyMock Strict mock @Mock @@ -49,49 +48,45 @@ public class InjectMockObjectTestCase private HelloWorld helloWorld; @Test - public void testMock() - { - EasyMock.expect( providedMock.go() ).andReturn( "Ciao" ); - EasyMock.replay( providedMock ); - - Assert.assertNotNull( this.providedMock ); - Assert.assertEquals( "Ciao", helloWorld.sayHalloByService() ); - EasyMock.verify( providedMock ); + public void testMock() { + EasyMock.expect(providedMock.go()).andReturn("Ciao"); + EasyMock.replay(providedMock); + + Assert.assertNotNull(this.providedMock); + Assert.assertEquals("Ciao", helloWorld.sayHalloByService()); + EasyMock.verify(providedMock); } @Test - public void testMock2() - { - EasyMock.expect( providedMock.go() ).andReturn( "Ciao" ); - EasyMock.replay( providedMock ); - - Assert.assertNotNull( this.providedMock ); - Assert.assertEquals( "Ciao", helloWorld.sayHalloByService() ); - EasyMock.verify( providedMock ); + public void testMock2() { + EasyMock.expect(providedMock.go()).andReturn("Ciao"); + EasyMock.replay(providedMock); + + Assert.assertNotNull(this.providedMock); + Assert.assertEquals("Ciao", helloWorld.sayHalloByService()); + EasyMock.verify(providedMock); } @Test - public void testStrickMock() - { - EasyMock.expect( telephonServiceMock.getTelephonNumber() ).andReturn( "1234567890" ); - providedMock.call( "1234567890" ); + public void testStrickMock() { + EasyMock.expect(telephonServiceMock.getTelephonNumber()).andReturn("1234567890"); + providedMock.call("1234567890"); EasyMock.expectLastCall().once(); - EasyMock.replay( telephonServiceMock ); - EasyMock.replay( providedMock ); + EasyMock.replay(telephonServiceMock); + EasyMock.replay(providedMock); helloWorld.callHelloWorldTelephon(); - EasyMock.verify( telephonServiceMock ); - EasyMock.verify( providedMock ); + EasyMock.verify(telephonServiceMock); + EasyMock.verify(providedMock); // reset manually the mock object. Flag resettable is false!!! - EasyMock.reset( telephonServiceMock ); + EasyMock.reset(telephonServiceMock); } @Test - public void testStrickMock2() - { - Assert.assertNotNull( telephonServiceMock ); + public void testStrickMock2() { + Assert.assertNotNull(telephonServiceMock); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/7adbc83c/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/InjectModuleClassTestCase.java ---------------------------------------------------------------------- diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/InjectModuleClassTestCase.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/InjectModuleClassTestCase.java index 1c6557b..9fc92bb 100644 --- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/InjectModuleClassTestCase.java +++ b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/InjectModuleClassTestCase.java @@ -19,35 +19,32 @@ package org.apache.james.mpt.onami.test; +import javax.inject.Inject; + import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import com.google.inject.AbstractModule; -import javax.inject.Inject; import com.google.inject.name.Named; import com.google.inject.name.Names; -@RunWith( OnamiRunner.class ) -public class InjectModuleClassTestCase - extends AbstractModule -{ +@RunWith(OnamiRunner.class) +public class InjectModuleClassTestCase extends AbstractModule { @Override - public void configure() - { - bind( Integer.class ).annotatedWith( Names.named( "numeber.version" ) ).toInstance( 10 ); + public void configure() { + bind(Integer.class).annotatedWith(Names.named("numeber.version")).toInstance(10); } @Inject - @Named( "numeber.version" ) + @Named("numeber.version") private Integer version; @Test - public void testInjectModuleClass() - { - Assert.assertNotNull( version ); - Assert.assertEquals( 10, version.intValue() ); + public void testInjectModuleClass() { + Assert.assertNotNull(version); + Assert.assertEquals(10, version.intValue()); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/7adbc83c/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/InjectStaticSimpleTestCase.java ---------------------------------------------------------------------- diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/InjectStaticSimpleTestCase.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/InjectStaticSimpleTestCase.java index 5d318a5..1541581 100644 --- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/InjectStaticSimpleTestCase.java +++ b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/InjectStaticSimpleTestCase.java @@ -20,6 +20,8 @@ package org.apache.james.mpt.onami.test; +import javax.inject.Inject; + import org.apache.james.mpt.onami.test.annotation.GuiceModules; import org.apache.james.mpt.onami.test.annotation.GuiceProvidedModules; import org.apache.james.mpt.onami.test.data.ComplexModule; @@ -30,13 +32,11 @@ import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import javax.inject.Inject; import com.google.inject.Module; -@RunWith( OnamiRunner.class ) -@GuiceModules( SimpleModule.class ) -public class InjectStaticSimpleTestCase -{ +@RunWith(OnamiRunner.class) +@GuiceModules(SimpleModule.class) +public class InjectStaticSimpleTestCase { /* * Any static filed will be injecteded once before creation of SimpleTest Class @@ -48,23 +48,20 @@ public class InjectStaticSimpleTestCase public static WhoIm whoIm; @GuiceProvidedModules - public static Module createComplexModule() - { - return new ComplexModule( "Marco Speranza" ); + public static Module createComplexModule() { + return new ComplexModule("Marco Speranza"); } @Test - public void testHelloWorld() - { - Assert.assertNotNull( helloWorld ); - Assert.assertEquals( "Hello World!!!!", helloWorld.sayHallo() ); + public void testHelloWorld() { + Assert.assertNotNull(helloWorld); + Assert.assertEquals("Hello World!!!!", helloWorld.sayHallo()); } @Test - public void testWhoIm() - { - Assert.assertNotNull( whoIm ); - Assert.assertEquals( "Marco Speranza", whoIm.sayWhoIm() ); + public void testWhoIm() { + Assert.assertNotNull(whoIm); + Assert.assertEquals("Marco Speranza", whoIm.sayWhoIm()); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/7adbc83c/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/MockTypeTestCase.java ---------------------------------------------------------------------- diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/MockTypeTestCase.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/MockTypeTestCase.java index 2d366db..262bb02 100644 --- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/MockTypeTestCase.java +++ b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/MockTypeTestCase.java @@ -27,17 +27,15 @@ import org.junit.Test; import org.junit.runner.RunWith; -@RunWith( OnamiRunner.class ) -public class MockTypeTestCase -{ +@RunWith(OnamiRunner.class) +public class MockTypeTestCase { - @Mock( type = MockObjType.EASY_MOCK_STRICT ) + @Mock(type = MockObjType.EASY_MOCK_STRICT) Service service; @Test - public void test() - { - Assert.assertNotNull( service ); + public void test() { + Assert.assertNotNull(service); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/7adbc83c/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/MockitoFrameworkTestCase.java ---------------------------------------------------------------------- diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/MockitoFrameworkTestCase.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/MockitoFrameworkTestCase.java index b12bf10..0e42713 100644 --- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/MockitoFrameworkTestCase.java +++ b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/MockitoFrameworkTestCase.java @@ -19,6 +19,8 @@ package org.apache.james.mpt.onami.test; +import javax.inject.Inject; + import org.apache.james.mpt.onami.test.annotation.Mock; import org.apache.james.mpt.onami.test.data.HelloWorld; import org.apache.james.mpt.onami.test.data.TelephonService; @@ -27,12 +29,8 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; -import javax.inject.Inject; - -@RunWith( OnamiRunner.class ) -public class MockitoFrameworkTestCase - extends AbstractMockitoTestCase -{ +@RunWith(OnamiRunner.class) +public class MockitoFrameworkTestCase extends AbstractMockitoTestCase { /* * Any NON-static filed will be injected before run each tests. @@ -44,17 +42,15 @@ public class MockitoFrameworkTestCase private TelephonService service; @BeforeClass - public static void setUpClass() - { + public static void setUpClass() { } @Test - public void testInjectNotStatic() - { - Assert.assertNotNull( helloWorldNotStatic ); - Assert.assertEquals( "Hello World!!!!", helloWorldNotStatic.sayHallo() ); - Assert.assertNotNull( service ); - Assert.assertNotNull( providedMock ); + public void testInjectNotStatic() { + Assert.assertNotNull(helloWorldNotStatic); + Assert.assertEquals("Hello World!!!!", helloWorldNotStatic.sayHallo()); + Assert.assertNotNull(service); + Assert.assertNotNull(providedMock); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/7adbc83c/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/OnamiSuiteTest.java ---------------------------------------------------------------------- diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/OnamiSuiteTest.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/OnamiSuiteTest.java index 56f5985..9f7cfd1 100644 --- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/OnamiSuiteTest.java +++ b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/OnamiSuiteTest.java @@ -23,7 +23,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Suite.SuiteClasses; @RunWith(OnamiSuite.class) -@SuiteClasses({ InjectDependingMockObjectTestCase.class, InjectFromSuperClassTestCase.class }) +@SuiteClasses({InjectDependingMockObjectTestCase.class, InjectFromSuperClassTestCase.class}) public class OnamiSuiteTest { } http://git-wip-us.apache.org/repos/asf/james-project/blob/7adbc83c/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/ServiceMockProviderTest.java ---------------------------------------------------------------------- diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/ServiceMockProviderTest.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/ServiceMockProviderTest.java index 8efcbfd..d076d36 100644 --- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/ServiceMockProviderTest.java +++ b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/ServiceMockProviderTest.java @@ -27,17 +27,15 @@ import org.junit.Test; import org.junit.runner.RunWith; -@RunWith( OnamiRunner.class ) -public class ServiceMockProviderTest -{ +@RunWith(OnamiRunner.class) +public class ServiceMockProviderTest { - @Mock( providedBy = "providerMethod", providerClass = ServiceMockProvider.class ) + @Mock(providedBy = "providerMethod", providerClass = ServiceMockProvider.class) private Service service; @Test - public void test() - { - Assert.assertNotNull( service ); + public void test() { + Assert.assertNotNull(service); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/7adbc83c/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/SimpleTest.java ---------------------------------------------------------------------- diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/SimpleTest.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/SimpleTest.java index 37ad2e2..2a341d6 100644 --- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/SimpleTest.java +++ b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/SimpleTest.java @@ -20,6 +20,8 @@ package org.apache.james.mpt.onami.test; +import javax.inject.Inject; + import org.apache.james.mpt.onami.test.annotation.GuiceModules; import org.apache.james.mpt.onami.test.data.HelloWorld; import org.apache.james.mpt.onami.test.data.SimpleModule; @@ -28,12 +30,9 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; -import javax.inject.Inject; - -@RunWith( OnamiRunner.class ) -@GuiceModules( SimpleModule.class ) -public class SimpleTest -{ +@RunWith(OnamiRunner.class) +@GuiceModules(SimpleModule.class) +public class SimpleTest { /* * Any NON-static filed will be injecteded before run each tests. @@ -42,15 +41,13 @@ public class SimpleTest private HelloWorld helloWorldNotStatic; @BeforeClass - public static void setUpClass() - { + public static void setUpClass() { } @Test - public void testInjectNotStatic() - { - Assert.assertNotNull( helloWorldNotStatic ); - Assert.assertEquals( "Hello World!!!!", helloWorldNotStatic.sayHallo() ); + public void testInjectNotStatic() { + Assert.assertNotNull(helloWorldNotStatic); + Assert.assertEquals("Hello World!!!!", helloWorldNotStatic.sayHallo()); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/7adbc83c/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/ComplexModule.java ---------------------------------------------------------------------- diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/ComplexModule.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/ComplexModule.java index b1f5963..3632a1d 100644 --- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/ComplexModule.java +++ b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/ComplexModule.java @@ -21,21 +21,17 @@ package org.apache.james.mpt.onami.test.data; import com.google.inject.AbstractModule; -public class ComplexModule - extends AbstractModule -{ +public class ComplexModule extends AbstractModule { private final String name; - public ComplexModule( String name ) - { + public ComplexModule(String name) { this.name = name; } @Override - protected void configure() - { - bind( WhoIm.class ).toInstance( new WhoIm( name ) ); + protected void configure() { + bind(WhoIm.class).toInstance(new WhoIm(name)); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/7adbc83c/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/HelloWordAnnotated.java ---------------------------------------------------------------------- diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/HelloWordAnnotated.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/HelloWordAnnotated.java index a7d2d2c..f011333 100644 --- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/HelloWordAnnotated.java +++ b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/HelloWordAnnotated.java @@ -20,26 +20,24 @@ package org.apache.james.mpt.onami.test.data; import javax.inject.Inject; + import com.google.inject.name.Named; -public class HelloWordAnnotated -{ +public class HelloWordAnnotated { @Inject @TestAnnotation Service service; @Inject - @Named( "test.named" ) + @Named("test.named") Service named; - public String go() - { + public String go() { return service.go(); } - public String getNamed() - { + public String getNamed() { return named.go(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/7adbc83c/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/HelloWorld.java ---------------------------------------------------------------------- diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/HelloWorld.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/HelloWorld.java index 42bd451..c81001c 100644 --- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/HelloWorld.java +++ b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/HelloWorld.java @@ -21,43 +21,37 @@ package org.apache.james.mpt.onami.test.data; import java.util.List; -import com.google.inject.Inject; - import javax.inject.Singleton; +import com.google.inject.Inject; + @Singleton -public class HelloWorld -{ +public class HelloWorld { - @Inject( optional = true ) + @Inject(optional = true) private Service service; - @Inject( optional = true ) + @Inject(optional = true) private TelephonService telephon; - @Inject( optional = true ) + @Inject(optional = true) private List<Service> services; - public String sayHallo() - { + public String sayHallo() { return "Hello World!!!!"; } - public String sayHalloByService() - { + public String sayHalloByService() { return service.go(); } - public void callHelloWorldTelephon() - { + public void callHelloWorldTelephon() { String number = telephon.getTelephonNumber(); - service.call( number ); + service.call(number); } - public void sayHalloByServiceLists() - { - for ( Service service : services ) - { + public void sayHalloByServiceLists() { + for (Service service : services) { service.go(); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/7adbc83c/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/Service.java ---------------------------------------------------------------------- diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/Service.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/Service.java index 9dc151e..5f0f6c3 100644 --- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/Service.java +++ b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/Service.java @@ -19,11 +19,10 @@ package org.apache.james.mpt.onami.test.data; -public interface Service -{ +public interface Service { String go(); - void call( String value ); + void call(String value); } http://git-wip-us.apache.org/repos/asf/james-project/blob/7adbc83c/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/ServiceImpl.java ---------------------------------------------------------------------- diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/ServiceImpl.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/ServiceImpl.java index 2bd76d1..bc891d6 100644 --- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/ServiceImpl.java +++ b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/ServiceImpl.java @@ -19,17 +19,13 @@ package org.apache.james.mpt.onami.test.data; -public class ServiceImpl - implements Service -{ +public class ServiceImpl implements Service { - public void call( String value ) - { + public void call(String value) { // do nothing } - public String go() - { + public String go() { return "It's real class"; } http://git-wip-us.apache.org/repos/asf/james-project/blob/7adbc83c/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/ServiceMockProvider.java ---------------------------------------------------------------------- diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/ServiceMockProvider.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/ServiceMockProvider.java index 669b92c..3592d42 100644 --- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/ServiceMockProvider.java +++ b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/ServiceMockProvider.java @@ -21,12 +21,10 @@ package org.apache.james.mpt.onami.test.data; import org.easymock.EasyMock; -public class ServiceMockProvider -{ +public class ServiceMockProvider { - public static Service providerMethod() - { - Service mockedService = EasyMock.createNiceMock( Service.class ); + public static Service providerMethod() { + Service mockedService = EasyMock.createNiceMock(Service.class); return mockedService; } http://git-wip-us.apache.org/repos/asf/james-project/blob/7adbc83c/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/ServiceModule.java ---------------------------------------------------------------------- diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/ServiceModule.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/ServiceModule.java index 14400d5..8fa7fa6 100644 --- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/ServiceModule.java +++ b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/ServiceModule.java @@ -21,15 +21,12 @@ package org.apache.james.mpt.onami.test.data; import com.google.inject.AbstractModule; -public class ServiceModule - extends AbstractModule -{ +public class ServiceModule extends AbstractModule { @Override - protected void configure() - { - bind( Service.class ).to( ServiceImpl.class ).asEagerSingleton(); - bind( TelephonService.class ).to( TelephonServiceImpl.class ).asEagerSingleton(); + protected void configure() { + bind(Service.class).to(ServiceImpl.class).asEagerSingleton(); + bind(TelephonService.class).to(TelephonServiceImpl.class).asEagerSingleton(); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/7adbc83c/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/SimpleModule.java ---------------------------------------------------------------------- diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/SimpleModule.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/SimpleModule.java index 6694dd6..7c3a084 100644 --- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/SimpleModule.java +++ b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/SimpleModule.java @@ -21,14 +21,11 @@ package org.apache.james.mpt.onami.test.data; import com.google.inject.AbstractModule; -public class SimpleModule - extends AbstractModule -{ +public class SimpleModule extends AbstractModule { @Override - protected void configure() - { - bind( HelloWorld.class ); + protected void configure() { + bind(HelloWorld.class); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/7adbc83c/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/TelephonService.java ---------------------------------------------------------------------- diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/TelephonService.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/TelephonService.java index 906ddad..1699f03 100644 --- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/TelephonService.java +++ b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/TelephonService.java @@ -19,8 +19,7 @@ package org.apache.james.mpt.onami.test.data; -public interface TelephonService -{ +public interface TelephonService { String getTelephonNumber(); http://git-wip-us.apache.org/repos/asf/james-project/blob/7adbc83c/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/TelephonServiceImpl.java ---------------------------------------------------------------------- diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/TelephonServiceImpl.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/TelephonServiceImpl.java index b61384e..54b1044 100644 --- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/TelephonServiceImpl.java +++ b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/TelephonServiceImpl.java @@ -20,11 +20,9 @@ package org.apache.james.mpt.onami.test.data; public class TelephonServiceImpl - implements TelephonService -{ + implements TelephonService { - public String getTelephonNumber() - { + public String getTelephonNumber() { return "It's real class"; } http://git-wip-us.apache.org/repos/asf/james-project/blob/7adbc83c/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/TestAnnotation.java ---------------------------------------------------------------------- diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/TestAnnotation.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/TestAnnotation.java index 04a3b42..2303176 100644 --- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/TestAnnotation.java +++ b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/TestAnnotation.java @@ -25,8 +25,7 @@ import java.lang.annotation.RetentionPolicy; import javax.inject.Qualifier; @Qualifier -@Retention( RetentionPolicy.RUNTIME ) -public @interface TestAnnotation -{ +@Retention(RetentionPolicy.RUNTIME) +public @interface TestAnnotation { } http://git-wip-us.apache.org/repos/asf/james-project/blob/7adbc83c/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/TestAnnotation2.java ---------------------------------------------------------------------- diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/TestAnnotation2.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/TestAnnotation2.java index 48e1440..6b6be9b 100644 --- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/TestAnnotation2.java +++ b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/TestAnnotation2.java @@ -25,8 +25,7 @@ import java.lang.annotation.RetentionPolicy; import javax.inject.Qualifier; @Qualifier -@Retention( RetentionPolicy.RUNTIME ) -public @interface TestAnnotation2 -{ +@Retention(RetentionPolicy.RUNTIME) +public @interface TestAnnotation2 { } http://git-wip-us.apache.org/repos/asf/james-project/blob/7adbc83c/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/WhoIm.java ---------------------------------------------------------------------- diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/WhoIm.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/WhoIm.java index b18bb2b..cb6bc11 100644 --- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/WhoIm.java +++ b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/data/WhoIm.java @@ -19,18 +19,15 @@ package org.apache.james.mpt.onami.test.data; -public class WhoIm -{ +public class WhoIm { private final String name; - public WhoIm( String name ) - { + public WhoIm(String name) { this.name = name; } - public String sayWhoIm() - { + public String sayWhoIm() { return name; } http://git-wip-us.apache.org/repos/asf/james-project/blob/7adbc83c/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/guice/MockAnnotatedWithTestCase.java ---------------------------------------------------------------------- diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/guice/MockAnnotatedWithTestCase.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/guice/MockAnnotatedWithTestCase.java index 94cd32c..a0b4e29 100644 --- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/guice/MockAnnotatedWithTestCase.java +++ b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/guice/MockAnnotatedWithTestCase.java @@ -19,6 +19,8 @@ package org.apache.james.mpt.onami.test.guice; +import javax.inject.Inject; + import org.apache.james.mpt.onami.test.OnamiRunner; import org.apache.james.mpt.onami.test.annotation.Mock; import org.apache.james.mpt.onami.test.data.HelloWordAnnotated; @@ -29,19 +31,16 @@ import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import javax.inject.Inject; - -@RunWith( OnamiRunner.class ) -public class MockAnnotatedWithTestCase -{ +@RunWith(OnamiRunner.class) +public class MockAnnotatedWithTestCase { - @Mock( annotatedWith = TestAnnotation.class ) + @Mock(annotatedWith = TestAnnotation.class) private Service service2; @Mock private Service service; - @Mock( namedWith = "test.named" ) + @Mock(namedWith = "test.named") private Service serviceNamed; @Inject @@ -49,28 +48,26 @@ public class MockAnnotatedWithTestCase @Test public void test() - throws Exception - { - Assert.assertNotNull( service2 ); - Assert.assertNotNull( service ); - Assert.assertNotNull( serviceNamed ); + throws Exception { + Assert.assertNotNull(service2); + Assert.assertNotNull(service); + Assert.assertNotNull(serviceNamed); } @Test public void test3() - throws Exception - { - Assert.assertNotNull( service2 ); - Assert.assertNotNull( serviceNamed ); + throws Exception { + Assert.assertNotNull(service2); + Assert.assertNotNull(serviceNamed); - EasyMock.expect( service2.go() ).andReturn( "Mocked injected class annotated" ).anyTimes(); - EasyMock.expect( serviceNamed.go() ).andReturn( "Mocked injected class named" ).anyTimes(); - EasyMock.replay( service2, serviceNamed ); + EasyMock.expect(service2.go()).andReturn("Mocked injected class annotated").anyTimes(); + EasyMock.expect(serviceNamed.go()).andReturn("Mocked injected class named").anyTimes(); + EasyMock.replay(service2, serviceNamed); - Assert.assertEquals( "Mocked injected class annotated", service2.go() ); - Assert.assertEquals( "Mocked injected class annotated", seviceImplAnnotated.go() ); - Assert.assertEquals( "Mocked injected class named", seviceImplAnnotated.getNamed() ); - EasyMock.verify( service2 ); + Assert.assertEquals("Mocked injected class annotated", service2.go()); + Assert.assertEquals("Mocked injected class annotated", seviceImplAnnotated.go()); + Assert.assertEquals("Mocked injected class named", seviceImplAnnotated.getNamed()); + EasyMock.verify(service2); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/7adbc83c/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/guice/TestCustomInjectionTest.java ---------------------------------------------------------------------- diff --git a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/guice/TestCustomInjectionTest.java b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/guice/TestCustomInjectionTest.java index 1fde58d..d3e0e02 100644 --- a/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/guice/TestCustomInjectionTest.java +++ b/mpt/onami-test/src/test/java/org/apache/james/mpt/onami/test/guice/TestCustomInjectionTest.java @@ -19,6 +19,8 @@ package org.apache.james.mpt.onami.test.guice; +import javax.inject.Inject; + import org.apache.james.mpt.onami.test.OnamiRunner; import org.apache.james.mpt.onami.test.annotation.GuiceModules; import org.apache.james.mpt.onami.test.annotation.Mock; @@ -32,12 +34,9 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; -import javax.inject.Inject; - -@RunWith( OnamiRunner.class ) -@GuiceModules( ServiceModule.class ) -public class TestCustomInjectionTest -{ +@RunWith(OnamiRunner.class) +@GuiceModules(ServiceModule.class) +public class TestCustomInjectionTest { @Mock private static Service service; @@ -49,34 +48,31 @@ public class TestCustomInjectionTest private HelloWorld helloWorld; @BeforeClass - public static void setUp() - { - Assert.assertNotNull( service ); + public static void setUp() { + Assert.assertNotNull(service); // service.go(); } @Test public void test() - throws Exception - { - Assert.assertNotNull( service ); - Assert.assertNotNull( telephonService ); - Assert.assertNotNull( helloWorld ); + throws Exception { + Assert.assertNotNull(service); + Assert.assertNotNull(telephonService); + Assert.assertNotNull(helloWorld); } @Test public void testOverideModule() - throws Exception - { - Assert.assertNotNull( service ); - Assert.assertNotNull( telephonService ); - Assert.assertEquals( "It's real class", telephonService.getTelephonNumber() ); + throws Exception { + Assert.assertNotNull(service); + Assert.assertNotNull(telephonService); + Assert.assertEquals("It's real class", telephonService.getTelephonNumber()); - EasyMock.expect( service.go() ).andReturn( "Mocked injected class" ); - EasyMock.replay( service ); + EasyMock.expect(service.go()).andReturn("Mocked injected class"); + EasyMock.replay(service); - Assert.assertEquals( "Mocked injected class", helloWorld.sayHalloByService() ); - EasyMock.verify( service ); + Assert.assertEquals("Mocked injected class", helloWorld.sayHalloByService()); + EasyMock.verify(service); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
