From 785ccece90832d6e90e0601b167d5dd37ad1b6ff Mon Sep 17 00:00:00 2001
From: Gunnar Morling <gunnar.morling@googlemail.com>
Date: Sun, 9 Feb 2014 18:59:39 +0100
Subject: [PATCH] #34 Asserting line and source type of diagnostics only when
 specified via @Diagnostic

---
 .../java/org/mapstruct/ap/testutil/MapperTestBase.java |  8 ++++++--
 .../ap/testutil/compilation/annotation/Diagnostic.java |  4 ++--
 .../compilation/model/DiagnosticDescriptor.java        | 10 +++++-----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/processor/src/test/java/org/mapstruct/ap/testutil/MapperTestBase.java b/processor/src/test/java/org/mapstruct/ap/testutil/MapperTestBase.java
index 0315952a3..3c52916c1 100644
--- a/processor/src/test/java/org/mapstruct/ap/testutil/MapperTestBase.java
+++ b/processor/src/test/java/org/mapstruct/ap/testutil/MapperTestBase.java
@@ -168,8 +168,12 @@ public abstract class MapperTestBase {
             DiagnosticDescriptor actual = actualIterator.next();
             DiagnosticDescriptor expected = expectedIterator.next();
 
-            assertThat( actual.getSourceFileName() ).isEqualTo( expected.getSourceFileName() );
-            assertThat( actual.getLine() ).isEqualTo( expected.getLine() );
+            if ( expected.getSourceFileName() != null ) {
+                assertThat( actual.getSourceFileName() ).isEqualTo( expected.getSourceFileName() );
+            }
+            if ( expected.getLine() != null ) {
+                assertThat( actual.getLine() ).isEqualTo( expected.getLine() );
+            }
             assertThat( actual.getKind() ).isEqualTo( expected.getKind() );
             assertThat( actual.getMessage() ).describedAs(
                 String.format(
diff --git a/processor/src/test/java/org/mapstruct/ap/testutil/compilation/annotation/Diagnostic.java b/processor/src/test/java/org/mapstruct/ap/testutil/compilation/annotation/Diagnostic.java
index 4b08f0f8c..1efe72c22 100644
--- a/processor/src/test/java/org/mapstruct/ap/testutil/compilation/annotation/Diagnostic.java
+++ b/processor/src/test/java/org/mapstruct/ap/testutil/compilation/annotation/Diagnostic.java
@@ -32,7 +32,7 @@ public @interface Diagnostic {
      *
      * @return The type for which the diagnostic was created.
      */
-    Class<?> type() default Diagnostic.class;
+    Class<?> type() default void.class;
 
     /**
      * The expected kind of diagnostic.
@@ -46,7 +46,7 @@ public @interface Diagnostic {
      *
      * @return The expected line number of the diagnostic.
      */
-    int line() default -1;
+    long line() default -1;
 
     /**
      * A regular expression matching the expected message of the diagnostic.
diff --git a/processor/src/test/java/org/mapstruct/ap/testutil/compilation/model/DiagnosticDescriptor.java b/processor/src/test/java/org/mapstruct/ap/testutil/compilation/model/DiagnosticDescriptor.java
index 7317623ed..5c551fee1 100644
--- a/processor/src/test/java/org/mapstruct/ap/testutil/compilation/model/DiagnosticDescriptor.java
+++ b/processor/src/test/java/org/mapstruct/ap/testutil/compilation/model/DiagnosticDescriptor.java
@@ -37,10 +37,10 @@ public class DiagnosticDescriptor {
 
     private final String sourceFileName;
     private final Kind kind;
-    private final long line;
+    private final Long line;
     private final String message;
 
-    private DiagnosticDescriptor(String sourceFileName, Kind kind, long line, String message) {
+    private DiagnosticDescriptor(String sourceFileName, Kind kind, Long line, String message) {
         this.sourceFileName = sourceFileName;
         this.kind = kind;
         this.line = line;
@@ -48,13 +48,13 @@ public class DiagnosticDescriptor {
     }
 
     public static DiagnosticDescriptor forDiagnostic(Diagnostic diagnostic) {
-        String soureFileName = diagnostic.type() != Diagnostic.class
+        String soureFileName = diagnostic.type() != void.class
                             ? diagnostic.type().getName().replace( ".", File.separator ) + ".java"
                             : null;
         return new DiagnosticDescriptor(
             soureFileName,
             diagnostic.kind(),
-            diagnostic.line(),
+            diagnostic.line() != -1 ? diagnostic.line() : null,
             diagnostic.messageRegExp()
         );
     }
@@ -111,7 +111,7 @@ public class DiagnosticDescriptor {
         return kind;
     }
 
-    public long getLine() {
+    public Long getLine() {
         return line;
     }