From a23030d31499b4f4ac789bb3460c0213a977b965 Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Fri, 26 Dec 2014 16:21:15 +0300
Subject: [PATCH] test expectations fixed: ipr file for test project isn't
 created anymore

---
 .../com/intellij/projectView/NavigateFromSourceTest.java     | 2 +-
 .../com/intellij/testFramework/TestSourceBasedTestCase.java  | 4 +---
 .../com/intellij/projectView/TestProjectTreeStructure.java   | 5 -----
 .../intellij/lang/properties/PropertiesProjectViewTest.java  | 4 ----
 4 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/java/java-tests/testSrc/com/intellij/projectView/NavigateFromSourceTest.java b/java/java-tests/testSrc/com/intellij/projectView/NavigateFromSourceTest.java
index b26afb406d5b..c27aa2c38052 100644
--- a/java/java-tests/testSrc/com/intellij/projectView/NavigateFromSourceTest.java
+++ b/java/java-tests/testSrc/com/intellij/projectView/NavigateFromSourceTest.java
@@ -115,7 +115,7 @@ public class NavigateFromSourceTest extends BaseProjectViewTestCase {
 
     pane.select(psiClass, psiClass.getContainingFile().getVirtualFile(), true);
 
-    assertEquals(9, tree.getSelectionCount());
+    assertEquals(8, tree.getSelectionCount());
   }
 
   private static void changeClassTextAndTryToNavigate(final String newClassString,
diff --git a/java/testFramework/src/com/intellij/testFramework/TestSourceBasedTestCase.java b/java/testFramework/src/com/intellij/testFramework/TestSourceBasedTestCase.java
index 55b55c55dfb7..0f4c5a1f53ef 100644
--- a/java/testFramework/src/com/intellij/testFramework/TestSourceBasedTestCase.java
+++ b/java/testFramework/src/com/intellij/testFramework/TestSourceBasedTestCase.java
@@ -15,7 +15,6 @@
  */
 package com.intellij.testFramework;
 
-import com.intellij.ide.highlighter.ProjectFileType;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.ex.PathManagerEx;
 import com.intellij.openapi.fileEditor.ex.FileEditorManagerEx;
@@ -101,7 +100,6 @@ import java.io.File;
   }
   
   protected String getRootFiles() {
-    return " " + myModule.getModuleFile().getName() + "\n" +
-           " " + myProject.getName() + ProjectFileType.DOT_DEFAULT_EXTENSION + "\n";
+    return " " + myModule.getModuleFile().getName() + "\n";
   }
 }
diff --git a/platform/testFramework/src/com/intellij/projectView/TestProjectTreeStructure.java b/platform/testFramework/src/com/intellij/projectView/TestProjectTreeStructure.java
index 400744bcc9e0..b7e33f6d6ef2 100644
--- a/platform/testFramework/src/com/intellij/projectView/TestProjectTreeStructure.java
+++ b/platform/testFramework/src/com/intellij/projectView/TestProjectTreeStructure.java
@@ -15,7 +15,6 @@
  */
 package com.intellij.projectView;
 
-import com.intellij.ide.highlighter.ProjectFileType;
 import com.intellij.ide.projectView.impl.AbstractProjectTreeStructure;
 import com.intellij.ide.projectView.impl.AbstractProjectViewPSIPane;
 import com.intellij.openapi.Disposable;
@@ -97,8 +96,4 @@ public class TestProjectTreeStructure extends AbstractProjectTreeStructure imple
   @Override
   public void dispose() {
   }
-
-  public String getProjectFileRepresentation() {
-    return " " + myProject.getName() + ProjectFileType.DOT_DEFAULT_EXTENSION + "\n";
-  }
 }
diff --git a/plugins/properties/testSrc/com/intellij/lang/properties/PropertiesProjectViewTest.java b/plugins/properties/testSrc/com/intellij/lang/properties/PropertiesProjectViewTest.java
index b91a878024b2..85d9fd90c102 100644
--- a/plugins/properties/testSrc/com/intellij/lang/properties/PropertiesProjectViewTest.java
+++ b/plugins/properties/testSrc/com/intellij/lang/properties/PropertiesProjectViewTest.java
@@ -57,7 +57,6 @@ public class PropertiesProjectViewTest extends LightPlatformCodeInsightFixtureTe
                        "    xxx_en.properties\n" +
                        "    xxx_ru_RU.properties\n" +
                        "   X.txt\n" +
-                       myStructure.getProjectFileRepresentation() +
                        " External Libraries\n";
     PlatformTestUtil.assertTreeEqual(pane.getTree(), structure);
   }
@@ -74,7 +73,6 @@ public class PropertiesProjectViewTest extends LightPlatformCodeInsightFixtureTe
                        "   xxx2.properties\n" +
                        "   yyy.properties\n" +
                        "   X.txt\n" +
-                       myStructure.getProjectFileRepresentation() +
                        " External Libraries\n";
 
     PlatformTestUtil.assertTreeEqual(pane.getTree(), structure);
@@ -94,7 +92,6 @@ public class PropertiesProjectViewTest extends LightPlatformCodeInsightFixtureTe
                        "    xxx.properties\n" +
                        "    xxx_en.properties\n" +
                        "   X.txt\n" +
-                       myStructure.getProjectFileRepresentation() +
                        " External Libraries\n";
 
     PlatformTestUtil.assertTreeEqual(pane.getTree(), structure);
@@ -111,7 +108,6 @@ public class PropertiesProjectViewTest extends LightPlatformCodeInsightFixtureTe
                 "    xxx_en.properties\n" +
                 "   xxx2.properties\n" +
                 "   yyy.properties\n" +
-                myStructure.getProjectFileRepresentation() +
                 " External Libraries\n";
 
     PlatformTestUtil.assertTreeEqual(pane.getTree(), structure);