From a2c74d43242eb1e7acb3271556697a0971b39f5c Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Wed, 9 Oct 2013 18:20:46 +0400
Subject: [PATCH] Refactor OverrideImplementWithLibTest

Use JdkAndMockLibraryProjectDescriptor instead of a jar file, which needs to be
regenerated every time binary format changes
---
 .../generators/tests/CompileBinaryTestData.kt |   6 ----
 .../withLib/fakeOverride.jar                  | Bin 977 -> 0 bytes
 .../withLib/fakeOverrideSrc/dependency.kt     |   5 +++
 .../overrideImplement/withLib/source.kt.txt   |   8 -----
 .../OverrideImplementWithLibTest.java         |  34 +++++-------------
 5 files changed, 14 insertions(+), 39 deletions(-)
 delete mode 100644 idea/testData/codeInsight/overrideImplement/withLib/fakeOverride.jar
 create mode 100644 idea/testData/codeInsight/overrideImplement/withLib/fakeOverrideSrc/dependency.kt
 delete mode 100644 idea/testData/codeInsight/overrideImplement/withLib/source.kt.txt

diff --git a/generators/src/org/jetbrains/jet/generators/tests/CompileBinaryTestData.kt b/generators/src/org/jetbrains/jet/generators/tests/CompileBinaryTestData.kt
index a385c7d15e2..d2afcb57bfb 100644
--- a/generators/src/org/jetbrains/jet/generators/tests/CompileBinaryTestData.kt
+++ b/generators/src/org/jetbrains/jet/generators/tests/CompileBinaryTestData.kt
@@ -78,12 +78,6 @@ private object BinaryTestData {
         rm("test")
     }
 
