From 7e704832ede75f7c9cf7bb9b5cdd0a50f6d35d87 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Wed, 28 Aug 2013 20:56:17 +0400
Subject: [PATCH] Add inner classes to duplicateLibraries test

---
 .../duplicateLibraries/DuplicateLibTest-1.jar | Bin 1397 -> 3007 bytes
 .../duplicateLibraries/DuplicateLibTest-2.jar | Bin 1397 -> 3007 bytes
 .../duplicateLibraries/DuplicateLibraries.kt  |   6 +++++-
 .../duplicateLibraries/DuplicateLibraries.txt |   3 +++
 .../duplicateLibraries/DuplicateTest.kt.txt   |   7 ++++++-
 5 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/compiler/testData/compileKotlinAgainstCustomJava/duplicateLibraries/DuplicateLibTest-1.jar b/compiler/testData/compileKotlinAgainstCustomJava/duplicateLibraries/DuplicateLibTest-1.jar
index 0855961612f5340efcb6fd59e575df0d2f0d9e3b..638144d94a4374c3960bad128b9182534624fc82 100644
GIT binary patch
delta 2096
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

delta 491
zcmdll{*|jfz?+#xgn<JHtrm(qGavy@1{MZi*APctPd_*Pf2SB2m>B}R**QQen4rpV
zYZd{jfNS=3^z(Fc4Gz)sb^Gjl=CqHuuHHpnZ(Xf(XU<P_6O3cwobgif$ZRRC3=1)l
zCrh*{o~gdh{8aR@h!Jez1+ioKHbCP*7-S(A*m4at*Mi(tl3HAnnU}7Qa28P2#vThs
zW*|MWM{4phF5%5z7>_VYGct)Vp!yo-CC<q*TvGKQ?*@3IszP=L$a@H23uI#REXV{d
z2HfsNn6MkjM7W+&1MWPKH>Iv$m-`4*Ai>DMAcN2YWIdc*z@-iH+~j#&(o8Z;lXr6|
Th_JGO)UX1fJ5YlJ3y22*TxeGE

diff --git a/compiler/testData/compileKotlinAgainstCustomJava/duplicateLibraries/DuplicateLibTest-2.jar b/compiler/testData/compileKotlinAgainstCustomJava/duplicateLibraries/DuplicateLibTest-2.jar
index 0855961612f5340efcb6fd59e575df0d2f0d9e3b..638144d94a4374c3960bad128b9182534624fc82 100644
GIT binary patch
delta 2096
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

delta 491
zcmdll{*|jfz?+#xgn<JHtrm(qGavy@1{MZi*APctPd_*Pf2SB2m>B}R**QQen4rpV
zYZd{jfNS=3^z(Fc4Gz)sb^Gjl=CqHuuHHpnZ(Xf(XU<P_6O3cwobgif$ZRRC3=1)l
zCrh*{o~gdh{8aR@h!Jez1+ioKHbCP*7-S(A*m4at*Mi(tl3HAnnU}7Qa28P2#vThs
zW*|MWM{4phF5%5z7>_VYGct)Vp!yo-CC<q*TvGKQ?*@3IszP=L$a@H23uI#REXV{d
z2HfsNn6MkjM7W+&1MWPKH>Iv$m-`4*Ai>DMAcN2YWIdc*z@-iH+~j#&(o8Z;lXr6|
Th_JGO)UX1fJ5YlJ3y22*TxeGE

diff --git a/compiler/testData/compileKotlinAgainstCustomJava/duplicateLibraries/DuplicateLibraries.kt b/compiler/testData/compileKotlinAgainstCustomJava/duplicateLibraries/DuplicateLibraries.kt
index 5472bfb0085..081589d0337 100644
--- a/compiler/testData/compileKotlinAgainstCustomJava/duplicateLibraries/DuplicateLibraries.kt
+++ b/compiler/testData/compileKotlinAgainstCustomJava/duplicateLibraries/DuplicateLibraries.kt
@@ -2,4 +2,8 @@ package test
 
 import testing.*
 
-val testObjectProperty = TopLevelObject
\ No newline at end of file
+val testObjectProperty = TopLevelObject
+
+val outer = Outer()
+val inn3r = Outer().Inner()
+val nested = Outer.Nested()
diff --git a/compiler/testData/compileKotlinAgainstCustomJava/duplicateLibraries/DuplicateLibraries.txt b/compiler/testData/compileKotlinAgainstCustomJava/duplicateLibraries/DuplicateLibraries.txt
index d36b3924312..5962718cbf1 100644
--- a/compiler/testData/compileKotlinAgainstCustomJava/duplicateLibraries/DuplicateLibraries.txt
+++ b/compiler/testData/compileKotlinAgainstCustomJava/duplicateLibraries/DuplicateLibraries.txt
@@ -1,3 +1,6 @@
 package test
 
+internal val inn3r: testing.Outer.Inner
+internal val nested: testing.Outer.Nested
+internal val outer: testing.Outer
 internal val testObjectProperty: testing.TopLevelObject
diff --git a/compiler/testData/compileKotlinAgainstCustomJava/duplicateLibraries/DuplicateTest.kt.txt b/compiler/testData/compileKotlinAgainstCustomJava/duplicateLibraries/DuplicateTest.kt.txt
index e3b8606e6af..96fd72e944e 100644
--- a/compiler/testData/compileKotlinAgainstCustomJava/duplicateLibraries/DuplicateTest.kt.txt
+++ b/compiler/testData/compileKotlinAgainstCustomJava/duplicateLibraries/DuplicateTest.kt.txt
@@ -1,3 +1,8 @@
 package testing
 
-object TopLevelObject
\ No newline at end of file
+object TopLevelObject
+
+class Outer {
+    inner class Inner
+    class Nested
+}