#169 Removing dependency to commons-io

This commit is contained in:
Gunnar Morling 2014-05-31 09:21:49 +02:00
parent 67ce1122ed
commit 0b0f7a7b6f
4 changed files with 6 additions and 14 deletions

View File

@ -120,11 +120,6 @@
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.11</version> <version>4.11</version>
</dependency> </dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version>
</dependency>
<!-- CDI, Weld, Arquillian --> <!-- CDI, Weld, Arquillian -->
<dependency> <dependency>

View File

@ -79,11 +79,6 @@
<artifactId>javax.inject</artifactId> <artifactId>javax.inject</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<scope>test</scope>
</dependency>
<!-- There is no compile dependency to Joda-Time; It's only required for testing the Joda conversions --> <!-- There is no compile dependency to Joda-Time; It's only required for testing the Joda conversions -->
<dependency> <dependency>

View File

@ -59,7 +59,7 @@ import static org.fest.assertions.Assertions.assertThat;
@RunWith(AnnotationProcessorTestRunner.class) @RunWith(AnnotationProcessorTestRunner.class)
public class ConflictingTypesNamesTest { public class ConflictingTypesNamesTest {
private GeneratedSource generatedSource = new GeneratedSource(); private final GeneratedSource generatedSource = new GeneratedSource();
@Rule @Rule
public GeneratedSource getGeneratedSource() { public GeneratedSource getGeneratedSource() {
@ -86,7 +86,7 @@ public class ConflictingTypesNamesTest {
@Test @Test
@IssueKey("178") @IssueKey("178")
public void mapperHasNoUnecessaryImports() { public void mapperHasNoUnnecessaryImports() {
Source source = new Source(); Source source = new Source();
source.setNotImported( new NotImportedDatatype( 42 ) ); source.setNotImported( new NotImportedDatatype( 42 ) );

View File

@ -21,11 +21,13 @@ package org.mapstruct.ap.testutil.assertions;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import org.apache.commons.io.FileUtils;
import org.fest.assertions.Assertions; import org.fest.assertions.Assertions;
import org.fest.assertions.FileAssert; import org.fest.assertions.FileAssert;
import org.fest.assertions.StringAssert; import org.fest.assertions.StringAssert;
import com.google.common.base.Charsets;
import com.google.common.io.Files;
/** /**
* Allows to perform assertions on .java source files. * Allows to perform assertions on .java source files.
* *
@ -47,7 +49,7 @@ public class JavaFileAssert extends FileAssert {
isFile(); isFile();
try { try {
return Assertions.assertThat( FileUtils.readFileToString( actual ) ); return Assertions.assertThat( Files.toString( actual, Charsets.UTF_8 ) );
} }
catch ( IOException e ) { catch ( IOException e ) {
failIfCustomMessageIsSet( e ); failIfCustomMessageIsSet( e );