From ee740aa05628856906e4b1b25f84d6cbb8cd3d9c Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Mon, 7 Sep 2015 20:34:28 +0300
Subject: [PATCH] [java-decompiler] main test method extended to accept
 companion files

---
 .../java/decompiler/SingleClassesTestBase.java | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTestBase.java b/test/org/jetbrains/java/decompiler/SingleClassesTestBase.java
index 97e98b2..0601f0e 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTestBase.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTestBase.java
@@ -49,16 +49,26 @@ public abstract class SingleClassesTestBase {
     return Collections.emptyMap();
   }
 
-  protected void doTest(String testFile) {
+  protected void doTest(String testFile, String... companionFiles) {
+    ConsoleDecompiler decompiler = fixture.getDecompiler();
+
     File classFile = new File(fixture.getTestDataDir(), "/classes/" + testFile + ".class");
     assertTrue(classFile.isFile());
-    String testName = classFile.getName().substring(0, classFile.getName().length() - 6);
+    for (File file : collectClasses(classFile)) {
+      decompiler.addSpace(file, true);
+    }
 
-    ConsoleDecompiler decompiler = fixture.getDecompiler();
+    for (String companionFile : companionFiles) {
+      File companionClassFile = new File(fixture.getTestDataDir(), "/classes/" + companionFile + ".class");
+      assertTrue(companionClassFile.isFile());
+      for (File file : collectClasses(companionClassFile)) {
+        decompiler.addSpace(file, true);
+      }
+    }
 
-    for (File file : collectClasses(classFile)) decompiler.addSpace(file, true);
     decompiler.decompileContext();
 
+    String testName = classFile.getName().substring(0, classFile.getName().length() - 6);
     File decompiledFile = new File(fixture.getTargetDir(), testName + ".java");
     assertTrue(decompiledFile.isFile());
     File referenceFile = new File(fixture.getTestDataDir(), "results/" + testName + ".dec");