From ee081e4150c8a166c69049242291f1e9eda4d4bd Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@intellij.com>
Date: Fri, 11 Sep 2009 21:30:41 +0400
Subject: [PATCH] test++

---
 .../java-tests/testData}/psi/cls/stubBuilder/Nullable.txt     | 0
 .../java-tests/testData}/psi/cls/stubBuilder/TimeUnit.txt     | 0
 .../testData}/psi/cls/stubBuilder/UtilCollections.txt         | 0
 .../java-tests/testData}/psi/cls/stubBuilder/UtilHashMap.txt  | 0
 .../java-tests/testData}/psi/cls/stubBuilder/UtilList.txt     | 0
 .../java-tests/testData}/psi/cls/stubBuilder/UtilMap.txt      | 0
 .../java-tests/testSrc}/com/intellij/psi/ClsBuilderTest.java  | 4 ++--
 7 files changed, 2 insertions(+), 2 deletions(-)
 rename {testData => java/java-tests/testData}/psi/cls/stubBuilder/Nullable.txt (100%)
 rename {testData => java/java-tests/testData}/psi/cls/stubBuilder/TimeUnit.txt (100%)
 rename {testData => java/java-tests/testData}/psi/cls/stubBuilder/UtilCollections.txt (100%)
 rename {testData => java/java-tests/testData}/psi/cls/stubBuilder/UtilHashMap.txt (100%)
 rename {testData => java/java-tests/testData}/psi/cls/stubBuilder/UtilList.txt (100%)
 rename {testData => java/java-tests/testData}/psi/cls/stubBuilder/UtilMap.txt (100%)
 rename {idea-tests/src => java/java-tests/testSrc}/com/intellij/psi/ClsBuilderTest.java (94%)

diff --git a/testData/psi/cls/stubBuilder/Nullable.txt b/java/java-tests/testData/psi/cls/stubBuilder/Nullable.txt
similarity index 100%
rename from testData/psi/cls/stubBuilder/Nullable.txt
rename to java/java-tests/testData/psi/cls/stubBuilder/Nullable.txt
diff --git a/testData/psi/cls/stubBuilder/TimeUnit.txt b/java/java-tests/testData/psi/cls/stubBuilder/TimeUnit.txt
similarity index 100%
rename from testData/psi/cls/stubBuilder/TimeUnit.txt
rename to java/java-tests/testData/psi/cls/stubBuilder/TimeUnit.txt
diff --git a/testData/psi/cls/stubBuilder/UtilCollections.txt b/java/java-tests/testData/psi/cls/stubBuilder/UtilCollections.txt
similarity index 100%
rename from testData/psi/cls/stubBuilder/UtilCollections.txt
rename to java/java-tests/testData/psi/cls/stubBuilder/UtilCollections.txt
diff --git a/testData/psi/cls/stubBuilder/UtilHashMap.txt b/java/java-tests/testData/psi/cls/stubBuilder/UtilHashMap.txt
similarity index 100%
rename from testData/psi/cls/stubBuilder/UtilHashMap.txt
rename to java/java-tests/testData/psi/cls/stubBuilder/UtilHashMap.txt
diff --git a/testData/psi/cls/stubBuilder/UtilList.txt b/java/java-tests/testData/psi/cls/stubBuilder/UtilList.txt
similarity index 100%
rename from testData/psi/cls/stubBuilder/UtilList.txt
rename to java/java-tests/testData/psi/cls/stubBuilder/UtilList.txt
diff --git a/testData/psi/cls/stubBuilder/UtilMap.txt b/java/java-tests/testData/psi/cls/stubBuilder/UtilMap.txt
similarity index 100%
rename from testData/psi/cls/stubBuilder/UtilMap.txt
rename to java/java-tests/testData/psi/cls/stubBuilder/UtilMap.txt
diff --git a/idea-tests/src/com/intellij/psi/ClsBuilderTest.java b/java/java-tests/testSrc/com/intellij/psi/ClsBuilderTest.java
similarity index 94%
rename from idea-tests/src/com/intellij/psi/ClsBuilderTest.java
rename to java/java-tests/testSrc/com/intellij/psi/ClsBuilderTest.java
index 06547e9427d7..9d635c1460af 100644
--- a/idea-tests/src/com/intellij/psi/ClsBuilderTest.java
+++ b/java/java-tests/testSrc/com/intellij/psi/ClsBuilderTest.java
@@ -3,7 +3,7 @@
  */
 package com.intellij.psi;
 
-import com.intellij.openapi.application.ex.PathManagerEx;
+import com.intellij.JavaTestUtil;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.projectRoots.impl.JavaSdkImpl;
 import com.intellij.openapi.roots.OrderRootType;
@@ -56,7 +56,7 @@ public class ClsBuilderTest extends LightIdeaTestCase {
     final PsiFileStub stub = ClsStubBuilder.build(vFile, vFile.contentsToByteArray());
     final String butWas = ((StubBase)stub).printTree();
 
-    final String goldFilePath = PathManagerEx.getTestDataPath() + "/psi/cls/stubBuilder/" + goldFile;
+    final String goldFilePath = JavaTestUtil.getJavaTestDataPath() + "/psi/cls/stubBuilder/" + goldFile;
     String expected = "";
     try {
       expected = FileUtil.loadTextAndClose(new FileReader(goldFilePath));