Merge remote-tracking branch 'aosp/upstream-master' into merge

Conflicts:
	.idea/modules.xml
	build/scripts/tests.gant

Change-Id: I9a1fe25b61f1004e0f62419a5f64e1452644b784

1 files changed, 6 insertions, 1 deletions

diff --git a/platform/testFramework/src/com/intellij/FileSetTestCase.java b/platform/testFramework/src/com/intellij/FileSetTestCase.java
index ba2afa2f8d86..d89e175a52c2 100644
--- a/platform/testFramework/src/com/intellij/FileSetTestCase.java
+++ b/platform/testFramework/src/com/intellij/FileSetTestCase.java
@@ -16,6 +16,7 @@ import com.intellij.util.ArrayUtil;
 import junit.framework.TestSuite;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Pattern;
@@ -80,6 +81,10 @@ public abstract class FileSetTestCase extends TestSuite {
     }
   }
 
+  protected String loadFile(File testFile) throws IOException {
+    return FileUtil.loadFile(testFile);
+  }
+
   protected String getDelimiter() {
     return "---";
   }
@@ -116,7 +121,7 @@ public abstract class FileSetTestCase extends TestSuite {
 
     @Override
     protected void runTest() throws Throwable {
-      String content = FileUtil.loadFile(myTestFile);
+      String content = loadFile(myTestFile);
       assertNotNull(content);
 
       List<String> input = new ArrayList<String>();