commit e280bdf575ad4b6ec6245c5df79331ea788eac32
author Yohann Roussel <yroussel@google.com> Fri Jan 05 10:41:36 2018 +0100
committer Yohann Roussel <yroussel@google.com> Fri Jan 05 10:41:36 2018 +0100
tree fed9e75ca165a6d81f79e39493b5757daab6afea
parent 9ac5047e2c3d9aa0cd91b51c33ed2e9ae5d6dfad

Update the test D8DiagnoticHandler

To be closer to real case usage.

Change-Id: Ic1821c21e1824ed693e7361533b154633d8138e0

src/test/apiUsageSample/com/android/tools/apiusagesample/D8DiagnosticsHandler.java

diff --git a/src/test/apiUsageSample/com/android/tools/apiusagesample/D8DiagnosticsHandler.java b/src/test/apiUsageSample/com/android/tools/apiusagesample/D8DiagnosticsHandler.java
index 9b08352..e3a53b8 100644
--- a/src/test/apiUsageSample/com/android/tools/apiusagesample/D8DiagnosticsHandler.java
+++ b/src/test/apiUsageSample/com/android/tools/apiusagesample/D8DiagnosticsHandler.java
@@ -12,6 +12,7 @@
 import com.android.tools.r8.position.Position;
 import com.android.tools.r8.position.TextPosition;
 import com.android.tools.r8.position.TextRange;
+import java.io.File;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
@@ -49,19 +50,23 @@
     Origin origin = diagnostic.getOrigin();
     Position positionInOrigin = diagnostic.getPosition();
     String position;
-    if (origin.parent() instanceof PathOrigin) {
+    if (origin instanceof PathOrigin) {
+      File originFile = ((PathOrigin) origin).getPath().toFile();
       if (positionInOrigin instanceof TextRange) {
         TextRange textRange = (TextRange) positionInOrigin;
-        position = ((PathOrigin) origin.parent()).getPath().toFile() + ": "
+        position = originFile + ": "
             + textRange.getStart().getLine() + "," + textRange.getStart().getColumn()
             + " - " + textRange.getEnd().getLine() + "," + textRange.getEnd().getColumn();
       } else if (positionInOrigin instanceof TextPosition) {
         TextPosition textPosition = (TextPosition) positionInOrigin;
-        position = ((PathOrigin) origin.parent()).getPath().toFile() + ": "
+        position = originFile + ": "
             + textPosition.getLine() + "," + textPosition.getColumn();
       } else {
-        position = ((PathOrigin) origin.parent()).getPath().toFile().toString();
+        position = originFile.toString();
       }
+    } else if (origin.parent() instanceof PathOrigin) {
+      File originFile = ((PathOrigin) origin.parent()).getPath().toFile();
+      position = originFile.toString();
     } else {
       position = "UNKNOWN";
       if (origin != Origin.unknown()) {