From f8b6740da8a18221540ccfa7a60c948f2bd0370e Mon Sep 17 00:00:00 2001
From: Alexander Chernikov <Alexander.Chernikov@jetbrains.com>
Date: Mon, 26 Jul 2010 23:58:04 +0400
Subject: [PATCH] Eclipse integration: lib/var collision test data.

---
 .../varAddJavadoc/expected/.classpath          |   9 +++++++++
 .../varAddJavadoc/expected/ws-internals.eml    |   8 ++++++++
 .../modification/varAddJavadoc/jars/test.jar   | Bin 0 -> 840 bytes
 .../modification/varAddJavadoc/test/.classpath |   5 +++++
 .../modification/varAddJavadoc/test/.project   |  17 +++++++++++++++++
 .../varAddJavadoc/variableidea/test.jar        | Bin 0 -> 840 bytes
 .../EclipseLibrariesModificationsTest.java     |   6 ++++++
 7 files changed, 45 insertions(+)
 create mode 100644 plugins/eclipse/testData/modification/varAddJavadoc/expected/.classpath
 create mode 100644 plugins/eclipse/testData/modification/varAddJavadoc/expected/ws-internals.eml
 create mode 100644 plugins/eclipse/testData/modification/varAddJavadoc/jars/test.jar
 create mode 100644 plugins/eclipse/testData/modification/varAddJavadoc/test/.classpath
 create mode 100644 plugins/eclipse/testData/modification/varAddJavadoc/test/.project
 create mode 100644 plugins/eclipse/testData/modification/varAddJavadoc/variableidea/test.jar

