From 3e873179d63f63eda6643454e83ece4986de72fb Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Tue, 18 Mar 2014 15:25:03 +0400 Subject: [PATCH] [log] fix graph tests when called from idea ultimate Use the absolute path to the test data dir, determined by utility method --- .../vcs/log/newgraph/AbstractTestWithTextFile.java | 8 +++++--- platform/vcs-log/graph/vcs-log-graph.iml | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/platform/vcs-log/graph/test/com/intellij/vcs/log/newgraph/AbstractTestWithTextFile.java b/platform/vcs-log/graph/test/com/intellij/vcs/log/newgraph/AbstractTestWithTextFile.java index e09defcd68c9..9a1ad254ae0c 100644 --- a/platform/vcs-log/graph/test/com/intellij/vcs/log/newgraph/AbstractTestWithTextFile.java +++ b/platform/vcs-log/graph/test/com/intellij/vcs/log/newgraph/AbstractTestWithTextFile.java @@ -16,6 +16,7 @@ package com.intellij.vcs.log.newgraph; +import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.openapi.util.io.FileUtil; import java.io.File; @@ -28,13 +29,14 @@ public abstract class AbstractTestWithTextFile { protected final String myDirectory; + @SuppressWarnings("JUnitTestCaseWithNonTrivialConstructors") protected AbstractTestWithTextFile(String directory) { - this.myDirectory = BASE_DIRECTORY + directory; + this.myDirectory = PathManagerEx.findFileUnderCommunityHome(BASE_DIRECTORY + directory).getPath(); } protected void doTest(String testName) throws IOException { - String in = FileUtil.loadFile(new File(myDirectory + testName + IN_POSTFIX), true); - String out = FileUtil.loadFile(new File(myDirectory + testName + OUT_POSTFIX), true); + String in = FileUtil.loadFile(new File(myDirectory, testName + IN_POSTFIX), true); + String out = FileUtil.loadFile(new File(myDirectory, testName + OUT_POSTFIX), true); runTest(in, out); } diff --git a/platform/vcs-log/graph/vcs-log-graph.iml b/platform/vcs-log/graph/vcs-log-graph.iml index ebacf13cf84a..650c4cc57128 100644 --- a/platform/vcs-log/graph/vcs-log-graph.iml +++ b/platform/vcs-log/graph/vcs-log-graph.iml @@ -12,6 +12,7 @@ +