-    GenScript("idea/testData/codeInsight/overrideImplement/withLib", "source.kt", "fakeOverride.jar")
-    fun genFakeOverride() {
-        jar("fakeOverride.jar", "dependency")
-        rm("dependency")
-    }
-
     GenScript("idea/testData/completion/basic/custom/", "TopLevelNonImportedExtFunSource.kt", "TopLevelNonImportedExtFun.jar")
     fun genTopLevelNonImportedExtFun() {
         jar("TopLevelNonImportedExtFun.jar", "abc")
diff --git a/idea/testData/codeInsight/overrideImplement/withLib/fakeOverride.jar b/idea/testData/codeInsight/overrideImplement/withLib/fakeOverride.jar
deleted file mode 100644
index ecf51a2d503834310e1a606134830fe27ade7447..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 977
zcmWIWW@Zs#-~ht)9Zt>+NPv@pg~8V~#8KDN&rSc|DFy~+h5&DN4v-2asImZ@nni#r
z;F^6M{XE@VgG2Ou-9G!CIql=Et9OytTUYDcne&^246YbIcv__A<*VcAd$DvC3+IfN
zl1FAsX=PZ5i9A`NRq;&qb>^p{k421N+b@V6%eMiV4Z<MXxxg-2hvsx{plC{JL26z~
zYF=`sKEj#k3WZP=I_f3oBo-IP2KeS*b`Y4mac`OVHt#u;nszE|U!|~6Q7A^>g4b*h
zm(~Ryyk4yjHf`Kq5`5k5qZnuB{e%A>v>a)aKhW>g6YJ1%c+d9F&z!B_A3vXepYZ|X
z9TyIxuW_O?wJ!BLKV($e68@=K=GmqS^EtZVTBdS0I39Y<d{~_N&x5Bi{OMDx(C_DY
zn`)z`wUk$LvmBrEk}I+J*ZWuM9Pff-Gm0e~81}I8wQyYA68C$N$xgjvJJ)DsWuIIc
zx1x0E=|juni=t+DDht~2@9KHq`=)()(QO~L?Q*H1_I-W#<bK5E*Bfn~+x+wK%am(n
zbEmh@e;2X1`stq=H)R#K@7m~)B9W|rNF-MO(T--hUx`8wZ*Un_=~^jmsa1P)r2OU)
zL2J(KG1iF}cW#il{g~;fXE(pgf3JS2yK75}&PYz5>GZ<qbjUOAo!5$Ht`0Z7VEXyk
zlJs4Ej~<^s^n!cqg{jL{X>?ukaBdHq(BL|4f@jGl*FB7LK3Ju0*WA#je|E9AL=5Kz
zru`2e<bT#Hj7|Q#e#6iI48Ls?4wf~`-BGx==$7fJTkZmm&v_GAqxXYTg3jw5dlxb?
zFem{NV}Lg!lL!N9GKQs5P%=gZ@N@}E)aY7~6BsBFBY-WC3D=60q(LTdG2l*!2orV#
pnJCE;;c8IAMD`IVVIsg2AQMR=G?@l?v$BEIumIsVAbk|<WdLVbJO%&&

diff --git a/idea/testData/codeInsight/overrideImplement/withLib/fakeOverrideSrc/dependency.kt b/idea/testData/codeInsight/overrideImplement/withLib/fakeOverrideSrc/dependency.kt
new file mode 100644
index 00000000000..ac345b5a635
--- /dev/null
+++ b/idea/testData/codeInsight/overrideImplement/withLib/fakeOverrideSrc/dependency.kt
@@ -0,0 +1,5 @@
+package dependency
+
+public open class A {
+    public open fun foo() {}
+}
diff --git a/idea/testData/codeInsight/overrideImplement/withLib/source.kt.txt b/idea/testData/codeInsight/overrideImplement/withLib/source.kt.txt
deleted file mode 100644
index 6e50002b4fd..00000000000
--- a/idea/testData/codeInsight/overrideImplement/withLib/source.kt.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-package dependency
-
-// To regenerate this test, run CompileBinaryTestData.kt
-// Or manually, compile this file into jar
-
-public open class A {
-    public open fun foo() {}
-}
diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/OverrideImplementWithLibTest.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/OverrideImplementWithLibTest.java
index 9bf1a57c1f9..c4bc98f1ff0 100644
--- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/OverrideImplementWithLibTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/OverrideImplementWithLibTest.java
@@ -16,17 +16,12 @@
 
 package org.jetbrains.jet.plugin.codeInsight;
 
-import com.intellij.openapi.roots.OrderRootType;
-import com.intellij.openapi.roots.ui.configuration.libraryEditor.NewLibraryEditor;
-import com.intellij.openapi.vfs.VfsUtil;
-import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl;
+import com.intellij.testFramework.LightProjectDescriptor;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.plugin.JdkAndMockLibraryProjectDescriptor;
 import org.jetbrains.jet.plugin.PluginTestCaseBase;
-import org.jetbrains.jet.testing.ConfigLibraryUtil;
-
-import java.io.File;
 
 public final class OverrideImplementWithLibTest extends AbstractOverrideImplementTest {
-
     private static final String TEST_PATH = PluginTestCaseBase.getTestDataPathBase() + "/codeInsight/overrideImplement/withLib";
 
     @Override
@@ -35,24 +30,13 @@ public final class OverrideImplementWithLibTest extends AbstractOverrideImplemen
         myFixture.setTestDataPath(TEST_PATH);
     }
 
-    public void doTestWithLib() {
-        File dependency = new File(TEST_PATH + "/" + getTestName(true) + ".jar");
-        assert dependency.exists();
-        NewLibraryEditor editor = new NewLibraryEditor();
-        editor.setName("dependency");
-        editor.addRoot(VfsUtil.getUrlForLibraryRoot(dependency), OrderRootType.CLASSES);
-
-        try {
-            ConfigLibraryUtil.configureLibrary(myModule, getProjectDescriptor().getSdk(), editor);
-            CodeInsightTestFixtureImpl.ensureIndexesUpToDate(getProject());
-            doOverrideFileTest();
-        }
-        finally {
-            ConfigLibraryUtil.unConfigureLibrary(myModule, getProjectDescriptor().getSdk(), editor.getName());
-        }
+    @NotNull
+    @Override
+    protected LightProjectDescriptor getProjectDescriptor() {
+        return new JdkAndMockLibraryProjectDescriptor(TEST_PATH + "/" + getTestName(true) + "Src", false);
     }
 
-    public void testFakeOverride() throws Exception {
-        doTestWithLib();
+    public void testFakeOverride() {
+        doOverrideFileTest();
     }
 }