From 83192b5e2ecc4ca5c68ff88c4f345d17c5b3f00c Mon Sep 17 00:00:00 2001
From: "Maxim.Mossienko" <Maxim.Mossienko@jetbrains.com>
Date: Wed, 8 Feb 2017 10:22:48 +0100
Subject: [PATCH] extracted loadTestDataFile, getPathToTestDataFile,
 getExpectedFileExtension

---
 .../intellij/testFramework/LexerTestCase.java | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/platform/testFramework/src/com/intellij/testFramework/LexerTestCase.java b/platform/testFramework/src/com/intellij/testFramework/LexerTestCase.java
index 2ab56cd8e1b9..b28cc76ed1f4 100644
--- a/platform/testFramework/src/com/intellij/testFramework/LexerTestCase.java
+++ b/platform/testFramework/src/com/intellij/testFramework/LexerTestCase.java
@@ -48,10 +48,20 @@ public abstract class LexerTestCase extends UsefulTestCase {
       assertSameLines(expected, result);
     }
     else {
-      assertSameLinesWithFile(PathManager.getHomePath() + "/" + getDirPath() + "/" + getTestName(true) + ".txt", result);
+      assertSameLinesWithFile(getPathToTestDataFile(getExpectedFileExtension()), result);
     }
   }
 
+  @NotNull
+  protected String getPathToTestDataFile(String extension) {
+    return PathManager.getHomePath() + "/" + getDirPath() + "/" + getTestName(true) + extension;
+  }
+
+  @NotNull
+  protected String getExpectedFileExtension() {
+    return ".txt";
+  }
+
   protected void checkZeroState(String text, TokenSet tokenTypes) {
     Lexer lexer = createLexer();
     lexer.start(text);
@@ -106,7 +116,12 @@ public abstract class LexerTestCase extends UsefulTestCase {
   }
 
   protected void doFileTest(@NonNls String fileExt) {
-    String fileName = PathManager.getHomePath() + "/" + getDirPath() + "/" + getTestName(true) + "." + fileExt;
+    doTest(loadTestDataFile(fileExt));
+  }
+
+  @NotNull
+  protected String loadTestDataFile(@NonNls String fileExt) {
+    String fileName = getPathToTestDataFile(fileExt);
     String text = "";
     try {
       String fileText = FileUtil.loadFile(new File(fileName));
@@ -115,7 +130,7 @@ public abstract class LexerTestCase extends UsefulTestCase {
     catch (IOException e) {
       fail("can't load file " + fileName + ": " + e.getMessage());
     }
-    doTest(text);
+    return text;
   }
 
   protected boolean shouldTrim() {