third_codes/mapstruct
1
0
Fork 0
mirror of https://github.com/mapstruct/mapstruct.git synced 2025-07-12 00:00:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

#31 Improving reporting in case actual diagnostics are different than expected ones

Browse Source
This commit is contained in:
Gunnar Morling 2013-07-29 23:10:13 +02:00
parent f4c18c8836
commit 1648375ede
2 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
processor/src/test/java/org/mapstruct/ap/testutil/MapperTestBase.java
View File

@ -73,7 +73,7 @@ public abstract class MapperTestBase {
private String classOutputDir; private String classOutputDir;
private String sourceOutputDir; private String sourceOutputDir;
private List<File> classPath; private List<File> classPath;
private List<String> libraries; private final List<String> libraries;
private DiagnosticCollector<JavaFileObject> diagnostics; private DiagnosticCollector<JavaFileObject> diagnostics;
public MapperTestBase() { public MapperTestBase() {
@ -147,14 +147,18 @@ public abstract class MapperTestBase {
Iterator<DiagnosticDescriptor> actualIterator = actualDiagnostics.iterator(); Iterator<DiagnosticDescriptor> actualIterator = actualDiagnostics.iterator();
Iterator<DiagnosticDescriptor> expectedIterator = expectedDiagnostics.iterator(); Iterator<DiagnosticDescriptor> expectedIterator = expectedDiagnostics.iterator();
assertThat( actualDiagnostics ).describedAs(
String.format(
"Numbers of expected and actual diagnostics are diffent. Actual:%s%s%sExpected:%s%s.",
System.lineSeparator(),
actualDiagnostics.toString().replace( ", ", System.lineSeparator() ),
System.lineSeparator(),
System.lineSeparator(),
expectedDiagnostics.toString().replace( ", ", System.lineSeparator() )
)
).hasSize( expectedDiagnostics.size() );
while ( actualIterator.hasNext() ) { while ( actualIterator.hasNext() ) {
assertThat( expectedIterator.hasNext() ).describedAs(
String.format(
"Found more diagnostics than expected. Actual: %s; Expected: %s.",
actualDiagnostics,
expectedDiagnostics
)
).isTrue();
DiagnosticDescriptor actual = actualIterator.next(); DiagnosticDescriptor actual = actualIterator.next();
DiagnosticDescriptor expected = expectedIterator.next(); DiagnosticDescriptor expected = expectedIterator.next();
@ -171,14 +175,6 @@ public abstract class MapperTestBase {
) )
).matches( ".*" + expected.getMessage() + ".*" ); ).matches( ".*" + expected.getMessage() + ".*" );
} }
assertThat( expectedIterator.hasNext() ).describedAs(
String.format(
"Found less diagnostics than expected. Actual: %s; Expected: %s.",
actualDiagnostics,
expectedDiagnostics
)
).isFalse();
} }
/** /**

6
processor/src/test/java/org/mapstruct/ap/testutil/compilation/model/DiagnosticDescriptor.java
View File

@ -167,8 +167,8 @@ public class DiagnosticDescriptor {
@Override @Override
public String toString() { public String toString() {
return "DiagnosticDescriptor [sourceFileName=" + sourceFileName String sourceFileName = this.sourceFileName
+ ", kind=" + kind + ", line=" + line + ", message=" + message .substring( this.sourceFileName.lastIndexOf( File.separatorChar ) + 1 );
+ "]"; return "DiagnosticDescriptor: " + kind + " " + sourceFileName + ":" + line + " " + message;
} }
} }