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

o Fix test on Windows

Browse Source
This commit is contained in:
Andreas Gudian 2013-05-13 20:05:16 +02:00
parent 50d916c370
commit c247bfbe5b
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
parent/pom.xml
View File

@ -131,7 +131,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.12</version> <version>2.14.1</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>com.mycila.maven-license-plugin</groupId> <groupId>com.mycila.maven-license-plugin</groupId>

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

@ -16,6 +16,8 @@
package org.mapstruct.ap.testutil.compilation.model; package org.mapstruct.ap.testutil.compilation.model;
import java.io.File; import java.io.File;
import java.io.IOException;
import javax.tools.Diagnostic.Kind; import javax.tools.Diagnostic.Kind;
import javax.tools.JavaFileObject; import javax.tools.JavaFileObject;
@ -41,18 +43,26 @@ public class DiagnosticDescriptor {
} }
public static DiagnosticDescriptor forDiagnostic(Diagnostic diagnostic) { public static DiagnosticDescriptor forDiagnostic(Diagnostic diagnostic) {
String soureFileName = diagnostic.type().getName().replaceAll( "\\.", File.separator ) + ".java"; String soureFileName = diagnostic.type().getName().replace( ".", File.separator ) + ".java";
return new DiagnosticDescriptor( soureFileName, diagnostic.kind(), diagnostic.line(), "" ); return new DiagnosticDescriptor( soureFileName, diagnostic.kind(), diagnostic.line(), "" );
} }
public static DiagnosticDescriptor forDiagnostic(String sourceDir, javax.tools.Diagnostic<? extends JavaFileObject> diagnostic) { public static DiagnosticDescriptor forDiagnostic(String sourceDir, javax.tools.Diagnostic<? extends JavaFileObject> diagnostic) {
try
{
String sourceName = new File(diagnostic.getSource().toUri()).getCanonicalPath();
return new DiagnosticDescriptor( return new DiagnosticDescriptor(
diagnostic.getSource().getName().substring( sourceDir.length() + 1 ), (sourceName.length() > sourceDir.length() ? sourceName.substring( sourceDir.length() + 1 ) : sourceName),
diagnostic.getKind(), diagnostic.getKind(),
diagnostic.getLineNumber(), diagnostic.getLineNumber(),
"" ""
); );
} }
catch ( IOException e )
{
throw new RuntimeException( e );
}
}
public String getSourceFileName() { public String getSourceFileName() {
return sourceFileName; return sourceFileName;