From 69dc786510ddbabdeb9dce5013dc14a6419d3e4d Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Fri, 12 Sep 2014 12:51:55 +0400
Subject: java-decompiler: NPE in test fixture; diagnostic

---
 test/org/jetbrains/java/decompiler/DecompilerTestFixture.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'test/org')

diff --git a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
index f8fb9a5..b82b65e 100644
--- a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
+++ b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
@@ -33,7 +33,7 @@ public class DecompilerTestFixture {
     testDataDir = new File("testData");
     if (!isTestDataDir(testDataDir)) testDataDir = new File("community/plugins/java-decompiler/engine/testData");
     if (!isTestDataDir(testDataDir)) testDataDir = new File("plugins/java-decompiler/engine/testData");
-    assertTrue(isTestDataDir(testDataDir));
+    assertTrue("current dir: " + new File("").getAbsolutePath(), isTestDataDir(testDataDir));
 
     //noinspection SSBasedInspection
     tempDir = File.createTempFile("decompiler_test_", "_dir");
@@ -51,7 +51,9 @@ public class DecompilerTestFixture {
   }
 
   public void tearDown() {
-    delete(tempDir);
+    if (tempDir != null) {
+      delete(tempDir);
+    }
   }
 
   public File getTestDataDir() {
-- 
cgit v1.2.3