Merge pull request #3 from kemitix/switch-to-kemitix-parent

Switch to kemitix-parent as parent pom
This commit is contained in:
Paul Campbell 2016-01-25 12:26:08 +00:00
commit 4f8fbe50c5
3 changed files with 23 additions and 17 deletions

View file

@ -78,15 +78,19 @@
<module name="TreeWalker">
<!-- Support @SuppressWarnings annotation -->
<!-- See http://checkstyle.sourceforge.net/config.html -->
<module name="SuppressWarningsHolder"/>
<!-- Support @SuppressWarnings annotation -->
<!-- See http://checkstyle.sourceforge.net/config.html -->
<module name="SuppressWarningsHolder"/>
<module name="FileContentsHolder"/>
<!-- Checks for Javadoc comments. -->
<!-- See http://checkstyle.sf.net/config_javadoc.html -->
<module name="JavadocMethod"/>
<module name="JavadocMethod">
<property name="scope" value="public"/>
</module>
<module name="JavadocType"/>
<module name="JavadocVariable"/>
<!--<module name="JavadocVariable"/>-->
<module name="JavadocStyle"/>
@ -113,12 +117,7 @@
<!-- Checks for Size Violations. -->
<!-- See http://checkstyle.sf.net/config_sizes.html -->
<module name="LineLength">
<!-- Allow for long imports for Spring Batch -->
<!-- EnableBatchProcessing, JobBuilderFactory -->
<!-- and StepBuilderFactory -->
<property name="ignorePattern" value="^import"/>
</module>
<module name="LineLength"/>
<module name="MethodLength"/>
<module name="ParameterNumber"/>
@ -157,7 +156,11 @@
<module name="AvoidInlineConditionals"/>
<module name="EmptyStatement"/>
<module name="EqualsHashCode"/>
<module name="HiddenField"/>
<module name="HiddenField">
<property name="ignoreConstructorParameter" value="true"/>
<property name="ignoreSetter" value="true"/>
<property name="setterCanReturnItsClass" value="true"/>
</module>
<module name="IllegalInstantiation"/>
<module name="InnerAssignment"/>
<module name="MagicNumber"/>
@ -183,6 +186,7 @@
</module>
<module name="SuppressWarningsFilter"/>
<module name="SuppressWarningsFilter"/>
<module name="SuppressionCommentFilter"/>
</module>

View file

@ -30,8 +30,8 @@
<parent>
<groupId>net.kemitix</groupId>
<artifactId>kemitix-spring-parent</artifactId>
<version>1.2.1</version>
<artifactId>kemitix-parent</artifactId>
<version>0.6.1</version>
</parent>
<dependencies>
@ -48,13 +48,14 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<type>jar</type>
</dependency>
</dependencies>

View file

@ -209,7 +209,8 @@ public class WiserAssertionsTest {
//given
final String fragment = "foo";
//when
sendMimeMultipartMessage("from", "to", "subject " + fragment + " tail", "body");
sendMimeMultipartMessage(
"from", "to", "subject " + fragment + " tail", "body");
//then
getAssertions().withSubjectContains(fragment);
}