diff --git a/plugins/eclipse/testData/modification/varAddJavadoc/expected/.classpath b/plugins/eclipse/testData/modification/varAddJavadoc/expected/.classpath
new file mode 100644
index 000000000000..f53870069b97
--- /dev/null
+++ b/plugins/eclipse/testData/modification/varAddJavadoc/expected/.classpath
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+  <classpathentry kind="var" path="variable/test.jar" sourcepath="variable/test.jar">
+    <attributes>
+      <attribute name="javadoc_location" value="jar:file:/$ROOT$/jars/test.jar!/" />
+    </attributes>
+  </classpathentry>
+  <classpathentry kind="output" path="bin" />
+</classpath>
\ No newline at end of file
diff --git a/plugins/eclipse/testData/modification/varAddJavadoc/expected/ws-internals.eml b/plugins/eclipse/testData/modification/varAddJavadoc/expected/ws-internals.eml
new file mode 100644
index 000000000000..7025e8384962
--- /dev/null
+++ b/plugins/eclipse/testData/modification/varAddJavadoc/expected/ws-internals.eml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component>
+  <exclude-output />
+  <contentEntry url="file://$MODULE_DIR$" />
+  <lib name="test.jar" scope="COMPILE">
+    <srcroot url="jar://$variable$/test.jar!/" />
+  </lib>
+</component>
\ No newline at end of file
diff --git a/plugins/eclipse/testData/modification/varAddJavadoc/jars/test.jar b/plugins/eclipse/testData/modification/varAddJavadoc/jars/test.jar
new file mode 100644
index 0000000000000000000000000000000000000000..69d35ecffe38daa9f5223585d031f42787e479ea
GIT binary patch
literal 840
zcmWIWW@h1H0D*&D*;Zf%l;C7wVeoYgan$wnbJPEKih&^js+5D_08pvpv?#qOpwcuT
z76D?oQeQ_uPdC@#5ItYF&%S3)`*`c>UF7xF)jD_P{N^BoE5;9=7M*bxD%A1tIp-0|
z(8Z{F_A5{2&N<yd!rno_C3CeJUo}dVOy=noF=_JtEK*}Ux%*SMcDHv>akr?==Sg2p
zDtA`wgu8`-VKbVuxq)s;P0q<IC{FdsOwva<8l+HHQ!rnOk%3_q5KE&f49+htN=|hH
zl6uKGiN(da0lwac9Yp3_U*;<<9K1So&&#v?1`78?_}N$$x3y1+Nu8|scG`?7CAa@S
z_5ARF|ATv{{>Cj$a%FO#%hK-c`}?QrKSM!hEq7^&@0(dSlq0?$e0+Da{fl;IC-WIy
zOFsln?A;q6t|c8WEMtHESyYOZ&`YOn7nDu%LzaEfU07EnCCFnh@7W~1!snZ~{zjcP
zCBM{})76!FT^4%n%aW>E^sJ@XL2c!%v#AS`^v{U9D#=S!E>H~?wfD3=>FyI2zG}-Z
z>AS8!gQRu0aPF<2%rW<@S#yP!u&=@Nr$X-G7H+-!85Lv>IW%Waj^tI7*GiVueOD3F
znf>?;@0TdgZ4$FXH}lTE_)qY_!7|Yo>&`wGJs!XK^J$Ol<mEwcYnTJP8JR?waVHvJ
zxB`Iy!&^rX4Nn)4Bm~onJrRL4fWVSQZ6FEPij<^~Eyou1VC`Vbw*#3d2?1d>wxj^j
c2(tPCsz&sL5#Y_r22#udg#UrGF%yUf0C~Xuh5!Hn

literal 0
HcmV?d00001

diff --git a/plugins/eclipse/testData/modification/varAddJavadoc/test/.classpath b/plugins/eclipse/testData/modification/varAddJavadoc/test/.classpath
new file mode 100644
index 000000000000..65e495d45cd3
--- /dev/null
+++ b/plugins/eclipse/testData/modification/varAddJavadoc/test/.classpath
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+  <classpathentry kind="var" path="variable/test.jar" sourcepath="variable/test.jar" />
+  <classpathentry kind="output" path="bin" />
+</classpath>
\ No newline at end of file
diff --git a/plugins/eclipse/testData/modification/varAddJavadoc/test/.project b/plugins/eclipse/testData/modification/varAddJavadoc/test/.project
new file mode 100644
index 000000000000..3c7030a86519
--- /dev/null
+++ b/plugins/eclipse/testData/modification/varAddJavadoc/test/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>ws-internals</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/eclipse/testData/modification/varAddJavadoc/variableidea/test.jar b/plugins/eclipse/testData/modification/varAddJavadoc/variableidea/test.jar
new file mode 100644
index 0000000000000000000000000000000000000000..69d35ecffe38daa9f5223585d031f42787e479ea
GIT binary patch
literal 840
zcmWIWW@h1H0D*&D*;Zf%l;C7wVeoYgan$wnbJPEKih&^js+5D_08pvpv?#qOpwcuT
z76D?oQeQ_uPdC@#5ItYF&%S3)`*`c>UF7xF)jD_P{N^BoE5;9=7M*bxD%A1tIp-0|
z(8Z{F_A5{2&N<yd!rno_C3CeJUo}dVOy=noF=_JtEK*}Ux%*SMcDHv>akr?==Sg2p
zDtA`wgu8`-VKbVuxq)s;P0q<IC{FdsOwva<8l+HHQ!rnOk%3_q5KE&f49+htN=|hH
zl6uKGiN(da0lwac9Yp3_U*;<<9K1So&&#v?1`78?_}N$$x3y1+Nu8|scG`?7CAa@S
z_5ARF|ATv{{>Cj$a%FO#%hK-c`}?QrKSM!hEq7^&@0(dSlq0?$e0+Da{fl;IC-WIy
zOFsln?A;q6t|c8WEMtHESyYOZ&`YOn7nDu%LzaEfU07EnCCFnh@7W~1!snZ~{zjcP
zCBM{})76!FT^4%n%aW>E^sJ@XL2c!%v#AS`^v{U9D#=S!E>H~?wfD3=>FyI2zG}-Z
z>AS8!gQRu0aPF<2%rW<@S#yP!u&=@Nr$X-G7H+-!85Lv>IW%Waj^tI7*GiVueOD3F
znf>?;@0TdgZ4$FXH}lTE_)qY_!7|Yo>&`wGJs!XK^J$Ol<mEwcYnTJP8JR?waVHvJ
zxB`Iy!&^rX4Nn)4Bm~onJrRL4fWVSQZ6FEPij<^~Eyou1VC`Vbw*#3d2?1d>wxj^j
c2(tPCsz&sL5#Y_r22#udg#UrGF%yUf0C~Xuh5!Hn

literal 0
HcmV?d00001

diff --git a/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseLibrariesModificationsTest.java b/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseLibrariesModificationsTest.java
index 08a2d1c44152..9a6fcdb8b5e0 100644
--- a/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseLibrariesModificationsTest.java
+++ b/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseLibrariesModificationsTest.java
@@ -128,6 +128,12 @@ public class EclipseLibrariesModificationsTest extends EclipseVarsTest {
                    new String[]{});
   }
 
+  public void testVarAddJavadoc() throws Exception {
+    doTestExisting(new String[]{"/variableidea/test.jar!/"},
+                   new String[]{"/variableidea/test.jar!/"},
+                   new String[]{"/jars/test.jar!/"});
+  }
+
   public void testVarAddVarSource() throws Exception {
     doTestExisting(new String[]{"/variableidea/test.jar!/"},
                    new String[]{"/variableidea/test.jar!/", "/srcvariableidea/test.jar!/"},