Improved error message for DuplicateOptionAnnotationsException. Closes …

…#100
remkop · Apr 18, 2017 · efde066 · efde066
1 parent c4ee144
commit efde066
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/main/java/picocli/CommandLine.java b/src/main/java/picocli/CommandLine.java
@@ -3193,8 +3193,9 @@ public DuplicateOptionAnnotationsException(String msg) {
         }
 
         private static DuplicateOptionAnnotationsException create(String name, Field field1, Field field2) {
-            return new DuplicateOptionAnnotationsException("Option name '" + name + "' is used in both "
-                    + field1.getName() + " and " + field2.getName());
+            return new DuplicateOptionAnnotationsException("Option name '" + name + "' is used by both " +
+                    field1.getDeclaringClass().getName() + "." + field1.getName() + " and " +
+                    field2.getDeclaringClass().getName() + "." + field2.getName());
         }
     }
 

diff --git a/src/test/java/picocli/CommandLineTest.java b/src/test/java/picocli/CommandLineTest.java
@@ -1684,7 +1684,7 @@ class ChildOption extends ParentOption {
             CommandLine.parse(new ChildOption(), "");
             fail("expected CommandLine$DuplicateOptionAnnotationsException");
         } catch (DuplicateOptionAnnotationsException ex) {
-            assertEquals("Option name '-p' is used in both path and text", ex.getMessage());
+            assertEquals("Option name '-p' is used by both picocli.CommandLineTest$2ParentOption.path and picocli.CommandLineTest$2ChildOption.text", ex.getMessage());
         }
     }